jenterkin/tree-sitter-jhcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ending heredoc identifiers must be on single line

Browse Source
This commit is contained in:
mhoffm
2021-06-26 11:11:34 +02:00
parent bc0b3f1eb0
commit 0ae2fffe6d
5 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scanner.cc
View File

@@ -73,7 +73,11 @@ public:
}
bool scan(TSLexer* lexer, const bool* valid_symbols) {
bool has_leading_whitespace_with_newline = false;
while (iswspace(lexer->lookahead)) {
if (lexer->lookahead == '\n') {
has_leading_whitespace_with_newline = true;
}
skip(lexer);
}
if (lexer->lookahead == '\0') {
@@ -127,7 +131,7 @@ public:
context_stack.push_back({ .type = HEREDOC_TEMPLATE, .heredoc_identifier = identifier });
return accept_and_advance(lexer, HEREDOC_IDENTIFIER);
}
if (valid_symbols[HEREDOC_IDENTIFIER] && in_heredoc_context()) {
if (valid_symbols[HEREDOC_IDENTIFIER] && in_heredoc_context() && has_leading_whitespace_with_newline) {
string expected_identifier = context_stack.back().heredoc_identifier;
for (string::iterator it = expected_identifier.begin(); it != expected_identifier.end(); ++it) {