Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce negate pattern in files.exclude #152225

Closed
wants to merge 2 commits into from
Closed

Introduce negate pattern in files.exclude #152225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1abd41c
Introduce negate pattern in `files.exclude`
dankox Jun 15, 2022
ca61555
fix code hygien
dankox Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ interface CachedParsedExpression {
*/
export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
private hiddenExpressionPerRoot = new Map<string, CachedParsedExpression>();
private visibleExpressionPerRoot = new Map<string, CachedParsedExpression>();
private editorsAffectingFilter = new Set<EditorInput>();
private _onDidChange = new Emitter<void>();
private toDispose: IDisposable[] = [];
Expand Down Expand Up @@ -709,7 +710,22 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {

const excludesConfigCopy = deepClone(excludesConfig); // do not keep the config, as it gets mutated under our hoods

// Prepare include list created from negate pattern (same as in .gitignore) in files.exclude
const includesConfig: glob.IExpression = Object.create(null);
for (const key in excludesConfig) {
if (key.length > 1 && key[0] === '!') {
// populate include list from negated excludes
includesConfig[key.substring(1)] = excludesConfig[key];
delete excludesConfigCopy[key];
} else if (key.length > 2 && key[0] === '\\' && key[1] === '!') {
// update exclude list if `!` negate character is escaped with backslash
excludesConfigCopy[key.substring(1)] = excludesConfig[key];
delete excludesConfigCopy[key];
}
}

this.hiddenExpressionPerRoot.set(folder.uri.toString(), { original: excludesConfigCopy, parsed: glob.parse(excludesConfigCopy) });
this.visibleExpressionPerRoot.set(folder.uri.toString(), { original: includesConfig, parsed: glob.parse(includesConfig) });
});

if (shouldFire || updatedGitIgnoreSetting) {
Expand Down Expand Up @@ -782,12 +798,14 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
// Hide those that match Hidden Patterns
const cached = this.hiddenExpressionPerRoot.get(stat.root.resource.toString());
const globMatch = cached?.parsed(path.relative(stat.root.resource.path, stat.resource.path), stat.name, name => !!(stat.parent && stat.parent.getChild(name)));
const includesCached = this.visibleExpressionPerRoot.get(stat.root.resource.toString());
const globIncludesCached = includesCached?.parsed(path.relative(stat.root.resource.path, stat.resource.path), stat.name, name => !!(stat.parent && stat.parent.getChild(name)));
// Small optimization to only traverse gitIgnore if the globMatch from fileExclude returned nothing
const ignoreFile = globMatch ? undefined : this.ignoreTreesPerRoot.get(stat.root.resource.toString())?.findSubstr(stat.resource);
const isIncludedInTraversal = ignoreFile?.isPathIncludedInTraversal(stat.resource.path, stat.isDirectory);
// Doing !undefined returns true and we want it to be false when undefined because that means it's not included in the ignore file
const isIgnoredByIgnoreFile = isIncludedInTraversal === undefined ? false : !isIncludedInTraversal;
if (isIgnoredByIgnoreFile || globMatch || stat.parent?.isExcluded) {
if (isIgnoredByIgnoreFile || (globMatch && !globIncludesCached) || stat.parent?.isExcluded) {
stat.isExcluded = true;
const editors = this.editorService.visibleEditors;
const editor = editors.find(e => e.resource && this.uriIdentityService.extUri.isEqualOrParent(e.resource, stat.resource));
Expand Down