Add newline fix-it after consecutive statements

Author: kimdv

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -717,8 +717,16 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
           position: position,
           .consecutiveStatementsOnSameLine,
           fixIts: [
-            FixIt(message: .insertSemicolon, changes: .makePresent(semicolon))
-          ],
+            node.lastToken(viewMode: .sourceAccurate).map {
+              FixIt(
+                message: .insertNewline,
+                changes: [
+                  .replaceTrailingTrivia(token: $0, newTrivia: $0.trailingTrivia + .newlines(1) + getIndentation(for: $0))
+                ]
+              )
+            },
+            FixIt(message: .insertSemicolon, changes: .makePresent(semicolon)),
+          ].compactMap { $0 },
           handledNodes: [semicolon.id]
         )
       } else {

Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift

@@ -109,7 +109,7 @@ extension DiagnosticMessage where Self == StaticParserError {
     .init("consecutive declarations on a line must be separated by newline or ';'")
   }
   public static var consecutiveStatementsOnSameLine: Self {
-    .init("consecutive statements on a line must be separated by ';'")
+    .init("consecutive statements on a line must be separated by newline or ';'")
   }
   public static var cStyleForLoop: Self {
     .init("C-style for statement has been removed in Swift 3")

Tests/SwiftParserTest/DeclarationTests.swift

@@ -328,9 +328,54 @@ final class DeclarationTests: XCTestCase {
       internal(set) var defaultProp = 0
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "consecutive statements on a line must be separated by ';'", fixIts: ["insert ';'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "consecutive statements on a line must be separated by ';'", fixIts: ["insert ';'"]),
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+      ],
+      applyFixIts: ["insert newline"],
+      fixedSource: """
+        open
+        open(set)
+        var openProp = 0
+        public public(set) var publicProp = 0
+        package package(set) var packageProp = 0
+        internal internal(set) var internalProp = 0
+        fileprivate fileprivate(set) var fileprivateProp = 0
+        private private(set) var privateProp = 0
+        internal(set) var defaultProp = 0
+        """
+    )
+
+    assertParse(
+      """
+      open1️⃣ open(set)2️⃣ var openProp = 0
+      public public(set) var publicProp = 0
+      package package(set) var packageProp = 0
+      internal internal(set) var internalProp = 0
+      fileprivate fileprivate(set) var fileprivateProp = 0
+      private private(set) var privateProp = 0
+      internal(set) var defaultProp = 0
+      """,
+      diagnostics: [
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
       ],
+      applyFixIts: ["insert ';'"],
       fixedSource: """
         open; open(set); var openProp = 0
         public public(set) var publicProp = 0
@@ -1024,18 +1069,74 @@ final class DeclarationTests: XCTestCase {
     )
   }
 
-  func testTextRecovery() {
+  func testTextRecovery1() {
     assertParse(
       """
       Lorem1️⃣ ipsum2️⃣ dolor3️⃣ sit4️⃣ amet5️⃣, consectetur adipiscing elit
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "consecutive statements on a line must be separated by ';'", fixIts: ["insert ';'"]),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "consecutive statements on a line must be separated by ';'", fixIts: ["insert ';'"]),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "consecutive statements on a line must be separated by ';'", fixIts: ["insert ';'"]),
-        DiagnosticSpec(locationMarker: "4️⃣", message: "consecutive statements on a line must be separated by ';'", fixIts: ["insert ';'"]),
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "3️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "4️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(locationMarker: "5️⃣", message: "extraneous code ', consectetur adipiscing elit' at top level"),
+      ],
+      applyFixIts: ["insert newline"],
+      fixedSource: """
+        Lorem
+        ipsum
+        dolor
+        sit
+        amet, consectetur adipiscing elit
+        """
+    )
+  }
+
+  func testTextRecovery2() {
+    assertParse(
+      """
+      Lorem1️⃣ ipsum2️⃣ dolor3️⃣ sit4️⃣ amet5️⃣, consectetur adipiscing elit
+      """,
+      diagnostics: [
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "3️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "4️⃣",
+          message: "consecutive statements on a line must be separated by newline or ';'",
+          fixIts: ["insert newline", "insert ';'"]
+        ),
         DiagnosticSpec(locationMarker: "5️⃣", message: "extraneous code ', consectetur adipiscing elit' at top level"),
       ],
+      applyFixIts: ["insert ';'"],
       fixedSource: """
         Lorem; ipsum; dolor; sit; amet, consectetur adipiscing elit
         """