Merge branch 'main' into version-lens

Author: 9romise

.vscode/launch.json

@@ -12,7 +12,7 @@
         "--skip-release-notes",
         "--skip-welcome",
         "--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode",
-        "${workspaceFolder}/playground"
+        "${workspaceFolder}/playground/playground.code-workspace"
       ],
       "outFiles": [
         "${workspaceFolder}/extensions/vscode/dist/**/*.js"

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/index.ts

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

playground/npm/.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+  "name": "@playground/npm-pkg",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "engines": {
+    "node": ">16"
+  },
+  "dependencies": {
+    "@prismicio/client": "~7.21.0-canary.147e3f2",
+    "lodash": "^4.17.21",
+    "axios": "^1.7.0"
+  },
+  "devDependencies": {
+    "ofetch": "^1.4.0",
+    "array-includes": "^3.1.8"
+  }
+}

playground/npm/package.json

@@ -0,0 +1,13 @@
+{
+  "folders": [
+    {
+      "path": "npm"
+    },
+    {
+      "path": "pnpm"
+    },
+    {
+      "path": "yarn"
+    }
+  ]
+}

playground/package.json

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

playground/playground.code-workspace

@@ -0,0 +1,19 @@
+{
+  "name": "@playground/pnpm-pkg",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "engines": {
+    "node": ">16"
+  },
+  "dependencies": {
+    "@prismicio/client": "~7.21.0-canary.147e3f2",
+    "lodash": "catalog:",
+    "axios": "^1.7.0"
+  },
+  "devDependencies": {
+    "ofetch": "^1.4.0",
+    "array-includes": "^3.1.8",
+    "is-number": "catalog:dev"
+  }
+}