Skip to content

Commit a6469ca

Browse files
authored
Refactor Configuration Migration Logic (#198414)
* fix migration #198056
1 parent cfd5267 commit a6469ca

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.vscode/settings.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,10 @@
165165
"src/vs/workbench/workbench.web.main.ts",
166166
"src/vs/workbench/api/common/extHostTypes.ts"
167167
],
168-
169168
// Temporarily enabled for self-hosting
170169
"terminal.integrated.stickyScroll.enabled": true,
171-
172170
// Temporarily enabled for self-hosting
173171
"scm.showIncomingChanges": "always",
174-
"scm.showOutgoingChanges": "always"
172+
"scm.showOutgoingChanges": "always",
173+
"workbench.editor.showTabs": "multiple",
175174
}

src/vs/workbench/browser/workbench.contribution.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,17 +817,21 @@ Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
817817
Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
818818
.registerConfigurationMigrations([{
819819
key: 'workbench.editor.doubleClickTabToToggleEditorGroupSizes', migrateFn: (value: any) => {
820+
const results: ConfigurationKeyValuePairs = [];
820821
if (typeof value === 'boolean') {
821822
value = value ? 'expand' : 'off';
823+
results.push(['workbench.editor.doubleClickTabToToggleEditorGroupSizes', { value }]);
822824
}
823-
return [['workbench.editor.doubleClickTabToToggleEditorGroupSizes', { value: value }]];
825+
return results;
824826
}
825827
}, {
826828
key: LayoutSettings.EDITOR_TABS_MODE, migrateFn: (value: any) => {
829+
const results: ConfigurationKeyValuePairs = [];
827830
if (typeof value === 'boolean') {
828831
value = value ? EditorTabsMode.MULTIPLE : EditorTabsMode.SINGLE;
832+
results.push([LayoutSettings.EDITOR_TABS_MODE, { value }]);
829833
}
830-
return [[LayoutSettings.EDITOR_TABS_MODE, { value }]];
834+
return results;
831835
}
832836
}, {
833837
key: 'workbench.editor.tabCloseButton', migrateFn: (value: any) => {

0 commit comments

Comments
 (0)