Merge branch 'main' into refactor-list-constructor

Author: aspeddro

Makefile

@@ -9,7 +9,8 @@ wild_github_repos := rescript-lang/rescript-react \
 										 rescript-association/rescript-lang.org \
 										 tinymce/rescript-webapi \
 										 cca-io/rescript-material-ui \
-										 rescript-association/reanalyze
+										 rescript-association/reanalyze \
+										 TheSpyder/rescript-nodejs.git
 
 wild_sandboxes := $(patsubst %,test_wild/%,$(wild_github_repos))
 

grammar.js

@@ -107,7 +107,8 @@ module.exports = grammar({
     [$.variant_declaration],
     [$.unit, $._function_type_parameter_list],
     [$.functor_parameter, $.module_primary_expression, $.module_identifier_path],
-    [$._reserved_identifier, $.function]
+    [$._reserved_identifier, $.function],
+    [$.polyvar_type]
   ],
 
   rules: {
@@ -260,20 +261,22 @@ module.exports = grammar({
       optional('export'),
       'type',
       optional('rec'),
-      $._type_declaration,
+      $._type_declaration
     ),
 
     _type_declaration: $ => seq(
       choice($.type_identifier, $.type_identifier_path),
       optional($.type_parameters),
       optional(seq(
-        choice('=', '+='),
-        optional('private'),
-        $._type,
-        repeat($.type_constraint),
         optional(seq('=', $._type)),
-        optional(alias($._type_declaration_and, $.type_declaration)),
+        optional(seq(
+          choice('=', '+='),
+          optional('private'),
+          $._type,
+        )),
+        repeat($.type_constraint),
       )),
+      optional(alias($._type_declaration_and, $.type_declaration))
     ),
 
     _type_declaration_and: $ => seq(
@@ -363,6 +366,7 @@ module.exports = grammar({
     ),
 
     polyvar_type: $ => prec.left(seq(
+      repeat($.decorator),
       choice('[', '[>', '[<',),
       optional('|'),
       barSep1($.polyvar_declaration),
@@ -373,7 +377,7 @@ module.exports = grammar({
     polyvar_declaration: $ => prec.right(
       choice(
         seq(
-          optional($.decorator),
+          repeat($.decorator),
           $.polyvar_identifier,
           optional($.polyvar_parameters),
         ),
@@ -425,10 +429,11 @@ module.exports = grammar({
 
     ),
 
-    generic_type: $ => seq(
+    generic_type: $ => prec.left(seq(
       $._type_identifier,
-      $.type_arguments
-    ),
+      $.type_arguments,
+      optional($.as_aliasing_type)
+    )),
 
     type_arguments: $ => seq(
       '<',
@@ -627,20 +632,28 @@ module.exports = grammar({
 
     tuple: $ => seq(
       '(',
-      commaSep2t($.expression),
+      commaSep2t(
+        seq(repeat($.decorator), $.expression)
+      ),
       ')',
     ),
 
     array: $ => seq(
       '[',
-      commaSept($.expression),
+      commaSept(
+        seq(repeat($.decorator), $.expression)
+      ),
       ']'
     ),
 
     list: $ => seq(
       $._list_constructor,
       '{',
-      optional(commaSep1t($._list_element)),
+      optional(
+        commaSep1t(
+          seq(repeat($.decorator), $._list_element)
+        )
+      ),
       '}'
     ),
 
@@ -798,6 +811,7 @@ module.exports = grammar({
         seq(
           '=',
           optional('?'),
+          repeat($.decorator),
           field('value', $.expression),
           optional(field('type', $.type_annotation)),
         ),
@@ -930,20 +944,29 @@ module.exports = grammar({
 
     tuple_pattern: $ => seq(
       '(',
-      commaSep2t(alias($._pattern, $.tuple_item_pattern)),
+      commaSep2t(
+        alias(
+          seq(repeat($.decorator), $._pattern),
+          $.tuple_item_pattern
+        )
+      ),
       ')',
     ),
 
     array_pattern: $ => seq(
       '[',
-      optional(commaSep1t($._collection_element_pattern)),
+      optional(commaSep1t(
+        seq(repeat($.decorator), $._collection_element_pattern)
+      )),
       ']',
     ),
 
     list_pattern: $ => seq(
       $._list_constructor,
       '{',
-      optional(commaSep1t($._collection_element_pattern)),
+      optional(commaSep1t(
+        seq(repeat($.decorator), $._collection_element_pattern)
+      )),
       '}',
     ),
 

queries/highlights.scm

@@ -71,6 +71,12 @@
 ; single parameter with no parens
 (function parameter: (value_identifier) @parameter)
 
+; first-level descructuring (required for nvim-tree-sitter as it only matches direct
+; children and the above patterns do not match destructuring patterns in NeoVim)
+(parameter (tuple_pattern (tuple_item_pattern (value_identifier) @parameter)))
+(parameter (array_pattern (value_identifier) @parameter))
+(parameter (record_pattern (value_identifier) @parameter))
+
 ; Meta
 ;-----
 

test/corpus/expressions.txt

@@ -101,6 +101,7 @@ blocky(
   ~third={3},
 )
 f(raise)
+call(~a=@decorator 1)
 
 ---
 
@@ -172,7 +173,16 @@ f(raise)
     (call_expression
       function: (value_identifier)
       arguments: (arguments
-        (value_identifier)))))
+        (value_identifier))))
+
+  (expression_statement
+    (call_expression
+      function: (value_identifier)
+      arguments: (arguments
+        (labeled_argument
+          label: (value_identifier)
+          (decorator (decorator_identifier))
+          value: (number))))))
 
 ===========================================
 Pipe

test/corpus/let_bindings.txt

@@ -88,6 +88,7 @@ Array destructuring
 
 let [bar, baz] = foo
 let [bar, baz, _] = foo
+let [@decorator bar, _] = foo
 
 ---
 
@@ -103,13 +104,21 @@ let [bar, baz, _] = foo
       (value_identifier)
       (value_identifier)
       (value_identifier))
+    (value_identifier))
+
+  (let_binding
+    (array_pattern
+      (decorator (decorator_identifier))
+      (value_identifier)
+      (value_identifier))
     (value_identifier)))
 
 ============================================
 List destructuring
 ============================================
 
 let list{head, ...tail} = foo
+let list{@decorator head, ..._} = foo
 
 ---
 
@@ -118,6 +127,13 @@ let list{head, ...tail} = foo
     (list_pattern
       (value_identifier)
       (spread_pattern (value_identifier)))
+    (value_identifier))
+
+  (let_binding
+    (list_pattern
+      (decorator (decorator_identifier))
+      (value_identifier)
+      (spread_pattern (value_identifier)))
     (value_identifier)))
 
 

test/corpus/type_declarations.txt

@@ -5,13 +5,16 @@ Opaque
 type t
 type t'
 type \"type"
+type t and b
 
 ---
 
 (source_file
  (type_declaration (type_identifier))
  (type_declaration (type_identifier))
- (type_declaration (type_identifier)))
+ (type_declaration (type_identifier))
+ (type_declaration (type_identifier)
+  (type_declaration (type_identifier))))
 
 ===========================================
 Export
@@ -224,7 +227,7 @@ type t = [>
   ]
 
 
-type foo<'a> = [> #Blue | #DeepBlue | #LightBlue ] as 'a
+type foo<'a> = @decorator [> #Blue | #DeepBlue | #LightBlue ] as 'a
 type t<'w> = [M.t<'w>]
 
 ---
@@ -247,6 +250,7 @@ type t<'w> = [M.t<'w>]
     (type_identifier)
     (type_parameters (type_identifier))
     (polyvar_type
+      (decorator (decorator_identifier))
       (polyvar_declaration (polyvar_identifier))
       (polyvar_declaration (polyvar_identifier))
       (polyvar_declaration (polyvar_identifier))
@@ -349,6 +353,7 @@ Generic
 
 type t<'a, 'b> = (array<'a>, array<'b>)
 type t = result<(), string>
+type t<'a> = generic<'a> as 's
 
 ---
 
@@ -365,7 +370,15 @@ type t = result<(), string>
       (type_identifier)
       (type_arguments
         (unit)
-        (type_identifier)))))
+        (type_identifier))))
+
+  (type_declaration
+    (type_identifier)
+    (type_parameters (type_identifier))
+    (generic_type
+      (type_identifier)
+      (type_arguments (type_identifier))
+      (as_aliasing_type (type_identifier)))))
 
 ===========================================
 Recursive
@@ -530,6 +543,7 @@ Type constraint
 
 type t<'a> = 'a constraint 'a = int
 type decorator<'a, 'b> = 'a => 'b constraint 'a = int constraint 'b = _ => _
+type t<'a> constraint 'a = t
 
 ---
 
@@ -553,4 +567,11 @@ type decorator<'a, 'b> = 'a => 'b constraint 'a = int constraint 'b = _ => _
       (type_identifier)
       (function_type
         (function_type_parameters (type_identifier))
-        (type_identifier)))))
+        (type_identifier))))
+
+  (type_declaration
+    (type_identifier)
+    (type_parameters (type_identifier))
+    (type_constraint
+      (type_identifier)
+      (type_identifier))))

test/highlight/functions.res

@@ -2,6 +2,12 @@ let inc = n => n + 1
 //        ^ parameter
 //          ^ punctuation.special
 
+let fn = (a, (b, c), {d, e}, [f, g]) => a + b + c + d + e + f + g
+//        ^ parameter
+//            ^ parameter
+//                    ^ parameter
+//                            ^ parameter
+
 let uncurry = (. u, .x) => (u, x)
 //             ^ operator
 //                  ^ operator