Fix pathing in sidebar (#107)

* Remove some unused code

* Update nova-extension-utils

* Fix tests

* Switch to utils clean utility

* changelog

Author: apexskier

package.json

@@ -37,7 +37,7 @@
     "eslint": "^7.11.0",
     "eslint-plugin-nova": "^1.1.0",
     "jest": "^26.5.3",
-    "nova-extension-utils": "^1.1.0",
+    "nova-extension-utils": "^1.2.1",
     "onchange": "^7.0.2",
     "prettier": "^2.1.2",
     "rollup": "^2.32.0",

src/commands/findReferences.ts

@@ -39,10 +39,6 @@ export function registerFindReferences(client: LanguageClient) {
       return;
     }
 
-    if (nova.inDevMode()) {
-      console.log(JSON.stringify(response, null, "  "));
-    }
-
     createLocationSearchResultsTree(selectedText, response);
   }
 }

src/commands/findSymbol.ts

@@ -34,9 +34,6 @@ export function registerFindSymbol(client: LanguageClient) {
       return;
     }
 
-    if (nova.inDevMode()) {
-      console.log(JSON.stringify(response, null, "  "));
-    }
     createSymbolSearchResultsTree(response);
   }
 }

src/requests/publishDiagnostics.test.ts

@@ -239,29 +239,34 @@ describe("Location search results tree", () => {
     expect(provider.getChildren("fileURI2")).toEqual(locations.slice(1));
     expect(provider.getTreeItem("fileURI1")).toMatchInlineSnapshot(`
       MockTreeItem {
+        "command": "apexskier.typescript.showSearchResult",
         "name": "fileURI1",
         "path": "fileURI1",
         "state": undefined,
       }
     `);
     expect(provider.getTreeItem(locations[0])).toMatchInlineSnapshot(`
       MockTreeItem {
+        "command": "apexskier.typescript.showSearchResult",
+        "descriptiveText": ":2:3",
         "name": "name",
         "state": Symbol(TreeItemCollapsibleState.None),
       }
     `);
   });
 
-  it.only("cleans filepaths before rendering them", () => {
+  it("cleans filepaths before rendering them", () => {
     (nova.workspace as any).path = "/workspace";
     createLocationSearchResultsTree("name", locations);
     const provider: TreeDataProvider<string | lspTypes.SymbolInformation> =
       TreeViewTypedMock.mock.calls[0][1].dataProvider;
     expect(provider.getTreeItem("file:///workspace/path").name).toBe("./path");
     expect(provider.getTreeItem("file:///home/path").name).toBe("~/path");
     expect(provider.getTreeItem("file:///path").name).toBe("/path");
+
+    (nova.workspace as any).path = null;
     expect(
-      provider.getTreeItem("file:///Volumes/Macintosh HD/home/path").name
+      provider.getTreeItem("file:///Volumes/Macintosh%20HD/home/path").name
     ).toBe("~/path");
   });
 });

src/requests/publishDiagnostics.ts

@@ -1,31 +1,9 @@
 // eslint-disable-next-line no-unused-vars
 import type * as lspTypes from "vscode-languageserver-protocol";
+import { cleanPath } from "nova-extension-utils";
 import { wrapCommand } from "./novaUtils";
 import { showLocation } from "./showLocation";
 
-// https://stackoverflow.com/a/6969486
-function escapeRegExp(string: string) {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
-}
-const filePrefix = new RegExp("^" + escapeRegExp("file://"));
-
-const hr = new RegExp("^" + escapeRegExp(`file://${nova.environment["HOME"]}`));
-const stdVolumePrefix = new RegExp(
-  "^" + escapeRegExp("file:///Volumes/Macintosh HD")
-);
-function cleanPath(path: string) {
-  const wr = new RegExp("^" + escapeRegExp(`file://${nova.workspace.path}`));
-  path = decodeURIComponent(path);
-  path = path.replace(stdVolumePrefix, "file://");
-  return (
-    path
-      .replace(wr, ".")
-      .replace(hr, "~")
-      // needs to go last
-      .replace(filePrefix, "")
-  );
-}
-
 type MyTreeProvider<T> = TreeDataProvider<T> & {
   onSelect(element: T): Promise<void>;
 };

src/searchResults.test.ts

@@ -2,6 +2,10 @@
 
 ## future
 
+### Fixed
+
+- Fix paths cleaning in search results sidebar
+
 ### Breaking
 
 - Remove functionality now supplied by Nova directly (Go to Definition, Code Action, Offer Suggestions)

src/searchResults.ts

@@ -3263,10 +3263,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-nova-extension-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/nova-extension-utils/-/nova-extension-utils-1.1.0.tgz#bcb9d4499af714e963af254b4928c751e8b88344"
-  integrity sha512-aFjwAYLWMXxV2MmDdAN4WepnS9jNt7pRXa68UEsj0YvsZmCI6stC6pY7SFNA+i8GLIIp9wdfcmlMTZSNpchz1g==
+nova-extension-utils@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/nova-extension-utils/-/nova-extension-utils-1.2.1.tgz#afacdf2e0f01e475a6dbdbb57c14d596c373a9ff"
+  integrity sha512-WtIo+TAbGmXnIhB7eNR1H04cCD94sFVWWO9N3EaRKRpkuozs58tkLqChV0wJrmdc/g5Y3vh5593HgS3E8mwSPg==
 
 npm-run-path@^2.0.0:
   version "2.0.2"