tree-sitter-topaz 0.1.0 → 0.1.1

package/grammar.js

@@ -1,3 +1,10 @@
+// Canonical keyword_registry! in Topaz 5.20 token.rs; all other words are contextual.
+const KEYWORDS = [
+  "let", "mut", "const", "type", "function", "return", "if", "else",
+  "match", "case", "for", "in", "by", "while", "break", "continue",
+  "defer", "concurrent", "true", "false", "null",
+];
+
 const PREC = {
   assignment: 1,
   lambda: 2,
@@ -20,6 +27,8 @@ module.exports = grammar({
 
   word: ($) => $.identifier,
 
+  inline: ($) => [$._identifier],
+
   externals: ($) => [
     $._nominal_record_construction,
     $._record_lbrace,
@@ -49,6 +58,8 @@ module.exports = grammar({
     [$.array_element, $.type_identifier],
     [$._expression, $.argument],
     [$._expression, $.binding_pattern],
+    // Range endpoints can start with calls; keep the constructor-pattern branch.
+    [$._expression, $.constructor_pattern],
     [$._top_level_item, $._statement],
     [$.refutable_let_declaration, $._pattern],
     [$.refutable_let_declaration, $._primary_pattern],
@@ -106,7 +117,7 @@ module.exports = grammar({
           field("path", $.module_path),
           optional(
             choice(
-              seq("as", field("alias", $.identifier)),
+              seq("as", field("alias", $._identifier)),
               field("selections", $.import_list),
             ),
           ),
@@ -116,7 +127,7 @@ module.exports = grammar({
 
     module_path: ($) =>
       prec.right(
-        seq($.identifier, repeat(seq(".", field("segment", $.identifier)))),
+        seq($._identifier, repeat(seq(".", field("segment", $._identifier)))),
       ),
 
     import_list: ($) =>
@@ -125,8 +136,8 @@ module.exports = grammar({
         optional(
           commaSep1(
             seq(
-              field("name", $.identifier),
-              optional(seq("as", field("alias", $.identifier))),
+              field("name", $._identifier),
+              optional(seq("as", field("alias", $._identifier))),
             ),
           ),
         ),
@@ -162,9 +173,9 @@ module.exports = grammar({
         seq(
           "export",
           "function",
-          field("name", $.identifier),
+          field("name", $._identifier),
           "as",
-          field("alias", $.identifier),
+          field("alias", $._identifier),
           $.parameter_list,
           optional($.return_type),
           $.block,
@@ -344,7 +355,7 @@ module.exports = grammar({
       seq(
         optional("export"),
         "function",
-        field("name", $.identifier),
+        field("name", $._identifier),
         "(",
         "self",
         optional(seq(",", commaSep1($.parameter))),
@@ -367,7 +378,7 @@ module.exports = grammar({
     protocol_method_signature: ($) =>
       seq(
         "function",
-        field("name", $.identifier),
+        field("name", $._identifier),
         optional($.function_type_parameters),
         $.parameter_list,
         optional($.return_type),
@@ -394,7 +405,7 @@ module.exports = grammar({
     protocol_impl_method: ($) =>
       seq(
         "function",
-        field("name", $.identifier),
+        field("name", $._identifier),
         optional($.function_type_parameters),
         $.parameter_list,
         optional($.return_type),
@@ -404,7 +415,7 @@ module.exports = grammar({
     function_declaration: ($) =>
       seq(
         "function",
-        field("name", $.identifier),
+        field("name", $._identifier),
         optional($.function_type_parameters),
         $.parameter_list,
         optional($.return_type),
@@ -449,8 +460,7 @@ module.exports = grammar({
         ),
       ),
 
-    parameter_name: ($) =>
-      choice($.identifier, alias("self", $.identifier)),
+    parameter_name: ($) => $._identifier,
 
     return_type: ($) => seq("->", field("type", $._type)),
 
@@ -559,7 +569,7 @@ module.exports = grammar({
     const_declaration: ($) =>
       seq(
         "const",
-        field("name", $.identifier),
+        field("name", $._identifier),
         optional(seq(":", field("type", $._type))),
         "=",
         field("value", $._expression),
@@ -571,7 +581,7 @@ module.exports = grammar({
         2,
         seq(
           "using",
-          field("name", $.identifier),
+          field("name", $._identifier),
           "=",
           field("value", $._expression),
           field("body", $.block),
@@ -614,7 +624,7 @@ module.exports = grammar({
         optional(";"),
       ),
 
-    loop_label: ($) => seq("'", field("name", $.identifier)),
+    loop_label: ($) => seq("'", field("name", $._identifier)),
 
     assignment_statement: ($) =>
       prec.right(
@@ -773,7 +783,7 @@ module.exports = grammar({
 
     concurrent_arm: ($) =>
       seq(
-        field("name", $.identifier),
+        field("name", $._identifier),
         ":",
         field("value", $._expression),
         optional(choice(",", ";")),
@@ -787,6 +797,7 @@ module.exports = grammar({
             "parameters",
             choice(
               $.identifier,
+              $.contextual_identifier,
               $.legacy_keyword_identifier,
               seq(
                 "(",
@@ -803,10 +814,7 @@ module.exports = grammar({
 
     lambda_parameter: ($) =>
       seq(
-        field(
-          "name",
-          choice($.identifier, $.legacy_keyword_identifier),
-        ),
+        field("name", $._identifier),
         optional(seq(":", field("type", $._type))),
       ),
 
@@ -848,11 +856,15 @@ module.exports = grammar({
     argument: ($) =>
       choice(
         field("value", $.record_construction),
+        $.forbidden_keyword_argument,
         seq("...", field("value", $._expression)),
-        seq(field("name", $.identifier), ":", field("value", $._expression)),
+        seq(field("name", $._identifier), ":", field("value", $._expression)),
         field("value", $._expression),
       ),
 
+    forbidden_keyword_argument: ($) =>
+      seq(field("name", choice(...KEYWORDS)), ":", field("value", $._expression)),
+
     member_expression: ($) =>
       prec.left(
         PREC.postfix,
@@ -865,6 +877,9 @@ module.exports = grammar({
 
     pipeline_placeholder: (_) => "_",
 
+    _identifier: ($) =>
+      choice($.identifier, $.contextual_identifier, $.legacy_keyword_identifier),
+
     contextual_identifier: ($) =>
       prec(-1, alias(choice("map", "set"), $.identifier)),
 
@@ -872,7 +887,12 @@ module.exports = grammar({
       prec(
         -2,
         alias(
-          choice("import", "export", "use", "loop", "record", "self"),
+          choice(
+            "import", "export", "use", "loop", "record", "self",
+            "enum", "impl", "newtype", "protocol", "using",
+            "derives", "Eq", "Order", "Show", "JSON", "as", "timeout",
+            "int", "float", "string", "bool",
+          ),
           $.identifier,
         ),
       ),
@@ -904,6 +924,12 @@ module.exports = grammar({
             "value",
             choice(
               $.identifier,
+              $.contextual_identifier,
+              $.legacy_keyword_identifier,
+              $.member_expression,
+              $.index_expression,
+              $.call_expression,
+              $.record_update,
               $.parenthesized_expression,
             ),
           ),
@@ -994,11 +1020,13 @@ module.exports = grammar({
       prec.right(
         PREC.unary,
         seq(
-          field("operator", choice("+", "-", "!", "~")),
+          field("operator", choice("+", "-", "!", $.forbidden_reserved_operator)),
           field("argument", $._expression),
         ),
       ),
 
+    forbidden_reserved_operator: (_) => "~",
+
     binary_expression: ($) =>
       choice(
         ...[
@@ -1099,28 +1127,36 @@ module.exports = grammar({
         $.legacy_keyword_identifier,
       ),
     type_pattern: ($) =>
-      seq(field("name", $.identifier), ":", field("type", $._type)),
+      seq(field("name", $._identifier), ":", field("type", $._type)),
     constructor_pattern: ($) =>
       seq(
-        field("name", $.identifier),
-        "(",
+        field("name", $._identifier),
+        // Share the adjacent call token while also allowing spaced constructors.
+        choice("(", token.immediate("(")),
         optional(commaSep1($._pattern)),
         optional(","),
         ")",
       ),
     range_pattern: ($) =>
       seq($._const_expression, field("operator", choice("..", "..<")), $._const_expression),
+    // One optional rest marker, with ordinary patterns on either side.
     list_pattern: ($) =>
       seq(
         "[",
         optional(
-          choice(
-            $.list_rest_pattern,
-            seq(
-              commaSep1($._pattern),
-              optional(seq(",", $.list_rest_pattern)),
-              optional(","),
+          seq(
+            choice(
+              seq($.list_rest_pattern, repeat(seq(",", $._pattern))),
+              seq(
+                commaSep1($._pattern),
+                optional(seq(
+                  ",",
+                  $.list_rest_pattern,
+                  repeat(seq(",", $._pattern)),
+                )),
+              ),
             ),
+            optional(","),
           ),
         ),
         "]",
@@ -1139,7 +1175,7 @@ module.exports = grammar({
     record_pattern_field: ($) =>
       choice(
         seq(field("name", $.field_identifier), ":", field("pattern", $._pattern)),
-        field("name", $.identifier),
+        field("name", $._identifier),
       ),
 
     tagged_template: ($) => $._tagged_template,
@@ -1160,32 +1196,13 @@ module.exports = grammar({
           /[_\p{L}\u{1F300}-\u{1FAFF}\u{2600}-\u{27BF}][_\p{L}\p{N}\u{1F300}-\u{1FAFF}\u{2600}-\u{27BF}\u{FE0F}\u{200D}]*/u,
         ),
       ),
-    type_identifier: ($) => alias($.identifier, $.type_identifier),
+    type_identifier: ($) => alias($._identifier, $.type_identifier),
     field_identifier: ($) =>
       choice(
         alias($.identifier, $.field_identifier),
+        alias($.contextual_identifier, $.field_identifier),
         alias($.legacy_keyword_identifier, $.field_identifier),
-        "let",
-        "mut",
-        "const",
-        "type",
-        "function",
-        "return",
-        "if",
-        "else",
-        "match",
-        "case",
-        "for",
-        "in",
-        "by",
-        "while",
-        "break",
-        "continue",
-        "defer",
-        "concurrent",
-        "true",
-        "false",
-        "null",
+        ...KEYWORDS,
       ),
 
     line_comment: (_) => token(seq("//", /[^\n\r]*/)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-topaz",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "Apache-2.0",
   "main": "bindings/node",
   "types": "bindings/node",
@@ -20,7 +20,8 @@
     "test": "tree-sitter test",
     "test:queries": "node scripts/check-queries.mjs",
     "parse:acceptance": "node scripts/parse-acceptance.mjs",
-    "prepack": "tree-sitter generate"
+    "prepack": "tree-sitter generate",
+    "test:acceptance-extractor": "node --test scripts/rust-topaz-sources.test.mjs"
   },
   "dependencies": {
     "node-addon-api": "^8.5.0",

package/queries/highlights.scm

@@ -52,6 +52,11 @@
 (parameter
   name: (parameter_name (identifier) @variable.parameter))
 (lambda_parameter name: (identifier) @variable.parameter)
+(parameter
+  name: (parameter_name
+    [(contextual_identifier) (legacy_keyword_identifier)] @variable.parameter))
+(lambda_parameter
+  name: [(contextual_identifier) (legacy_keyword_identifier)] @variable.parameter)
 (field_identifier) @property
 (identifier) @variable