Skip to content

Commit 891f5f2

Browse files
authored
Rename VS Code Dark and Light themes to Dark 2026 and Light 2026 (#306356)
rename VS Code Dark -> Dark 2026
1 parent 573fb0a commit 891f5f2

5 files changed

Lines changed: 21 additions & 16 deletions

File tree

extensions/theme-defaults/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
"contributes": {
1515
"themes": [
1616
{
17-
"id": "VS Code Light",
18-
"label": "%vsCodeLightThemeLabel%",
17+
"id": "Light 2026",
18+
"label": "%light2026ThemeLabel%",
1919
"uiTheme": "vs",
2020
"path": "./themes/2026-light.json"
2121
},
2222
{
23-
"id": "VS Code Dark",
24-
"label": "%vsCodeDarkThemeLabel%",
23+
"id": "Dark 2026",
24+
"label": "%dark2026ThemeLabel%",
2525
"uiTheme": "vs-dark",
2626
"path": "./themes/2026-dark.json"
2727
},

extensions/theme-defaults/package.nls.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"displayName": "Default Themes",
33
"description": "The default Visual Studio light and dark themes",
4-
"vsCodeLightThemeLabel": "VS Code Light",
5-
"vsCodeDarkThemeLabel": "VS Code Dark",
4+
"light2026ThemeLabel": "Light 2026",
5+
"dark2026ThemeLabel": "Dark 2026",
66
"darkPlusColorThemeLabel": "Dark+",
77
"darkModernThemeLabel": "Dark Modern",
88
"lightPlusColorThemeLabel": "Light+",

src/vs/sessions/contrib/configuration/browser/configuration.contribution.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
77
import { Registry } from '../../../../platform/registry/common/platform.js';
8+
import { ThemeSettingDefaults } from '../../../../workbench/services/themes/common/workbenchThemeService.js';
89

910
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultConfigurations([{
1011
overrides: {
@@ -68,7 +69,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultCon
6869
'workbench.layoutControl.type': 'toggles',
6970
'workbench.editor.useModal': 'all',
7071
'workbench.panel.showLabels': false,
71-
'workbench.colorTheme': 'VS Code Dark',
72+
'workbench.colorTheme': ThemeSettingDefaults.COLOR_THEME_DARK,
7273

7374
'window.menuStyle': 'custom',
7475
'window.dialogStyle': 'custom',

src/vs/workbench/services/themes/common/workbenchThemeService.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ export enum ThemeSettings {
3939
}
4040

4141
export namespace ThemeSettingDefaults {
42-
export const COLOR_THEME_DARK = 'VS Code Dark';
43-
export const COLOR_THEME_LIGHT = 'VS Code Light';
42+
export const COLOR_THEME_DARK = 'Dark 2026';
43+
export const COLOR_THEME_LIGHT = 'Light 2026';
4444
export const COLOR_THEME_HC_DARK = 'Default High Contrast';
4545
export const COLOR_THEME_HC_LIGHT = 'Default High Contrast Light';
4646

@@ -59,8 +59,12 @@ export function migrateThemeSettingsId(settingsId: string): string {
5959
case 'Default Light Modern': return 'Light Modern';
6060
case 'Default Dark+': return 'Dark+';
6161
case 'Default Light+': return 'Light+';
62-
case 'Experimental Dark': return 'VS Code Dark';
63-
case 'Experimental Light': return 'VS Code Light';
62+
case 'Experimental Dark':
63+
case 'VS Code Dark':
64+
return ThemeSettingDefaults.COLOR_THEME_DARK;
65+
case 'Experimental Light':
66+
case 'VS Code Light':
67+
return ThemeSettingDefaults.COLOR_THEME_LIGHT;
6468
}
6569
return settingsId;
6670
}

src/vs/workbench/services/themes/test/common/workbenchThemeService.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import assert from 'assert';
7-
import { migrateThemeSettingsId } from '../../common/workbenchThemeService.js';
7+
import { migrateThemeSettingsId, ThemeSettingDefaults } from '../../common/workbenchThemeService.js';
88
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
99
import { ThemeConfiguration } from '../../common/themeConfiguration.js';
1010
import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
@@ -28,15 +28,15 @@ suite('WorkbenchThemeService', () => {
2828

2929
test('migrates Experimental theme IDs to VS Code themes', () => {
3030
assert.deepStrictEqual(
31-
['Experimental Dark', 'Experimental Light'].map(migrateThemeSettingsId),
32-
['VS Code Dark', 'VS Code Light']
31+
['Experimental Dark', 'Experimental Light', 'VS Code Dark', 'VS Code Light'].map(migrateThemeSettingsId),
32+
[ThemeSettingDefaults.COLOR_THEME_DARK, ThemeSettingDefaults.COLOR_THEME_LIGHT, ThemeSettingDefaults.COLOR_THEME_DARK, ThemeSettingDefaults.COLOR_THEME_LIGHT]
3333
);
3434
});
3535

3636
test('returns unknown IDs unchanged', () => {
3737
assert.deepStrictEqual(
38-
['Dark Modern', 'VS Code Dark', 'Some Custom Theme', ''].map(migrateThemeSettingsId),
39-
['Dark Modern', 'VS Code Dark', 'Some Custom Theme', '']
38+
['Dark Modern', 'Dark 2026', 'Some Custom Theme', ''].map(migrateThemeSettingsId),
39+
['Dark Modern', 'Dark 2026', 'Some Custom Theme', '']
4040
);
4141
});
4242
});

0 commit comments

Comments
 (0)