Update queries

tgross35 · Jan 3, 2024 · 0b8b1a0 · 0b8b1a0
1 parent 991760c
commit 0b8b1a0
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 116 deletions.
diff --git a/package.json b/package.json
@@ -38,11 +38,11 @@
         ".JUSTFILE",
         ".Justfile"
       ],
+      "first-line-regex": "#!\\S*bin\\S*[/ ]just",
+      "injection-regex": "^(?i)just(file)?$",
       "highlights": [
         "queries/highlights.scm"
       ],
-      "first-line-regex": "#!\\S*bin\\S*[/ ]just",
-      "injection-regex": "^(?i)just(file)?$",
       "locals": [
         "queries/locals.scm"
       ],

diff --git a/queries/just/folds.scm b/queries/just/folds.scm
diff --git a/queries/just/highlights.scm b/queries/just/highlights.scm
diff --git a/queries/just/injections.scm b/queries/just/injections.scm
diff --git a/queries/just/locals.scm b/queries/just/locals.scm
diff --git a/queries/just/textobjects.scm b/queries/just/textobjects.scm
diff --git a/src/scanner.cc b/src/scanner.cc
@@ -122,14 +122,19 @@ bool tree_sitter_just_external_scanner_scan(void *payload, TSLexer *lexer,
     while (std::iswspace(lookahead)) {
       switch (lookahead) {
       case '\n':
-        // state->eol = true;
         return false;
 
       case '\t':
       case ' ':
         skip(lexer);
         break;
       }
+
+      if (lexer->eof(lexer)) {
+        if (valid_symbols[DEDENT]) {
+          return true;
+        }    
+      }
     }
 
     uint32_t indent = lexer->get_column(lexer);

diff --git a/test/corpus/recipes.txt b/test/corpus/recipes.txt
@@ -5,6 +5,9 @@ recipe
 foo:
 	body
 
+bar:
+    body
+
 --------------------------------------------------------------------------------
 
 (source_file
@@ -23,6 +26,19 @@ foo:
             (recipeline
               (notcomment)
               (NEWLINE))))
+            (DEDENT))))
+    (item
+      (recipe
+        (recipeheader
+          (NAME))
+        (NEWLINE)
+        (body
+          (INDENT)
+          (recipe_body
+            (line
+              (recipeline
+                (notcomment)
+                (NEWLINE))))
         (MISSING DEDENT)))))
 
 ================================================================================
@@ -88,7 +104,10 @@ foo: bar baz
 arguments
 ================================================================================
 
-foo bar *baz:
+foo bar:
+  body
+
+baz qux *quux:
 	body
 
 --------------------------------------------------------------------------------
@@ -103,6 +122,22 @@ foo bar *baz:
         (NAME)
         (parameters
           (parameter
+            (NAME))))
+          (NEWLINE)
+          (body
+            (INDENT)
+            (recipe_body
+              (line
+                (recipeline
+                  (notcomment)
+                  (NEWLINE))))
+            (DEDENT))))
+      (item
+        (recipe
+          (recipeheader
+            (NAME)
+            (parameters
+              (parameter
             (NAME))
           (variadic_parameters
             (parameter