chore: improve workspace building logs

Author: 9romise

packages/language-core/src/workspace.ts

@@ -92,8 +92,7 @@ export class WorkspaceContext {
     this.packageManager = await this.adapter.detectPackageManager(this.rootPath)
 
     if (this.packageManager !== 'npm') {
-      const workspaceFilename = workspaceFileMapping[this.packageManager]
-      this.workspaceFilePath = `${this.rootPath}/${workspaceFilename}`
+      this.workspaceFilePath = join(this.rootPath, workspaceFileMapping[this.packageManager])
       this.#catalogs.resolve(
         await this.adapter.fileExists(this.workspaceFilePath)
           ? (await this.loadWorkspaceFileInfo(this.workspaceFilePath))?.catalogs

packages/language-server/src/workspace.ts

@@ -37,10 +37,10 @@ function createLanguageServerAdapter(folderUri: URI, connection: Connection, ser
       }
     },
 
-    async detectPackageManager(): Promise<'npm' | 'pnpm' | 'yarn'> {
+    async detectPackageManager(rootPath): Promise<'npm' | 'pnpm' | 'yarn'> {
       try {
         const result = await connection.sendRequest(getPackageManagerRequestType, {
-          uri: folderUri.toString(),
+          uri: rootPath,
         })
         return result || 'npm'
       } catch {
@@ -106,13 +106,14 @@ export class WorkspaceState implements IWorkspaceState {
     [URI]
   >(
     async (folderUri) => {
-      this.#connection.console.info(`[workspace-context] built ${folderUri.path}`)
-      this.#cachedFolderPaths.add(folderUri.path)
-
-      return await WorkspaceContext.create(
+      const ctx = await WorkspaceContext.create(
         folderUri.path,
         createLanguageServerAdapter(folderUri, this.#connection, this.#server),
       )
+      this.#cachedFolderPaths.add(folderUri.path)
+
+      this.#connection.console.info(`[workspace-context] built for ${folderUri}, packageManager: ${ctx.packageManager}`)
+      return ctx
     },
     {
       name: 'workspace-context',

playground/npm/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "npm.packageManager": "npm"
+}

playground/pnpm/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "npm.packageManager": "pnpm"
+}

playground/yarn/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "npm.packageManager": "yarn"
+}