Don't show file path on hover.

Author: cristianoc

Changes.md

@@ -1,6 +1,6 @@
 # master
 - Fix issue in jump-to-definition on Windows. (See https://github.com/rescript-lang/rescript-vscode/issues/98) where the wrong URI was generated.
-
+- Don't show file path on hover.
 
 ## Release 1.0.6 of rescript-vscode
 This [commit](https://github.com/rescript-lang/rescript-editor-support/commit/03ee0d97b250474028d4fb08eac81ddb21ccb082) is vendored in [rescript-vscode 1.0.6](https://github.com/rescript-lang/rescript-vscode/releases/tag/1.0.6).

src/rescript-editor-support/EditorSupportCommands.re

@@ -44,7 +44,6 @@ let dumpLocations = (state, ~package, ~file, ~extra, ~selectPos, uri) => {
 
          let hoverText =
            Hover.newHover(
-             ~rootUri=state.TopTypes.rootUri,
              ~file,
              ~getModule=State.fileForModule(state, ~package),
              loc,
@@ -121,8 +120,7 @@ let splitLineChar = pathWithPos => {
 
 let dump = files => {
   Shared.cacheTypeToString := true;
-  let rootPath = Unix.getcwd();
-  let state = TopTypes.empty(~rootUri=Uri2.fromPath(rootPath));
+  let state = TopTypes.empty();
   files
   |> List.iter(pathWithPos => {
        let (filePath, selectPos) = pathWithPos |> splitLineChar;
@@ -154,8 +152,7 @@ let autocomplete = (~currentFile, ~full, ~package, ~pos, ~state) => {
 };
 
 let complete = (~pathWithPos, ~currentFile) => {
-  let rootPath = Unix.getcwd();
-  let state = TopTypes.empty(~rootUri=Uri2.fromPath(rootPath));
+  let state = TopTypes.empty();
   switch (pathWithPos |> splitLineChar) {
   | (filePath, Some(pos)) =>
     let filePath = Files.maybeConcat(Unix.getcwd(), filePath);

src/rescript-editor-support/Hover.re

@@ -59,7 +59,7 @@ let showModule =
   };
 };
 
-let newHover = (~rootUri, ~file: SharedTypes.file, ~getModule, loc) => {
+let newHover = (~file: SharedTypes.file, ~getModule, loc) => {
   switch (loc) {
   | SharedTypes.Explanation(text) => Some(text)
   | TypeDefinition(name, decl, _stamp) =>
@@ -144,9 +144,7 @@ let newHover = (~rootUri, ~file: SharedTypes.file, ~getModule, loc) => {
       | None =>
         let (typeString, docstring) = t |> fromType(~docstring=None);
         [typeString, docstring];
-      | Some((docstring, {uri}, res)) =>
-        let pathFromRoot = uri |> Uri2.pathFromRoot(~rootUri);
-
+      | Some((docstring, res)) =>
         let parts =
           switch (res) {
           | `Declared =>
@@ -171,7 +169,7 @@ let newHover = (~rootUri, ~file: SharedTypes.file, ~getModule, loc) => {
             [typeString, docstring];
           };
 
-        parts @ [Some(pathFromRoot)];
+        parts;
       };
 
     Some(String.concat("\n\n", parts |> Utils.filterMap(x => x)));

src/rescript-editor-support/MessageHandlers.re

@@ -281,7 +281,6 @@ let handlers:
         let%opt (location, loc) = References.locForPos(~extra, pos);
         let%opt text =
           Hover.newHover(
-            ~rootUri=state.rootUri,
             ~file,
             ~getModule=State.fileForModule(state, ~package),
             loc,

src/rescript-editor-support/References.re

@@ -99,10 +99,10 @@ let definedForLoc = (~file, ~getModule, locKind) => {
     switch (tip) {
     | Constructor(name) =>
       let%opt constructor = Query.getConstructor(file, stamp, name);
-      Some((None, file, `Constructor(constructor)));
+      Some((None, `Constructor(constructor)));
     | Field(name) =>
       let%opt field = Query.getField(file, stamp, name);
-      Some((None, file, `Field(field)));
+      Some((None, `Field(field)));
     | _ =>
       maybeLog(
         "Trying for declared "
@@ -114,7 +114,7 @@ let definedForLoc = (~file, ~getModule, locKind) => {
       );
       let%opt declared =
         Query.declaredForTip(~stamps=file.stamps, stamp, tip);
-      Some((declared.docstring, file, `Declared));
+      Some((declared.docstring, `Declared));
     };
   };
 

src/rescript-editor-support/RescriptEditorSupport.re

@@ -60,7 +60,7 @@ let getInitialState = params => {
     ]),
   );
 
-  let state = TopTypes.empty(~rootUri);
+  let state = TopTypes.empty();
 
   Ok(state);
 };

src/rescript-editor-support/TopTypes.re

@@ -17,15 +17,13 @@ type package = {
 };
 
 type state = {
-  rootUri: uri,
   documentText: Hashtbl.t(uri, string),
   packagesByRoot: Hashtbl.t(string, package),
   rootForUri: Hashtbl.t(uri, string),
   cmtCache: Hashtbl.t(filePath, (float, SharedTypes.file)),
 };
 
-let empty = (~rootUri) => {
-  rootUri,
+let empty = () => {
   documentText: Hashtbl.create(5),
   packagesByRoot: Hashtbl.create(1),
   rootForUri: Hashtbl.create(30),

src/rescript-editor-support/Uri2.re

@@ -2,7 +2,6 @@ module Uri: {
   type t;
   let fromPath: string => t;
   let parse: string => option(t);
-  let pathFromRoot: (~rootUri: t, t) => string;
   let toPath: t => string;
   let toString: t => string;
 } = {
@@ -67,10 +66,6 @@ module Uri: {
     };
   let toPath = ({path}) => path;
   let toString = ({uri}) => uri;
-
-  let pathFromRoot = (~rootUri as {path: rootPath}, {path}) =>
-    Utils.startsWith(path, rootPath)
-      ? "<root>" ++ Utils.sliceToEnd(path, String.length(rootPath)) : path;
 };
 
 include Uri;