提交 51e58cc5 编写于 作者: R Rob Lourens

Don't search files.exclude when disregardExcludeSettings is set

上级 95d4e101
...@@ -46,7 +46,8 @@ export class QueryBuilder { ...@@ -46,7 +46,8 @@ export class QueryBuilder {
fileEncoding: options.fileEncoding, fileEncoding: options.fileEncoding,
contentPattern: contentPattern, contentPattern: contentPattern,
useRipgrep: configuration.search.useRipgrep, useRipgrep: configuration.search.useRipgrep,
disregardIgnoreFiles: options.disregardIgnoreFiles disregardIgnoreFiles: options.disregardIgnoreFiles,
disregardExcludeSettings: options.disregardExcludeSettings
}; };
} }
} }
\ No newline at end of file
...@@ -42,17 +42,19 @@ export class SearchService implements ISearchService { ...@@ -42,17 +42,19 @@ export class SearchService implements ISearchService {
// Configuration: Encoding // Configuration: Encoding
if (!query.fileEncoding) { if (!query.fileEncoding) {
let fileEncoding = configuration && configuration.files && configuration.files.encoding; const fileEncoding = configuration && configuration.files && configuration.files.encoding;
query.fileEncoding = fileEncoding; query.fileEncoding = fileEncoding;
} }
// Configuration: File Excludes // Configuration: File Excludes
let fileExcludes = configuration && configuration.files && configuration.files.exclude; if (!query.disregardExcludeSettings) {
if (fileExcludes) { const fileExcludes = configuration && configuration.files && configuration.files.exclude;
if (!query.excludePattern) { if (fileExcludes) {
query.excludePattern = fileExcludes; if (!query.excludePattern) {
} else { query.excludePattern = fileExcludes;
objects.mixin(query.excludePattern, fileExcludes, false /* no overwrite */); } else {
objects.mixin(query.excludePattern, fileExcludes, false /* no overwrite */);
}
} }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册