fix: do not parse strings inside a REGEX_NO_SPACE

tree-sitter · Aug 28, 2023 · 94ae7b8 · 94ae7b8
1 parent 7e7187d
commit 94ae7b8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/scanner.c b/src/scanner.c
@@ -660,6 +660,8 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
                             if (!lexer->eof(lexer)) {
                                 advance(lexer);
                             }
+                        } else if (lexer->lookahead == '"') {
+                            return false;
                         } else {
                             if (iswspace(lexer->lookahead)) {
                                 lexer->mark_end(lexer);

diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
@@ -1027,6 +1027,7 @@ Test commands with regexes
 [[ ${var1} == *${var2}* ]]
 [[ "$server" =~ [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} ]]
 [[ "$primary_wins" =~ ([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}) ]]
+[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]]
 
 --------------------------------------------------------------------------------
 
@@ -1086,7 +1087,23 @@ Test commands with regexes
       (string
         (simple_expansion
           (variable_name)))
-      (regex))))
+      (regex)))
+  (test_command
+    (unary_expression
+      (test_operator)
+      (binary_expression
+        (binary_expression
+          (expansion
+            (variable_name))
+          (command_substitution
+            (command
+              (command_name (word))
+              (word)
+              (word)
+              (word)
+              (number)
+              (string (expansion (variable_name))))))
+        (concatenation (word) (string) (word))))))
 
 ================================================================================
 Subshells