tree-sitter-objectscript 1.9.5 → 1.9.6

package/core/src/parser.c

@@ -133,7 +133,7 @@ enum ts_symbol_identifiers {
   anon_sym_false = 103,
   sym_json_null_literal = 104,
   sym_identifier = 105,
-  aux_sym_quote_permitting_identifier_token1 = 106,
+  aux_sym__quote_permitting_identifier_token1 = 106,
   anon_sym_SLASH_SLASH = 107,
   anon_sym_POUND_SEMI = 108,
   anon_sym_SEMI = 109,
@@ -371,7 +371,7 @@ enum ts_symbol_identifiers {
   sym_json_array_literal = 341,
   sym_json_boolean_literal = 342,
   sym__expression_list = 343,
-  sym_quote_permitting_identifier = 344,
+  sym__quote_permitting_identifier = 344,
   sym_statements = 345,
   sym_line_comment_1 = 346,
   sym_line_comment_2 = 347,
@@ -702,7 +702,7 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_false] = "false",
   [sym_json_null_literal] = "json_null_literal",
   [sym_identifier] = "identifier",
-  [aux_sym_quote_permitting_identifier_token1] = "quote_permitting_identifier_token1",
+  [aux_sym__quote_permitting_identifier_token1] = "identifier",
   [anon_sym_SLASH_SLASH] = "//",
   [anon_sym_POUND_SEMI] = "#;",
   [anon_sym_SEMI] = ";",
@@ -940,7 +940,7 @@ static const char * const ts_symbol_names[] = {
   [sym_json_array_literal] = "json_array_literal",
   [sym_json_boolean_literal] = "json_boolean_literal",
   [sym__expression_list] = "_expression_list",
-  [sym_quote_permitting_identifier] = "class_name",
+  [sym__quote_permitting_identifier] = "class_name",
   [sym_statements] = "statements",
   [sym_line_comment_1] = "line_comment_1",
   [sym_line_comment_2] = "line_comment_2",
@@ -1271,7 +1271,7 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_false] = anon_sym_false,
   [sym_json_null_literal] = sym_json_null_literal,
   [sym_identifier] = sym_identifier,
-  [aux_sym_quote_permitting_identifier_token1] = aux_sym_quote_permitting_identifier_token1,
+  [aux_sym__quote_permitting_identifier_token1] = sym_identifier,
   [anon_sym_SLASH_SLASH] = anon_sym_SLASH_SLASH,
   [anon_sym_POUND_SEMI] = anon_sym_POUND_SEMI,
   [anon_sym_SEMI] = anon_sym_SEMI,
@@ -1509,7 +1509,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_json_array_literal] = sym_json_array_literal,
   [sym_json_boolean_literal] = sym_json_boolean_literal,
   [sym__expression_list] = sym__expression_list,
-  [sym_quote_permitting_identifier] = sym_class_name,
+  [sym__quote_permitting_identifier] = sym_class_name,
   [sym_statements] = sym_statements,
   [sym_line_comment_1] = sym_line_comment_1,
   [sym_line_comment_2] = sym_line_comment_2,
@@ -2158,9 +2158,9 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [aux_sym_quote_permitting_identifier_token1] = {
-    .visible = false,
-    .named = false,
+  [aux_sym__quote_permitting_identifier_token1] = {
+    .visible = true,
+    .named = true,
   },
   [anon_sym_SLASH_SLASH] = {
     .visible = true,
@@ -3110,7 +3110,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
-  [sym_quote_permitting_identifier] = {
+  [sym__quote_permitting_identifier] = {
     .visible = true,
     .named = true,
   },
@@ -29726,7 +29726,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('a' <= lookahead && lookahead <= 'z')) ADVANCE(1541);
       END_STATE();
     case 1542:
-      ACCEPT_TOKEN(aux_sym_quote_permitting_identifier_token1);
+      ACCEPT_TOKEN(aux_sym__quote_permitting_identifier_token1);
       if (lookahead == '"') ADVANCE(59);
       END_STATE();
     case 1543:
@@ -912721,10 +912721,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(11), 1,
       anon_sym_SLASH_STAR,
     STATE(11643), 1,
-      sym_quote_permitting_identifier,
+      sym__quote_permitting_identifier,
     ACTIONS(13843), 2,
       sym_identifier,
-      aux_sym_quote_permitting_identifier_token1,
+      aux_sym__quote_permitting_identifier_token1,
     ACTIONS(13), 3,
       sym__whitespace,
       sym_inline_comment,
@@ -962007,7 +962007,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [14841] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11868),
   [14843] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7749),
   [14845] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3600),
