From bdb4390cf3f09885f9de034e5f1a40a7e37395d4 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Mon, 12 Jun 2023 10:57:39 +0000 Subject: [PATCH 1/2] Update ripgrep arguments for file search --- packages/file-search/src/node/file-search-service-impl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/file-search/src/node/file-search-service-impl.ts b/packages/file-search/src/node/file-search-service-impl.ts index fc38824eabb19..cb24e0682d3c3 100644 --- a/packages/file-search/src/node/file-search-service-impl.ts +++ b/packages/file-search/src/node/file-search-service-impl.ts @@ -133,7 +133,7 @@ export class FileSearchServiceImpl implements FileSearchService { return new Promise((resolve, reject) => { const cwd = FileUri.fsPath(rootUri); const args = this.getSearchArgs(options); - const ripgrep = cp.spawn(rgPath, args, { cwd, stdio: ['pipe', 'pipe', 'inherit'] }); + const ripgrep = cp.spawn(rgPath, args, { cwd }); ripgrep.on('error', reject); ripgrep.on('exit', (code, signal) => { if (typeof code === 'number' && code !== 0) { @@ -160,7 +160,7 @@ export class FileSearchServiceImpl implements FileSearchService { } private getSearchArgs(options: FileSearchService.BaseOptions): string[] { - const args = ['--files', '--hidden']; + const args = ['--files', '--hidden', '--case-sensitive', '--no-require-git', '--no-config']; if (options.includePatterns) { for (const includePattern of options.includePatterns) { if (includePattern) { From c0a8e42abcba8bb659320294c7a10e76dba9ea90 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Mon, 12 Jun 2023 11:06:22 +0000 Subject: [PATCH 2/2] Update `private` to `protected` --- packages/file-search/src/node/file-search-service-impl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/file-search/src/node/file-search-service-impl.ts b/packages/file-search/src/node/file-search-service-impl.ts index cb24e0682d3c3..1d98bc5590af2 100644 --- a/packages/file-search/src/node/file-search-service-impl.ts +++ b/packages/file-search/src/node/file-search-service-impl.ts @@ -129,7 +129,7 @@ export class FileSearchServiceImpl implements FileSearchService { return [...exactMatches, ...fuzzyMatches].slice(0, opts.limit); } - private doFind(rootUri: URI, options: FileSearchService.BaseOptions, accept: (fileUri: string) => void, token: CancellationToken): Promise { + protected doFind(rootUri: URI, options: FileSearchService.BaseOptions, accept: (fileUri: string) => void, token: CancellationToken): Promise { return new Promise((resolve, reject) => { const cwd = FileUri.fsPath(rootUri); const args = this.getSearchArgs(options); @@ -159,7 +159,7 @@ export class FileSearchServiceImpl implements FileSearchService { }); } - private getSearchArgs(options: FileSearchService.BaseOptions): string[] { + protected getSearchArgs(options: FileSearchService.BaseOptions): string[] { const args = ['--files', '--hidden', '--case-sensitive', '--no-require-git', '--no-config']; if (options.includePatterns) { for (const includePattern of options.includePatterns) {