fix: exclude/include configs and missing workspacePath (#192)

vitest-dev · Nov 14, 2023 · bee4f6e · bee4f6e
1 parent 292e272
commit bee4f6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -42,8 +42,8 @@ export function getConfig(workspaceFolder?: WorkspaceFolder | vscode.Uri | strin
 export function getCombinedConfig(config: ResolvedConfig, workspaceFolder?: WorkspaceFolder | vscode.Uri | string) {
   const vitestConfig = getConfig(workspaceFolder)
   return {
-    exclude: vitestConfig.exclude || config.exclude || configDefaults.exclude,
-    include: vitestConfig.include || config.include || configDefaults.include,
+    exclude: vitestConfig.exclude?.concat(config.exclude) || configDefaults.exclude,
+    include: vitestConfig.include?.concat(config.include) || configDefaults.include,
   }
 }
 

diff --git a/src/discover.ts b/src/discover.ts
@@ -106,6 +106,7 @@ export class TestFileDiscoverer extends vscode.Disposable {
 
     await Promise.all(
       vscode.workspace.workspaceFolders.map(async (workspaceFolder) => {
+        const workspacePath = workspaceFolder.uri.fsPath
         const exclude = getCombinedConfig(this.config, workspaceFolder).exclude
         for (const include of getCombinedConfig(this.config, workspaceFolder).include) {
           const pattern = new vscode.RelativePattern(