Fix compilation errors after rebase

Author: ahoppen

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -813,6 +813,28 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     if shouldSkip(node) {
       return .skipChildren
     }
+    if let singleQuote = node.unexpectedBetweenOpenDelimiterAndOpenQuote?.onlyToken(where: { $0.tokenKind == .singleQuote }) {
+      let fixIt = FixIt(
+        message: ReplaceTokensFixIt(replaceTokens: [singleQuote], replacement: node.openQuote),
+        changes: [
+          .makeMissing(singleQuote, transferTrivia: false),
+          .makePresent(node.openQuote, leadingTrivia: singleQuote.leadingTrivia ?? []),
+          .makeMissing(node.unexpectedBetweenSegmentsAndCloseQuote, transferTrivia: false),
+          .makePresent(node.closeQuote, trailingTrivia: node.unexpectedBetweenSegmentsAndCloseQuote?.trailingTrivia ?? []),
+        ]
+      )
+      addDiagnostic(
+        singleQuote,
+        .singleQuoteStringLiteral,
+        fixIts: [fixIt],
+        handledNodes: [
+          node.unexpectedBetweenOpenDelimiterAndOpenQuote?.id,
+          node.openQuote.id,
+          node.unexpectedBetweenSegmentsAndCloseQuote?.id,
+          node.closeQuote.id,
+        ].compactMap { $0 }
+      )
+    }
     for (diagnostic, handledNodes) in MultiLineStringLiteralIndentatinDiagnosticsGenerator.diagnose(node) {
       addDiagnostic(diagnostic, handledNodes: handledNodes)
     }
@@ -870,37 +892,6 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     return .visitChildren
   }
 
-  public override func visit(_ node: StringLiteralExprSyntax) -> SyntaxVisitorContinueKind {
-    if shouldSkip(node) {
-      return .skipChildren
-    }
-
-    if let singleQuote = node.unexpectedBetweenOpenDelimiterAndOpenQuote?.onlyToken(where: { $0.tokenKind == .singleQuote }) {
-      let fixIt = FixIt(
-        message: ReplaceTokensFixIt(replaceTokens: [singleQuote], replacement: node.openQuote),
-        changes: [
-          .makeMissing(singleQuote, transferTrivia: false),
-          .makePresent(node.openQuote, leadingTrivia: singleQuote.leadingTrivia ?? []),
-          .makeMissing(node.unexpectedBetweenSegmentsAndCloseQuote, transferTrivia: false),
-          .makePresent(node.closeQuote, trailingTrivia: node.unexpectedBetweenSegmentsAndCloseQuote?.trailingTrivia ?? []),
-        ]
-      )
-      addDiagnostic(
-        singleQuote,
-        .singleQuoteStringLiteral,
-        fixIts: [fixIt],
-        handledNodes: [
-          node.unexpectedBetweenOpenDelimiterAndOpenQuote?.id,
-          node.openQuote.id,
-          node.unexpectedBetweenSegmentsAndCloseQuote?.id,
-          node.closeQuote.id,
-        ].compactMap { $0 }
-      )
-    }
-
-    return .visitChildren
-  }
-
   public override func visit(_ node: SwitchCaseSyntax) -> SyntaxVisitorContinueKind {
     if shouldSkip(node) {
       return .skipChildren

Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift

@@ -415,7 +415,7 @@ public struct StaticParserNote: NoteMessage {
 extension NoteMessage where Self == StaticParserNote {
   /// Please order alphabetically by property name.
   public static var shouldMatchIndentationOfClosingQuote: Self {
-    .init("should match indentation here"
+    .init("should match indentation here")
   }
 }