Refactor CSSLanguageServer to improve workspace initialization

master-co · May 21, 2024 · d701125 · d701125
1 parent d4241c9
commit d701125
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/packages/language-server/src/core.ts b/packages/language-server/src/core.ts
@@ -12,7 +12,6 @@ import glob from 'fast-glob'
 import { URI } from 'vscode-uri'
 
 export declare type Workspace = {
-    path: string
     uri: string
     openedTextDocuments: TextDocument[]
     languageService?: CSSLanguageService
@@ -168,7 +167,7 @@ export default class CSSLanguageServer {
     }
 
     private async initWorkspaceFolder(workspaceFolderURI: string) {
-        const workspaceFolderCWD = path.resolve(URI.parse(workspaceFolderURI).fsPath)
+        const workspaceFolderCWD = URI.parse(workspaceFolderURI).fsPath
         let customWorkspaceFolderSettings: Settings | undefined
         if (this.clientCapabilities.workspace?.configuration) {
             customWorkspaceFolderSettings = await this.connection.workspace.getConfiguration({
@@ -200,7 +199,6 @@ export default class CSSLanguageServer {
             const workspaceURI = URI.file(workspaceDir).toString()
             this.console.info(`Added workspace ${workspaceURI}`)
             this.workspaces.push({
-                path: workspaceDir,
                 uri: workspaceURI,
                 openedTextDocuments: [],
                 languageServiceSettings
@@ -212,7 +210,7 @@ export default class CSSLanguageServer {
         let workspaceConfig: Config | undefined
         try {
             workspaceConfig = exploreConfig({
-                cwd: workspace.path,
+                cwd: URI.parse(workspace.uri).fsPath,
                 found: undefined
             })
         } catch (e: any) {