From 51e58cc5b3e376416358d133836705c7266bbe16 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 29 Mar 2017 11:10:37 -0700 Subject: [PATCH] Don't search files.exclude when disregardExcludeSettings is set --- .../workbench/parts/search/common/searchQuery.ts | 3 ++- .../services/search/node/searchService.ts | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/search/common/searchQuery.ts b/src/vs/workbench/parts/search/common/searchQuery.ts index 66118bfe5c9..e76813228d3 100644 --- a/src/vs/workbench/parts/search/common/searchQuery.ts +++ b/src/vs/workbench/parts/search/common/searchQuery.ts @@ -46,7 +46,8 @@ export class QueryBuilder { fileEncoding: options.fileEncoding, contentPattern: contentPattern, useRipgrep: configuration.search.useRipgrep, - disregardIgnoreFiles: options.disregardIgnoreFiles + disregardIgnoreFiles: options.disregardIgnoreFiles, + disregardExcludeSettings: options.disregardExcludeSettings }; } } \ No newline at end of file diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts index b73cdcf4f41..52589883cad 100644 --- a/src/vs/workbench/services/search/node/searchService.ts +++ b/src/vs/workbench/services/search/node/searchService.ts @@ -42,17 +42,19 @@ export class SearchService implements ISearchService { // Configuration: Encoding if (!query.fileEncoding) { - let fileEncoding = configuration && configuration.files && configuration.files.encoding; + const fileEncoding = configuration && configuration.files && configuration.files.encoding; query.fileEncoding = fileEncoding; } // Configuration: File Excludes - let fileExcludes = configuration && configuration.files && configuration.files.exclude; - if (fileExcludes) { - if (!query.excludePattern) { - query.excludePattern = fileExcludes; - } else { - objects.mixin(query.excludePattern, fileExcludes, false /* no overwrite */); + if (!query.disregardExcludeSettings) { + const fileExcludes = configuration && configuration.files && configuration.files.exclude; + if (fileExcludes) { + if (!query.excludePattern) { + query.excludePattern = fileExcludes; + } else { + objects.mixin(query.excludePattern, fileExcludes, false /* no overwrite */); + } } } } -- GitLab