tree-sitter-objectscript 1.7.4 → 1.7.5

package/objectscript_routine/src/scanner.c

@@ -5,7 +5,6 @@
 // Keep this in sync with grammar externals.
 enum TokenType {
   COMPILED_HEADER = OBJECTSCRIPT_CORE_TOKEN_TYPE_MAX,
-  ROUTINE,
   RTN_DOT,
 };
 
@@ -13,21 +12,6 @@ struct ObjectScript_Routine_Scanner {
   struct ObjectScript_Core_Scanner core_scanner;
 };
 
-static bool lex_routine_keyword(TSLexer *lexer) {
-  static const char keyword[] = "ROUTINE";
-
-  for (size_t i = 0; keyword[i] != 0; i++) {
-    if (ascii_toupper_i32(lexer->lookahead) != (int32_t)keyword[i]) {
-      return false;
-    }
-    advance(lexer);
-  }
-
-  lexer->mark_end(lexer);
-  lexer->result_symbol = ROUTINE;
-  return true;
-}
-
 static bool lex_rtn_dot(TSLexer *lexer) {
   if (lexer->get_column(lexer) != 0) return false;
   if (lexer->lookahead != '.') return false;
@@ -44,6 +28,33 @@ static bool lex_rtn_dot(TSLexer *lexer) {
   return false;
 }
 
+static bool lex_compiled_header(TSLexer *lexer) {
+  lexer->mark_end(lexer);
+  while(!lexer->eof(lexer) && lexer->lookahead != '\n') {
+    advance(lexer);
+  }
+  if (lexer->lookahead != '\n') return false;
+
+  advance(lexer);
+  if (lexer->lookahead != '%') return false;
+  advance(lexer);
+  if (lexer->lookahead != 'R') return false;
+  advance(lexer);
+  if (lexer->lookahead != 'O') return false;
+  advance(lexer);
+
+  lexer->result_symbol = COMPILED_HEADER;
+  int newline_count = 0;
+  while(newline_count < 2 && !lexer->eof(lexer)) {
+    if (lexer->lookahead == '\n') {
+      newline_count++;
+    }
+    advance(lexer);
+  }
+  lexer->mark_end(lexer);
+  return true;
+}
+
 static bool scan(void *payload, TSLexer *lexer, const bool *valid_symbols) {
   struct ObjectScript_Routine_Scanner *scanner =
       (struct ObjectScript_Routine_Scanner *)payload;
@@ -53,43 +64,20 @@ static bool scan(void *payload, TSLexer *lexer, const bool *valid_symbols) {
     return false;
   }
 
-  if (valid_symbols[ROUTINE] && lexer->get_column(lexer) == 0 && lex_routine_keyword(lexer)) {
+  if (valid_symbols[RTN_DOT] && lex_rtn_dot(lexer)) {
+    return true;
+  }
+
+  if (ObjectScript_Core_Scanner_scan(&scanner->core_scanner, lexer,
+                                     valid_symbols)) {
     return true;
-  } else if (valid_symbols[COMPILED_HEADER]) {
-    lexer->mark_end(lexer);
-    while(!lexer->eof(lexer) && lexer->lookahead != '\n') {
-      advance(lexer);
-    }
-    if (lexer->lookahead == '\n') {
-      advance(lexer);
-      if (lexer->lookahead != '%') {
-        return false;
-      }
-      advance(lexer);
-      if (lexer->lookahead != 'R') return false;
-      advance(lexer);
-
-      if (lexer->lookahead != 'O') return false;
-      advance(lexer);
-      lexer->result_symbol = COMPILED_HEADER;
-      int newline_count = 0;
-      while(newline_count < 2 &&!lexer->eof(lexer)) {
-        if (lexer->lookahead == '\n') 
-        {newline_count++;}
-        advance(lexer);
-      }
-      lexer->mark_end(lexer);
-      return true;
-    }
   }
 
-  if (valid_symbols[RTN_DOT] && lex_rtn_dot(lexer)) {
+  if (valid_symbols[COMPILED_HEADER] && lex_compiled_header(lexer)) {
     return true;
   }
 
-  bool matched = ObjectScript_Core_Scanner_scan(&scanner->core_scanner, lexer,
-                                                valid_symbols);
-  return matched;
+  return false;
 }
 
 void *tree_sitter_objectscript_routine_external_scanner_create() {
@@ -100,6 +88,7 @@ void *tree_sitter_objectscript_routine_external_scanner_create() {
   // scanner->saw_routine_header = false;
   ObjectScript_Core_Scanner_init(&scanner->core_scanner);
   scanner->core_scanner.column1_statement_mode = false;
+  scanner->core_scanner.routine_token_mode = true;
   return scanner;
 }
 

package/package.json

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

package/tree-sitter.json

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

package/udl/queries/studio-highlights.scm

@@ -12,6 +12,19 @@
     ] @punctuation.bracket.json)
 ]
 
+[
+  (class_body
+    [
+      "{"
+      "}"
+    ] @punctuation.special)
+  (method_definition
+    [
+      "{"
+      "}"
+    ] @punctuation.special)
+]
+
 ; end @punctuation.bracket.json
 ; start @label (maroon fg, yellow bg)
 (tag) @label