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

Don't search files.exclude when disregardExcludeSettings is set

上级 95d4e101
......@@ -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
......@@ -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 */);
}
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册