fix: prefer nested config profiles for shared tests

packages/extension/src/api.ts

@@ -91,10 +91,11 @@ export async function resolveVitestAPI(
   const resolvedApisPromises = await Promise.allSettled(workspacePromises)
   const errors: unknown[] = []
   const apis: VitestProcessAPI[] = []
+  const resolvedResults: DiscoveryResult[] = []
   for (const result of resolvedApisPromises) {
     if (result.status === 'fulfilled') {
       apis.push(result.value.api)
-      onResolved?.(result.value)
+      resolvedResults.push(result.value)
     } else {
       errors.push(result.reason)
     }
@@ -144,7 +145,7 @@ export async function resolveVitestAPI(
     try {
       const result = await createVitestProcessAPI(usedConfigs, pkg)
       apis.push(result.api)
-      onResolved?.(result)
+      resolvedResults.push(result)
       if (result.api.workspaceSource) {
         workspaceRoots.push(dirname(result.api.workspaceSource))
       }
@@ -167,6 +168,10 @@ export async function resolveVitestAPI(
     showVitestError('The extension could not load some configs')
   }
 
+  resolvedResults
+    .sort((a, b) => b.api.package.cwd.split('/').length - a.api.package.cwd.split('/').length)
+    .forEach((result) => onResolved?.(result))
+
   return new VitestAPI(apis)
 }
 

packages/extension/src/extension.ts

@@ -199,7 +199,11 @@ class VitestExtension {
       this.testTree.collectFile(vitest, file)
     })
 
-    const prefix = vitest.prefix
+    // VS Code sorts default profiles by label, so indent nested configs first.
+    const depth = relative(vitest.workspaceFolder.uri.fsPath, vitest.package.cwd)
+      .split('/')
+      .filter(Boolean).length
+    const prefix = `${' '.repeat(depth)}${vitest.prefix}`
 
     let runProfile = this.runProfiles.get(`${vitest.id}:run`)
     if (!runProfile) {

packages/extension/src/testTree.ts

@@ -146,7 +146,11 @@ export class TestTree extends vscode.Disposable {
     const normalizedFile = normalize(file)
     const fileId = `${normalizedFile}${project}`
     const cached = this.fileItems.get(fileId)
-    if (cached) return cached
+    if (cached) {
+      // A file can be included in several configs (#799).
+      if (!cached.tags.includes(api.tag)) cached.tags = [...cached.tags, api.tag]
+      return cached
+    }
 
     const fileUri = vscode.Uri.file(resolve(file))
     const parentItem = this.getOrCreateFolderTestItem(api, dirname(file))

samples/multiple-configs/vitest.config.base.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['z-leaf/**/*.test.ts'],
+  },
+})

samples/multiple-configs/z-leaf/test/selected-config.test.ts

@@ -0,0 +1,5 @@
+import { expect, it } from 'vitest'
+
+it('uses the leaf config', { tags: ['leaf-only'] }, () => {
+  expect(1 + 1).toBe(2)
+})

samples/multiple-configs/z-leaf/vitest.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig, mergeConfig } from 'vitest/config'
+import baseConfig from '../vitest.config.base'
+
+export default mergeConfig(
+  baseConfig,
+  defineConfig({
+    test: {
+      include: ['**/*.test.ts'],
+      tags: [{ name: 'leaf-only' }],
+    },
+  }),
+)

test/e2e/runner.test.ts

@@ -88,6 +88,25 @@ test('workspaces', async ({ launch }) => {
   await expect(tester.tree.getResultsLocator()).toHaveText('4/4')
 })
 
+test('gutter uses the nested config for shared test files', async ({ launch }) => {
+  const { page, tester } = await launch({
+    workspacePath: './samples/multiple-configs',
+  })
+
+  await tester.tree.expand('z-leaf/test/selected-config.test.ts')
+  const nestedTest = tester.tree.getFileItem('selected-config.test.ts')
+
+  await expect(nestedTest).toHaveTests({
+    'uses the leaf config': 'waiting',
+  })
+
+  await nestedTest.navigate()
+  await page.locator('.testing-run-glyph').first().click()
+
+  await expect(tester.tree.getResultsLocator()).toHaveText('1/1')
+  await expect(nestedTest).toHaveState('passed')
+})
+
 test('running a project does not update other projects', async ({ launch }) => {
   const { tester } = await launch({
     workspacePath: './samples/projects',

test/unit/testTree.test.ts

@@ -0,0 +1,44 @@
+import { resolve } from 'node:path'
+import * as vscode from 'vscode'
+import { expect } from 'chai'
+import type { VitestProcessAPI } from '../../packages/extension/src/apiProcess'
+import { TransformSchemaProvider } from '../../packages/extension/src/schemaProvider'
+import { TagsManager } from '../../packages/extension/src/tagsManager'
+import { TestTree } from '../../packages/extension/src/testTree'
+
+describe('TestTree', () => {
+  it('adds every config tag to a shared test file', () => {
+    const controller = vscode.tests.createTestController('test-tree', 'Vitest')
+    const loader = controller.createTestItem('loader', 'Loading')
+    const schemaProvider = new TransformSchemaProvider(async () => null)
+    const tree = new TestTree(controller, loader, new TagsManager(), schemaProvider)
+    const root = resolve(__dirname, '../..')
+    const workspaceFolder = {
+      uri: vscode.Uri.file(root),
+      name: 'vscode',
+      index: 0,
+    }
+    const file = resolve(__dirname, 'testTree.test.ts')
+    const metadata = { project: '', pool: 'threads' }
+    const baseApi = {
+      tag: new vscode.TestTag('root:vitest.config.base.ts'),
+    } as VitestProcessAPI
+    const packageApi = {
+      tag: new vscode.TestTag('foo:vitest.config.ts'),
+    } as VitestProcessAPI
+
+    tree.reset([workspaceFolder])
+    const item = tree.getOrCreateFileTestItem(baseApi, metadata, file)
+    const cachedItem = tree.getOrCreateFileTestItem(packageApi, metadata, file)
+
+    expect(cachedItem).to.equal(item)
+    expect(cachedItem.tags.map((tag) => tag.id)).to.deep.equal([
+      'root:vitest.config.base.ts',
+      'foo:vitest.config.ts',
+    ])
+
+    tree.dispose()
+    schemaProvider.dispose()
+    controller.dispose()
+  })
+})