From 462eda781ae9f41dbd68e50432057a2f4e8ea0a0 Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Date: Wed, 17 Apr 2024 16:41:18 +0200
Subject: [PATCH] fix: correctly pass down resolved config files

---
 samples/basic/.vscode/settings.json | 10 +---------
 src/api/pkg.ts                      | 14 +++++++++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/samples/basic/.vscode/settings.json b/samples/basic/.vscode/settings.json
index c736b62..53d6bf6 100644
--- a/samples/basic/.vscode/settings.json
+++ b/samples/basic/.vscode/settings.json
@@ -2,15 +2,7 @@
   "vitest.nodeEnv": {
     "TEST_CUSTOM_ENV": "hello"
   },
-  "vitest.exclude": [
-    "**/node_modules/**",
-    "**/dist/**",
-    "**/cypress/**",
-    "**/.{idea,git,cache,output,temp}/**",
-    "**/ignored.test.ts"
-  ],
   "[typescript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  },
-  "vitest.commandLine": "npx vitest"
+  }
 }
diff --git a/src/api/pkg.ts b/src/api/pkg.ts
index a70290f..abf4df6 100644
--- a/src/api/pkg.ts
+++ b/src/api/pkg.ts
@@ -193,6 +193,9 @@ export async function resolveVitestPackagesViaConfigs(showWarning: boolean): Pro
     }
   }
 
+  if (rootConfig)
+    log.info('[API] Using user root config:', rootConfig)
+
   const configs = rootConfig
     ? [vscode.Uri.file(rootConfig)]
     : await vscode.workspace.findFiles(configGlob, config.configSearchPatternExclude)
@@ -218,10 +221,15 @@ export async function resolveVitestPackagesViaConfigs(showWarning: boolean): Pro
       : configFiles
     filteredConfigFiles.forEach((config) => {
       const vitest = resolveVitestConfig(showWarning, config)
-      if (vitest)
-        resolvedMeta.push(vitest)
-      else
+      if (vitest) {
+        resolvedMeta.push({
+          ...vitest,
+          configFile: vitest.id,
+        })
+      }
+      else {
         warned = true
+      }
     })
   }
 
-- 
2.54.0