maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #129581

Browse source
This commit is contained in:
Raymond Zhao 2021-07-29 14:06:19 -07:00
parent a491a1e07f
commit 302af5ff63
No known key found for this signature in database
GPG key ID: D36E5FCE46B63B58
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
View file

@ -1201,17 +1201,17 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
private renderEnumEditWidget(
keyOrValue: IObjectEnumData,
{ isKey, originalItem, update }: IObjectRenderEditWidgetOptions,
{ isKey, changedItem, update }: IObjectRenderEditWidgetOptions,
) {
const selectBox = this.createBasicSelectBox(keyOrValue);
const originalKeyOrValue = isKey ? originalItem.key : originalItem.value;
const changedKeyOrValue = isKey ? changedItem.key : changedItem.value;
this.listDisposables.add(
selectBox.onDidSelect(({ selected }) =>
update(
originalKeyOrValue.type === 'boolean'
? { ...originalKeyOrValue, data: selected === 'true' ? true : false }
: { ...originalKeyOrValue, data: selected },
changedKeyOrValue.type === 'boolean'
? { ...changedKeyOrValue, data: selected === 'true' ? true : false }
: { ...changedKeyOrValue, data: selected },
)
)
);
@ -1227,10 +1227,13 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
const selected = keyOrValue.options.findIndex(option => keyOrValue.data === option.value);
if (selected === -1 && keyOrValue.options.length) {
update(
originalKeyOrValue.type === 'boolean'
? { ...originalKeyOrValue, data: true }
: { ...originalKeyOrValue, data: keyOrValue.options[0].value }
changedKeyOrValue.type === 'boolean'
? { ...changedKeyOrValue, data: true }
: { ...changedKeyOrValue, data: keyOrValue.options[0].value }
);
} else if (changedKeyOrValue.type === 'boolean') {
// https://github.com/microsoft/vscode/issues/129581
update({ ...changedKeyOrValue, data: keyOrValue.data === 'true' });
}
return { widget: selectBox, element: wrapper };