Cleaned up statusbar code

Author: mikecentola

src/util/configuration/config.ts

@@ -7,8 +7,6 @@ import { ConfigurationChangeEvent, ConfigurationScope, Event, EventEmitter, Exte
 import { constants } from '../constants';
 import { Logger } from '../logger';
 export class Config {
-    // private _config: WorkspaceConfiguration;
-
     private _onDidChange = new EventEmitter<ConfigurationChangeEvent>();
     get onDidChange(): Event<ConfigurationChangeEvent> {
         return this._onDidChange.event;
@@ -18,25 +16,14 @@ export class Config {
         context.subscriptions.push(workspace.onDidChangeConfiguration(cfg.onConfigurationChanged, cfg));
     }
 
-    // Constructor
-    constructor() {
-        // Static reference to configuration
-        // this._config = workspace.getConfiguration(constants.configId);
-    }
-
     private onConfigurationChanged(e: ConfigurationChangeEvent) {
         Logger.log('Configuration changed...');
 
         this._onDidChange.fire(e);
     }
 
-    private reloadConfig() {
-        // this._config = workspace.getConfiguration(constants.configId);
-    }
-
     // Get Parameter
     getParam<T>(param: string, scope?: ConfigurationScope, defaultValue?: T): T | undefined {
-        // this.reloadConfig();
         return defaultValue === undefined
             ? workspace.getConfiguration(constants.configId, scope).get<T>(param)
             : workspace.getConfiguration(constants.configId, scope).get<T>(param, defaultValue);
@@ -51,14 +38,10 @@ export class Config {
             return false;
         }
 
-        // this.reloadConfig();
-
         return this.getParam(param) === value;
     }
 
     changed(e: ConfigurationChangeEvent, section: string, scope?: ConfigurationScope): boolean {
-        // const section: string = <string>args[0];
-
         return e.affectsConfiguration(`${constants.configId}.${section}`, scope) ?? true;
     }
 }

src/util/configuration/defaults.ts

@@ -5,6 +5,7 @@
 
 'use strict';
 
+import { StatusBarAlignment } from 'vscode';
 import { LineNumberFrequency } from '../lineNumberer';
 import { TraceLevel } from '../logger';
 
@@ -18,7 +19,7 @@ interface GCodeConfiguration {
 
         statusBars: {
             enabled: boolean;
-            alignment: 'left' | 'right';
+            alignment: StatusBarAlignment;
         };
 
         units: 'Auto' | 'Inch' | 'Metric';
@@ -58,7 +59,7 @@ export const defaults: GCodeConfiguration = {
         },
         statusBars: {
             enabled: true,
-            alignment: 'left',
+            alignment: StatusBarAlignment.Left,
         },
         units: 'Auto',
         outputLevel: TraceLevel.Verbose,

src/util/statusBar.ts

@@ -15,6 +15,7 @@ import {
 } from 'vscode';
 import { UtilCommands } from './commands/common';
 import { configuration } from './configuration/config';
+import { defaults } from './configuration/defaults';
 import { Logger } from './logger';
 
 export interface StatusBars {
@@ -26,6 +27,11 @@ export interface StatusBars {
 
 export type StatusBar = keyof StatusBars;
 
+const sb = {
+    enabled: 'general.statusBars.enabled',
+    aligh: 'general.statusBars.alignment',
+};
+
 export class StatusBarControl implements Disposable {
     private _enabled: boolean;
     private _align: StatusBarAlignment;
@@ -37,7 +43,7 @@ export class StatusBarControl implements Disposable {
     constructor(private context: ExtensionContext) {
         this._disposable = Disposable.from(configuration.onDidChange(this.onConfigurationChanged, this));
 
-        this._enabled = <boolean>configuration.getParam('general.statusBars.enabled');
+        this._enabled = configuration.getParam(sb.enabled) ?? defaults.general.statusBars.enabled;
 
         this._statusBars = {
             treeStatusBar: undefined,
@@ -46,10 +52,7 @@ export class StatusBarControl implements Disposable {
             support: undefined,
         };
 
-        this._align =
-            configuration.getParam('general.statusBars.alignment') === 'Left'
-                ? StatusBarAlignment.Left
-                : StatusBarAlignment.Right;
+        this._align = configuration.getParam(sb.aligh) ?? defaults.general.statusBars.alignment;
 
         if (this._enabled) {
             Logger.log('Loading Status Bars...');
@@ -74,7 +77,7 @@ export class StatusBarControl implements Disposable {
     }
 
     private onConfigurationChanged(e: ConfigurationChangeEvent) {
-        if (configuration.changed(e, 'general.statusBars.enabled')) {
+        if (configuration.changed(e, sb.enabled)) {
             if (this._enabled) {
                 // Disable & Dispose
                 Object.keys(this._statusBars).forEach(key => {
@@ -92,12 +95,9 @@ export class StatusBarControl implements Disposable {
                 this.showStatusBars();
             }
 
-            this._enabled = <boolean>configuration.getParam('general.statusBars.enabled');
+            this._enabled = configuration.getParam(sb.enabled) ?? defaults.general.statusBars.enabled;
 
-            this._align =
-                configuration.getParam('general.statusBars.alignment') === 'Left'
-                    ? StatusBarAlignment.Left
-                    : StatusBarAlignment.Right;
+            this._align = configuration.getParam(sb.aligh) ?? defaults.general.statusBars.alignment;
         } else {
             return;
         }