Merge pull request swiftlang#637 from omochi/fix-nested-interpolation…

…-crash Fix crash on nested interpolation
andrewjl · Aug 26, 2022 · 6eb1701 · 6eb1701
2 parents 40518fa + 25703b1
commit 6eb1701
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Sources/SwiftParser/Lexer.swift b/Sources/SwiftParser/Lexer.swift
@@ -1029,7 +1029,7 @@ extension Lexer.Cursor {
       }
       if !self.isAtEndOfFile, self.peek() == UInt8(ascii: "\\") &&
            TmpPtr.delimiterMatches(customDelimiterLength) &&
-            TmpPtr.advance() == UInt8(ascii: "(") {
+            TmpPtr.peek() == UInt8(ascii: "(") {
         // Consume tokens until we hit the corresponding ')'.
         self = Self.skipToEndOfInterpolatedExpression(TmpPtr, IsMultilineString)
         if self.advance(if: { $0 == Unicode.Scalar(")") }) {

diff --git a/Tests/SwiftParserTest/Expressions.swift b/Tests/SwiftParserTest/Expressions.swift
@@ -194,6 +194,24 @@ final class ExpressionTests: XCTestCase {
       return "Fixit: \(range.debugDescription) Text: \"\(text)\""
       """#
     }
+
+    try AssertParse({ $0.parseExpression() }) {
+      #"""
+      "text \(array.map({ "\($0)" }).joined(separator: ",")) text"
+      """#
+    }
+
+    try AssertParse({ $0.parseExpression() }) {
+      #"""
+      """
+      \(gen(xx) { (x) in
+          return """
+          case
+      """
+      })
+      """
+      """#
+    }
   }
 
   func testStringLiterals() throws {