fix ident-to-module action

Author: zth

compiler/ml/cmt_utils.ml

@@ -9,6 +9,7 @@ type action_type =
   | ReplaceWithPolymorphicVariantConstructor of {constructor_name: string}
   | RewriteObjectToRecord
   | RewriteArrayToTuple
+  | RewriteIdentToModule of {module_name: string}
   | RewriteIdent of {new_ident: Longident.t}
   | PrefixVariableWithUnderscore
   | RemoveUnusedVariable
@@ -28,6 +29,8 @@ let action_to_string = function
   | AddAwait -> "AddAwait"
   | RewriteObjectToRecord -> "RewriteObjectToRecord"
   | RewriteArrayToTuple -> "RewriteArrayToTuple"
+  | RewriteIdentToModule {module_name} ->
+    Printf.sprintf "RewriteIdentToModule(%s)" module_name
   | PrefixVariableWithUnderscore -> "PrefixVariableWithUnderscore"
   | RemoveUnusedVariable -> "RemoveUnusedVariable"
   | ReplaceWithVariantConstructor {constructor_name} ->

compiler/ml/typetexp.ml

@@ -873,35 +873,34 @@ let report_error env ppf = function
       a lowercase identifier in JS but a module in ReScript.
       
       'Console' is a typical example, where JS is `console.log` and ReScript is `Console.log`. *)
-    let as_module =
+    let as_module_name =
       match lid with
-      | Lident name -> (
+      | Lident name -> Some (String.capitalize_ascii name)
+      | _ -> None
+    in
+    let as_module =
+      match as_module_name with
+      | Some name -> (
         try
           Some
             (env
             |> Env.lookup_module ~load:false
                  (Lident (String.capitalize_ascii name)))
         with _ -> None)
-      | _ -> None
+      | None -> None
     in
-    match as_module with
-    | None -> ()
-    | Some module_path ->
-      let new_ident =
-        module_path |> Printtyp.string_of_path |> Longident.parse
-      in
+    match (as_module, as_module_name) with
+    | Some module_path, Some as_module_name ->
       Cmt_utils.add_possible_action
         {
           loc;
-          action = Cmt_utils.RewriteIdent {new_ident};
-          description =
-            "Change to `"
-            ^ (new_ident |> Longident.flatten |> String.concat ".")
-            ^ "`";
+          action = Cmt_utils.RewriteIdentToModule {module_name = as_module_name};
+          description = "Change to `" ^ as_module_name ^ "`";
         };
       Format.fprintf ppf "@,@[<v 2>@,@[%s to use the module @{<info>%a@}?@]@]"
         (if did_spellcheck then "Or did you mean" else "Maybe you meant")
-        Printtyp.path module_path)
+        Printtyp.path module_path
+    | _ -> ())
   | Unbound_module lid ->
     (* modified *)
     (match lid with

tests/build_tests/actions/expected/Actions_IdentButDidYouMeanModule_applied.res

@@ -1,5 +1,5 @@
-\"Console".log(123)
+Console.log(123)
 
 /* === AVAILABLE ACTIONS:
-- RewriteIdent(Console) - Change to `Console`
+- RewriteIdentToModule(Console) - Change to `Console`
 */

tools/src/tools.ml

@@ -1486,6 +1486,22 @@ module Actions = struct
                      else
                        (* Other cases when the loc is on something else in the expr *)
                        match (expr.pexp_desc, action.action) with
+                       | ( Pexp_field
+                             ( {pexp_desc = Pexp_ident e},
+                               {txt = Lident inner; loc} ),
+                           RewriteIdentToModule {module_name} )
+                         when e.loc = action.loc ->
+                         Some
+                           {
+                             expr with
+                             pexp_desc =
+                               Pexp_ident
+                                 {
+                                   loc;
+                                   txt =
+                                     Longident.Ldot (Lident module_name, inner);
+                                 };
+                           }
                        | Pexp_await inner, RemoveAwait
                          when inner.pexp_loc = action.loc ->
                          Some (Ast_mapper.default_mapper.expr mapper inner)
@@ -1578,6 +1594,8 @@ module Actions = struct
                    List.mem "RewriteObjectToRecord" filter
                  | RewriteArrayToTuple -> List.mem "RewriteArrayToTuple" filter
                  | RewriteIdent _ -> List.mem "RewriteIdent" filter
+                 | RewriteIdentToModule _ ->
+                   List.mem "RewriteIdentToModule" filter
                  | PrefixVariableWithUnderscore ->
                    List.mem "PrefixVariableWithUnderscore" filter
                  | RemoveUnusedVariable ->