Parse string to URI and extract fsPath (useblocks#27)

HughG · Jun 4, 2023 · 3f0db87 · 3f0db87
1 parent cc2b23e
commit 3f0db87
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -15,9 +15,10 @@
     },
     "dependencies": {
         "vscode-languageserver": "8.0.2",
-        "vscode-languageserver-textdocument": "1.0.7"
+        "vscode-languageserver-textdocument": "1.0.7",
+        "vscode-uri": "^3.0.7"
     },
     "devDependencies": {
         "@types/vscode": "1.67.0"
     }
-}
+}
diff --git a/server/src/server.ts b/server/src/server.ts
@@ -21,7 +21,8 @@ import {
 	FileEvent
 } from 'vscode-languageserver/node';
 
-import { DocumentUri, TextDocument } from 'vscode-languageserver-textdocument';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { URI } from 'vscode-uri';
 
 import { LogLevel, TimeStampedLogger } from './logging';
 
@@ -35,7 +36,7 @@ const documents: TextDocuments<TextDocument> = new TextDocuments(TextDocument);
 let hasConfigurationCapability = false;
 let hasWorkspaceFolderCapability = false;
 
-let workspace_folder_uri: DocumentUri;
+let workspace_folder_uri: URI | undefined;
 
 let needs_infos: NeedsInfos;
 let isMultiDocs = false;
@@ -106,11 +107,9 @@ interface WsConfigs {
 }
 
 connection.onInitialize((params: InitializeParams) => {
-	if (params.workspaceFolders) {
-		workspace_folder_uri = params.workspaceFolders[0].uri;
-	} else {
-		workspace_folder_uri = '';
-	}
+	workspace_folder_uri = (params.workspaceFolders && params.workspaceFolders.length > 0)
+		? URI.parse(params.workspaceFolders[0].uri)
+		: undefined;
 
 	const capabilities = params.capabilities;
 
@@ -237,7 +236,7 @@ function check_wk_confs(configs: WsConfigs) {
 
 // Get workspace settings
 async function get_wk_conf_settings() {
-	const cal_wk_folder_uri: string = workspace_folder_uri.replace('file://', '');
+	const cal_wk_folder_uri: string = workspace_folder_uri?.fsPath ?? "";
 
 	// Get configuration of sphinx-needs.needsJson
 	let needs_json_path = '';