live change of theme from preferences

Author: francescospissu

arduino-ide-extension/src/browser/contributions/settings.ts

@@ -32,7 +32,7 @@ export class Settings extends SketchContribution {
           await this.settingsService.update(settings);
           await this.settingsService.save();
         } else {
-          await this.settingsService.reset();
+          await this.settingsService.reset(true);
         }
       },
       isEnabled: () => !this.settingsOpened,

arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx

@@ -589,9 +589,11 @@ export class SettingsComponent extends React.Component<
   ): void => {
     const { selectedIndex } = event.target.options;
     const theme = ThemeService.get().getThemes()[selectedIndex];
-    if (theme) {
-      this.setState({ themeId: theme.id });
+    const prevTheme = ThemeService.get().getCurrentTheme();
+    if (theme && prevTheme) {
+      this.setState({ themeId: theme.id, prevThemeId: prevTheme.id });
     }
+    ThemeService.get().setCurrentTheme(theme.id);
   };
 
   protected languageDidChange = (

arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx

@@ -114,7 +114,7 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
 
     // calling settingsService.reset() in order to reload the settings from the preferenceService
     // and update the UI including changes triggered from the command palette
-    this.settingsService.reset();
+    this.settingsService.reset(false);
 
     this.widget.activate();
   }

arduino-ide-extension/src/browser/dialogs/settings/settings.ts

@@ -46,6 +46,7 @@ export const SHOW_ALL_FILES_SETTING = `${SKETCHBOOK_SETTING}.showAllFiles`;
 export interface Settings {
   editorFontSize: number; // `editor.fontSize`
   themeId: string; // `workbench.colorTheme`
+  prevThemeId: string; // `workbench.prevColorTheme`
   autoSave: Settings.AutoSave; // `files.autoSave`
   quickSuggestions: Record<'other' | 'comments' | 'strings', boolean>; // `editor.quickSuggestions`
 
@@ -123,6 +124,7 @@ export class SettingsService {
       currentLanguage,
       editorFontSize,
       themeId,
+      prevThemeId,
       autoSave,
       quickSuggestions,
       autoScaleInterface,
@@ -144,6 +146,7 @@ export class SettingsService {
           ? 'arduino-theme-dark'
           : 'arduino-theme'
       ),
+      this.preferenceService.get<string>('workbench.prevColorTheme', ''),
       this.preferenceService.get<Settings.AutoSave>(
         AUTO_SAVE_SETTING,
         Settings.AutoSave.DEFAULT_ON
@@ -169,6 +172,7 @@ export class SettingsService {
     return {
       editorFontSize,
       themeId,
+      prevThemeId,
       languages,
       currentLanguage,
       autoSave,
@@ -204,10 +208,14 @@ export class SettingsService {
     }
   }
 
-  async reset(): Promise<void> {
+  async reset(resetFromDialog: boolean): Promise<void> {
+    const prevThemeId = this._settings.prevThemeId;
     const settings = await this.loadSettings();
     await this.update(settings, false);
     this.onDidResetEmitter.fire(this._settings);
+    if (resetFromDialog && prevThemeId) {
+      ThemeService.get().setCurrentTheme(prevThemeId);
+    }
   }
 
   async validate(
@@ -259,6 +267,7 @@ export class SettingsService {
       currentLanguage,
       editorFontSize,
       themeId,
+      prevThemeId,
       autoSave,
       quickSuggestions,
       autoScaleInterface,
@@ -283,6 +292,7 @@ export class SettingsService {
 
     await this.savePreference('editor.fontSize', editorFontSize);
     await this.savePreference('workbench.colorTheme', themeId);
+    await this.savePreference('workbench.prevColorTheme', prevThemeId);
     await this.savePreference(AUTO_SAVE_SETTING, autoSave);
     await this.savePreference('editor.quickSuggestions', quickSuggestions);
     await this.savePreference(AUTO_SCALE_SETTING, autoScaleInterface);