Format code

Author: DougGregor

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxCollectionsFile.swift

@@ -38,12 +38,12 @@ let syntaxCollectionsFile = SourceFileSyntax(leadingTrivia: generateCopyrightHea
   for node in SYNTAX_NODES where node.isSyntaxCollection {
     let documentation =
       node.description.map { "/// " + $0 }
-        ?? """
-        /// `\(node.name)` represents a collection of one or more
-        /// `\(node.collectionElement)` nodes. \(node.name) behaves
-        /// as a regular Swift collection, and has accessors that return new
-        /// versions of the collection with different children.
-        """
+      ?? """
+      /// `\(node.name)` represents a collection of one or more
+      /// `\(node.collectionElement)` nodes. \(node.name) behaves
+      /// as a regular Swift collection, and has accessors that return new
+      /// versions of the collection with different children.
+      """
 
     try! StructDeclSyntax(
       """

Sources/SwiftDiagnostics/DiagnosticsFormatter.swift

@@ -53,7 +53,8 @@ public struct DiagnosticsFormatter {
   /// Print given diagnostics for a given syntax tree on the command line
   func annotatedSource<SyntaxType: SyntaxProtocol>(
     fileName: String?,
-    tree: SyntaxType, diags: [Diagnostic],
+    tree: SyntaxType,
+    diags: [Diagnostic],
     indentString: String,
     suffixText: [(AbsolutePosition, String)]
   ) -> String {
@@ -124,7 +125,7 @@ public struct DiagnosticsFormatter {
 
       // add indentation
       annotatedSource.append(indentString)
-      
+
       // print the source line
       annotatedSource.append("\(linePrefix)\(annotatedLine.sourceString)")
 
@@ -168,7 +169,8 @@ public struct DiagnosticsFormatter {
 
   /// Print given diagnostics for a given syntax tree on the command line
   public func annotatedSource<SyntaxType: SyntaxProtocol>(
-    tree: SyntaxType, diags: [Diagnostic]
+    tree: SyntaxType,
+    diags: [Diagnostic]
   ) -> String {
     return annotatedSource(
       fileName: nil,

Sources/SwiftDiagnostics/GroupedDiagnostics.swift

@@ -49,7 +49,7 @@ public struct GroupedDiagnostics {
   /// source file IDs.
   var rootIndexes: [SourceFileSyntax: SourceFileID] = [:]
 
-  public init() { }
+  public init() {}
 
   /// Add a new source file to the set of grouped diagnostics.
   ///
@@ -106,7 +106,8 @@ public struct GroupedDiagnostics {
   ///   - knownSourceFileID: the source file into which this diagnostic goes,
   ///     if known.
   public mutating func addDiagnostic(
-    _ diagnostic: Diagnostic, in knownSourceFileID: SourceFileID? = nil
+    _ diagnostic: Diagnostic,
+    in knownSourceFileID: SourceFileID? = nil
   ) {
     guard let sourceFileID = knownSourceFileID ?? findSourceFileContaining(diagnostic.node) else {
       // Drop the diagnostic on the floor.
@@ -175,13 +176,14 @@ extension GroupedDiagnostics {
     }
 
     // Render the buffer.
-    return prefixString + formatter.annotatedSource(
-      fileName: isRoot ? sourceFile.displayName : nil,
-      tree: sourceFile.tree,
-      diags: sourceFile.diagnostics,
-      indentString: indentString,
-      suffixText: childSources
-    ) + suffixString
+    return prefixString
+      + formatter.annotatedSource(
+        fileName: isRoot ? sourceFile.displayName : nil,
+        tree: sourceFile.tree,
+        diags: sourceFile.diagnostics,
+        indentString: indentString,
+        suffixText: childSources
+      ) + suffixString
   }
 }
 

Tests/SwiftDiagnosticsTest/GroupDiagnosticsFormatterTests.swift

@@ -35,7 +35,7 @@ extension GroupedDiagnostics {
     _ markedSource: String,
     displayName: String,
     parent: (SourceFileID, AbsolutePosition)? = nil,
-    extraDiagnostics: [String : (String, DiagnosticSeverity)] = [:]
+    extraDiagnostics: [String: (String, DiagnosticSeverity)] = [:]
   ) -> (SourceFileID, [String: AbsolutePosition]) {
     // Parse the source file and produce parser diagnostics.
     let (markers, source) = extractMarkers(markedSource)
@@ -85,7 +85,7 @@ final class GroupedDiagnosticsFormatterTests: XCTestCase {
       print("hello"
       """,
       displayName: "main.swift",
-      extraDiagnostics: ["0️⃣" : ("in expansion of macro 'myAssert' here", .note)]
+      extraDiagnostics: ["0️⃣": ("in expansion of macro 'myAssert' here", .note)]
     )
     let inExpansionNotePos = mainSourceMarkers["0️⃣"]!
 
@@ -101,14 +101,16 @@ final class GroupedDiagnosticsFormatterTests: XCTestCase {
       displayName: "#myAssert",
       parent: (mainSourceID, inExpansionNotePos),
       extraDiagnostics: [
-        "0️⃣" : ("no matching operator '==' for types 'Double' and 'Int'", .error)
+        "0️⃣": ("no matching operator '==' for types 'Double' and 'Int'", .error)
       ]
     )
 
     let formatter = DiagnosticsFormatter()
     let annotated = formatter.annotateSources(in: group)
     print(annotated)
-    AssertStringsEqualWithDiff(annotated, """
+    AssertStringsEqualWithDiff(
+      annotated,
+      """
       === main.swift ===
       1 │ let pi = 3.14159
       2 │ #myAssert(pi == 3)
@@ -139,7 +141,7 @@ final class GroupedDiagnosticsFormatterTests: XCTestCase {
       print("hello"
       """,
       displayName: "main.swift",
-      extraDiagnostics: ["0️⃣" : ("in expansion of macro 'myAssert' here", .note)]
+      extraDiagnostics: ["0️⃣": ("in expansion of macro 'myAssert' here", .note)]
     )
     let inExpansionNotePos = mainSourceMarkers["0️⃣"]!
 
@@ -155,7 +157,7 @@ final class GroupedDiagnosticsFormatterTests: XCTestCase {
       displayName: "#myAssert",
       parent: (mainSourceID, inExpansionNotePos),
       extraDiagnostics: [
-        "0️⃣" : ("in expansion of macro 'invertedEqualityCheck' here", .note)
+        "0️⃣": ("in expansion of macro 'invertedEqualityCheck' here", .note)
       ]
     )
     let inInnerExpansionNotePos = outerExpansionSourceMarkers["0️⃣"]!
@@ -168,14 +170,16 @@ final class GroupedDiagnosticsFormatterTests: XCTestCase {
       displayName: "#invertedEqualityCheck",
       parent: (outerExpansionSourceID, inInnerExpansionNotePos),
       extraDiagnostics: [
-        "0️⃣" : ("no matching operator '==' for types 'Double' and 'Int'", .error)
+        "0️⃣": ("no matching operator '==' for types 'Double' and 'Int'", .error)
       ]
     )
 
     let formatter = DiagnosticsFormatter()
     let annotated = formatter.annotateSources(in: group)
     print(annotated)
-    AssertStringsEqualWithDiff(annotated, """
+    AssertStringsEqualWithDiff(
+      annotated,
+      """
       === main.swift ===
       1 │ let pi = 3.14159
       2 │ #myAssert(pi == 3)

Tests/SwiftParserTest/translated/StringLiteralEofTests.swift

@@ -105,7 +105,7 @@ final class StringLiteralEofTests: XCTestCase {
             foo
             \(<#expression#>)"""
         """##
-      // FIXME: The closing delimiter should be put on the new line
+        // FIXME: The closing delimiter should be put on the new line
     )
   }