Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-25 09:06:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames files.excludeGitIgnore -> explorer.excludeGitIgnore (#150848)

Browse Source
This commit is contained in:
Logan Ramos
2022-05-31 10:42:51 -04:00
committed by GitHub
parent 0110f0e149
commit 86dfba25d4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/files/common/files.ts
-1
View File
@@ -1218,7 +1218,6 @@ export interface IFilesConfiguration {
autoSaveDelay: number;
eol: string;
enableTrash: boolean;
excludeGitIgnore: boolean;
hotExit: string;
saveConflictResolution: 'askUser' | 'overwriteFileOnDisk';
};
src/vs/workbench/contrib/files/browser/files.contribution.ts
+6 -6
View File
@@ -186,12 +186,6 @@ configurationRegistry.registerConfiguration({
'markdownDescription': nls.localize('autoGuessEncoding', "When enabled, the editor will attempt to guess the character set encoding when opening files. This setting can also be configured per language. Note, this setting is not respected by text search. Only `#files.encoding#` is respected."),
'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
},
'files.excludeGitIgnore': {
type: 'boolean',
markdownDescription: nls.localize('excludeGitignore', "Controls whether entries in .gitignore should be parsed and excluded from the explorer. Similar to `#files.exclude#`."),
default: false,
scope: ConfigurationScope.RESOURCE
},
'files.eol': {
'type': 'string',
'enum': [
@@ -477,6 +471,12 @@ configurationRegistry.registerConfiguration({
'description': nls.localize('copyRelativePathSeparator', "The path separation character used when copying relative file paths."),
'default': 'auto'
},
'explorer.excludeGitIgnore': {
type: 'boolean',
markdownDescription: nls.localize('excludeGitignore', "Controls whether entries in .gitignore should be parsed and excluded from the explorer. Similar to `#files.exclude#`."),
default: false,
scope: ConfigurationScope.RESOURCE
},
'explorer.fileNesting.enabled': {
'type': 'boolean',
scope: ConfigurationScope.RESOURCE,
src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+2 -2
View File
@@ -622,7 +622,7 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
) {
this.toDispose.push(this.contextService.onDidChangeWorkspaceFolders(() => this.updateConfiguration()));
this.toDispose.push(this.configurationService.onDidChangeConfiguration((e) => {
if (e.affectsConfiguration('files.exclude') || e.affectsConfiguration('files.excludeGitIgnore')) {
if (e.affectsConfiguration('files.exclude') || e.affectsConfiguration('explorer.excludeGitIgnore')) {
this.updateConfiguration();
}
}));
@@ -683,7 +683,7 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
this.contextService.getWorkspace().folders.forEach(folder => {
const configuration = this.configurationService.getValue<IFilesConfiguration>({ resource: folder.uri });
const excludesConfig: glob.IExpression = configuration?.files?.exclude || Object.create(null);
const parseIgnoreFile: boolean = configuration.files.excludeGitIgnore;
const parseIgnoreFile: boolean = configuration.explorer.excludeGitIgnore;
// If we should be parsing ignoreFiles for this workspace and don't have an ignore tree initialize one
if (parseIgnoreFile && !this.ignoreTreesPerRoot.has(folder.uri.toString())) {
src/vs/workbench/contrib/files/common/files.ts
+1
View File
@@ -98,6 +98,7 @@ export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkb
badges: boolean;
};
incrementalNaming: 'simple' | 'smart';
excludeGitIgnore: boolean;
fileNesting: {
enabled: boolean;
expand: boolean;