locate: reset state from entry points

Author: trefis

src/analysis/locate.ml

@@ -703,8 +703,6 @@ end = struct
 end
 
 let locate ~config ~ml_or_mli ~path ~lazy_trie ~pos ~str_ident loc =
-  File_switching.reset ();
-  Fallback.reset ();
   Preferences.set ml_or_mli;
   log ~title:"locate"
     "present in the environment, walking up the typedtree looking for '%s'"
@@ -740,6 +738,8 @@ let from_longident ~config ~env ~lazy_trie ~pos nss ml_or_mli ident =
       locate ~config ~ml_or_mli ~path:tagged_path ~lazy_trie ~pos ~str_ident loc
 
 let from_path ~config ~env ~local_defs ~pos ~namespace ml_or_mli path =
+  File_switching.reset ();
+  Fallback.reset ();
   let str_ident = Path.name path in
   if Utils.is_builtin_path path then
     `Builtin
@@ -761,6 +761,8 @@ let from_path ~config ~env ~local_defs ~pos ~namespace ml_or_mli path =
       | `Found (loc, _) -> find_source ~config loc str_ident
 
 let from_string ~config ~env ~local_defs ~pos ?namespaces switch path =
+  File_switching.reset ();
+  Fallback.reset ();
   let browse = Mbrowse.of_typedtree local_defs in
   let lazy_trie =
     lazy (Typedtrie.of_browses ~local_buffer:true
@@ -808,6 +810,8 @@ let from_string ~config ~env ~local_defs ~pos ?namespaces switch path =
     | `Found (loc, _) -> find_source ~config loc path
 
 let get_doc ~config ~env ~local_defs ~comments ~pos =
+  File_switching.reset ();
+  Fallback.reset ();
   let browse = Mbrowse.of_typedtree local_defs in
   let lazy_trie = lazy (Typedtrie.of_browses ~local_buffer:true
                           [Browse_tree.of_browse browse]) in

tests/test-dirs/server-tests/locate-state/reset-file-switching.t

@@ -56,20 +56,7 @@ random documentation is fetched for the same `document` request as before
   $ $MERLIN server document -position 23:5 < lib_doc.ml
   {
     "class": "return",
-    "value": "List operations.
-  
-     Some functions are flagged as not tail-recursive.  A tail-recursive
-     function uses constant stack space, while a non-tail-recursive function
-     uses stack space proportional to the length of its list argument, which
-     can be a problem with very long lists.  When the function takes several
-     list arguments, an approximate formula giving stack usage (in some
-     unspecified constant unit) is shown in parentheses.
-  
-     The above considerations can usually be ignored if your lists are not
-     longer than about 10000 elements.
-  
-     The labeled version of this module can be used as described in the
-     {!StdLabels} module.",
+    "value": "No documentation available",
     "notifications": []
   }