Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't write setting value that doesn't pass validation for simple settings.

Browse Source 
Can't do this for array types, it could prevent someone from fixing a setting that's already invalid
Fix #99268
This commit is contained in:
Rob Lourens
2020-06-03 10:17:43 -05:00
parent 9e75a3f984
commit e0a7603f23
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+14 -5
View File
@@ -979,7 +979,11 @@ export class SettingTextRenderer extends AbstractSettingRenderer implements ITre
template.onChange = undefined;
template.inputBox.value = dataElement.value;
template.onChange = value => { renderValidations(dataElement, template, false, label); onChange(value); };
template.onChange = value => {
if (!renderValidations(dataElement, template, false, label)) {
onChange(value);
}
};
renderValidations(dataElement, template, true, label);
}
@@ -1126,8 +1130,9 @@ export class SettingNumberRenderer extends AbstractSettingRenderer implements IT
template.onChange = undefined;
template.inputBox.value = dataElement.value;
template.onChange = value => {
renderValidations(dataElement, template, false, label);
onChange(nullNumParseFn(value));
if (!renderValidations(dataElement, template, false, label)) {
onChange(nullNumParseFn(value));
}
};
renderValidations(dataElement, template, true, label);
@@ -1348,7 +1353,10 @@ export class SettingTreeRenderers {
}
}
function renderValidations(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, calledOnStartup: boolean, originalAriaLabel: string) {
/**
* Validate and render any error message. Returns true if the value is invalid.
*/
function renderValidations(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, calledOnStartup: boolean, originalAriaLabel: string): boolean {
if (dataElement.setting.validator) {
const errMsg = dataElement.setting.validator(template.inputBox.value);
if (errMsg) {
@@ -1357,12 +1365,13 @@ function renderValidations(dataElement: SettingsTreeSettingElement, template: IS
const validationError = localize('validationError', "Validation Error.");
template.inputBox.inputElement.parentElement!.setAttribute('aria-label', [originalAriaLabel, validationError, errMsg].join(' '));
if (!calledOnStartup) { ariaAlert(validationError + ' ' + errMsg); }
return;
return true;
} else {
template.inputBox.inputElement.parentElement!.setAttribute('aria-label', originalAriaLabel);
}
}
DOM.removeClass(template.containerElement, 'invalid-input');
return false;
}
function renderArrayValidations(