tree-sitter-zsh 0.39.0 → 0.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-zsh",
-  "version": "0.39.0",
+  "version": "0.41.0",
   "description": "Zsh grammar for tree-sitter",
   "repository": "https://github.com/geohar/tree-sitter-zsh",
   "license": "MIT",

package/src/scanner.c

@@ -966,15 +966,11 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
                 "valid_symbols[CONCAT]=%d, lookahead='%c'\n",
                 valid_symbols[CONCAT], lexer->lookahead);
 #endif
-        if (!valid_symbols[CONCAT] &&
-            (lexer->lookahead == ' ' || lexer->lookahead == '\t')) {
+        if (!valid_symbols[CONCAT] && iswspace(lexer->lookahead)) {
 #if DEBUG
             fprintf(stderr, "SCANNER: BARE_DOLLAR skipping whitespace\n");
 #endif
-            while ((lexer->lookahead == ' ' || lexer->lookahead == '\t') &&
-                   !lexer->eof(lexer)) {
-                skip(lexer);
-            }
+            skip_wsnl(lexer);
         }
 
         if (lexer->lookahead == '$') {
@@ -1805,20 +1801,14 @@ regex:
                 }
             }
 
+#if DEBUG
+        fprintf(stderr, "DEBUG: regex scan start\n");
+#endif
+
             lexer->mark_end(lexer);
 
             State state = {false, false, false, false, false, 0, 0, 0};
             while (!state.done) {
-                if (state.in_single_quote) {
-                    if (lexer->lookahead == '\'') {
-                        state.in_single_quote = false;
-                        advance(lexer);
-                        lexer->mark_end(lexer);
-
-                        // Track entering parameter expansion context
-                        enter_context(scanner, CTX_RAW_STRING);     // FIXME!
-                    }
-                }
                 switch (lexer->lookahead) {
                 case '\\':
                     state.last_was_escape = true;
@@ -1862,8 +1852,26 @@ regex:
                     break;
                 case '\'':
                     // Enter or exit a single-quoted string.
-                    state.in_single_quote = !state.in_single_quote;
+                    if (state.in_single_quote) {
+                        state.in_single_quote = false;
+#if DEBUG
+        fprintf(stderr, "DEBUG: regex scan exit raw string\n");
+#endif
+
+                        // Track entering parameter expansion context
+                        exit_context(scanner, CTX_RAW_STRING);
+                    } else {
+                        state.in_single_quote = true;
+#if DEBUG
+        fprintf(stderr, "DEBUG: regex scan entering raw string\n");
+#endif
+
+                        // Track entering parameter expansion context
+                        enter_context(scanner, CTX_RAW_STRING);
+
+                    }
                     advance(lexer);
+                    lexer->mark_end(lexer);
                     state.advanced_once = true;
                     state.last_was_escape = false;
                     continue;
@@ -1964,6 +1972,10 @@ regex:
                 return false;
             }
 
+#if DEBUG
+        fprintf(stderr, "DEBUG: regex scan returning regex\n");
+#endif
+
             return true;
         }
     }