Fetch settings in initializeGlobalDependent (#4307)

compiler-explorer · Nov 25, 2022 · f1a4f16 · f1a4f16
1 parent ec44737
commit f1a4f16
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/static/panes/compiler.ts b/static/panes/compiler.ts
@@ -39,7 +39,7 @@ import * as monacoConfig from '../monaco-config';
 import * as TimingWidget from '../widgets/timing-info-widget';
 import {CompilerPicker} from '../compiler-picker';
 import {CompilerService} from '../compiler-service';
-import {Settings, SiteSettings} from '../settings';
+import {SiteSettings} from '../settings';
 import * as LibUtils from '../lib-utils';
 import {getAssemblyDocumentation} from '../api/api';
 import {MonacoPane} from './pane';
@@ -48,7 +48,7 @@ import {MonacoPaneState} from './pane.interfaces';
 import {Hub} from '../hub';
 import {Container} from 'golden-layout';
 import {CompilerState} from './compiler.interfaces';
-import {ComponentConfig, GccDumpOptions, ToolViewState} from '../components.interfaces';
+import {ComponentConfig, ToolViewState} from '../components.interfaces';
 import {FiledataPair} from '../multifile-service';
 import {LanguageLibs} from '../options.interfaces';
 import {CompilerFilters} from '../../types/features/filters.interfaces';
@@ -320,7 +320,6 @@ export class Compiler extends MonacoPane<monaco.editor.IStandaloneCodeEditor, Co
         super(hub, container, state);
 
         this.id = state.id || hub.nextCompilerId();
-        this.settings = Settings.getStoredSettings();
 
         this.infoByLang = {};
         this.deferCompiles = hub.deferred;

diff --git a/static/panes/diff.ts b/static/panes/diff.ts
@@ -260,7 +260,8 @@ export class Diff extends MonacoPane<monaco.editor.IStandaloneDiffEditor, DiffSt
 
     override createEditor(editorRoot: HTMLElement) {
         return monaco.editor.createDiffEditor(editorRoot, {
-            fontFamily: 'Consolas, "Liberation Mono", Courier, monospace',
+            fontFamily: this.settings.editorsFFont,
+            fontLigatures: this.settings.editorsFLigatures,
             scrollBeyondLastLine: true,
             readOnly: true,
         });
@@ -272,7 +273,7 @@ export class Diff extends MonacoPane<monaco.editor.IStandaloneDiffEditor, DiffSt
         this.updateState();
     }
 
-    onCompileResult(id: number | string, compiler: CompilerInfo, result: CompilationResult) {
+    override onCompileResult(id: number | string, compiler: CompilerInfo, result: CompilationResult) {
         // both sides must be updated, don't be tempted to rewrite this as
         // var changes = lhs.update() || rhs.update();
         const lhsChanged = this.lhs.update(id, compiler, result);
@@ -322,9 +323,7 @@ export class Diff extends MonacoPane<monaco.editor.IStandaloneDiffEditor, DiffSt
         if (!compiler) return;
         options = options || '';
         let name = compiler.name + ' ' + options;
-        // TODO: selectize doesn't play nicely with CSS tricks for truncation; this is the best I can do
-        // There's a plugin at: http://www.benbybenjacobs.com/blog/2014/04/09/no-wrap-plugin-for-selectize-dot-js
-        // but it doesn't look easy to integrate.
+        // TODO: tomselect doesn't play nicely with CSS tricks for truncation; this is the best I can do
         const maxLength = 30;
         if (name.length > maxLength - 3) name = name.substr(0, maxLength - 3) + '...';
         this.compilers[id] = {

diff --git a/static/panes/editor.ts b/static/panes/editor.ts
@@ -500,7 +500,6 @@ export class Editor extends MonacoPane<monaco.editor.IStandaloneCodeEditor, Edit
         super.initializeGlobalDependentProperties();
 
         this.httpRoot = window.httpRoot;
-        this.settings = Settings.getStoredSettings();
         this.langKeys = Object.keys(languages);
     }
 
@@ -1207,7 +1206,7 @@ export class Editor extends MonacoPane<monaco.editor.IStandaloneCodeEditor, Edit
         }
     }
 
-    override onSettingsChange(newSettings: SiteSettings | Record<string, never>): void {
+    override onSettingsChange(newSettings: SiteSettings): void {
         const before = this.settings;
         const after = newSettings;
         this.settings = {...newSettings};

diff --git a/static/panes/pane.ts b/static/panes/pane.ts
@@ -29,7 +29,7 @@ import * as monaco from 'monaco-editor';
 import {MonacoPaneState, PaneCompilerState, PaneState} from './pane.interfaces';
 
 import {FontScale} from '../widgets/fontscale';
-import {SiteSettings} from '../settings';
+import {Settings, SiteSettings} from '../settings';
 import * as utils from '../utils';
 
 import {PaneRenaming} from '../widgets/pane-renaming';
@@ -50,7 +50,7 @@ export abstract class Pane<S> {
     protected hub: Hub;
     eventHub: EventHub;
     isAwaitingInitialResults = false;
-    settings: SiteSettings | Record<string, never> = {};
+    settings: SiteSettings;
     paneName: string | undefined = undefined;
     paneRenaming: PaneRenaming;
 
@@ -119,7 +119,9 @@ export abstract class Pane<S> {
 
     initializeDefaults(): void {}
 
-    initializeGlobalDependentProperties(): void {}
+    initializeGlobalDependentProperties(): void {
+        this.settings = Settings.getStoredSettings();
+    }
 
     initializeStateDependentProperties(state: S): void {}
 

diff --git a/static/panes/tool-input-view.ts b/static/panes/tool-input-view.ts
@@ -45,8 +45,6 @@ export class ToolInputView extends MonacoPane<monaco.editor.IStandaloneCodeEdito
         if ((state as any).compilerId) state.id = (state as any).compilerId;
         super(hub, container, state);
 
-        this.settings = Settings.getStoredSettings();
-
         this._toolId = state.toolId;
         this._toolName = state.toolName;
         // TODO according to TS typing this should always be true