diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts index 6b9887e0330edd36b1da915bd13a21dade359a3a..098e449517794089f1cd03537a808d9fae96fa22 100644 --- a/src/vs/platform/search/common/search.ts +++ b/src/vs/platform/search/common/search.ts @@ -36,8 +36,8 @@ export interface IQueryOptions { cacheKey?: string; fileEncoding?: string; useRipgrep?: boolean; - useIgnoreFiles?: boolean; - useExcludeSettings?: boolean; + disregardIgnoreFiles?: boolean; + disregardExcludeSettings?: boolean; } export interface ISearchQuery extends IQueryOptions { diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index 59150a51710f7cdeae7ba811127037ad2216795b..52b19a3c183cf0af26e02ba31f11c32df803e556 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -963,8 +963,8 @@ export class SearchViewlet extends Viewlet { excludePattern: excludes, maxResults: SearchViewlet.MAX_TEXT_RESULTS, includePattern: includes, - useIgnoreFiles, - useExcludeSettings + disregardIgnoreFiles: !useIgnoreFiles, + disregardExcludeSettings: !useExcludeSettings }; this.onQueryTriggered(this.queryBuilder.text(content, options), patternExcludes, patternIncludes); diff --git a/src/vs/workbench/parts/search/common/searchQuery.ts b/src/vs/workbench/parts/search/common/searchQuery.ts index c2b85a0470b00288b470cbd3d4e02c9fa517b264..66118bfe5c9f766da91c3ec0b5ea165ccdfc1c21 100644 --- a/src/vs/workbench/parts/search/common/searchQuery.ts +++ b/src/vs/workbench/parts/search/common/searchQuery.ts @@ -25,7 +25,7 @@ export class QueryBuilder { const configuration = this.configurationService.getConfiguration(); const settingsExcludePattern = getExcludes(configuration); - if (options.useExcludeSettings) { + if (!options.disregardExcludeSettings) { if (options.excludePattern) { mixin(options.excludePattern, settingsExcludePattern, false /* no overwrite */); } else { @@ -46,7 +46,7 @@ export class QueryBuilder { fileEncoding: options.fileEncoding, contentPattern: contentPattern, useRipgrep: configuration.search.useRipgrep, - useIgnoreFiles: options.useIgnoreFiles + disregardIgnoreFiles: options.disregardIgnoreFiles }; } } \ No newline at end of file diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts index 0fcd2731a62ab608dd73719bb613d66ddbbabc11..1897d53c820a5f0054322e618cdcf836926e226d 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts @@ -346,7 +346,7 @@ function getRgArgs(config: IRawSearch): { args: string[], siblingClauses: glob.I args.push('--max-filesize', config.maxFilesize + ''); } - if (!config.useIgnoreFiles) { + if (config.disregardIgnoreFiles) { // Don't use .gitignore or .ignore args.push('--no-ignore'); } diff --git a/src/vs/workbench/services/search/node/search.ts b/src/vs/workbench/services/search/node/search.ts index 7f4ed33e360c32d0233786e46d162c28bd03bb9c..527e86e9b9a541ae8af90907033e71029f53ffa3 100644 --- a/src/vs/workbench/services/search/node/search.ts +++ b/src/vs/workbench/services/search/node/search.ts @@ -22,7 +22,7 @@ export interface IRawSearch { maxFilesize?: number; fileEncoding?: string; useRipgrep?: boolean; - useIgnoreFiles?: boolean; + disregardIgnoreFiles?: boolean; } export interface IRawSearchService { diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts index e5db5a60cf090ddec479296a1a2ae02d8a67696a..b73cdcf4f411aa4952f58490bd0070ce17b4e08b 100644 --- a/src/vs/workbench/services/search/node/searchService.ts +++ b/src/vs/workbench/services/search/node/searchService.ts @@ -230,7 +230,7 @@ export class DiskSearch { sortByScore: query.sortByScore, cacheKey: query.cacheKey, useRipgrep: query.useRipgrep, - useIgnoreFiles: query.useIgnoreFiles + disregardIgnoreFiles: query.disregardIgnoreFiles }; if (query.type === QueryType.Text) {