-  [14847] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quote_permitting_identifier, 1, 0, 0),
+  [14847] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__quote_permitting_identifier, 1, 0, 0),
   [14849] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10205),
   [14851] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2421),
   [14853] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
@@ -963344,7 +963344,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_core(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 5,
+      .patch_version = 6,
     },
   };
   return &language;

package/expr/grammar.js

@@ -173,7 +173,7 @@ module.exports = grammar({
       seq(
         $.keyword_pound_pound_class,
         alias(token.immediate('('), $.bracket),
-        alias($.quote_permitting_identifier, $.class_name),
+        alias($._quote_permitting_identifier, $.class_name),
         alias(token.immediate(')'), $.bracket),
         optional(
           // Class cast syntax
@@ -1035,7 +1035,7 @@ module.exports = grammar({
     json_null_literal: (_) => 'null',
     identifier: (_) => /[%A-Za-z][A-Za-z0-9]*(?:\.[%A-Za-z0-9][A-Za-z0-9]*)*/,
     _expression_list: ($) => commaSep1($.expression),
-    quote_permitting_identifier: ($) =>
-      choice(/"((?:""|[^"])*)"/, $.identifier),
+    _quote_permitting_identifier: ($) =>
+      choice(alias(/"((?:""|[^"])*)"/, $.identifier), $.identifier),
   },
 });

package/expr/src/node-types.json

@@ -121,7 +121,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",

package/expr/src/parser.c

@@ -129,7 +129,7 @@ enum ts_symbol_identifiers {
   anon_sym_false = 99,
   sym_json_null_literal = 100,
   sym_identifier = 101,
-  aux_sym_quote_permitting_identifier_token1 = 102,
+  aux_sym__quote_permitting_identifier_token1 = 102,
   sym_source_file = 103,
   sym_expression = 104,
   sym_expr_atom = 105,
@@ -210,7 +210,7 @@ enum ts_symbol_identifiers {
   sym_json_array_literal = 180,
   sym_json_boolean_literal = 181,
   sym__expression_list = 182,
-  sym_quote_permitting_identifier = 183,
+  sym__quote_permitting_identifier = 183,
   aux_sym_expression_repeat1 = 184,
   aux_sym_dollarsf_repeat1 = 185,
   aux_sym__method_arg_list_repeat1 = 186,
@@ -336,7 +336,7 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_false] = "false",
   [sym_json_null_literal] = "json_null_literal",
   [sym_identifier] = "identifier",
-  [aux_sym_quote_permitting_identifier_token1] = "quote_permitting_identifier_token1",
+  [aux_sym__quote_permitting_identifier_token1] = "identifier",
   [sym_source_file] = "source_file",
   [sym_expression] = "expression",
   [sym_expr_atom] = "expr_atom",
@@ -417,7 +417,7 @@ static const char * const ts_symbol_names[] = {
   [sym_json_array_literal] = "json_array_literal",
   [sym_json_boolean_literal] = "json_boolean_literal",
   [sym__expression_list] = "_expression_list",
-  [sym_quote_permitting_identifier] = "class_name",
+  [sym__quote_permitting_identifier] = "class_name",
   [aux_sym_expression_repeat1] = "expression_repeat1",
   [aux_sym_dollarsf_repeat1] = "dollarsf_repeat1",
   [aux_sym__method_arg_list_repeat1] = "_method_arg_list_repeat1",
@@ -543,7 +543,7 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_false] = anon_sym_false,
   [sym_json_null_literal] = sym_json_null_literal,
   [sym_identifier] = sym_identifier,
-  [aux_sym_quote_permitting_identifier_token1] = aux_sym_quote_permitting_identifier_token1,
+  [aux_sym__quote_permitting_identifier_token1] = sym_identifier,
   [sym_source_file] = sym_source_file,
   [sym_expression] = sym_expression,
   [sym_expr_atom] = sym_expr_atom,
@@ -624,7 +624,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_json_array_literal] = sym_json_array_literal,
   [sym_json_boolean_literal] = sym_json_boolean_literal,
   [sym__expression_list] = sym__expression_list,
