abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-20 08:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Enable disableFuzzySearch config option propagation (#7002)

Browse Source 
Co-authored-by: Jacob Richman <jacob314@gmail.com>
This commit is contained in:
Bryant Chandler
2025-08-27 08:27:41 -07:00
committed by GitHub
parent 4c3ec1f0cc
commit 99a28e6b6a
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/cli/src/config/config.ts
View File

@@ -532,6 +532,7 @@ export async function loadCliConfig(
respectGeminiIgnore: settings.fileFiltering?.respectGeminiIgnore, respectGeminiIgnore: settings.fileFiltering?.respectGeminiIgnore,
enableRecursiveFileSearch: enableRecursiveFileSearch:
settings.fileFiltering?.enableRecursiveFileSearch, settings.fileFiltering?.enableRecursiveFileSearch,
disableFuzzySearch: settings.fileFiltering?.disableFuzzySearch,
}, },
checkpointing: argv.checkpointing || settings.checkpointing?.enabled, checkpointing: argv.checkpointing || settings.checkpointing?.enabled,
proxy: proxy:

23
packages/core/src/utils/filesearch/fileSearch.ts
View File

@@ -101,6 +101,7 @@ class RecursiveFileSearch implements FileSearch {
async initialize(): Promise<void> { async initialize(): Promise<void> {
this.ignore = loadIgnoreRules(this.options); this.ignore = loadIgnoreRules(this.options);
this.allFiles = await crawl({ this.allFiles = await crawl({
crawlDirectory: this.options.projectRoot, crawlDirectory: this.options.projectRoot,
cwd: this.options.projectRoot, cwd: this.options.projectRoot,
@@ -116,7 +117,11 @@ class RecursiveFileSearch implements FileSearch {
pattern: string, pattern: string,
options: SearchOptions = {}, options: SearchOptions = {},
): Promise<string[]> { ): Promise<string[]> {
if (!this.resultCache || !this.fzf || !this.ignore) { if (
!this.resultCache ||
(!this.fzf && !this.options.disableFuzzySearch) ||
!this.ignore
) {
throw new Error('Engine not initialized. Call initialize() first.'); throw new Error('Engine not initialized. Call initialize() first.');
} }
@@ -131,7 +136,7 @@ class RecursiveFileSearch implements FileSearch {
filteredCandidates = candidates; filteredCandidates = candidates;
} else { } else {
let shouldCache = true; let shouldCache = true;
if (pattern.includes('*') || this.options.disableFuzzySearch) { if (pattern.includes('*') || !this.fzf) {
filteredCandidates = await filter(candidates, pattern, options.signal); filteredCandidates = await filter(candidates, pattern, options.signal);
} else { } else {
filteredCandidates = await this.fzf filteredCandidates = await this.fzf
@@ -175,12 +180,14 @@ class RecursiveFileSearch implements FileSearch {
private buildResultCache(): void { private buildResultCache(): void {
this.resultCache = new ResultCache(this.allFiles); this.resultCache = new ResultCache(this.allFiles);
// The v1 algorithm is much faster since it only looks at the first if (!this.options.disableFuzzySearch) {
// occurence of the pattern. We use it for search spaces that have >20k // The v1 algorithm is much faster since it only looks at the first
// files, because the v2 algorithm is just too slow in those cases. // occurence of the pattern. We use it for search spaces that have >20k
this.fzf = new AsyncFzf(this.allFiles, { // files, because the v2 algorithm is just too slow in those cases.
fuzzy: this.allFiles.length > 20000 ? 'v1' : 'v2', this.fzf = new AsyncFzf(this.allFiles, {
}); fuzzy: this.allFiles.length > 20000 ? 'v1' : 'v2',
});
}
} }
} }