mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-02 00:09:30 +01:00
rename VS Code Dark -> Dark 2026 (#306364)
This commit is contained in:
committed by
GitHub
parent
f91019e767
commit
cc13977fc4
@@ -14,14 +14,14 @@
|
||||
"contributes": {
|
||||
"themes": [
|
||||
{
|
||||
"id": "VS Code Light",
|
||||
"label": "%vsCodeLightThemeLabel%",
|
||||
"id": "Light 2026",
|
||||
"label": "%light2026ThemeLabel%",
|
||||
"uiTheme": "vs",
|
||||
"path": "./themes/2026-light.json"
|
||||
},
|
||||
{
|
||||
"id": "VS Code Dark",
|
||||
"label": "%vsCodeDarkThemeLabel%",
|
||||
"id": "Dark 2026",
|
||||
"label": "%dark2026ThemeLabel%",
|
||||
"uiTheme": "vs-dark",
|
||||
"path": "./themes/2026-dark.json"
|
||||
},
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"displayName": "Default Themes",
|
||||
"description": "The default Visual Studio light and dark themes",
|
||||
"vsCodeLightThemeLabel": "VS Code Light",
|
||||
"vsCodeDarkThemeLabel": "VS Code Dark",
|
||||
"light2026ThemeLabel": "Light 2026",
|
||||
"dark2026ThemeLabel": "Dark 2026",
|
||||
"darkPlusColorThemeLabel": "Dark+",
|
||||
"darkModernThemeLabel": "Dark Modern",
|
||||
"lightPlusColorThemeLabel": "Light+",
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
import { Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
|
||||
import { Registry } from '../../../../platform/registry/common/platform.js';
|
||||
import { ThemeSettingDefaults } from '../../../../workbench/services/themes/common/workbenchThemeService.js';
|
||||
|
||||
Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultConfigurations([{
|
||||
overrides: {
|
||||
@@ -68,7 +69,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultCon
|
||||
'workbench.layoutControl.type': 'toggles',
|
||||
'workbench.editor.useModal': 'all',
|
||||
'workbench.panel.showLabels': false,
|
||||
'workbench.colorTheme': 'VS Code Dark',
|
||||
'workbench.colorTheme': ThemeSettingDefaults.COLOR_THEME_DARK,
|
||||
|
||||
'window.menuStyle': 'custom',
|
||||
'window.dialogStyle': 'custom',
|
||||
|
||||
@@ -39,8 +39,8 @@ export enum ThemeSettings {
|
||||
}
|
||||
|
||||
export namespace ThemeSettingDefaults {
|
||||
export const COLOR_THEME_DARK = 'VS Code Dark';
|
||||
export const COLOR_THEME_LIGHT = 'VS Code Light';
|
||||
export const COLOR_THEME_DARK = 'Dark 2026';
|
||||
export const COLOR_THEME_LIGHT = 'Light 2026';
|
||||
export const COLOR_THEME_HC_DARK = 'Default High Contrast';
|
||||
export const COLOR_THEME_HC_LIGHT = 'Default High Contrast Light';
|
||||
|
||||
@@ -59,8 +59,12 @@ export function migrateThemeSettingsId(settingsId: string): string {
|
||||
case 'Default Light Modern': return 'Light Modern';
|
||||
case 'Default Dark+': return 'Dark+';
|
||||
case 'Default Light+': return 'Light+';
|
||||
case 'Experimental Dark': return 'VS Code Dark';
|
||||
case 'Experimental Light': return 'VS Code Light';
|
||||
case 'Experimental Dark':
|
||||
case 'VS Code Dark':
|
||||
return ThemeSettingDefaults.COLOR_THEME_DARK;
|
||||
case 'Experimental Light':
|
||||
case 'VS Code Light':
|
||||
return ThemeSettingDefaults.COLOR_THEME_LIGHT;
|
||||
}
|
||||
return settingsId;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import assert from 'assert';
|
||||
import { migrateThemeSettingsId } from '../../common/workbenchThemeService.js';
|
||||
import { migrateThemeSettingsId, ThemeSettingDefaults } from '../../common/workbenchThemeService.js';
|
||||
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
|
||||
import { ThemeConfiguration } from '../../common/themeConfiguration.js';
|
||||
import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
|
||||
@@ -28,15 +28,15 @@ suite('WorkbenchThemeService', () => {
|
||||
|
||||
test('migrates Experimental theme IDs to VS Code themes', () => {
|
||||
assert.deepStrictEqual(
|
||||
['Experimental Dark', 'Experimental Light'].map(migrateThemeSettingsId),
|
||||
['VS Code Dark', 'VS Code Light']
|
||||
['Experimental Dark', 'Experimental Light', 'VS Code Dark', 'VS Code Light'].map(migrateThemeSettingsId),
|
||||
[ThemeSettingDefaults.COLOR_THEME_DARK, ThemeSettingDefaults.COLOR_THEME_LIGHT, ThemeSettingDefaults.COLOR_THEME_DARK, ThemeSettingDefaults.COLOR_THEME_LIGHT]
|
||||
);
|
||||
});
|
||||
|
||||
test('returns unknown IDs unchanged', () => {
|
||||
assert.deepStrictEqual(
|
||||
['Dark Modern', 'VS Code Dark', 'Some Custom Theme', ''].map(migrateThemeSettingsId),
|
||||
['Dark Modern', 'VS Code Dark', 'Some Custom Theme', '']
|
||||
['Dark Modern', 'Dark 2026', 'Some Custom Theme', ''].map(migrateThemeSettingsId),
|
||||
['Dark Modern', 'Dark 2026', 'Some Custom Theme', '']
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user