fix: log correct name when running in vite-plus (#760)

Author: sheremet-va

packages/extension/src/spawn/pkg.ts

@@ -21,6 +21,7 @@ export interface VitestPackage {
   id: string
   cwd: string
   version: string
+  name: string
   arguments?: string
   configFile?: string
   workspaceFile?: string
@@ -90,6 +91,7 @@ function resolveVitestConfig(
       loader: vitest.pnp.loaderPath,
       pnp: vitest.pnp.pnpPath,
       runtime,
+      name: vitest.packageName,
     }
   }
 
@@ -105,6 +107,7 @@ function resolveVitestConfig(
     vitestNodePath: vitest.vitestNodePath,
     version: pkg.version,
     runtime,
+    name: vitest.packageName,
   }
 }
 
@@ -178,6 +181,7 @@ function resolveVitestWorkspacePackages(showWarning: boolean) {
       vitestNodePath: vitest.vitestNodePath,
       version: pkg.version,
       runtime,
+      name: vitest.packageName,
     })
   })
   return {
@@ -240,6 +244,7 @@ export async function resolveVitestPackagesViaPackageJson(
       vitestNodePath: vitest.vitestNodePath,
       version: pkg.version,
       runtime,
+      name: vitest.packageName,
     })
   })
 
@@ -314,6 +319,7 @@ async function resolveVitestConfigs(showWarning: boolean) {
         config.configSearchPatternInclude || configGlob,
         config.configSearchPatternExclude,
       )
+  console.log(configs, vscode.workspace.workspaceFolders)
 
   const configsByFolder = configs.reduce<Record<string, vscode.Uri[]>>((acc, config) => {
     const dir = dirname(config.fsPath)

packages/extension/src/spawn/resolve.ts

@@ -8,6 +8,7 @@ const _require = require
 export interface VitestResolution {
   vitestPackageJsonPath: string
   vitestNodePath: string
+  packageName: string
   pnp?: {
     loaderPath: string
     pnpPath: string
@@ -23,31 +24,40 @@ export function resolveVitestPackage(
     return {
       vitestNodePath: resolveVitestNodePath(vitestPackageJsonPath),
       vitestPackageJsonPath,
+      packageName: 'Vitest',
     }
   }
   const vitePlus = resolveVitePlusPackagePath(cwd)
   if (vitePlus) {
     return {
       vitestNodePath: resolveViePlusVitestNodePath(vitePlus),
       vitestPackageJsonPath: vitePlus,
+      packageName: 'VitePlus',
     }
   }
 
   const pnpCwd = folder?.uri.fsPath || cwd
   const pnp = resolvePnp(pnpCwd)
   if (!pnp) return null
-  const vitestNodePath =
-    resolvePnpPackagePath(pnp.pnpApi, 'vitest/node', pnpCwd) ||
-    resolvePnpPackagePath(pnp.pnpApi, 'vite-plus/test/node', pnpCwd)
-  if (!vitestNodePath) return null
-  return {
-    vitestNodePath,
-    vitestPackageJsonPath: '', // we don't read pkg.json for pnp
-    pnp: {
-      loaderPath: pnp.pnpLoader,
-      pnpPath: pnp.pnpPath,
-    },
+  const vitestNodePath = resolvePnpPackagePath(pnp.pnpApi, 'vitest/node', pnpCwd)
+  if (vitestNodePath) {
+    return {
+      vitestNodePath,
+      vitestPackageJsonPath: '', // we don't read pkg.json for pnp
+      pnp,
+      packageName: 'Vitest',
+    }
+  }
+  const vitePlusNodePath = resolvePnpPackagePath(pnp.pnpApi, 'vite-plus/test/node', pnpCwd)
+  if (vitePlusNodePath) {
+    return {
+      vitestNodePath: vitePlusNodePath,
+      vitestPackageJsonPath: '', // we don't read pkg.json for pnp
+      pnp,
+      packageName: 'VitePlus',
+    }
   }
+  return null
 }
 
 export function resolveVitestPackagePath(cwd: string, folder: vscode.WorkspaceFolder | undefined) {
@@ -91,7 +101,7 @@ export function resolvePnp(cwd: string) {
     }
     const pnpApi = _require(pnpPath)
     return {
-      pnpLoader: require.resolve('./.pnp.loader.mjs', {
+      loaderPath: require.resolve('./.pnp.loader.mjs', {
         paths: [dirname(pnpPath)],
       }),
       pnpPath,

packages/extension/src/utils.ts

@@ -13,7 +13,7 @@ import { getTestData, TestFile } from './testTreeData'
 export function noop() {}
 
 export function formatPkg(pkg: VitestPackage) {
-  return `Vitest v${pkg.version} (${relative(dirname(pkg.cwd), pkg.id)})`
+  return `${pkg.name} v${pkg.version} (${relative(dirname(pkg.cwd), pkg.id)})`
 }
 
 function _showVitestError(message: string, error?: any) {