提交 caaa8c49 编写于 作者: R Rob Lourens

Fix #23270 -

Flip the flags around so that files.exclude (and gitignore) will be respected by default
上级 cb5907d6
......@@ -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 {
......
......@@ -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);
......
......@@ -25,7 +25,7 @@ export class QueryBuilder {
const configuration = this.configurationService.getConfiguration<ISearchConfiguration>();
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
......@@ -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');
}
......
......@@ -22,7 +22,7 @@ export interface IRawSearch {
maxFilesize?: number;
fileEncoding?: string;
useRipgrep?: boolean;
useIgnoreFiles?: boolean;
disregardIgnoreFiles?: boolean;
}
export interface IRawSearchService {
......
......@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册