development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 21:52:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify exclude state change logic and fix bugs:

Browse source 
unable to edit a when setting
in some cases unable to edit a defualt setting to/from a nondefault one
and probbaly some others.
This commit is contained in:
Jackson Kearl 2018-08-24 15:53:24 -07:00
parent 51fca9825b
commit 849322bcc4
1 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/vs/workbench/parts/preferences/browser/settingsTree.ts
View file

@ -794,38 +794,25 @@ export class SettingsRenderer implements ITreeRenderer {
common.toDispose.push(excludeWidget.onDidChangeExclude(e => {
if (template.context) {
const newValue = {
...template.context.scopeValue
};
let newValue = { ...template.context.scopeValue };
if (e.pattern) {
if (e.originalPattern in newValue) {
// editing something present in the value
if (e.pattern === e.originalPattern) {
// editing the when condition
newValue[e.pattern] = e.sibling ? { when: e.sibling } : true;
} else {
newValue[e.pattern] = newValue[e.originalPattern];
delete newValue[e.originalPattern];
}
} else if (e.originalPattern) {
// editing a default
// first delete the existing entry, if present
if (e.originalPattern) {
if (e.originalPattern in template.context.defaultValue) {
// delete a default by overriding it
newValue[e.originalPattern] = false;
newValue[e.pattern] = template.context.defaultValue[e.originalPattern];
} else if (e.pattern in newValue) {
// Adding back an explicity overridden default pattern
} else {
delete newValue[e.originalPattern];
}
}
// then add the new or updated entry, if present
if (e.pattern) {
if (e.pattern in template.context.defaultValue && !e.sibling) {
// add a default by deleting its override
delete newValue[e.pattern];
} else {
// adding a new pattern
newValue[e.pattern] = true;
}
} else {
if (e.originalPattern in newValue) {
// deleting a configured pattern
delete newValue[e.originalPattern];
} else if (e.originalPattern) {
// "deleting" a default by overriding it
newValue[e.originalPattern] = false;
newValue[e.pattern] = e.sibling ? { when: e.sibling } : true;
}
}