Update tests

master-co · May 17, 2024 · 8920cbd · 8920cbd
1 parent 815f4d8
commit 8920cbd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/packages/language-server/src/core.ts b/packages/language-server/src/core.ts
@@ -1,4 +1,4 @@
-import { createConnection, TextDocuments, InitializeParams, WorkspaceFolder, Disposable, Connection, InitializedNotification } from 'vscode-languageserver/node'
+import { createConnection, TextDocuments, InitializeParams, WorkspaceFolder, Disposable, Connection, InitializedNotification, DidChangeConfigurationNotification } from 'vscode-languageserver/node'
 import { TextDocument } from 'vscode-languageserver-textdocument'
 import path from 'node:path'
 import CSSLanguageService, { Settings as CSSLanguageServiceSettings } from '@master/css-language-service'
@@ -24,7 +24,7 @@ export default class CSSLanguageServer {
     workspaceFolders: WorkspaceFolder[] = []
     workspaces = new Set<Workspace>()
     documents: TextDocuments<TextDocument>
-    initializing?: Promise<any[]>
+    initializing?: Promise<void>
     private disposables: Disposable[] = []
 
     constructor(
@@ -135,26 +135,19 @@ export default class CSSLanguageServer {
 
     init() {
         if (this.initializing) return this.initializing
-        return this.initializing = Promise.all(
-            [
-                ...this.workspaceFolders.map((folder) => this.initWorkspaceFolder(folder.uri)),
-                // this.connection.client.register(DidChangeConfigurationNotification.type, undefined)
-            ]
-        )
+        // eslint-disable-next-line no-async-promise-executor
+        return this.initializing = new Promise(async (resolve) => {
+            await Promise.all(this.workspaceFolders.map((folder) => this.initWorkspaceFolder(folder.uri)))
+            resolve()
+        })
     }
 
     private async initWorkspaceFolder(workspaceFolderURI: string) {
         const workspaceFolderCWD = URI.parse(workspaceFolderURI).fsPath
-        let customWorkspaceFolderSettings: Settings | undefined
-        try {
-            customWorkspaceFolderSettings = await this.connection.workspace.getConfiguration({
-                scopeUri: workspaceFolderURI,
-                section: 'masterCSS'
-            }) as Settings
-        } catch (error) {
-            console.error('Failed to load workspace folder settings', workspaceFolderURI)
-            console.error(error)
-        }
+        const customWorkspaceFolderSettings = await this.connection.workspace.getConfiguration({
+            scopeUri: workspaceFolderURI,
+            section: 'masterCSS'
+        }) as Settings
         const { workspaces, ...languageServiceSettings } = extend(settings, this.customSettings, customWorkspaceFolderSettings) as Settings
         const resolvedWorkspaceDirectories = new Set<string>([workspaceFolderCWD])
         console.info('Registered workspace folder', workspaceFolderURI)

diff --git a/packages/language-server/tests/connection.ts b/packages/language-server/tests/connection.ts
@@ -4,7 +4,7 @@ import CSSLanguageServer, { Settings } from '../src'
 
 export function connect(settings?: Settings) {
     class TestStream extends Duplex {
-        _write(chunk: string, _encoding: BufferEncoding, done: () => void) {
+        _write(chunk: Buffer, _encoding: BufferEncoding, done: () => void) {
             this.emit('data', chunk)
             done()
         }

diff --git a/packages/language-server/tests/setup.ts b/packages/language-server/tests/setup.ts
@@ -3,7 +3,6 @@ import CSSLanguageServer, { Settings } from '../src'
 import { beforeAll, describe } from 'vitest'
 import { resolve } from 'node:path'
 import { URI } from 'vscode-uri'
-import { Duplex } from 'node:stream'
 import createDocument from '../src/utils/create-document'
 import { connect } from './connection'
 
@@ -127,11 +126,10 @@ export function withFixture(fixture: string, cb: (context: FixtureContext) => vo
             await clientConnection.sendRequest(InitializeRequest.type, {
                 rootUri,
                 capabilities,
-                workspaceFolders,
-                trace: 'verbose'
+                workspaceFolders
             } as InitializeParams)
             await clientConnection.sendNotification(InitializedNotification.method, {})
-            // await server.init()
+            await server.init()
             return () => {
                 server.stop()
                 clientConnection.dispose()