Skip to content

fix scanner and keyword #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aspeddro merged 4 commits into from
Apr 25, 2026
+17 −3
Merged

fix scanner and keyword #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
538a158
fix scanne and keyword
aspeddro Jun 9, 2023
a73ed5f
add test
aspeddro Aug 28, 2023
746a967
Merge branch 'main' into fix-and-scanner
aspeddro Mar 21, 2024
6c13401
Merge branch 'main' into fix-and-scanner
aspeddro Apr 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,11 @@ bool tree_sitter_rescript_external_scanner_scan(
if (lexer->lookahead == 'n') {
advance(lexer);
if (lexer->lookahead == 'd') {
// Ignore new lines before `and` keyword (recursive definition)
in_multiline_statement = true;
advance(lexer);
if (is_whitespace(lexer->lookahead)) {
Comment thread
aspeddro marked this conversation as resolved.
// Ignore new lines before `and` keyword (recursive definition)
in_multiline_statement = true;
}
}
}
} else if (lexer->lookahead == 'e') {
Expand Down
13 changes: 12 additions & 1 deletion test/corpus/expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,6 +1608,8 @@ Subscript expressions

myArray[42]
myObj["foo"]
andd[0]
andd[1]

--------------------------------------------------------------------------------

Expand All @@ -1620,7 +1622,16 @@ myObj["foo"]
(subscript_expression
(value_identifier)
(string
(string_fragment)))))
(string_fragment))))

(expression_statement
(subscript_expression
(value_identifier)
(number)))
(expression_statement
(subscript_expression
(value_identifier)
(number))))

================================================================================
Variants
Expand Down
Loading