TS parser 100% done now

tree-sitter/grammar.js

@@ -24,6 +24,10 @@ module.exports = grammar({
 
   precedences: _ => [
     [
+      "parentrized",
+      "function_call",
+      "expr_atom",
+
       "ident",
       "exponent",
       "multiplication",
@@ -34,54 +38,67 @@ module.exports = grammar({
       "equal",
       "if",
       "let",
-      "new_match_arm",
       "match_arm",
+      "new_match_arm",
       "await",
       "tag",
     ],
   ],
 
-  conflicts: $ => [
-    [$.match_expr, $.match_expr], // TODO
-  ],
-
   rules: {
-    source_file: $ => repeat($._definition),
+    source_file: $ => repeat($.definition),
 
     _identifier_tok: $ => token(/[a-zA-Z_]+[a-zA-Z0-9_]*/),
     identifier: $ => reserved('toplevel_kw', $._identifier_tok),
     path: $ => prec.left(seq($.identifier, repeat(seq('.', $.identifier)))),
 
     comment: $ =>
-      token(seq("#", /.*/)),
+      token(seq("# ", /.*/)),
 
-    _definition: $ => choice(
-      $.full_partial_type_definition,
-      $.type_definition,
-      $.extensible_union,
-      $.extend_decl,
-      $.def,
+    doc_comment: $ =>
+      repeat1(seq('## ', token.immediate(/.*/))),
+
+    definition: $ => seq(
+      optional(field('doc', $.doc_comment)),
+      field('body', choice(
+        $.full_partial_type_definition,
+        $.type_definition,
+        $.extensible_union,
+        $.extend_decl,
+        $.def,
+      )),
     ),
 
     extensible_union: $ => seq(
       'extensible', 'union', $.path),
 
     extend_decl: $ => seq(
-      'extend', $.path, 'with', $.tag, $._type),
+      'extend',
+      field('what', $.path),
+      'with',
+      field('tag', $.tag),
+      field('ty', $._type)),
 
     full_partial_type_definition: $ => seq(
       "type",
-      "?", $.path,
+      "?", field('name', $.path),
       "=",
-      $._type
+      field('type', $._type)
     ),
 
     type_definition: $ => seq(
       "type",
-      repeat($.identifier),
-      $.path,
+      optional(choice(
+        field('arg', $.identifier),
+        seq(
+          '[',
+          repeat(seq(field('arg', $.identifier), ',')),
+          field('arg', $.identifier),
+          ']'),
+      )),
+      field('name', $.path),
       "=",
-      $._type
+      field('type', $._type)
     ),
 
     _type_atom: $ => choice(
@@ -107,45 +124,63 @@ module.exports = grammar({
     ),
 
     union_type: $ => prec.left(1,
-      seq($._type, '|', $._type)),
+      seq(
+        field('left', $._type),
+        '|',
+        field('right', $._type))),
 
     partial_union_type: $ => prec.left(1,
-      seq($._type, '|', '...', $.partial_type)),
+      seq(
+        field('left', $._type),
+        '|', '...',
+        field('partial', $.partial_type))),
 
     tag: $ => new RustRegex("'(?:[a-zA-Z_][a-zA-Z0-9_]*(?:[.][a-zA-Z_0-9]+)*)"),
     tagged_type: $ => prec.right(3,
-      seq($.tag, optional(
-        choice(
+      seq(field('tag', $.tag), optional(
+        field('type', choice(
           $._type_atom,
-          $.parametrized_type)))),
+          $.parametrized_type))))),
 
-    multi_type_parameters: $ => seq('[', $._type, repeat(seq(',', $._type)), ']'),
+    multi_type_parameters: $ => seq('[',
+      field('arg', $._type),
+      repeat(seq(',', field('arg', $._type))),
+      ']'),
     parametrized_type: $ => prec.left(4, seq(
-      choice(
+      field('nest', choice(
         $.multi_type_parameters,
-        $._type_atom
-      ),
-      repeat1($.path)
+        $._type_atom,
+      )),
+      repeat(field('nest', $.path)),
+      field('type', $.path),
     )),
 
-    with_type: $ => seq('with', $.identifier, repeat(seq(',', $.identifier)), ':', $._type),
+    with_type: $ => seq('with',
+      field('arg', $.identifier),
+      repeat(seq(',', field('arg', $.identifier))),
+      ':',
+      field('type', $._type)),
 
-    recursive_type: $ => seq('&', $.identifier, $._type),
+    recursive_type: $ => seq('&',
+      field('name', $.identifier),
+      field('type', $._type)),
 
     partial_type: $ => seq('?', $.identifier),
 
     fn_type: $ => prec.left(-10,
-      seq($._type, '->', $._type)),
+      seq(field('arg', $._type), '->', field('res', $._type))),
 
     just_type: $ => prec(-1, $.path),
 
-    record_type_field: $ => seq($.identifier, ':', $._type),
+    // TODO: doc comments
+
+    record_type_field: $ => seq(field('name', $.identifier), ':', field('type', $._type)),
     record_type: $ => seq(
       '{',
-      repeat(seq($.record_type_field, ',')),
+      repeat(seq(field('field', $.record_type_field), ',')),
       optional(choice(
-        $.record_type_field,
-        seq('...', $.partial_type),
+        field('field', $.record_type_field),
+        seq('...', field('partial', $.partial_type)),
       )),
       '}'),
 
@@ -159,6 +194,7 @@ module.exports = grammar({
     char_literal: $ =>
       seq('\'', choice($.escape_sequence, $.char_middle), '\''),
 
+    // TODO: fstrings
     string_literal: $ =>
       seq('"', repeat(choice($.escape_sequence, $.string_middle)), '"'),
 
@@ -179,18 +215,21 @@ module.exports = grammar({
         ']'),
 
     field_access: $ => prec.left(
-      seq($._atom, ':', $.identifier)),
+      seq(field('expr', $._atom), ':', field('field', $.identifier))),
 
-    function_call: $ => prec.left(1,
-      seq($._atom, '(',
-        repeat(seq($._expression, ',')), optional($._expression),
+    function_call: $ => prec.left("function_call",
+      seq(
+        field('fn', $._atom),
+        '(',
+        repeat(seq(field('arg', $._expression), ',')),
+        optional(field('arg', $._expression)),
         ')')),
 
     ident_expr: $ => prec("ident",
       $.path),
 
     record_expr_field: $ =>
-      seq($.identifier, ':', $._expression),
+      seq(field('field', $.identifier), ':', field('value', $._expression)),
 
     record_expr: $ => seq(
       '{',
@@ -199,7 +238,7 @@ module.exports = grammar({
       '}'),
 
     _atom: $ => choice(
-      prec(0, seq('(', $._expression, ')')),
+      prec("parentrized", seq('(', $._expression, ')')),
       $.ident_expr,
       $.char_literal,
       $.string_literal,
@@ -241,68 +280,75 @@ module.exports = grammar({
       field('body', $._expression)
     )),
 
-    with_expr: $ => prec.left("with",
-      seq($._expression, 'with', $._atom)),
-
     and_expr: $ => prec.left("with",
-      seq($._expression, 'and', $._atom)),
+      seq(
+        field('left', $._expression),
+        'and',
+        field('right', $._atom))),
 
     if_expr: $ => prec("if",
-      seq('if', $._expression, 'then', $._expression, 'else', $._expression)),
+      seq(
+        'if',
+        field('condition', $._expression),
+        'then',
+        field('then', $._expression),
+        'else',
+        field('else', $._expression))),
 
     sub_expr: $ => prec.left("addition",
-      seq($._expression, '-', $._expression)),
+      seq(field('left', $._expression), '-', field('right', $._expression))),
     add_expr: $ => prec.left("addition",
-      seq($._expression, '+', $._expression)),
+      seq(field('left', $._expression), '+', field('right', $._expression))),
 
     divide_expr: $ => prec.left("multiplication",
-      seq($._expression, '/', $._expression)),
+      seq(field('left', $._expression), '/', field('right', $._expression))),
     multiply_expr: $ => prec.left("multiplication",
-      seq($._expression, '*', $._expression)),
+      seq(field('left', $._expression), '*', field('right', $._expression))),
 
     equal_expr: $ => prec.left("equal",
-      seq($._expression, '=', $._expression)),
+      seq(field('left', $._expression), '=', field('right', $._expression))),
 
     concat_expr: $ => prec.left("concat",
-      seq($._expression, '++', $._expression)),
+      seq(field('left', $._expression), '++', field('right', $._expression))),
 
     compose_expr: $ => prec.left("concat",
-      seq($._expression, '=>', $._expression)),
+      seq(field('left', $._expression), '=>', field('right', $._expression))),
 
     exponent_expr: $ => prec.left("exponent",
-      seq($._expression, '^', $._atom)),
+      seq(field('left', $._expression), '^', field('right', $._atom))),
 
     match_arm: $ => prec("match_arm",
       seq(
         field('cases', seq($._atom, repeat(seq('|', $._atom)))),
-        '->', $._expression)),
+        '->', field('expr', $._atom))),
 
     match_expr: $ =>
-      seq('match', $._expression, 'with',
-        $.match_arm,
-        prec("new_match_arm", repeat(seq('|', $.match_arm)))),
+      seq('match', field('on', $._expression), 'with',
+        field('arm', $.match_arm),
+        prec("new_match_arm", repeat(seq('|', field('arm', $.match_arm))))),
 
     negate_expr: $ => prec.right("negate",
-      seq('-', $._expression)),
+      seq('-', field('expr', $._expression))),
 
     tag_expr: $ => prec.right("tag",
-      seq($.tag, $._expression)),
+      seq(
+        field('tag', $.tag),
+        field('expr', $._expression))),
 
     await_expr: $ => prec.right("await",
-      seq('await', $._expression)),
+      seq('await', field('expr', $._expression))),
 
     _expression: $ => choice(
-      $._atom,
+      prec("expr_atom", $._atom),
       $.let_binding,
       $.await_binding,
       $.await_expr,
       $.type_downcast,
       $.lambda,
-      $.with_expr,
       $.and_expr,
       $.if_expr,
-      $.match_expr,
       $.tag_expr,
+      $.match_expr,
 
       $.add_expr,
       $.sub_expr,