move to returning 'did scan single-line block comment

tree-sitter · Jun 30, 2024 · 69556fc · 69556fc
1 parent 19d6fcb
commit 69556fc
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/scanner.c b/src/scanner.c
@@ -47,7 +47,8 @@ static bool scan_template_chars(TSLexer *lexer) {
     }
 }
 
-static bool scan_whitespace_and_comments(TSLexer *lexer, bool *scanned_comment, bool *saw_block_newline) {
+static bool scan_whitespace_and_comments(TSLexer *lexer, bool *scanned_comment, bool *saw_single_block_comment) {
+    bool saw_block_newline = false;
     for (;;) {
         while (iswspace(lexer->lookahead)) {
             skip(lexer);
@@ -70,12 +71,13 @@ static bool scan_whitespace_and_comments(TSLexer *lexer, bool *scanned_comment,
                         skip(lexer);
                         if (lexer->lookahead == '/') {
                             skip(lexer);
+                            *saw_single_block_comment = !saw_block_newline;
                             *scanned_comment = true;
                             break;
                         }
                     } else if (lexer->lookahead == '\n' || lexer->lookahead == 0x2028 ||
                                lexer->lookahead == 0x2029) {
-                        *saw_block_newline = true;
+                        saw_block_newline = true;
                         skip(lexer);
                     } else {
                         skip(lexer);
@@ -94,19 +96,19 @@ static bool scan_automatic_semicolon(TSLexer *lexer, bool comment_condition, boo
     lexer->result_symbol = AUTOMATIC_SEMICOLON;
     lexer->mark_end(lexer);
 
-    bool saw_comment_newline = false;
+    bool saw_single_block_comment = true;
     for (;;) {
         if (lexer->lookahead == 0) {
             return true;
         }
 
         if (lexer->lookahead == '/') {
-            if (!scan_whitespace_and_comments(lexer, scanned_comment, &saw_comment_newline)) {
+            if (!scan_whitespace_and_comments(lexer, scanned_comment, &saw_single_block_comment)) {
                 return false;
             }
 
             if (comment_condition && lexer->lookahead != ',' && lexer->lookahead != '=') {
-                return saw_comment_newline;
+                return !saw_single_block_comment;
             }
         }
 
@@ -133,7 +135,7 @@ static bool scan_automatic_semicolon(TSLexer *lexer, bool comment_condition, boo
 
 
 
-    if (!scan_whitespace_and_comments(lexer, scanned_comment, &saw_comment_newline)) {
+    if (!scan_whitespace_and_comments(lexer, scanned_comment, &saw_single_block_comment)) {
         return false;
     }