Prevent looping in scrape-aliases (fixes ocaml/ocaml-lsp#1192) (#1686)

from voodoos/fix-scrape-aliases
ocaml · Sep 26, 2023 · 1859d9e · 1859d9e
2 parents 9b072a5 + 4567b30
commit 1859d9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,8 @@ unreleased
   + merlin binary
     - Fix issue with let operators and tuples (#1684, fixes #1683, fixes
       ocaml/ocaml-lsp#1182)
+    - Fix an issue causing Merlin locate queries to hang (#1686,
+      fixes ocaml/ocaml-lsp#1192)
 
 merlin 4.11
 ===========

diff --git a/src/analysis/locate.ml b/src/analysis/locate.ml
@@ -326,8 +326,11 @@ let scrape_alias ~env ~fallback_uid ~namespace path =
   in
   let rec non_alias_declaration_uid ~fallback_uid path =
     match find_type_and_uid ~env ~namespace path with
-    | (Mty_alias path | Mty_ident path), fallback_uid ->
+    | Mty_alias path, fallback_uid ->
         non_alias_declaration_uid ~fallback_uid path
+    | Mty_ident alias_path, fallback_uid when not (Path.same path alias_path) ->
+        (* This case is necessary to traverse module type aliases *)
+        non_alias_declaration_uid ~fallback_uid alias_path
     | _, md_uid -> md_uid
     | exception Not_found -> fallback_uid
   in