WIP #2

Author: let-def

emacs/merlin.el

@@ -1043,7 +1043,7 @@ errors in the fringe.  If VIEW-ERRORS-P is non-nil, display a count of them."
          (prefix (car ident-))
          (pos    (merlin-unmake-point (point)))
          (data   (merlin-send-command
-                   (if merlin-completion-with-doc
+                   (if (and merlin-completion-with-doc);; (> (length ident) 0))
                      `(complete prefix ,ident at ,pos with doc)
                      `(complete prefix ,ident at ,pos))))
          ;; all classic entries

src/analysis/track_definition.ml

@@ -651,18 +651,42 @@ let get_doc ~project ~env ~local_defs ~comments ~pos source =
   Fluid.let' cfg_cmt_path (Project.cmt_path project) @@ fun () ->
   Fluid.let' loadpath     (Project.cmt_path project) @@ fun () ->
   Fluid.let' last_location Location.none @@ fun () ->
-  match
+  let store, location =
+    let is_cached (namespace,path,_) =
+      let ident = Path.head path in
+      try
+        if not (Ident.persistent ident) then
+          raise Not_found;
+        let filename = Utils.find_file ~with_fallback:true
+            (File.CMTI (Ident.name ident)) in
+        let cmt = Cmt_cache.read filename in
+        let key = (namespace,List.tl (Path.to_string_list path)) in
+        match Hashtbl.find cmt.Cmt_cache.doc_table key with
+        | store -> `Some store
+        | exception Not_found ->
+          let store = ref None in
+          Hashtbl.add cmt.Cmt_cache.doc_table key store;
+          `None store
+      with _ -> `None (ref None)
+    in
     match path with
-    | `Completion_entry entry -> from_completion_entry ~pos ~lazy_trie entry
+    | `Completion_entry entry ->
+      begin match is_cached entry with
+        | `Some cache -> cache, `Cached !cache
+        | `None store -> store, from_completion_entry ~pos ~lazy_trie entry
+      end
     | `User_input path ->
       let lid    = Longident.parse path in
       begin match inspect_context browse path pos with
-      | None -> `Found { Location. loc_start=pos; loc_end=pos ; loc_ghost=true }
-      | Some ctxt ->
-        info_log "looking for the doc of '%s'" path ;
-        from_longident ~pos ~env ~lazy_trie ctxt `MLI lid
+        | None -> ref None, `Found { Location. loc_start=pos; loc_end=pos ; loc_ghost=true }
+        | Some ctxt ->
+          info_log "looking for the doc of '%s'" path ;
+          ref None, from_longident ~pos ~env ~lazy_trie ctxt `MLI lid
       end
-  with
+  in
+  match location with
+  | `Cached (Some doc) -> `Found doc
+  | `Cached None -> `No_documentation
   | `Found loc ->
     let comments =
       match File_switching.where_am_i () with
@@ -671,11 +695,11 @@ let get_doc ~project ~env ~local_defs ~comments ~pos source =
         let {Cmt_cache. cmt_infos} = Cmt_cache.read cmt_path in
         cmt_infos.Cmt_format.cmt_comments
     in
-    begin match
-      Ocamldoc.associate_comment comments loc (Fluid.get last_location)
-    with
-    | None, _     -> `No_documentation
-    | Some doc, _ -> `Found doc
+    let doc, _ = Ocamldoc.associate_comment comments loc (Fluid.get last_location) in
+    store := doc;
+    begin match doc with
+      | None     -> `No_documentation
+      | Some doc -> `Found doc
     end
   | `File_not_found _
   | `Not_found _

src/ocaml_aux/cmt_cache.ml

@@ -51,6 +51,7 @@ type trie = (Location.t * namespace * node) list String.Map.t
 type cmt_item = {
   cmt_infos : Cmt_format.cmt_infos ;
   mutable location_trie : trie ;
+  doc_table: (namespace * string list, string option ref) Hashtbl.t;
 }
 
 include File_cache.Make (struct
@@ -59,5 +60,6 @@ include File_cache.Make (struct
   let read file = {
     cmt_infos = Cmt_format.read_cmt file ;
     location_trie = String.Map.empty ;
+    doc_table = Hashtbl.create 7 ;
   }
 end)