Don't let exported override included

Author: nojaf

analysis/src/CompletionBackEnd.ml

@@ -458,21 +458,6 @@ let processLocalInclude includePath _loc ~prefix ~exact ~(env : QueryEnv.t)
   |> Hashtbl.iter (fun (name, _) (declared : Types.type_expr Declared.t) ->
          (* We check all the values if their origin is the same as the include path. *)
          match declared.modulePath with
-         | ModulePath.ExportedModule {name = exportedName}
-           when exportedName = includePath ->
-           if Utils.checkName name ~prefix ~exact then
-             if not (Hashtbl.mem localTables.namesUsed name) then (
-               Hashtbl.add localTables.namesUsed name ();
-               localTables.resultRev <-
-                 {
-                   (Completion.create declared.name.txt ~env
-                      ~kind:(Value declared.item))
-                   with
-                   deprecated = declared.deprecated;
-                   docstring = declared.docstring;
-                   synthetic = true;
-                 }
-                 :: localTables.resultRev)
          | ModulePath.IncludedModule (source, _) ->
            let source_module_path =
              match Path.flatten source with

analysis/src/LocalTables.ml

@@ -25,9 +25,25 @@ let create () =
 let populateValues ~env localTables =
   env.QueryEnv.file.stamps
   |> Stamps.iterValues (fun _ declared ->
-         Hashtbl.replace localTables.valueTable
-           (declared.name.txt, declared.name.loc |> Loc.start)
-           declared)
+         match declared.modulePath with
+         | ModulePath.ExportedModule _ -> (
+           match
+             Hashtbl.find_opt localTables.valueTable
+               (declared.name.txt, declared.name.loc |> Loc.start)
+           with
+           | Some
+               {modulePath = ModulePath.IncludedModule _; name = existingName}
+             when declared.name.txt = existingName.txt ->
+             (* Don't override an included module declared item with an Exported one *)
+             ()
+           | _ ->
+             Hashtbl.replace localTables.valueTable
+               (declared.name.txt, declared.name.loc |> Loc.start)
+               declared)
+         | _ ->
+           Hashtbl.replace localTables.valueTable
+             (declared.name.txt, declared.name.loc |> Loc.start)
+             declared)
 
 let populateConstructors ~env localTables =
   env.QueryEnv.file.stamps