Fix regex literal parsing

tisohjung · Dec 3, 2022 · 852b9af · 852b9af
1 parent ce82120
commit 852b9af
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 6 deletions.
diff --git a/Snapshots/Issues/1269.swift b/Snapshots/Issues/1269.swift
@@ -1,4 +1,4 @@
-// switformat:options --swiftversion 5.7
+// swiftformat:options --swiftversion 5.7
 
 struct Foo<Value> {
     func bar<V, R>(

diff --git a/Snapshots/Issues/1319.swift b/Snapshots/Issues/1319.swift
@@ -0,0 +1,4 @@
+// swiftformat:options --swiftversion 5.7
+// swiftformat:disable --redundantLet
+
+let _ = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/
diff --git a/Sources/Tokenizer.swift b/Sources/Tokenizer.swift
@@ -812,12 +812,8 @@ private extension UnicodeScalarView {
         var start = self
         if var tail = readCharacter(where: isHead) {
             switch tail {
-            case "?", "!", "\\":
+            case "/" where !["*", "/"].contains(first), "?", "!", "\\":
                 return .operator(String(tail), .none)
-            case "/":
-                if first == "\\" {
-                    return .operator("/", .none)
-                }
             default:
                 start = self
             }

diff --git a/Tests/TokenizerTests.swift b/Tests/TokenizerTests.swift
@@ -729,6 +729,22 @@ class TokenizerTests: XCTestCase {
         XCTAssertEqual(tokenize(input), output)
     }
 
+    func testAnchoredSingleLineRegexLiteral() {
+        let input = "let _ = /^foo$/"
+        let output: [Token] = [
+            .keyword("let"),
+            .space(" "),
+            .identifier("_"),
+            .space(" "),
+            .operator("=", .infix),
+            .space(" "),
+            .startOfScope("/"),
+            .stringBody("^foo$"),
+            .endOfScope("/"),
+        ]
+        XCTAssertEqual(tokenize(input), output)
+    }
+
     func testSingleLineRegexLiteralStartingWithEscapeSequence() {
         let input = "let regex = /\\w+/"
         let output: [Token] = [
@@ -943,6 +959,36 @@ class TokenizerTests: XCTestCase {
         XCTAssertEqual(tokenize(input), output)
     }
 
+    func testPrefixSlashCaretOperator() {
+        let input = "let _ = /^foo"
+        let output: [Token] = [
+            .keyword("let"),
+            .space(" "),
+            .identifier("_"),
+            .space(" "),
+            .operator("=", .infix),
+            .space(" "),
+            .operator("/^", .prefix),
+            .identifier("foo"),
+        ]
+        XCTAssertEqual(tokenize(input), output)
+    }
+
+    func testPrefixSlashQueryOperator() {
+        let input = "let _ = /?foo"
+        let output: [Token] = [
+            .keyword("let"),
+            .space(" "),
+            .identifier("_"),
+            .space(" "),
+            .operator("=", .infix),
+            .space(" "),
+            .operator("/?", .prefix),
+            .identifier("foo"),
+        ]
+        XCTAssertEqual(tokenize(input), output)
+    }
+
     // MARK: Single-line comments
 
     func testSingleLineComment() {