fix: fix go to definition for copybook in shared drive (UNC)

fix go to definition for copybook in shared drive (UNC). VsCode is unable to resolve below unc path file:////<hostname>/Users/FILE , but can resolve file://<hostname>/Users/FILE Signed-off-by: ap891843 <aman.prashant@broadcom.com>
eclipse-che4z · Jul 23, 2024 · 2e61f09 · 2e61f09
1 parent e8331a7
commit 2e61f09
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 65 deletions.
diff --git a/...l-lsp-vscode-extension/src/__tests__/services/copybook/CopybookMessageHandlerTest.spec.ts b/...l-lsp-vscode-extension/src/__tests__/services/copybook/CopybookMessageHandlerTest.spec.ts
@@ -36,7 +36,7 @@ jest.mock("url", () => {
 (globSync as any) = jest.fn().mockImplementation((x: any) => [x]);
 (fs.realpathSync.native as any) = jest.fn().mockImplementation((x: any) => x);
 (vscode.Uri.file as any) = jest.fn().mockImplementation((x: any) => {
-  return { fsPath: x };
+  return { fsPath: x, toString: jest.fn().mockReturnValue(x) };
 });
 
 describe("Test the copybook message handler", () => {
@@ -50,21 +50,19 @@ describe("Test the copybook message handler", () => {
       .fn()
       .mockReturnValue(["/configured/path/from/setting"]);
 
-    expect(
-      await downloaderNoApi.resolveCopybookHandler(
-        "cobolFileName",
-        "copybookName",
-        "dialectType",
+    const actualResolvedPath = await downloaderNoApi.resolveCopybookHandler(
+      "cobolFileName",
+      "copybookName",
+      "dialectType",
+    );
+    expect(actualResolvedPath).toBe(
+      path.resolve(
+        "/configured",
+        "path",
+        "from",
+        "setting",
+        "copybookName.cpy",
       ),
-    ).toBe(
-      "file://" +
-        path.resolve(
-          "/configured",
-          "path",
-          "from",
-          "setting",
-          "copybookName.cpy",
-        ),
     );
   });
 
@@ -81,16 +79,15 @@ describe("Test the copybook message handler", () => {
         "dialectType",
       ),
     ).toBe(
-      "file://" +
-        path.resolve(
-          "/storagePath",
-          ".zowe",
-          ".copybooks",
-          "testProfile",
-          "configured",
-          "path",
-          "copybookName",
-        ),
+      path.resolve(
+        "/storagePath",
+        ".zowe",
+        ".copybooks",
+        "testProfile",
+        "configured",
+        "path",
+        "copybookName",
+      ),
     );
   });
 
@@ -109,16 +106,15 @@ describe("Test the copybook message handler", () => {
         "dialectType",
       ),
     ).toBe(
-      "file://" +
-        path.resolve(
-          "/storagePath",
-          ".zowe",
-          ".copybooks",
-          "testProfile",
-          "configured",
-          "path",
-          "copybookName",
-        ),
+      path.resolve(
+        "/storagePath",
+        ".zowe",
+        ".copybooks",
+        "testProfile",
+        "configured",
+        "path",
+        "copybookName",
+      ),
     );
   });
   const filename = "cobolFileName";
@@ -225,15 +221,14 @@ describe("Test the copybook message handler", () => {
       type: "type",
     });
     expect(target).toEqual(
-      "file://" +
-        path.resolve(
-          "/storagePath",
-          ".e4e",
-          ".copybooks",
-          "instance.profile",
-          "dataset",
-          "copybook",
-        ),
+      path.resolve(
+        "/storagePath",
+        ".e4e",
+        ".copybooks",
+        "instance.profile",
+        "dataset",
+        "copybook",
+      ),
     );
   });
   it("checks E4E downloaded element copybooks are resolved", async () => {
@@ -274,19 +269,18 @@ describe("Test the copybook message handler", () => {
       type: "type",
     });
     expect(target).toEqual(
-      "file://" +
-        path.resolve(
-          "/storagePath",
-          ".e4e",
-          ".copybooks",
-          "instance.profile",
-          "environment",
-          "stage",
-          "system",
-          "subsystem",
-          "type",
-          "copybook",
-        ),
+      path.resolve(
+        "/storagePath",
+        ".e4e",
+        ".copybooks",
+        "instance.profile",
+        "environment",
+        "stage",
+        "system",
+        "subsystem",
+        "type",
+        "copybook",
+      ),
     );
   });
   it("checks E4E downloaded element copybooks are not resolved due to settings", async () => {

diff --git a/clients/cobol-lsp-vscode-extension/src/services/util/FSUtils.ts b/clients/cobol-lsp-vscode-extension/src/services/util/FSUtils.ts
@@ -15,7 +15,6 @@
 import * as fs from "fs";
 import * as path from "path";
 import { globSync, hasMagic } from "glob";
-import * as urlUtil from "url";
 import { Uri } from "vscode";
 import * as vscode from "vscode";
 import { Utils } from "./Utils";
@@ -38,13 +37,7 @@ export function searchCopybookInExtensionFolder(
     for (const ext of extensions) {
       const searchResult = globSearch(extensionFolder, p, copybookName, ext);
       if (searchResult) {
-        const root = path.parse(searchResult).root;
-        const urlPath = searchResult
-          .substring(root.length)
-          .split(path.sep)
-          .map((s) => encodeURIComponent(s))
-          .join(path.sep);
-        return new urlUtil.URL("file://" + root + urlPath).href;
+        return vscode.Uri.file(searchResult).toString();
       }
     }
   }