tree-sitter-objectscript 1.9.14 → 1.9.16

package/objectscript_routine/queries/injections.scm

@@ -24,4 +24,35 @@
 
 ; === END CORE ===
 ; === BEGIN LOCAL ===
+(embedded_html
+  (angled_bracket_fenced_text) @injection.content
+  (#set! injection.language "html"))
+
+(embedded_sql
+  (_
+    (paren_fenced_text) @injection.content)
+  (#set! injection.language "sql"))
+
+(embedded_js
+  [
+    (angled_bracket_fenced_text)
+    (embedded_js_special_case)
+  ] @injection.content
+  (#set! injection.language "javascript"))
+
+(embedded_xml
+  (angled_bracket_fenced_text) @injection.content
+  (#set! injection.language "xml"))
+
+([
+  (line_comment_1)
+  (line_comment_2)
+  (line_comment_3)
+  (line_comment_4)
+  (block_comment)
+  (inline_comment)
+  (argumentless_inline_comment)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ; === END LOCAL ===

package/objectscript_routine/src/parser.c

@@ -16586,9 +16586,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead != 0 &&
           lookahead != '*' &&
           lookahead != ':' &&
-          lookahead != ';' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1500);
+          lookahead != ';') ADVANCE(1500);
       END_STATE();
     case 3:
       ADVANCE_MAP(
@@ -20323,9 +20321,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(1609);
       if (lookahead == '\\') ADVANCE(294);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(75);
+          lookahead != '\n') ADVANCE(75);
       END_STATE();
     case 76:
       ADVANCE_MAP(
@@ -20624,9 +20620,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 85:
       if (lookahead == '"') ADVANCE(1606);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(85);
+      if (lookahead != 0) ADVANCE(85);
       END_STATE();
     case 86:
       ADVANCE_MAP(
@@ -20768,25 +20762,19 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(1328);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(101);
+          lookahead != '\r') ADVANCE(101);
       END_STATE();
     case 102:
       if (lookahead == '"') ADVANCE(105);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(102);
+          lookahead != '\r') ADVANCE(102);
       END_STATE();
     case 103:
       if (lookahead == '"') ADVANCE(116);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(103);
+          lookahead != '\r') ADVANCE(103);
       END_STATE();
     case 104:
       if (lookahead == '"') ADVANCE(1512);
@@ -20847,9 +20835,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(111);
       if (lookahead != 0 &&
           lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(110);
+          lookahead != '\r') ADVANCE(110);
       END_STATE();
     case 111:
       if (lookahead == '"') ADVANCE(110);
@@ -32106,9 +32092,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '"') ADVANCE(1609);
       if (lookahead == '\\') ADVANCE(294);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(75);
+          lookahead != '\n') ADVANCE(75);
       END_STATE();
     case 1500:
       ACCEPT_TOKEN(aux_sym_sql_field_identifier_token2);
@@ -32133,9 +32117,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '*' &&
           lookahead != ':' &&
           lookahead != ';' &&
-          lookahead != '\\' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1500);
+          lookahead != '\\') ADVANCE(1500);
       END_STATE();
     case 1503:
       ACCEPT_TOKEN(aux_sym_sql_field_identifier_token2);
@@ -32162,42 +32144,32 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == ';') ADVANCE(1621);
       if (('\t' <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(1508);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1509:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(104);
       if (lookahead == '#') ADVANCE(1511);
       if (lookahead == ';') ADVANCE(1618);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1510:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(104);
       if (lookahead == '*') ADVANCE(1627);
       if (lookahead == '/') ADVANCE(1614);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1511:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(104);
       if (lookahead == ';') ADVANCE(1624);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1512:
       ACCEPT_TOKEN(aux_sym__quoted_member_name_token1);
       if (lookahead == '"') ADVANCE(104);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1513:
       ACCEPT_TOKEN(anon_sym_POUND2);
@@ -32883,9 +32855,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH);
       if (lookahead == '"') ADVANCE(104);
       if (lookahead == '/') ADVANCE(1825);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1615:
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH);
@@ -32895,9 +32865,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH);
       if (lookahead == '/') ADVANCE(1826);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1617:
       ACCEPT_TOKEN(anon_sym_POUND_SEMI);
@@ -32905,16 +32873,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1618:
       ACCEPT_TOKEN(anon_sym_POUND_SEMI);
       if (lookahead == '"') ADVANCE(104);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1619:
       ACCEPT_TOKEN(anon_sym_POUND_SEMI);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1620:
       ACCEPT_TOKEN(anon_sym_SEMI);
@@ -32922,16 +32886,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1621:
       ACCEPT_TOKEN(anon_sym_SEMI);
       if (lookahead == '"') ADVANCE(104);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1622:
       ACCEPT_TOKEN(anon_sym_SEMI);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1623:
       ACCEPT_TOKEN(anon_sym_POUND_POUND_SEMI);
@@ -32939,16 +32899,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1624:
       ACCEPT_TOKEN(anon_sym_POUND_POUND_SEMI);
       if (lookahead == '"') ADVANCE(104);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1625:
       ACCEPT_TOKEN(anon_sym_POUND_POUND_SEMI);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1626:
       ACCEPT_TOKEN(anon_sym_SLASH_STAR);
@@ -32956,16 +32912,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1627:
       ACCEPT_TOKEN(anon_sym_SLASH_STAR);
       if (lookahead == '"') ADVANCE(104);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1628:
       ACCEPT_TOKEN(anon_sym_SLASH_STAR);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1629:
       ACCEPT_TOKEN(anon_sym_STAR_SLASH);
@@ -33594,42 +33546,32 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           (0x0b <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(1772);
       if (lookahead != 0 &&
-          (lookahead < '\t' || '\r' < lookahead) &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          (lookahead < '\t' || '\r' < lookahead)) ADVANCE(1776);
       END_STATE();
     case 1773:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead == '#') ADVANCE(1775);
       if (lookahead == ';') ADVANCE(1619);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1774:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead == '*') ADVANCE(1628);
       if (lookahead == '/') ADVANCE(1616);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1775:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead == ';') ADVANCE(1625);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1776:
       ACCEPT_TOKEN(aux_sym_macro_value_line_token2);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1777:
       ACCEPT_TOKEN(aux_sym_mnemonic_name_token1);
