Normalize relative paths by avoiding prefixes of the form ./something.

Author: cristianoc

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## master
+- Fix issue where using paths of the form `./something` would show multiple copies of the same file in vscode.
 
 ## 1.2.1
 

analysis/src/Files.ml

@@ -19,12 +19,9 @@ let relpath base path =
   if pathStartsWith path base then
     let baselen = String.length base in
     let rest = String.sub path baselen (String.length path - baselen) in
-    if rest = "" then "." ^ Filename.dir_sep
-    else if rest.[0] = Filename.dir_sep.[0] then
-      if String.length rest > 1 && rest.[1] = '.' then sliceToEnd rest 1
-      else "." ^ rest
-    else if rest.[0] = '.' then rest
-    else "." ^ Filename.dir_sep ^ rest
+    (if rest <> "" && rest.[0] = Filename.dir_sep.[0] then sliceToEnd rest 1
+    else rest)
+    |> removeExtraDots
   else
     let rec loop bp pp =
       match (bp, pp) with
@@ -57,7 +54,6 @@ let readFile ~filename =
   with _ -> None
 
 let exists path = match maybeStat path with None -> false | Some _ -> true
-
 let ifExists path = if exists path then Some path else None
 
 let readDirectory dir =

analysis/tests/bsconfig.json

@@ -1,6 +1,11 @@
 {
   "name": "test",
-  "sources": "src",
+  "sources": [
+    {
+      "dir": "src",
+      "subdirs": true
+    }
+  ],
   "bs-dependencies": ["@rescript/react"],
   "reason": { "react-jsx": 3 }
 }

analysis/tests/src/expected/Debug.res.txt

@@ -1,35 +1,35 @@
 
 Definition tests/src/Debug.res 1:20
 Dependencies: @rescript/react
-Source directories: tests/node_modules/@rescript/react/./src tests/node_modules/@rescript/react/./src/legacy
-Source files: tests/node_modules/@rescript/react/./src/React.res tests/node_modules/@rescript/react/./src/ReactDOM.res tests/node_modules/@rescript/react/./src/ReactDOMServer.res tests/node_modules/@rescript/react/./src/ReactDOMStyle.res tests/node_modules/@rescript/react/./src/ReactEvent.res tests/node_modules/@rescript/react/./src/ReactEvent.resi tests/node_modules/@rescript/react/./src/ReactTestUtils.res tests/node_modules/@rescript/react/./src/ReactTestUtils.resi tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.res tests/node_modules/@rescript/react/./src/RescriptReactErrorBoundary.resi tests/node_modules/@rescript/react/./src/RescriptReactRouter.res tests/node_modules/@rescript/react/./src/RescriptReactRouter.resi tests/node_modules/@rescript/react/./src/legacy/ReactDOMRe.res tests/node_modules/@rescript/react/./src/legacy/ReasonReact.res
-Source directories: tests/src
+Source directories: tests/node_modules/@rescript/react/src tests/node_modules/@rescript/react/src/legacy
+Source files: tests/node_modules/@rescript/react/src/React.res tests/node_modules/@rescript/react/src/ReactDOM.res tests/node_modules/@rescript/react/src/ReactDOMServer.res tests/node_modules/@rescript/react/src/ReactDOMStyle.res tests/node_modules/@rescript/react/src/ReactEvent.res tests/node_modules/@rescript/react/src/ReactEvent.resi tests/node_modules/@rescript/react/src/ReactTestUtils.res tests/node_modules/@rescript/react/src/ReactTestUtils.resi tests/node_modules/@rescript/react/src/RescriptReactErrorBoundary.res tests/node_modules/@rescript/react/src/RescriptReactErrorBoundary.resi tests/node_modules/@rescript/react/src/RescriptReactRouter.res tests/node_modules/@rescript/react/src/RescriptReactRouter.resi tests/node_modules/@rescript/react/src/legacy/ReactDOMRe.res tests/node_modules/@rescript/react/src/legacy/ReasonReact.res
+Source directories: tests/src tests/src/expected
 Source files: tests/src/Auto.res tests/src/CompletePrioritize1.res tests/src/CompletePrioritize2.res tests/src/Completion.res tests/src/Component.res tests/src/Component.resi tests/src/Cross.res tests/src/Debug.res tests/src/Definition.res tests/src/DefinitionWithInterface.res tests/src/DefinitionWithInterface.resi tests/src/Div.res tests/src/Fragment.res tests/src/Hover.res tests/src/Jsx.res tests/src/Jsx.resi tests/src/LongIdentTest.res tests/src/Obj.res tests/src/Patterns.res tests/src/RecModules.res tests/src/RecordCompletion.res tests/src/References.res tests/src/ReferencesWithInterface.res tests/src/ReferencesWithInterface.resi tests/src/Rename.res tests/src/RenameWithInterface.res tests/src/RenameWithInterface.resi tests/src/TableclothMap.ml tests/src/TableclothMap.mli tests/src/TypeDefinition.res
