Update tests and fix monorepo workspace issues

master-co · May 21, 2024 · d4241c9 · d4241c9
1 parent 74c1683
commit d4241c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/packages/language-server/src/core.ts b/packages/language-server/src/core.ts
@@ -168,7 +168,7 @@ export default class CSSLanguageServer {
     }
 
     private async initWorkspaceFolder(workspaceFolderURI: string) {
-        const workspaceFolderCWD = URI.parse(workspaceFolderURI).fsPath
+        const workspaceFolderCWD = path.resolve(URI.parse(workspaceFolderURI).fsPath)
         let customWorkspaceFolderSettings: Settings | undefined
         if (this.clientCapabilities.workspace?.configuration) {
             customWorkspaceFolderSettings = await this.connection.workspace.getConfiguration({

diff --git a/packages/language-server/tests/custom-workspace.test.ts b/packages/language-server/tests/custom-workspace.test.ts
@@ -2,6 +2,7 @@ import { resolve } from 'path'
 import { withFixture } from './setup'
 import { test } from 'vitest'
 import { Settings } from '../src'
+import { URI } from 'vscode-uri'
 
 const settings: Settings = {
     workspaces: [
@@ -12,10 +13,10 @@ const settings: Settings = {
 withFixture('monorepo', async (context) => {
     test.concurrent('workspaces', async ({ expect }) => {
         expect(context.server.workspaces.length).toBe(2)
-        expect(context.server.workspaces).toEqual(
+        expect(context.server.workspaces.map((x) => x.uri)).toEqual(
             expect.arrayContaining([
-                expect.objectContaining({ path: resolve('tests/fixtures/monorepo') }),
-                expect.objectContaining({ path: resolve('tests/fixtures/monorepo/c') }),
+                URI.file(resolve('tests/fixtures/monorepo')).toString(),
+                URI.file(resolve('tests/fixtures/monorepo/c')).toString(),
             ])
         )
     })

diff --git a/packages/language-server/tests/monorepo.test.ts b/packages/language-server/tests/monorepo.test.ts
@@ -1,15 +1,16 @@
 import { resolve } from 'path'
 import { withFixture } from './setup'
 import { test } from 'vitest'
+import { URI } from 'vscode-uri'
 
 withFixture('monorepo', async (context) => {
     test.concurrent('workspaces', async ({ expect }) => {
         expect(context.server.workspaces.length).toBe(3)
-        expect(context.server.workspaces).toEqual(
+        expect(context.server.workspaces.map((x) => x.uri)).toEqual(
             expect.arrayContaining([
-                expect.objectContaining({ path: resolve('tests/fixtures/monorepo') }),
-                expect.objectContaining({ path: resolve('tests/fixtures/monorepo/a') }),
-                expect.objectContaining({ path: resolve('tests/fixtures/monorepo/b') }),
+                URI.file(resolve('tests/fixtures/monorepo')).toString(),
+                URI.file(resolve('tests/fixtures/monorepo/a')).toString(),
+                URI.file(resolve('tests/fixtures/monorepo/b')).toString()
             ])
         )
     })
@@ -18,7 +19,7 @@ withFixture('monorepo', async (context) => {
         const dir = resolve(__dirname, './fixtures/monorepo/a')
         const textDocument = context.createDocument('', { dir })
         await context.server.onDidOpen({ document: textDocument })
-        const targetWorkspace = context.server.workspaces.find((workspace) => workspace.path === resolve(dir))
+        const targetWorkspace = context.server.workspaces.find((workspace) => workspace.uri === URI.file(dir).toString())
         expect(targetWorkspace?.openedTextDocuments.length).toBe(1)
         await context.server.onDidClose({ document: textDocument })
         expect(context.rootWorkspace?.openedTextDocuments?.length).toBe(0)