-  [sym_quote_permitting_identifier] = sym_quote_permitting_identifier,
+  [sym__quote_permitting_identifier] = sym__quote_permitting_identifier,
   [aux_sym_expression_repeat1] = aux_sym_expression_repeat1,
   [aux_sym_dollarsf_repeat1] = aux_sym_dollarsf_repeat1,
   [aux_sym__method_arg_list_repeat1] = aux_sym__method_arg_list_repeat1,
@@ -1056,9 +1056,9 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [aux_sym_quote_permitting_identifier_token1] = {
-    .visible = false,
-    .named = false,
+  [aux_sym__quote_permitting_identifier_token1] = {
+    .visible = true,
+    .named = true,
   },
   [sym_source_file] = {
     .visible = true,
@@ -1380,7 +1380,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
-  [sym_quote_permitting_identifier] = {
+  [sym__quote_permitting_identifier] = {
     .visible = true,
     .named = true,
   },
@@ -8643,7 +8643,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('a' <= lookahead && lookahead <= 'z')) ADVANCE(1006);
       END_STATE();
     case 1007:
-      ACCEPT_TOKEN(aux_sym_quote_permitting_identifier_token1);
+      ACCEPT_TOKEN(aux_sym__quote_permitting_identifier_token1);
       if (lookahead == '"') ADVANCE(19);
       END_STATE();
     default:
@@ -28531,10 +28531,10 @@ static const uint16_t ts_small_parse_table[] = {
       aux_sym_json_array_literal_repeat1,
   [13708] = 2,
     STATE(683), 1,
-      sym_quote_permitting_identifier,
+      sym__quote_permitting_identifier,
     ACTIONS(1051), 2,
       sym_identifier,
-      aux_sym_quote_permitting_identifier_token1,
+      aux_sym__quote_permitting_identifier_token1,
   [13716] = 2,
     ACTIONS(1053), 1,
       anon_sym_DOT,
@@ -30754,7 +30754,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [1289] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
   [1291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
   [1293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
-  [1295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quote_permitting_identifier, 1, 0, 0),
+  [1295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__quote_permitting_identifier, 1, 0, 0),
   [1297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(712),
   [1299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(709),
   [1301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(713),
@@ -30829,7 +30829,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_expr(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 5,
+      .patch_version = 6,
     },
   };
   return &language;

package/objectscript/src/node-types.json

@@ -3236,7 +3236,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -3508,7 +3508,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -3545,11 +3545,11 @@
           "named": true
         },
         {
-          "type": "index_property_type",
+          "type": "identifier",
           "named": true
         },
         {
-          "type": "quote_permitting_identifier",
+          "type": "index_property_type",
           "named": true
         }
       ]
@@ -4854,7 +4854,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -5450,7 +5450,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -5690,21 +5690,6 @@
       ]
     }
   },
-  {
-    "type": "quote_permitting_identifier",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "identifier",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "quoted_member_name",
     "named": true,
@@ -5842,7 +5827,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -6779,7 +6764,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -7181,7 +7166,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",