-Impl cmt:tests/lib/bs/./src/Auto.cmt res:tests/src/Auto.res
-Impl cmt:tests/lib/bs/./src/CompletePrioritize1.cmt res:tests/src/CompletePrioritize1.res
-Impl cmt:tests/lib/bs/./src/CompletePrioritize2.cmt res:tests/src/CompletePrioritize2.res
-Impl cmt:tests/lib/bs/./src/Completion.cmt res:tests/src/Completion.res
-IntfAndImpl cmti:tests/lib/bs/./src/Component.cmti resi:tests/src/Component.resi cmt:tests/lib/bs/./src/Component.cmt res:tests/src/Component.res
-Impl cmt:tests/lib/bs/./src/Cross.cmt res:tests/src/Cross.res
-Impl cmt:tests/lib/bs/./src/Debug.cmt res:tests/src/Debug.res
-Impl cmt:tests/lib/bs/./src/Definition.cmt res:tests/src/Definition.res
-IntfAndImpl cmti:tests/lib/bs/./src/DefinitionWithInterface.cmti resi:tests/src/DefinitionWithInterface.resi cmt:tests/lib/bs/./src/DefinitionWithInterface.cmt res:tests/src/DefinitionWithInterface.res
-Impl cmt:tests/lib/bs/./src/Div.cmt res:tests/src/Div.res
-Impl cmt:tests/lib/bs/./src/Fragment.cmt res:tests/src/Fragment.res
-Impl cmt:tests/lib/bs/./src/Hover.cmt res:tests/src/Hover.res
-IntfAndImpl cmti:tests/lib/bs/./src/Jsx.cmti resi:tests/src/Jsx.resi cmt:tests/lib/bs/./src/Jsx.cmt res:tests/src/Jsx.res
-Impl cmt:tests/lib/bs/./src/LongIdentTest.cmt res:tests/src/LongIdentTest.res
-Impl cmt:tests/lib/bs/./src/Obj.cmt res:tests/src/Obj.res
-Impl cmt:tests/lib/bs/./src/Patterns.cmt res:tests/src/Patterns.res
-Impl cmt:tests/lib/bs/./src/RecModules.cmt res:tests/src/RecModules.res
-Impl cmt:tests/lib/bs/./src/RecordCompletion.cmt res:tests/src/RecordCompletion.res
-Impl cmt:tests/lib/bs/./src/References.cmt res:tests/src/References.res
-IntfAndImpl cmti:tests/lib/bs/./src/ReferencesWithInterface.cmti resi:tests/src/ReferencesWithInterface.resi cmt:tests/lib/bs/./src/ReferencesWithInterface.cmt res:tests/src/ReferencesWithInterface.res
-Impl cmt:tests/lib/bs/./src/Rename.cmt res:tests/src/Rename.res
-IntfAndImpl cmti:tests/lib/bs/./src/RenameWithInterface.cmti resi:tests/src/RenameWithInterface.resi cmt:tests/lib/bs/./src/RenameWithInterface.cmt res:tests/src/RenameWithInterface.res
-IntfAndImpl cmti:tests/lib/bs/./src/TableclothMap.cmti resi:tests/src/TableclothMap.mli cmt:tests/lib/bs/./src/TableclothMap.cmt res:tests/src/TableclothMap.ml
-Impl cmt:tests/lib/bs/./src/TypeDefinition.cmt res:tests/src/TypeDefinition.res
-Dependency dirs: tests/node_modules/@rescript/react/lib/bs/./src tests/node_modules/@rescript/react/lib/bs/./src/legacy
+Impl cmt:tests/lib/bs/src/Auto.cmt res:tests/src/Auto.res
+Impl cmt:tests/lib/bs/src/CompletePrioritize1.cmt res:tests/src/CompletePrioritize1.res
+Impl cmt:tests/lib/bs/src/CompletePrioritize2.cmt res:tests/src/CompletePrioritize2.res
+Impl cmt:tests/lib/bs/src/Completion.cmt res:tests/src/Completion.res
+IntfAndImpl cmti:tests/lib/bs/src/Component.cmti resi:tests/src/Component.resi cmt:tests/lib/bs/src/Component.cmt res:tests/src/Component.res
+Impl cmt:tests/lib/bs/src/Cross.cmt res:tests/src/Cross.res
+Impl cmt:tests/lib/bs/src/Debug.cmt res:tests/src/Debug.res
+Impl cmt:tests/lib/bs/src/Definition.cmt res:tests/src/Definition.res
+IntfAndImpl cmti:tests/lib/bs/src/DefinitionWithInterface.cmti resi:tests/src/DefinitionWithInterface.resi cmt:tests/lib/bs/src/DefinitionWithInterface.cmt res:tests/src/DefinitionWithInterface.res
+Impl cmt:tests/lib/bs/src/Div.cmt res:tests/src/Div.res
+Impl cmt:tests/lib/bs/src/Fragment.cmt res:tests/src/Fragment.res
+Impl cmt:tests/lib/bs/src/Hover.cmt res:tests/src/Hover.res
+IntfAndImpl cmti:tests/lib/bs/src/Jsx.cmti resi:tests/src/Jsx.resi cmt:tests/lib/bs/src/Jsx.cmt res:tests/src/Jsx.res
+Impl cmt:tests/lib/bs/src/LongIdentTest.cmt res:tests/src/LongIdentTest.res
+Impl cmt:tests/lib/bs/src/Obj.cmt res:tests/src/Obj.res
+Impl cmt:tests/lib/bs/src/Patterns.cmt res:tests/src/Patterns.res
+Impl cmt:tests/lib/bs/src/RecModules.cmt res:tests/src/RecModules.res
+Impl cmt:tests/lib/bs/src/RecordCompletion.cmt res:tests/src/RecordCompletion.res
+Impl cmt:tests/lib/bs/src/References.cmt res:tests/src/References.res
+IntfAndImpl cmti:tests/lib/bs/src/ReferencesWithInterface.cmti resi:tests/src/ReferencesWithInterface.resi cmt:tests/lib/bs/src/ReferencesWithInterface.cmt res:tests/src/ReferencesWithInterface.res
+Impl cmt:tests/lib/bs/src/Rename.cmt res:tests/src/Rename.res
+IntfAndImpl cmti:tests/lib/bs/src/RenameWithInterface.cmti resi:tests/src/RenameWithInterface.resi cmt:tests/lib/bs/src/RenameWithInterface.cmt res:tests/src/RenameWithInterface.res
+IntfAndImpl cmti:tests/lib/bs/src/TableclothMap.cmti resi:tests/src/TableclothMap.mli cmt:tests/lib/bs/src/TableclothMap.cmt res:tests/src/TableclothMap.ml
+Impl cmt:tests/lib/bs/src/TypeDefinition.cmt res:tests/src/TypeDefinition.res
+Dependency dirs: tests/node_modules/@rescript/react/lib/bs/src tests/node_modules/@rescript/react/lib/bs/src/legacy
 Opens from bsconfig: 
 locItems:
   1:18-1:21 Typed map (Belt.List.t<'a>, 'a => 'b) => Belt.List.t<'b> GlobalReference