feat: unnest more module_identifier_path’s

Author: nkrkv

grammar.js

@@ -24,6 +24,7 @@ module.exports = grammar({
     $.primary_expression,
     $._type,
     $.module_expression,
+    $.module_primary_expression,
   ],
 
   precedences: $ => [
@@ -91,7 +92,8 @@ module.exports = grammar({
     [$.parameter, $._parenthesized_pattern],
     [$._switch_value_pattern, $._parenthesized_pattern],
     [$.variant_declaration],
-    [$.unit, $._function_type_parameter_list]
+    [$.unit, $._function_type_parameter_list],
+    [$.module_primary_expression, $.module_identifier_path],
   ],
 
   rules: {
@@ -1235,18 +1237,22 @@ module.exports = grammar({
       ),
 
     type_identifier_path: $ => seq(
-      $.module_identifier_path,
+      $.module_primary_expression,
       '.',
       $.type_identifier
     ),
 
     module_expression: $ => choice(
-      $.module_identifier,
-      $.module_identifier_path,
+      $.module_primary_expression,
       $.type_identifier_path,
       $.module_type_of,
-      $.functor_use,
       $.module_type_constraint,
+    ),
+
+    module_primary_expression: $ => choice(
+      $.module_identifier,
+      $.module_identifier_path,
+      $.functor_use,
       $.module_unpack,
     ),
 

test/corpus/expressions.txt

@@ -493,8 +493,7 @@ switch foo {
       (switch_match
         (polyvar_type_pattern
           (type_identifier_path
-            (module_identifier_path
-              (module_identifier))
+            (module_identifier)
             (type_identifier)))
             (as_aliasing (value_identifier))
         (expression_statement (number))))))
@@ -1434,6 +1433,6 @@ let f = ({name, _} as foo: T.t) => {}
             (value_identifier)
             (type_annotation
               (type_identifier_path
-                (module_identifier_path (module_identifier))
+                (module_identifier)
                 (type_identifier))))))
       body: (block))))

test/corpus/modules.txt

@@ -240,8 +240,12 @@ module MyFunctor = (X: {type t}, Y: {type t}): {type tx; type ty} => {
       return_module_type: (module_type_annotation
           (block (type_declaration (type_identifier)) (type_declaration (type_identifier))))
       body: (block
-        (type_declaration (type_identifier) (type_identifier_path (module_identifier_path (module_identifier)) (type_identifier)))
-        (type_declaration (type_identifier) (type_identifier_path (module_identifier_path (module_identifier)) (type_identifier)))))))
+        (type_declaration
+          (type_identifier)
+          (type_identifier_path (module_identifier) (type_identifier)))
+        (type_declaration
+          (type_identifier)
+          (type_identifier_path (module_identifier) (type_identifier)))))))
 
 ===========================================
 Functor signature
@@ -405,7 +409,7 @@ external add: (
         (function_type
           (function_type_parameters
             (parameter
-              (type_identifier_path (module_identifier_path (module_identifier)) (type_identifier)))
+              (type_identifier_path (module_identifier) (type_identifier)))
             (parameter
               (decorator (decorator_identifier) (decorator_arguments (template_string)))
               (type_identifier))
@@ -434,11 +438,11 @@ external add: (
                     (polyvar_declaration
                       (polyvar_identifier)
                       (polyvar_parameters
-                        (type_identifier_path (module_identifier_path (module_identifier)) (type_identifier))))
+                        (type_identifier_path (module_identifier) (type_identifier))))
                     (polyvar_declaration
                       (polyvar_identifier)
                       (polyvar_parameters
-                        (type_identifier_path (module_identifier_path (module_identifier)) (type_identifier)))))))))
+                        (type_identifier_path (module_identifier) (type_identifier)))))))))
           (unit_type)))
         (string (string_fragment)))))
 

test/corpus/type_declarations.txt

@@ -171,8 +171,7 @@ type t =
         (variant_identifier)
         (variant_parameters
           (module_pack
-            (type_identifier_path
-              (module_identifier_path (module_identifier)) (type_identifier))))))))
+            (type_identifier_path (module_identifier) (type_identifier))))))))
 
 ===========================================
 Annotated variant