chore(vscode-extension): update default test file glob pattern (#694)

Co-authored-by: Copilot <[email protected]>

Author: 9aoy

packages/core/src/config.ts

@@ -161,9 +161,9 @@ const createDefaultConfig = (): NormalizedConfig => ({
       // This option accepts an array of wax(https://crates.io/crates/wax)-compatible glob patterns
       // not support `?()`: '**/*.{test,spec}.?(c|m)[jt]s?(x)',
       '**/*.{test,spec}.[jt]s',
-      '**/*.{test,spec}.[c|m][jt]s',
+      '**/*.{test,spec}.[cm][jt]s',
       '**/*.{test,spec}.[jt]sx',
-      '**/*.{test,spec}.[c|m][jt]sx',
+      '**/*.{test,spec}.[cm][jt]sx',
     ],
     enabled: false,
     provider: 'istanbul',

packages/core/tests/__snapshots__/config.test.ts.snap

@@ -16,9 +16,9 @@ exports[`mergeRstestConfig > should merge config correctly with default config 1
       "**/__mocks__/**",
       "**/*.d.ts",
       "**/*.{test,spec}.[jt]s",
-      "**/*.{test,spec}.[c|m][jt]s",
+      "**/*.{test,spec}.[cm][jt]s",
       "**/*.{test,spec}.[jt]sx",
-      "**/*.{test,spec}.[c|m][jt]sx",
+      "**/*.{test,spec}.[cm][jt]sx",
     ],
     "provider": "istanbul",
     "reportOnFailure": false,

packages/core/tests/core/__snapshots__/rstest.test.ts.snap

@@ -16,9 +16,9 @@ exports[`rstest context > should generate rstest context correctly 1`] = `
       "**/__mocks__/**",
       "**/*.d.ts",
       "**/*.{test,spec}.[jt]s",
-      "**/*.{test,spec}.[c|m][jt]s",
+      "**/*.{test,spec}.[cm][jt]s",
       "**/*.{test,spec}.[jt]sx",
-      "**/*.{test,spec}.[c|m][jt]sx",
+      "**/*.{test,spec}.[cm][jt]sx",
     ],
     "provider": "istanbul",
     "reportOnFailure": false,
@@ -93,9 +93,9 @@ exports[`rstest context > should generate rstest context correctly with multiple
       "**/__mocks__/**",
       "**/*.d.ts",
       "**/*.{test,spec}.[jt]s",
-      "**/*.{test,spec}.[c|m][jt]s",
+      "**/*.{test,spec}.[cm][jt]s",
       "**/*.{test,spec}.[jt]sx",
-      "**/*.{test,spec}.[c|m][jt]sx",
+      "**/*.{test,spec}.[cm][jt]sx",
     ],
     "provider": "istanbul",
     "reportOnFailure": false,
@@ -173,9 +173,9 @@ exports[`rstest context > should generate rstest context correctly with multiple
       "**/__mocks__/**",
       "**/*.d.ts",
       "**/*.{test,spec}.[jt]s",
-      "**/*.{test,spec}.[c|m][jt]s",
+      "**/*.{test,spec}.[cm][jt]s",
       "**/*.{test,spec}.[jt]sx",
-      "**/*.{test,spec}.[c|m][jt]sx",
+      "**/*.{test,spec}.[cm][jt]sx",
     ],
     "provider": "istanbul",
     "reportOnFailure": false,

packages/vscode/package.json

@@ -35,8 +35,10 @@
             "type": "string"
           },
           "default": [
-            "**/*.test.*",
-            "**/*.spec.*"
+            "**/*.{test,spec}.[jt]s",
+            "**/*.{test,spec}.[cm][jt]s",
+            "**/*.{test,spec}.[jt]sx",
+            "**/*.{test,spec}.[cm][jt]sx"
           ]
         },
         "rstest.rstestPackagePath": {

packages/vscode/src/config.ts

@@ -12,7 +12,13 @@ export type ExtensionConfig = {
 };
 
 export const defaultConfig: ExtensionConfig = {
-  testFileGlobPattern: ['**/*.test.*', '**/*.spec.*'],
+  // https://code.visualstudio.com/docs/editor/glob-patterns
+  testFileGlobPattern: [
+    '**/*.{test,spec}.[jt]s',
+    '**/*.{test,spec}.[cm][jt]s',
+    '**/*.{test,spec}.[jt]sx',
+    '**/*.{test,spec}.[cm][jt]sx',
+  ],
 };
 
 // Type-safe getter for a single config value with priority:

packages/vscode/src/extension.ts

@@ -9,7 +9,11 @@ import {
   TestFile,
   testData,
 } from './testTree';
-import { getWorkspaceTestPatterns, shouldIgnorePath } from './utils';
+import {
+  getWorkspaceTestPatterns,
+  isTestFile,
+  shouldIgnorePath,
+} from './utils';
 
 export async function activate(context: vscode.ExtensionContext) {
   const rstest = new Rstest(context);
@@ -322,8 +326,7 @@ function startWatchingWorkspace(
 }
 
 function isTestFilePath(uri: vscode.Uri): boolean {
-  const filename = uri.path.split('/').pop() || uri.path;
-  return filename.includes('.test.') || filename.includes('.spec.');
+  return isTestFile(uri.path.split('/').pop() || uri.path);
 }
 
 class RstestFileCoverage extends vscode.FileCoverage {

packages/vscode/src/utils.ts

@@ -9,6 +9,11 @@ export function shouldIgnorePath(path: string) {
   );
 }
 
+export function isTestFile(filename: string): boolean {
+  const regex = /.*\.(test|spec)\.(c|m)?[jt]sx?$/;
+  return regex.test(filename);
+}
+
 export type WorkspaceTestPattern = {
   workspaceFolder: vscode.WorkspaceFolder;
   pattern: vscode.GlobPattern;

packages/vscode/tests/fixtures/.vscode/settings.json

@@ -0,0 +1,8 @@
+// Test fixture file to verify that non-JS/TS files are excluded from test discovery
+const { describe, it, expect } = require('@rstest/core');
+
+describe('JS', () => {
+  it('should run in JS', () => {
+    expect(1).toBe(1);
+  });
+});

packages/vscode/tests/fixtures/test/jsFile.spec.js.txt

@@ -32,10 +32,23 @@ suite('Configuration Integration', () => {
     const prev = config.get('testFileGlobPattern');
 
     try {
-      // 1) Only discover *.spec.* files
+      await testController.resolveHandler?.(undefined as any);
+      await delay(200);
+
+      const defaultRootsSpec: vscode.TestItem[] = [];
+      testController.items.forEach((it) => {
+        defaultRootsSpec.push(it);
+      });
+      assert.equal(
+        defaultRootsSpec.length,
+        5,
+        'Should discover all test files',
+      );
+
+      // 1) Only discover *.spec.js/ts files
       await config.update(
         'testFileGlobPattern',
-        ['**/*.spec.*'],
+        ['**/*.spec.[jt]s'],
         vscode.ConfigurationTarget.Workspace,
       );
 
@@ -54,6 +67,12 @@ suite('Configuration Integration', () => {
         ),
         'Should include jsFile.spec.js',
       );
+      assert.ok(
+        !rootsSpec.some((it) =>
+          it.id.endsWith('/tests/fixtures/test/jsFile.spec.js.txt'),
+        ),
+        'Should not include jsFile.spec.js.txt',
+      );
       // Ensure no duplicate non-spec-only additions by counting unique suffixes
       assert.ok(
         !rootsSpec.some((it) =>