Merge pull request #59717 from skprabhanjan/fix-59364

Fix #59364 : Respect global .gitignore when searching
This commit is contained in:
Rob Lourens
2018-10-04 11:40:23 -07:00
committed by GitHub
12 changed files with 46 additions and 5 deletions

View File

@@ -302,6 +302,7 @@ export class FileIndexSearchEngine {
excludes,
includes,
useIgnoreFiles: !this.config.disregardIgnoreFiles,
useGlobalIgnoreFiles: !this.config.disregardGlobalIgnoreFiles,
followSymlinks: !this.config.ignoreSymlinks
};
}

View File

@@ -386,6 +386,7 @@ class TextSearchEngine {
excludes,
includes,
useIgnoreFiles: !this.config.disregardIgnoreFiles,
useGlobalIgnoreFiles: !this.config.disregardGlobalIgnoreFiles,
followSymlinks: !this.config.ignoreSymlinks,
encoding: this.config.fileEncoding,
maxFileSize: this.config.maxFileSize,
@@ -559,6 +560,7 @@ class FileSearchEngine {
excludes,
includes,
useIgnoreFiles: !this.config.disregardIgnoreFiles,
useGlobalIgnoreFiles: !this.config.disregardGlobalIgnoreFiles,
followSymlinks: !this.config.ignoreSymlinks,
maxResults: this.config.maxResults
};

View File

@@ -403,6 +403,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
const queryOptions: IQueryOptions = {
ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
disregardExcludeSettings: options.exclude === null,
fileEncoding: options.encoding,
maxResults: options.maxResults,