Fix definition files absolute path not working on windows

Author: JohnnyMorganz

CHANGELOG.md

@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Document symbols for method definitions now correctly use a colon instead of a dot operator.
 - Fixed crash when hovering over a type node
 - Fixed go to definition on a global just going to the top of the file. It will now not accept go to definition requests
+- Fixed using absolute file paths to point to definition files not working on Windows
 
 ## [1.6.0] - 2022-07-02
 

editors/code/package-lock.json

@@ -184,7 +184,6 @@
     },
     "dependencies": {
         "node-fetch": "^3.2.4",
-        "vscode-languageclient": "^8.0.2-next.5",
-        "vscode-uri": "^3.0.3"
+        "vscode-languageclient": "^8.0.2-next.5"
     }
-}
+}

editors/code/package.json

@@ -1,5 +1,6 @@
 import * as vscode from "vscode";
 import * as os from "os";
+import * as path from "path";
 import fetch from "node-fetch";
 import {
   Executable,
@@ -8,8 +9,6 @@ import {
   LanguageClientOptions,
 } from "vscode-languageclient/node";
 
-import { Utils as UriUtils } from "vscode-uri";
-
 import spawn from "./spawn";
 
 let client: LanguageClient;
@@ -41,6 +40,14 @@ const exists = (uri: vscode.Uri): Thenable<boolean> => {
   );
 };
 
+const basenameUri = (uri: vscode.Uri): string => {
+  return path.basename(uri.fsPath);
+};
+
+const resolveUri = (uri: vscode.Uri, ...paths: string[]): vscode.Uri => {
+  return vscode.Uri.file(path.resolve(uri.fsPath, ...paths));
+};
+
 const downloadApiDefinitions = async (context: vscode.ExtensionContext) => {
   try {
     return vscode.window.withProgress(
@@ -127,7 +134,7 @@ const updateSourceMap = async (workspaceFolder: vscode.WorkspaceFolder) => {
   // Check if the project file exists
   let projectFile =
     config.get<string>("rojoProjectFile") ?? "default.project.json";
-  const projectFileUri = UriUtils.resolvePath(workspaceFolder.uri, projectFile);
+  const projectFileUri = resolveUri(workspaceFolder.uri, projectFile);
 
   if (!(await exists(projectFileUri))) {
     // Search if there is a *.project.json file present in this workspace.
@@ -141,7 +148,7 @@ const updateSourceMap = async (workspaceFolder: vscode.WorkspaceFolder) => {
       );
       return;
     } else if (foundProjectFiles.length === 1) {
-      const fileName = UriUtils.basename(foundProjectFiles[0]);
+      const fileName = basenameUri(foundProjectFiles[0]);
       const option = await vscode.window.showWarningMessage(
         `Unable to find project file ${projectFile}. We found ${fileName} available`,
         `Set project file to ${fileName}`,
@@ -161,7 +168,7 @@ const updateSourceMap = async (workspaceFolder: vscode.WorkspaceFolder) => {
         "Cancel"
       );
       if (option === "Select project file") {
-        const files = foundProjectFiles.map((file) => UriUtils.basename(file));
+        const files = foundProjectFiles.map((file) => basenameUri(file));
         const selectedFile = await vscode.window.showQuickPick(files);
         if (selectedFile) {
           config.update("rojoProjectFile", selectedFile);
@@ -223,7 +230,7 @@ export async function activate(context: vscode.ExtensionContext) {
     for (const definitionPath of definitionFiles) {
       let uri;
       if (vscode.workspace.workspaceFolders) {
-        uri = UriUtils.resolvePath(
+        uri = resolveUri(
           vscode.workspace.workspaceFolders[0].uri,
           definitionPath
         );