Add longer bodies to tests

tgross35 · Jan 3, 2024 · 84e57b2 · 84e57b2
1 parent d8f48a6
commit 84e57b2
Show file tree

Hide file tree

Showing 2 changed files with 123 additions and 3 deletions.
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,12 +5,28 @@ recipe
 foo:
 	body
 
+bar:
+    body
+
 --------------------------------------------------------------------------------
 
 (source_file
   (item
     (eol
       (NEWLINE)))
+  (item
+    (recipe
+      (recipeheader
+        (NAME))
+      (NEWLINE)
+      (body
+        (INDENT)
+        (recipe_body
+          (line
+            (recipeline
+              (notcomment)
+              (NEWLINE))))
+        (DEDENT))))
   (item
     (recipe
       (recipeheader
@@ -88,7 +104,10 @@ foo: bar baz
 arguments
 ================================================================================
 
-foo bar *baz:
+foo bar:
+  body
+
+baz qux *quux:
 	body
 
 --------------------------------------------------------------------------------
@@ -97,6 +116,22 @@ foo bar *baz:
   (item
     (eol
       (NEWLINE)))
+  (item
+    (recipe
+      (recipeheader
+        (NAME)
+        (parameters
+          (parameter
+            (NAME))))
+      (NEWLINE)
+      (body
+        (INDENT)
+        (recipe_body
+          (line
+            (recipeline
+              (notcomment)
+              (NEWLINE))))
+        (DEDENT))))
   (item
     (recipe
       (recipeheader
@@ -187,7 +222,6 @@ foo:
     (eol
       (NEWLINE))))
 
-
 ================================================================================
 shebang
 ================================================================================
@@ -236,3 +270,84 @@ foo:
                 (notcomment)
                 (NEWLINE)))))
         (DEDENT)))))
+
+================================================================================
+longer bodies
+================================================================================
+
+foo:
+    body
+
+    more body
+
+    # same body
+    and even more
+
+bar:
+    body
+
+    more body
+
+    # same body
+    and even more
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (item
+    (eol
+      (NEWLINE)))
+  (item
+    (recipe
+      (recipeheader
+        (NAME))
+      (NEWLINE)
+      (body
+        (INDENT)
+        (recipe_body
+          (line
+            (recipeline
+              (notcomment)
+              (NEWLINE)))
+          (line
+            (recipeline
+              (notcomment)
+              (TEXT)
+              (NEWLINE)))
+          (line
+            (comment
+              (NEWLINE)))
+          (line
+            (recipeline
+              (notcomment)
+              (TEXT)
+              (TEXT)
+              (NEWLINE))))
+        (DEDENT))))
+  (item
+    (recipe
+      (recipeheader
+        (NAME))
+      (NEWLINE)
+      (body
+        (INDENT)
+        (recipe_body
+          (line
+            (recipeline
+              (notcomment)
+              (NEWLINE)))
+          (line
+            (recipeline
+              (notcomment)
+              (TEXT)
+              (NEWLINE)))
+          (line
+            (comment
+              (NEWLINE)))
+          (line
+            (recipeline
+              (notcomment)
+              (TEXT)
+              (TEXT)
+              (NEWLINE))))
+        (DEDENT)))))