@@ -33897,16 +33839,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 1825:
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH_SLASH);
       if (lookahead == '"') ADVANCE(104);
-      if (lookahead != 0 &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1512);
+      if (lookahead != 0) ADVANCE(1512);
       END_STATE();
     case 1826:
       ACCEPT_TOKEN(anon_sym_SLASH_SLASH_SLASH);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1776);
+          lookahead != '\n') ADVANCE(1776);
       END_STATE();
     case 1827:
       ACCEPT_TOKEN(aux_sym_documatic_line_token1);
@@ -33917,50 +33855,38 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           (0x0b <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(1827);
       if (lookahead != 0 &&
-          (lookahead < '\t' || '\r' < lookahead) &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1832);
+          (lookahead < '\t' || '\r' < lookahead)) ADVANCE(1832);
       END_STATE();
     case 1828:
       ACCEPT_TOKEN(aux_sym_documatic_line_token1);
       if (lookahead == '#') ADVANCE(1831);
       if (lookahead == ';') ADVANCE(1832);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1832);
+          lookahead != '\n') ADVANCE(1832);
       END_STATE();
     case 1829:
       ACCEPT_TOKEN(aux_sym_documatic_line_token1);
       if (lookahead == '*') ADVANCE(1832);
       if (lookahead == '/') ADVANCE(1830);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1832);
+          lookahead != '\n') ADVANCE(1832);
       END_STATE();
     case 1830:
       ACCEPT_TOKEN(aux_sym_documatic_line_token1);
       if (lookahead == '/') ADVANCE(1832);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1832);
+          lookahead != '\n') ADVANCE(1832);
       END_STATE();
     case 1831:
       ACCEPT_TOKEN(aux_sym_documatic_line_token1);
       if (lookahead == ';') ADVANCE(1832);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1832);
+          lookahead != '\n') ADVANCE(1832);
       END_STATE();
     case 1832:
       ACCEPT_TOKEN(aux_sym_documatic_line_token1);
       if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != 0x17f &&
-          lookahead != 0x212a) ADVANCE(1832);
+          lookahead != '\n') ADVANCE(1832);
       END_STATE();
     default:
       return false;
@@ -1011092,7 +1011018,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_routine(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 14,
+      .patch_version = 16,
     },
   };
   return &language;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-objectscript",
-  "version": "1.9.14",
+  "version": "1.9.16",
   "description": "Tree Sitter Grammar for InterSystems ObjectScript",
   "scripts": {
     "install": "node-gyp-build",
@@ -36,7 +36,7 @@
     "node-gyp": "^12.1.0",
     "prebuildify": "^6.0.1",
     "tree-sitter": "^0.25.0",
-    "tree-sitter-cli": "^0.26.11"
+    "tree-sitter-cli": "^0.26.12"
   },
   "main": "bindings/node",
   "types": "bindings/node",

package/tree-sitter.json

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

package/udl/queries/injections.scm

@@ -27,11 +27,8 @@
 ; Keywords, one of type language = "python", none of type codemode
 ; External method body injection based on [ Language = ... ]
 (method_definition
-  (method_keyword_external_language
-    (typename) @_lang)
   (python_method_body_content) @injection.content
   (#set! injection.include-children "true")
-  (#any-of? @_lang "python" "Python" "PYTHON")
   (#set! injection.language "python"))
 
 (method_definition
@@ -51,11 +48,8 @@
   (#set! injection.language "ispl"))
 
 (trigger
-  (method_keyword_external_language
-    (typename) @_lang)
   (python_method_body_content) @injection.content
   (#set! injection.include-children "true")
-  (#any-of? @_lang "python" "Python" "PYTHON")
   (#set! injection.language "python"))
 
 (trigger
@@ -147,4 +141,16 @@
   (#set! injection.language "xml")
   (#set! injection.include-children "true"))
 
+([
+  (line_comment_1)
+  (line_comment_2)
+  (line_comment_3)
+  (line_comment_4)
+  (block_comment)
+  (inline_comment)
+  (argumentless_inline_comment)
+  (documatic_line)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ; === END LOCAL ===