Skip to content

Commit 7ca7a58

Browse files
committed
Correction for files ignore patterns
1 parent 8efc232 commit 7ca7a58

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

packages/core/src/shared/utilities/workspaceUtils.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -293,18 +293,14 @@ export const defaultExcludePatterns = [
293293
'**/LICENSE.md',
294294
]
295295

296-
export function getExcludePattern(useDefaults: boolean = true, useCase?: FeatureUseCase) {
296+
export function getExcludePattern(useDefaults: boolean = true) {
297297
const globAlwaysExcludedDirs = getGlobalExcludePatterns()
298298
const allPatterns = [...globAlwaysExcludedDirs]
299299

300300
if (useDefaults) {
301301
allPatterns.push(...defaultExcludePatterns)
302302
}
303303

304-
if (useCase === FeatureUseCase.TEST_GENERATION) {
305-
allPatterns.push(...testGenExcludePatterns)
306-
}
307-
308304
return excludePatternsAsString(allPatterns)
309305
}
310306

@@ -325,12 +321,11 @@ function excludePatternsAsString(patterns: string[]): string {
325321
async function filterOutGitignoredFiles(
326322
rootPath: string,
327323
files: vscode.Uri[],
328-
useDefaultExcludePatterns: boolean = true,
329-
useCase?: FeatureUseCase
324+
useDefaultExcludePatterns: boolean = true
330325
): Promise<vscode.Uri[]> {
331326
const gitIgnoreFiles = await vscode.workspace.findFiles(
332327
new vscode.RelativePattern(rootPath, '**/.gitignore'),
333-
getExcludePattern(useCase === FeatureUseCase.TEST_GENERATION ? true : useDefaultExcludePatterns, useCase)
328+
getExcludePattern(useDefaultExcludePatterns)
334329
)
335330
const gitIgnoreFilter = await GitIgnoreFilter.build(gitIgnoreFiles)
336331
return gitIgnoreFilter.filterFiles(files)
@@ -392,7 +387,10 @@ export async function collectFiles(
392387
const inputExcludePatterns = options?.excludePatterns ?? defaultExcludePatterns
393388
const maxSizeBytes = options?.maxSizeBytes ?? maxRepoSizeBytes
394389

395-
const excludePatterns = [...getGlobalExcludePatterns()]
390+
const excludePatterns = [
391+
...getGlobalExcludePatterns(),
392+
...(useCase === FeatureUseCase.TEST_GENERATION ? [...testGenExcludePatterns, ...defaultExcludePatterns] : []),
393+
]
396394
if (inputExcludePatterns.length) {
397395
excludePatterns.push(...inputExcludePatterns)
398396
}
@@ -404,7 +402,7 @@ export async function collectFiles(
404402
excludePatternFilter
405403
)
406404

407-
const files = excludeByGitIgnore ? await filterOutGitignoredFiles(rootPath, allFiles, false, useCase) : allFiles
405+
const files = excludeByGitIgnore ? await filterOutGitignoredFiles(rootPath, allFiles, false) : allFiles
408406

409407
for (const file of files) {
410408
const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders })

0 commit comments

Comments
 (0)