Merge pull request swiftlang#690 from omochi/missing-string-closer

Generate missing string closer quote and delimiter

Author: ahoppen

Sources/SwiftParser/Expressions.swift

@@ -907,7 +907,9 @@ extension Parser {
       at: openDelimiter != nil ? .leadingRaw : .leading,
       text: text
     ) ?? RawTokenSyntax(missing: .stringQuote, arena: arena)
-    text = text.dropFirst(openQuote.tokenText.count)
+    if !openQuote.isMissing {
+      text = text.dropFirst(openQuote.tokenText.count)
+    }
 
     /// Parse segments.
     let (segments, closeStart) = self.parseStringLiteralSegments(
@@ -917,16 +919,31 @@ extension Parser {
     /// Parse close quote.
     let closeQuote = self.parseStringLiteralQuote(
       at: openDelimiter != nil ? .trailingRaw : .trailing,
-      text: text[closeStart...]
+      text: text
     ) ?? RawTokenSyntax(missing: openQuote.tokenKind, arena: arena)
-    text = text.dropFirst(closeQuote.byteLength)
-
+    if !closeQuote.isMissing {
+      text = text.dropFirst(closeQuote.tokenText.count)
+    }
     /// Parse closing raw string delimiter if exist.
-    let closeDelimiter = self.parseStringLiteralDelimiter(at: .trailing, text: text)
+    let closeDelimiter: RawTokenSyntax?
+    if let delimiter = self.parseStringLiteralDelimiter(
+      at: .trailing,
+      text: text
+    ) {
+      closeDelimiter = delimiter
+    } else if let openDelimiter = openDelimiter {
+      closeDelimiter = RawTokenSyntax(
+        missing: .rawStringDelimiter,
+        text: openDelimiter.tokenText,
+        arena: arena
+      )
+    } else {
+      closeDelimiter = nil
+    }
     assert((openDelimiter == nil) == (closeDelimiter == nil),
            "existence of open/close delimiter should match")
-    if let closeDelimiter = closeDelimiter {
-      text = text.dropFirst(closeDelimiter.tokenText.count)
+    if let closeDelimiter = closeDelimiter, !closeDelimiter.isMissing {
+      text = text.dropFirst(closeDelimiter.byteLength)
     }
 
     assert(text.isEmpty,
@@ -1060,7 +1077,10 @@ extension Parser {
       // position == .leadingRaw implies that we saw a `#` before the quote.
       // A multiline string literal must always start its contents on a new line.
       // Thus we are parsing somethign like #"""#, which is not a multiline string literal but a raw literal containing a single quote.
-      if position == .leadingRaw && text[index] == UInt8(ascii: "#") {
+      if position == .leadingRaw,
+         index < text.endIndex,
+         text[index] == UInt8(ascii: "#")
+      {
         quoteCount = 1
         index = text.index(text.startIndex, offsetBy: quoteCount)
       }

Sources/SwiftSyntax/Raw/RawSyntaxNodeProtocol.swift

@@ -158,10 +158,14 @@ public struct RawTokenSyntax: RawSyntaxNodeProtocol {
   /// If `text` is passed, it will be used to represent the missing token's text.
   /// If `text` is `nil`, the `kind`'s default text will be used.
   /// If that is also `nil`, the token will have empty text.
-  public init(missing kind: RawTokenKind, arena: __shared SyntaxArena) {
+  public init(
+    missing kind: RawTokenKind,
+    text: SyntaxText? = nil,
+    arena: __shared SyntaxArena
+  ) {
     self.init(
       kind: kind,
-      text: kind.defaultText ?? "",
+      text: text ?? kind.defaultText ?? "",
       leadingTriviaPieces: [],
       trailingTriviaPieces: [],
       presence: .missing,

Tests/SwiftParserTest/Expressions.swift

@@ -310,6 +310,36 @@ final class ExpressionTests: XCTestCase {
        """"""#^DIAG^#
        """##
      )
+
+    AssertParse(
+      ##"""
+      #"#^DIAG^#
+      """##,
+      diagnostics: [
+        DiagnosticSpec(message: #"Expected '"' in string literal"#),
+        DiagnosticSpec(message: #"Expected '#' in string literal"#)
+      ]
+    )
+
+    AssertParse(
+      ##"""
+      #"""#^DIAG^#
+      """##,
+      diagnostics: [
+        DiagnosticSpec(message: #"Expected '"""' in string literal"#),
+        DiagnosticSpec(message: #"Expected '#' in string literal"#)
+      ]
+    )
+
+    AssertParse(
+      ##"""
+      #"""a#^DIAG^#
+      """##,
+      diagnostics: [
+        DiagnosticSpec(message: #"Expected '"""' in string literal"#),
+        DiagnosticSpec(message: #"Expected '#' in string literal"#)
+      ]
+    )
   }
 
   func testSingleQuoteStringLiteral() {