Merge branch 'main' into fix-fcm

Author: nkrkv

grammar.js

@@ -71,6 +71,7 @@ module.exports = grammar({
     [$.record_field, $.record_pattern],
     [$.expression_statement, $.ternary_expression],
     [$._type_declaration],
+    [$._let_binding],
     [$.let_binding, $.ternary_expression],
     [$.variant_identifier, $.module_identifier],
     [$.variant],
@@ -91,7 +92,8 @@ module.exports = grammar({
     [$.parameter, $._pattern],
     [$.parameter, $._parenthesized_pattern],
     [$._switch_value_pattern, $._parenthesized_pattern],
-    [$.variant_declaration]
+    [$.variant_declaration],
+    [$.unit, $._function_type_parameter_list]
   ],
 
   rules: {
@@ -245,16 +247,27 @@ module.exports = grammar({
         choice('=', '+='),
         optional('private'),
         $._type,
-        optional(seq(
-          'and',
-          $._type_declaration
-        )),
+        repeat(alias($._type_declaration_and, $.type_declaration)),
       )),
     ),
 
+    _type_declaration_and: $ => seq(
+      // New line here not necessary terminates the statement,
+      // show this doubt to the parser
+      repeat($._newline),
+      repeat($.decorator),
+      'and',
+      $._type_declaration
+    ),
+
     type_parameters: $ => seq(
       '<',
-      commaSep1t($.type_identifier),
+      commaSep1t(
+        seq(
+          optional(choice('+', '-')),
+          $.type_identifier
+        )
+      ),
       '>',
     ),
 
@@ -283,6 +296,7 @@ module.exports = grammar({
       $.generic_type,
       $.unit_type,
       $.module_pack,
+      $.unit,
     ),
 
     tuple_type: $ => prec.dynamic(-1, seq(
@@ -422,13 +436,19 @@ module.exports = grammar({
         '=',
         repeat($.decorator),
         $.expression,
-        optional(seq(
-          'and',
-          $._let_binding,
-        )),
+        repeat(alias($._let_binding_and, $.let_binding)),
       )),
     ),
 
+    _let_binding_and: $ => seq(
+      // New line here not necessary terminates the statement,
+      // show this doubt to the parser
+      repeat($._newline),
+      repeat($.decorator),
+      'and',
+      $._let_binding,
+    ),
+
     _binding_pattern: $ => choice(
       $.value_identifier,
       $.tuple_pattern,

queries/highlights.scm

@@ -68,11 +68,13 @@
 ; Functions
 ;----------
 
+; parameter(s) in parens
 [
- (formal_parameters (value_identifier))
+ (parameter (value_identifier))
  (labeled_parameter (value_identifier))
 ] @parameter
 
+; single parameter with no parens
 (function parameter: (value_identifier) @parameter)
 
 ; Meta

test/corpus/decorators.txt

@@ -77,3 +77,34 @@ let onResult = () => @doesNotRaise Belt.Array.getExn([], 0)
           (array)
           (number))))))
 
+============================================
+Decorator before type `and`
+============================================
+
+@deriving
+type foo = {
+  foo: string
+}
+@deriving
+and bar = {bar: int}
+
+
+@deriving @hello and baz = {baz: float}
+
+---
+
+(source_file
+  (decorated
+    (decorator (decorator_identifier))
+    (type_declaration
+      (type_identifier)
+      (record_type (record_type_field (property_identifier) (type_annotation (type_identifier))))
+      (type_declaration
+        (decorator (decorator_identifier))
+        (type_identifier)
+        (record_type (record_type_field (property_identifier) (type_annotation (type_identifier)))))
+      (type_declaration
+        (decorator (decorator_identifier))
+        (decorator (decorator_identifier))
+        (type_identifier)
+        (record_type (record_type_field (property_identifier) (type_annotation (type_identifier))))))))

test/corpus/let_bindings.txt

@@ -202,11 +202,12 @@ let a = 5 and b = 4
   (let_binding
     (value_identifier)
     (number)
-    (value_identifier)
-    (number)))
+    (let_binding
+      (value_identifier)
+      (number))))
 
 ============================================
-And (Fuctions)
+And (Functions)
 ============================================
 
 let rec a = x => x + b(x) and b = y => y - 1
@@ -224,10 +225,40 @@ let rec a = x => x + b(x) and b = y => y - 1
           (value_identifier)
           (arguments
             (value_identifier)))))
-    (value_identifier)
-    (function
+    (let_binding
       (value_identifier)
-      (binary_expression
+      (function
+        (value_identifier)
+        (binary_expression
+          (value_identifier)
+          (number))))))
+
+============================================
+And (decorated)
+============================================
+
+@one
+let rec a = b
+@two @three
+and b = c
+
+@four and c = 42
+
+---
+
+(source_file
+  (decorated
+    (decorator (decorator_identifier))
+    (let_binding
+      (value_identifier)
+      (value_identifier)
+      (let_binding
+        (decorator (decorator_identifier))
+        (decorator (decorator_identifier))
+        (value_identifier)
+        (value_identifier))
+      (let_binding
+        (decorator (decorator_identifier))
         (value_identifier)
         (number)))))
 

test/corpus/type_declarations.txt

@@ -313,6 +313,7 @@ Generic
 ===========================================
 
 type t<'a, 'b> = (array<'a>, array<'b>)
+type t = result<(), string>
 
 ---
 
@@ -322,7 +323,14 @@ type t<'a, 'b> = (array<'a>, array<'b>)
     (type_parameters (type_identifier) (type_identifier))
     (tuple_type
       (generic_type (type_identifier) (type_arguments (type_identifier)))
-      (generic_type (type_identifier) (type_arguments (type_identifier))))))
+      (generic_type (type_identifier) (type_arguments (type_identifier)))))
+  (type_declaration
+    (type_identifier)
+    (generic_type
+      (type_identifier)
+      (type_arguments
+        (unit)
+        (type_identifier)))))
 
 ===========================================
 Recursive
@@ -391,15 +399,16 @@ and teacher = {
         (property_identifier)
         (type_annotation
           (type_identifier))))
-    (type_identifier)
-    (record_type
-      (record_type_field
-        (property_identifier)
-        (type_annotation
-          (generic_type
-            (type_identifier)
-            (type_arguments
-              (type_identifier))))))))
+    (type_declaration
+      (type_identifier)
+      (record_type
+        (record_type_field
+          (property_identifier)
+          (type_annotation
+            (generic_type
+              (type_identifier)
+              (type_arguments
+                (type_identifier)))))))))
 
 
 ===========================================
@@ -422,3 +431,20 @@ type test = (. ~attr: string) => unit
             (type_annotation
               (type_identifier)))))
       (unit_type))))
+
+===========================================
+Variance annotations
+===========================================
+
+type t<+'a>
+type t<-'a>
+
+---
+
+(source_file
+  (type_declaration
+    (type_identifier)
+    (type_parameters (type_identifier)))
+  (type_declaration
+    (type_identifier)
+    (type_parameters (type_identifier))))