Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

theme initialization: Do not wait for settings sync #192597

Merged
merged 1 commit into from
Sep 8, 2023
Merged

theme initialization: Do not wait for settings sync #192597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 23 additions & 7 deletions src/vs/workbench/services/themes/browser/workbenchThemeService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@ILogService private readonly logService: ILogService,
@IHostColorSchemeService private readonly hostColorService: IHostColorSchemeService,
@IUserDataInitializationService userDataInitializationService: IUserDataInitializationService,
@IUserDataInitializationService private readonly userDataInitializationService: IUserDataInitializationService,
@ILanguageService languageService: ILanguageService
) {
this.container = layoutService.container;
Expand Down Expand Up @@ -180,7 +180,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
this.applyAndSetProductIconTheme(productIconData, true);
}

Promise.all([extensionService.whenInstalledExtensionsRegistered(), userDataInitializationService.whenInitializationFinished()]).then(_ => {
extensionService.whenInstalledExtensionsRegistered().then(_ => {
this.installConfigurationListener();
this.installPreferredSchemeListener();
this.installRegistryListeners();
Expand Down Expand Up @@ -209,17 +209,23 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
if (devThemes.length) {
return this.setColorTheme(devThemes[0].id, ConfigurationTarget.MEMORY);
}
const fallbackTheme = this.currentColorTheme.type === ColorScheme.LIGHT ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
const theme = this.colorThemeRegistry.findThemeBySettingsId(this.settings.colorTheme, fallbackTheme);

const preferredColorScheme = this.getPreferredColorScheme();
const prevScheme = this.storageService.get(PERSISTED_OS_COLOR_SCHEME, PERSISTED_OS_COLOR_SCHEME_SCOPE);
if (preferredColorScheme !== prevScheme) {
this.storageService.store(PERSISTED_OS_COLOR_SCHEME, preferredColorScheme, PERSISTED_OS_COLOR_SCHEME_SCOPE, StorageTarget.USER);
if (preferredColorScheme && theme?.type !== preferredColorScheme) {
if (preferredColorScheme && this.currentColorTheme.type !== preferredColorScheme) {
return this.applyPreferredColorTheme(preferredColorScheme);
}
}
let theme = this.colorThemeRegistry.findThemeBySettingsId(this.settings.colorTheme, undefined);
if (!theme) {
// If the current theme is not available, first make sure setting sync is complete
await this.userDataInitializationService.whenInitializationFinished();
// try to get the theme again, now with a fallback to the default themes
const fallbackTheme = this.currentColorTheme.type === ColorScheme.LIGHT ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
theme = this.colorThemeRegistry.findThemeBySettingsId(this.settings.colorTheme, fallbackTheme);
}
return this.setColorTheme(theme && theme.id, undefined);
};

Expand All @@ -228,7 +234,12 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
if (devThemes.length) {
return this.setFileIconTheme(devThemes[0].id, ConfigurationTarget.MEMORY);
}
const theme = this.fileIconThemeRegistry.findThemeBySettingsId(this.settings.fileIconTheme);
let theme = this.fileIconThemeRegistry.findThemeBySettingsId(this.settings.fileIconTheme);
if (!theme) {
// If the current theme is not available, first make sure setting sync is complete
await this.userDataInitializationService.whenInitializationFinished();
theme = this.fileIconThemeRegistry.findThemeBySettingsId(this.settings.fileIconTheme);
}
return this.setFileIconTheme(theme ? theme.id : DEFAULT_FILE_ICON_THEME_ID, undefined);
};

Expand All @@ -237,7 +248,12 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
if (devThemes.length) {
return this.setProductIconTheme(devThemes[0].id, ConfigurationTarget.MEMORY);
}
const theme = this.productIconThemeRegistry.findThemeBySettingsId(this.settings.productIconTheme);
let theme = this.productIconThemeRegistry.findThemeBySettingsId(this.settings.productIconTheme);
if (!theme) {
// If the current theme is not available, first make sure setting sync is complete
await this.userDataInitializationService.whenInitializationFinished();
theme = this.productIconThemeRegistry.findThemeBySettingsId(this.settings.productIconTheme);
}
return this.setProductIconTheme(theme ? theme.id : DEFAULT_PRODUCT_ICON_THEME_ID, undefined);
};

Expand Down