Support mod idents <A.B />

Author: andreypopp

mlx/parser.ml

@@ -3660,6 +3660,13 @@ mk_longident(prefix,final):
 jsx_longident(uident, lident):
    | id = uident { `Module, $sloc, Lident id }
    | id = lident { `Value, $sloc, Lident id }
+   | prefix = uident DOT id = mod_longident { 
+     let rec rebase = function
+       | Lident id -> Ldot (Lident prefix, id)
+       | Ldot (prefix', id) -> Ldot (rebase prefix', id)
+       | Lapply _ -> assert false
+     in
+     `Module, $sloc, rebase id }
    | prefix = uident DOT id = val_longident { 
      let rec rebase = function
        | Lident id -> Ldot (Lident prefix, id)

mlx/parser.mly

@@ -3846,6 +3846,13 @@ val_longident:
 jsx_longident(uident, lident):
    | id = uident { `Module, $sloc, Lident id }
    | id = lident { `Value, $sloc, Lident id }
+   | prefix = uident DOT id = mod_longident { 
+     let rec rebase = function
+       | Lident id -> Ldot (Lident prefix, id)
+       | Ldot (prefix', id) -> Ldot (rebase prefix', id)
+       | Lapply _ -> assert false
+     in
+     `Module, $sloc, rebase id }
    | prefix = uident DOT id = val_longident { 
      let rec rebase = function
        | Lident id -> Ldot (Lident prefix, id)

ocamlmerlin_mlx/preprocess/parser_raw.cmly

@@ -23,12 +23,36 @@
   MERLIN
   let _ = Hello.createElement () ~children:[] ~attr ~with_value:1 [@JSX]
 
+  $ echo 'let _ = <Hello.ok attr with_value=1 />' | ./mlx
+  BATCH
+  let _ = Hello.ok () ~children:[] ~attr ~with_value:1 [@JSX]
+  MERLIN
+  let _ = Hello.ok () ~children:[] ~attr ~with_value:1 [@JSX]
+
+  $ echo 'let _ = <Hello.Ok attr with_value=1 />' | ./mlx
+  BATCH
+  let _ = Hello.Ok.createElement () ~children:[] ~attr ~with_value:1 [@JSX]
+  MERLIN
+  let _ = Hello.Ok.createElement () ~children:[] ~attr ~with_value:1 [@JSX]
+
   $ echo 'let _ = <Hello>world</Hello>' | ./mlx
   BATCH
   let _ = Hello.createElement () ~children:[ world ] [@JSX]
   MERLIN
   let _ = Hello.createElement () ~children:[ world ] [@JSX]
 
+  $ echo 'let _ = <Hello.ok>world</Hello.ok>' | ./mlx
+  BATCH
+  let _ = Hello.ok () ~children:[ world ] [@JSX]
+  MERLIN
+  let _ = Hello.ok () ~children:[ world ] [@JSX]
+
+  $ echo 'let _ = <Hello.Ok>world</Hello.Ok>' | ./mlx
+  BATCH
+  let _ = Hello.Ok.createElement () ~children:[ world ] [@JSX]
+  MERLIN
+  let _ = Hello.Ok.createElement () ~children:[ world ] [@JSX]
+
   $ echo 'let _ = <one>world</two>' | ./mlx
   BATCH
   File "*stdin*", line 1, characters 18-24: