Fix wrong wrapping of quote tokens around identifiers

Author: kimdv

Sources/SwiftParser/StringLiterals.swift

@@ -487,7 +487,7 @@ extension Parser {
       // string literal.
       guard currentToken.leadingTriviaText.isEmpty else { break }
 
-      if let stringSegment = self.consume(if: .stringSegment) {
+      if let stringSegment = self.consume(if: .stringSegment, TokenSpec(.identifier, remapping: .stringSegment)) {
         segments.append(.stringSegment(RawStringSegmentSyntax(content: stringSegment, arena: self.arena)))
       } else if let backslash = self.consume(if: .backslash) {
         let (unexpectedBeforeDelimiter, delimiter) = self.parsePoundDelimiter(.rawStringDelimiter, matching: openDelimiter)

Tests/SwiftParserTest/AttributeTests.swift

@@ -422,12 +422,23 @@ final class AttributeTests: XCTestCase {
 
     assertParse(
       """
-      @_expose(Cxx, 1️⃣baz) func foo() {}
+      @_expose(Cxx, 1️⃣baz2️⃣) func foo() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected string literal to end @_expose arguments", fixIts: ["insert string literal"]),
-        DiagnosticSpec(message: "unexpected code 'baz' in attribute"),
-      ]
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: #"expected '"' in string literal"#,
+          fixIts: [#"insert '"'"#]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: #"expected '"' to end string literal"#,
+          fixIts: [#"insert '"'"#]
+        ),
+      ],
+      fixedSource: """
+        @_expose(Cxx, "baz") func foo() {}
+        """
     )
   }
 
@@ -493,13 +504,25 @@ final class AttributeTests: XCTestCase {
 
     assertParse(
       """
-      @_unavailableFromAsync(message: 1️⃣abc)
+      @_unavailableFromAsync(message: 1️⃣abc2️⃣)
       func foo() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected string literal to end @_unavailableFromAsync argument", fixIts: ["insert string literal"]),
-        DiagnosticSpec(message: "unexpected code 'abc' in attribute"),
-      ]
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: #"expected '"' in string literal"#,
+          fixIts: [#"insert '"'"#]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: #"expected '"' to end string literal"#,
+          fixIts: [#"insert '"'"#]
+        ),
+      ],
+      fixedSource: """
+        @_unavailableFromAsync(message: "abc")
+        func foo() {}
+        """
     )
   }
 

Tests/SwiftParserTest/translated/OriginalDefinedInAttrTests.swift

@@ -61,12 +61,40 @@ final class OriginalDefinedInAttrTests: XCTestCase {
   func testOriginalDefinedInAttr5() {
     assertParse(
       """
-      @_originallyDefinedIn(1️⃣OSX 13.13.3)
+      @_originallyDefinedIn(1️⃣OSX 2️⃣13.13.3)
       public class ToplevelClass2 {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected 'module:', string literal, and ',' in @_originallyDefinedIn arguments", fixIts: ["insert 'module:', string literal, and ','"])
-      ]
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "expected 'module:' in @_originallyDefinedIn arguments",
+          fixIts: ["insert 'module:'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: #"expected '"' in string literal"#,
+          fixIts: [#"insert '"'"#]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: #"expected '"' to end string literal"#,
+          fixIts: [#"insert '"'"#]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "expected ',' in @_originallyDefinedIn arguments",
+          fixIts: ["insert ','"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "expected platform in version restriction",
+          fixIts: ["insert platform"]
+        ),
+      ],
+      fixedSource: """
+        @_originallyDefinedIn(module: "OSX" , <#identifier#>13.13.3)
+        public class ToplevelClass2 {}
+        """
     )
   }