Update deps, Reorganize tests

Author: Azganoth

package-lock.json

@@ -14,17 +14,17 @@
   "scripts": {
     "build": "tree-sitter generate && node-gyp build --debug",
     "install": "prebuild-install || node-gyp rebuild",
-    "dist": "prebuild -r electron -t 3.0.0 -t 4.0.0 -t 4.0.4 -t 5.0.0 --strip && prebuild -t 8.16.0 -t 10.16.1 --strip",
+    "dist": "prebuild -r electron -t 3.0.0 -t 4.0.0 -t 4.0.4 -t 5.0.0 -t 6.0.0 --strip && prebuild -t 8.17.0 -t 10.23.0 -t 12.20.0 --strip",
     "dist:upload": "prebuild --upload-all",
     "test": "tree-sitter test"
   },
   "dependencies": {
-    "nan": "^2.14.1",
-    "prebuild-install": "^5.3.5"
+    "nan": "^2.14.2",
+    "prebuild-install": "^6.0.0"
   },
   "devDependencies": {
-    "prebuild": "^10.0.0",
-    "tree-sitter-cli": "^0.16.8"
+    "prebuild": "^10.0.1",
+    "tree-sitter-cli": "^0.17.3"
   },
   "files": [
     "src",
@@ -33,5 +33,13 @@
     "index.js",
     "package.json",
     "package-lock.json"
+  ],
+  "tree-sitter": [
+    {
+      "scope": "source.lua",
+      "file-types": [
+        "lua"
+      ]
+    }
   ]
 }

package.json

@@ -2192,6 +2192,10 @@
     "type": "break_statement",
     "named": true
   },
+  {
+    "type": "comment",
+    "named": true
+  },
   {
     "type": "do",
     "named": false

src/node-types.json

@@ -5,11 +5,11 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
-#define LANGUAGE_VERSION 11
+#define LANGUAGE_VERSION 12
 #define STATE_COUNT 907
 #define LARGE_STATE_COUNT 113
 #define SYMBOL_COUNT 109
-#define ALIAS_COUNT 5
+#define ALIAS_COUNT 4
 #define TOKEN_COUNT 64
 #define EXTERNAL_TOKEN_COUNT 2
 #define FIELD_COUNT 1
@@ -128,7 +128,6 @@ enum {
   alias_sym_expression = 110,
   alias_sym_method = 111,
   alias_sym_property_identifier = 112,
-  alias_sym_variable_declarator = 113,
 };
 
 static const char *ts_symbol_names[] = {
@@ -245,7 +244,6 @@ static const char *ts_symbol_names[] = {
   [alias_sym_expression] = "expression",
   [alias_sym_method] = "method",
   [alias_sym_property_identifier] = "property_identifier",
-  [alias_sym_variable_declarator] = "variable_declarator",
 };
 
 static TSSymbol ts_symbol_map[] = {
@@ -362,7 +360,6 @@ static TSSymbol ts_symbol_map[] = {
   [alias_sym_expression] = alias_sym_expression,
   [alias_sym_method] = alias_sym_method,
   [alias_sym_property_identifier] = alias_sym_property_identifier,
-  [alias_sym_variable_declarator] = alias_sym_variable_declarator,
 };
 
 static const TSSymbolMetadata ts_symbol_metadata[] = {
@@ -818,10 +815,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [alias_sym_variable_declarator] = {
-    .visible = true,
-    .named = true,
-  },
 };
 
 enum {
@@ -851,10 +844,10 @@ static TSSymbol ts_alias_sequences[12][MAX_ALIAS_SEQUENCE_LENGTH] = {
     [2] = alias_sym_condition_expression,
   },
   [4] = {
-    [1] = alias_sym_variable_declarator,
+    [1] = sym__local_variable_declarator,
   },
   [5] = {
-    [0] = alias_sym_variable_declarator,
+    [0] = sym__local_variable_declarator,
   },
   [6] = {
     [2] = alias_sym_property_identifier,
@@ -876,6 +869,17 @@ static TSSymbol ts_alias_sequences[12][MAX_ALIAS_SEQUENCE_LENGTH] = {
   },
 };
 
+static uint16_t ts_non_terminal_alias_map[] = {
+  sym__variable_declarator, 2,
+    sym__variable_declarator,
+    sym__local_variable_declarator,
+  sym__expression, 3,
+    sym__expression,
+    alias_sym_condition_expression,
+    alias_sym_expression,
+  0,
+};
+
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
   START_LEXER();
   eof = lexer->eof(lexer);
@@ -41040,23 +41044,15 @@ extern const TSLanguage *tree_sitter_lua(void) {
     .symbol_count = SYMBOL_COUNT,
     .alias_count = ALIAS_COUNT,
     .token_count = TOKEN_COUNT,
-    .large_state_count = LARGE_STATE_COUNT,
+    .external_token_count = EXTERNAL_TOKEN_COUNT,
+    .symbol_names = ts_symbol_names,
     .symbol_metadata = ts_symbol_metadata,
-    .parse_table = (const unsigned short *)ts_parse_table,
-    .small_parse_table = (const uint16_t *)ts_small_parse_table,
-    .small_parse_table_map = (const uint32_t *)ts_small_parse_table_map,
+    .parse_table = (const uint16_t *)ts_parse_table,
     .parse_actions = ts_parse_actions,
     .lex_modes = ts_lex_modes,
-    .symbol_names = ts_symbol_names,
-    .public_symbol_map = ts_symbol_map,
     .alias_sequences = (const TSSymbol *)ts_alias_sequences,
-    .field_count = FIELD_COUNT,
-    .field_names = ts_field_names,
-    .field_map_slices = (const TSFieldMapSlice *)ts_field_map_slices,
-    .field_map_entries = (const TSFieldMapEntry *)ts_field_map_entries,
     .max_alias_sequence_length = MAX_ALIAS_SEQUENCE_LENGTH,
     .lex_fn = ts_lex,
-    .external_token_count = EXTERNAL_TOKEN_COUNT,
     .external_scanner = {
       (const bool *)ts_external_scanner_states,
       ts_external_scanner_symbol_map,
@@ -41066,6 +41062,16 @@ extern const TSLanguage *tree_sitter_lua(void) {
       tree_sitter_lua_external_scanner_serialize,
       tree_sitter_lua_external_scanner_deserialize,
     },
+    .field_count = FIELD_COUNT,
+    .field_map_slices = (const TSFieldMapSlice *)ts_field_map_slices,
+    .field_map_entries = (const TSFieldMapEntry *)ts_field_map_entries,
+    .field_names = ts_field_names,
+    .large_state_count = LARGE_STATE_COUNT,
+    .small_parse_table = (const uint16_t *)ts_small_parse_table,
+    .small_parse_table_map = (const uint32_t *)ts_small_parse_table_map,
+    .public_symbol_map = ts_symbol_map,
+    .alias_map = ts_non_terminal_alias_map,
+    .state_count = STATE_COUNT,
   };
   return &language;
 }

src/parser.c

@@ -35,6 +35,7 @@ typedef uint16_t TSStateId;
 typedef struct {
   bool visible : 1;
   bool named : 1;
+  bool supertype: 1;
 } TSSymbolMetadata;
 
 typedef struct TSLexer TSLexer;
@@ -119,6 +120,8 @@ struct TSLanguage {
   const uint16_t *small_parse_table;
   const uint32_t *small_parse_table_map;
   const TSSymbol *public_symbol_map;
+  const uint16_t *alias_map;
+  uint32_t state_count;
 };
 
 /*