tree-sitter-objectscript 1.7.9 → 1.7.11

package/common/scanner.h

@@ -1063,7 +1063,7 @@ if (valid_symbols[_POST_CONDITIONAL_ID] && lexer->lookahead==':') {
                 if (lexer->lookahead == '.' || (lexer->lookahead >= '0' && lexer->lookahead <= '9')) {
                     is_decimal = true;
                 }
-                if (!is_decimal && dots > 0 && (scanner->terminated_newline || new_line)) {
+                if (!is_decimal && dots > 0) {
                     lexer->result_symbol = BOL;
                     scanner->terminated_newline = false;
                     return true;
@@ -1241,23 +1241,31 @@ else if (valid_symbols[_ASSERT_NO_SPACE_BETWEEN_RULES]) {
     bool saw_nl   = scanner->terminated_newline;
 
     while (iswspace(lexer->lookahead)) {
-      if (lexer->lookahead == '\n') saw_nl = true;
+      if (lexer->lookahead == '\n') {
+        // End the current statement before the next dotted line so
+        // constructs like `x` newline `. quit` do not collapse into `x.quit`.
+        if (valid_symbols[_TERMINATION] && consumed) {
+          lexer->result_symbol = _WHITESPACE;
+          scanner->terminated_newline = false;
+          return true;
+          
+        }
+        saw_nl = true;
+      
+      }
       lexer->advance(lexer,false);
       consumed = true;
     }
 
-
     unsigned dots = 0;
 
     lexer->mark_end(lexer);
     
-    
     while (lexer->lookahead == '.') { lexer->advance(lexer,false); dots++; }
     bool is_decimal = false;
     if (lexer->lookahead == '.' || (lexer->lookahead >= '0' && lexer->lookahead <= '9')) {
         is_decimal = true;
     }
-
     if (saw_nl && valid_symbols[BOL] && dots > 0 && !is_decimal) {
         lexer->result_symbol = BOL;
         scanner->terminated_newline = false;

package/core/src/parser.c

@@ -1980366,7 +1980366,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_core(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 7,
-      .patch_version = 9,
+      .patch_version = 11,
     },
   };
   return &language;

package/expr/src/parser.c

@@ -34600,7 +34600,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_expr(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 7,
-      .patch_version = 9,
+      .patch_version = 11,
     },
   };
   return &language;

package/objectscript/src/parser.c

@@ -2158970,7 +2158970,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 7,
-      .patch_version = 9,
+      .patch_version = 11,
     },
   };
   return &language;

package/objectscript_routine/src/parser.c

@@ -2075599,7 +2075599,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_routine(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 7,
-      .patch_version = 9,
+      .patch_version = 11,
     },
   };
   return &language;

package/objectscript_routine/src/scanner.c

@@ -13,6 +13,7 @@ struct ObjectScript_Routine_Scanner {
 };
 
 static bool lex_rtn_dot(TSLexer *lexer) {
+  lexer->mark_end(lexer);
   if (lexer->get_column(lexer) != 0) return false;
   if (lexer->lookahead != '.') return false;
 
@@ -64,10 +65,6 @@ static bool scan(void *payload, TSLexer *lexer, const bool *valid_symbols) {
     return false;
   }
 
-  if (valid_symbols[RTN_DOT] && lex_rtn_dot(lexer)) {
-    return true;
-  }
-
   if (ObjectScript_Core_Scanner_scan(&scanner->core_scanner, lexer,
                                      valid_symbols)) {
     return true;
@@ -77,6 +74,10 @@ static bool scan(void *payload, TSLexer *lexer, const bool *valid_symbols) {
     return true;
   }
 
+  if (valid_symbols[RTN_DOT] && lex_rtn_dot(lexer)) {
+    return true;
+  }
+
   return false;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-objectscript",
-  "version": "1.7.9",
+  "version": "1.7.11",
   "description": "Tree Sitter Grammar for InterSystems ObjectScript",
   "scripts": {
     "install": "node-gyp-build",

package/tree-sitter.json

@@ -97,7 +97,7 @@
     }
   ],
   "metadata": {
-    "version": "1.7.9",
+    "version": "1.7.11",
     "license": "MIT",
     "description": "ObjectScript grammars for tree-sitter", 
     "namespace": "io.github.treesitter.objectscript",

package/udl/src/parser.c

@@ -2094596,7 +2094596,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_udl(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 7,
-      .patch_version = 9,
+      .patch_version = 11,
     },
   };
   return &language;