Skip to content

Allow else/else if on new line after closing brace #262

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
nojaf merged 1 commit into from
Jan 13, 2026
Merged

Allow else/else if on new line after closing brace #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,18 @@ bool tree_sitter_rescript_external_scanner_scan(
in_multiline_statement = true;
}
}
} else if (lexer->lookahead == 'e') {
advance(lexer);
if (lexer->lookahead == 'l') {
advance(lexer);
if (lexer->lookahead == 's') {
advance(lexer);
if (lexer->lookahead == 'e') {
// Ignore new lines before `else` keyword (else/else if clauses)
in_multiline_statement = true;
}
}
}
}

if (in_multiline_statement) {
Expand Down
60 changes: 60 additions & 0 deletions test/corpus/expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,66 @@ if predicateA {
(expression_statement
(value_identifier)))))))

================================================================================
If/else with else on new line
================================================================================

if predicateA {
foo
}
else if predicateB {
bar
}
else {
baz
}

if predicateA {
foo
} // comment before else if
else if predicateB {
bar
} // comment before else
else {
baz
}

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

(source_file
(expression_statement
(if_expression
(value_identifier)
(block
(expression_statement
(value_identifier)))
(else_if_clause
(value_identifier)
(block
(expression_statement
(value_identifier))))
(else_clause
(block
(expression_statement
(value_identifier))))))
(expression_statement
(if_expression
(value_identifier)
(block
(expression_statement
(value_identifier)))
(comment)
(else_if_clause
(value_identifier)
(block
(expression_statement
(value_identifier))))
(comment)
(else_clause
(block
(expression_statement
(value_identifier)))))))

================================================================================
Switch of literals
================================================================================
Expand Down