Merge pull request #1355 from kimdv/kimdv/update-swift-syntax

Fix leading newline in source files

Author: kimdv

CodeGeneration/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"])
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", revision: "cf413a6fe9a82e3f8e1c022cac6f6d23dfb1a035"),
+    .package(url: "https://github.com/apple/swift-syntax.git", revision: "4727d3c3f81be056cf7f9636d682ac9879270d12"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
   ],
   targets: [

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -27,16 +27,8 @@ public class CodeGenerationFormat: BasicFormat {
     }
   }
 
-  public override func visit(_ node: MemberDeclBlockSyntax) -> MemberDeclBlockSyntax {
-    if node.members.count == 0 {
-      return node.with(\.leftBrace, .leftBraceToken())
-    } else {
-      return super.visit(node)
-    }
-  }
-
   public override func visit(_ node: CodeBlockItemSyntax) -> CodeBlockItemSyntax {
-    if node.parent?.parent?.is(SourceFileSyntax.self) == true, !node.item.is(ImportDeclSyntax.self) {
+    if node.parent?.parent?.is(SourceFileSyntax.self) == true, !shouldBeSeparatedByTwoNewlines(node: node) {
       let formatted = super.visit(node)
       return ensuringTwoLeadingNewlines(node: formatted)
     } else {
@@ -64,9 +56,17 @@ public class CodeGenerationFormat: BasicFormat {
     }
   }
 
+  public override func visit(_ node: MemberDeclBlockSyntax) -> MemberDeclBlockSyntax {
+    if node.members.count == 0 {
+      return node.with(\.leftBrace, .leftBraceToken())
+    } else {
+      return super.visit(node)
+    }
+  }
+
   public override func visit(_ node: MemberDeclListItemSyntax) -> MemberDeclListItemSyntax {
     let formatted = super.visit(node)
-    if node.indexInParent != 0 {
+    if node.indexInParent != 0 && !node.decl.is(EnumCaseDeclSyntax.self) {
       return ensuringTwoLeadingNewlines(node: formatted)
     } else {
       return formatted
@@ -85,6 +85,12 @@ public class CodeGenerationFormat: BasicFormat {
 
   // MARK: - Private
 
+  private func shouldBeSeparatedByTwoNewlines(node: CodeBlockItemSyntax) -> Bool {
+    // First item in the `CodeBlockItemListSyntax` don't need a newline or identation if the parent is a `SourceFileSyntax`.
+    // We want to group imports so newline between them should be omitted
+    return node.parent?.as(CodeBlockItemListSyntax.self)?.first == node || node.item.is(ImportDeclSyntax.self)
+  }
+
   private func ensuringTwoLeadingNewlines<NodeType: SyntaxProtocol>(node: NodeType) -> NodeType {
     if node.leadingTrivia?.first?.isNewline ?? false {
       return node.with(\.leadingTrivia, indentedNewline + (node.leadingTrivia ?? []))

Sources/IDEUtils/generated/SyntaxClassification.swift

@@ -1,4 +1,3 @@
-
 //// Automatically Generated by generate-ideutils
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
@@ -18,58 +17,40 @@
 public enum SyntaxClassification {
   /// An attribute starting with an `@`.
   case attribute
-  
   /// A block comment starting with `/**` and ending with `*/.
   case blockComment
-  
   /// A build configuration directive like `#if`, `#elseif`, `#else`.
   case buildConfigId
-  
   /// A doc block comment starting with `/**` and ending with `*/.
   case docBlockComment
-  
   /// A doc line comment starting with `///`.
   case docLineComment
-  
   /// An identifier starting with `$` like `$0`.
   case dollarIdentifier
-  
   /// An editor placeholder of the form `<#content#>`
   case editorPlaceholder
-  
   /// A floating point literal.
   case floatingLiteral
-  
   /// A generic identifier.
   case identifier
-  
   /// An integer literal.
   case integerLiteral
-  
   /// A Swift keyword, including contextual keywords.
   case keyword
-  
   /// A line comment starting with `//`.
   case lineComment
-  
   /// The token should not receive syntax coloring.
   case none
-  
   /// An image, color, etc. literal.
   case objectLiteral
-  
   /// An identifier referring to an operator.
   case operatorIdentifier
-  
   /// A `#` keyword like `#warning`.
   case poundDirectiveKeyword
-  
   /// The opening and closing parenthesis of string interpolation.
   case stringInterpolationAnchor
-  
   /// A string literal including multiline string literals.
   case stringLiteral
-  
   /// An identifier referring to a type.
   case typeIdentifier
 }

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -1,4 +1,3 @@
-
 //// Automatically Generated by generate-swiftbasicformat
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//

Sources/SwiftParser/generated/DeclarationModifier.swift

@@ -1,4 +1,3 @@
-
 //// Automatically Generated by generate-swiftparser
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
@@ -17,69 +16,37 @@
 
 enum DeclarationModifier: TokenSpecSet {
   case `static`
-  
   case `class`
-  
   case final
-  
   case required
-  
   case optional
-  
   case lazy
-  
   case dynamic
-  
   case infix
-  
   case prefix
-  
   case postfix
-  
   case __consuming
-  
   case mutating
-  
   case nonmutating
-  
   case convenience
-  
   case override
-  
   case `private`
-  
   case `fileprivate`
-  
   case `internal`
-  
   case `public`
-  
   case package
-  
   case open
-  
   case __setter_access
-  
   case weak
-  
   case unowned
-  
   case `rethrows`
-  
   case indirect
-  
   case isolated
-  
   case async
-  
   case reasync
-  
   case nonisolated
-  
   case distributed
-  
   case _const
-  
   case _local
 
   init?(lexeme: Lexer.Lexeme) {

Sources/SwiftParser/generated/Parser+Entry.swift

@@ -1,4 +1,3 @@
-
 //// Automatically Generated by generate-swiftparser
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//

Sources/SwiftParser/generated/TokenSpecStaticMembers.swift

@@ -1,4 +1,3 @@
-
 //// Automatically Generated by generate-swiftparser
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//

Sources/SwiftParser/generated/TypeAttribute.swift

@@ -1,4 +1,3 @@
-
 //// Automatically Generated by generate-swiftparser
 //// Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
@@ -18,27 +17,16 @@
 extension Parser {
   enum TypeAttribute: TokenSpecSet {
     case autoclosure
-    
     case convention
-    
     case noescape
-    
     case escaping
-    
     case differentiable
-    
     case noDerivative
-    
     case async
-    
     case Sendable
-    
     case unchecked
-    
     case _local
-    
     case _noMetadata
-    
     case _opaqueReturnTypeOf
 
     init?(lexeme: Lexer.Lexeme) {