Merge pull request rescript-lang#199 from aspeddro/fix-unpack-constraint

support unpack with constrain type

Author: nkrkv

grammar.js

@@ -214,7 +214,19 @@ module.exports = grammar({
       $.extension_expression,
     ),
 
-    module_unpack: $ => seq('unpack', $.call_arguments),
+    module_unpack: $ => seq(
+      'unpack',
+      '(',
+      choice(
+        seq(
+          choice($.value_identifier, $.value_identifier_path, $.member_expression),
+          optional($.module_type_annotation)
+        ),
+        $.call_expression,
+        $.extension_expression
+      ),
+      ')'
+    ),
 
     functor: $ => seq(
       field('parameters', $.functor_parameters),
@@ -1137,7 +1149,7 @@ module.exports = grammar({
       $.block,
     ),
 
-    lazy_expression: $ =>  seq(
+    lazy_expression: $ => seq(
       'lazy',
       $.expression,
     ),
@@ -1353,7 +1365,7 @@ module.exports = grammar({
       $._escape_identifier,
     ),
 
-    _escape_identifier: $ => token(seq('\\"', /[^"]+/ , '"')),
+    _escape_identifier: $ => token(seq('\\"', /[^"]+/, '"')),
 
     module_identifier: $ => /[A-Z][a-zA-Z0-9_']*/,
 
@@ -1447,7 +1459,7 @@ module.exports = grammar({
           choice(
             /[a-z_][a-zA-Z0-9_']*/,
             // escape_sequence
-            seq('\\"', /[^"]+/ , '"'),
+            seq('\\"', /[^"]+/, '"'),
           )
         ),
         '`',

test/corpus/modules.txt

@@ -164,6 +164,14 @@ module(
 )
 module(SomeFunctor(unpack(x)))
 
+module T = unpack(foo: T)
+
+module S = unpack(foo: T with type t = a)
+
+module S = unpack(Mod.read(v))
+
+module S = unpack(%extension(payload))
+
 ---
 
 (source_file
@@ -187,7 +195,31 @@ module(SomeFunctor(unpack(x)))
         (module_identifier)
         (arguments
           (module_unpack
-            (call_arguments (value_identifier))))))))
+            (value_identifier))))))
+  (module_declaration
+    (module_identifier)
+    (module_unpack
+      (value_identifier)
+      (module_type_annotation (module_identifier))))
+  (module_declaration
+    (module_identifier)
+    (module_unpack
+      (value_identifier)
+      (module_type_annotation
+        (module_type_constraint (module_identifier)
+          (constrain_type (type_identifier) (type_identifier))))))
+  (module_declaration
+    (module_identifier)
+    (module_unpack
+      (call_expression
+        (value_identifier_path (module_identifier) (value_identifier)) 
+        (arguments (value_identifier)))))
+  (module_declaration
+    (module_identifier)
+      (module_unpack
+        (extension_expression
+          (extension_identifier)
+          (expression_statement (value_identifier))))))
 
 
 ===========================================