Refactor status bars

src/configReader.ts

@@ -0,0 +1,59 @@
+import { workspace, WorkspaceConfiguration } from 'vscode';
+
+export interface ColorsConfig {
+    disconnected: string,
+    launching: string,
+    connected: string,
+    typeStatus: string,
+    active: string,
+    inactive: string,
+    error: string
+}
+
+export class ConfigReader {
+    private changeEventDisposable;
+    constructor() {
+        this.changeEventDisposable = workspace.onDidChangeConfiguration(configChange => {
+            if(configChange.affectsConfiguration("calva.statusColor")){
+                this._colors = this.readColorConfig();
+            }
+        });
+    }
+
+    private _colors: ColorsConfig;
+
+    get colors() {
+        if(this._colors === undefined){
+            this._colors = this.readColorConfig();
+        }
+        return this._colors;
+    }
+
+    private readColorConfig(): ColorsConfig {
+        let colorConfig = workspace.getConfiguration('calva.statusColor');
+        return {
+            disconnected: this.colorValue("disconnectedColor", colorConfig),
+            launching: this.colorValue("launchingColor", colorConfig),
+            // TODO: Fix config typo
+            connected: this.colorValue("connectedSatusColor", colorConfig),
+            typeStatus: this.colorValue("typeStatusColor", colorConfig),
+            // TODO: Create config entries
+            active: "white",
+            inactive: "#b3b3b3",
+            error: "#FF2D00"
+        }
+    }
+
+    private colorValue(section: string, currentConf: WorkspaceConfiguration):string {
+        let { defaultValue, globalValue, workspaceFolderValue, workspaceValue} = currentConf.inspect(section);
+        return workspaceFolderValue || workspaceValue || globalValue || defaultValue;
+    }
+
+    dispose() {
+        this.changeEventDisposable.dispose();
+    }
+}
+
+// TODO: This should be somewhere else
+const configReader = new ConfigReader();
+export default configReader;

src/extension.ts

@@ -1,4 +1,5 @@
 import * as vscode from 'vscode';
+import configReader from "./configReader";
 import * as paredit from "./paredit/extension";
 import * as fmt from "./calva-fmt/src/extension";
 import * as highlight from "./highlight/src/extension";
@@ -54,6 +55,8 @@ function onDidOpen(document) {
 
 
 function activate(context: vscode.ExtensionContext) {
+    context.subscriptions.push(configReader);
+
     state.cursor.set('analytics', new Analytics(context));
     state.analytics().logPath("/start").logEvent("LifeCycle", "Started").send();
 

src/paredit/statusbar.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { window, StatusBarAlignment, StatusBarItem } from 'vscode';
-import statusbar from '../statusbar';
+import configReader from "../configReader";
 import * as paredit from './extension';
 
 export class StatusBar {
@@ -22,15 +22,14 @@ export class StatusBar {
 
         paredit.onPareditKeyMapChanged((keymap) => {
             this.keyMap = keymap;
-        }) 
+        })
     }
 
     get keyMap() {
         return this._keyMap;
     }
 
     set keyMap(keymap: String) {
-
         switch (keymap.trim().toLowerCase()) {
             case 'original':
                 this._keyMap = 'original';
@@ -62,10 +61,11 @@ export class StatusBar {
     set enabled(value: Boolean) {
         this._enabled = value;
 
+        // NOTE: Changes to color config are not picked up
         if (this._enabled) {
-            this._toggleBarItem.color = statusbar.color.active;
+            this._toggleBarItem.color = configReader.colors.active;
         } else {
-            this._toggleBarItem.color = statusbar.color.inactive;
+            this._toggleBarItem.color = configReader.colors.inactive;
         }
     }
 
@@ -84,4 +84,4 @@ export class StatusBar {
     dispose() {
         this._toggleBarItem.dispose();
     }
-}
+}

src/state.ts

@@ -95,6 +95,7 @@ function _trimAliasName(name: string): string {
     return name.replace(/^[\s,:]*/, "").replace(/[\s,:]*$/, "")
 }
 
+// TODO: Refactor config reader to provide all config values
 // TODO find a way to validate the configs
 function config() {
     let configOptions = vscode.workspace.getConfiguration('calva');

src/statusbar.ts → src/statusbar/index.ts

@@ -1,34 +1,22 @@
 import * as vscode from 'vscode';
-import { activeReplWindow } from './repl-window';
-import * as state from './state';
-import * as util from './utilities';
+import { activeReplWindow } from '../repl-window';
+import configReader from "../configReader";
+import * as state from '../state';
+import * as util from '../utilities';
 
 const connectionStatus = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
 const typeStatus = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
 const cljsBuildStatus = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
 const prettyPrintToggle = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
-const color = {
-    active: "white",
-    inactive: "#b3b3b3"
-};
-
-function colorValue(section: string, currentConf: vscode.WorkspaceConfiguration):string {
-    let { defaultValue, globalValue, workspaceFolderValue, workspaceValue} = currentConf.inspect(section);
-
-    return workspaceFolderValue || workspaceValue || globalValue || defaultValue;
-}
 
 function update() {
-
-    let currentConf = vscode.workspace.getConfiguration('calva.statusColor');
+    const color = configReader.colors;
 
     let current = state.deref(),
         doc = util.getDocument({}),
         fileType = util.getFileType(doc),
         cljsBuild = current.get('cljsBuild');
 
-    //let disconnectedColor = "rgb(192,192,192)";
-
     const pprint = state.config().prettyPrintingOptions.enabled;
     prettyPrintToggle.text = "pprint";
     prettyPrintToggle.color = pprint ? color.active : color.inactive;
@@ -38,7 +26,7 @@ function update() {
     typeStatus.command = null;
     typeStatus.text = "Disconnected";
     typeStatus.tooltip = "No active REPL session";
-    typeStatus.color = colorValue("disconnectedColor", currentConf);
+    typeStatus.color = color.disconnected;
 
     connectionStatus.command = null;
     connectionStatus.tooltip = "REPL connection status";
@@ -49,10 +37,10 @@ function update() {
 
     if (current.get('connected')) {
         connectionStatus.text = "nREPL $(zap)";
-        connectionStatus.color = colorValue("connectedSatusColor", currentConf);
+        connectionStatus.color = color.connected;
         connectionStatus.tooltip = `nrepl://${current.get('hostname')}:${current.get('port')} (Click to reset connection)`;
         connectionStatus.command = "calva.jackInOrConnect";
-        typeStatus.color = colorValue("typeStatusColor", currentConf);
+        typeStatus.color = color.typeStatus;
         if (fileType == 'cljc' && util.getREPLSessionType() !== null && !activeReplWindow()) {
             typeStatus.text = "cljc/" + util.getREPLSessionType()
             if (util.getSession('clj') !== null && util.getSession('cljs') !== null) {
@@ -76,7 +64,7 @@ function update() {
             }
         }
     } else if (util.getLaunchingState()) {
-        connectionStatus.color = colorValue("launchingColor", currentConf);
+        connectionStatus.color = color.launching;
         connectionStatus.text = "Launching REPL using " + util.getLaunchingState();
         connectionStatus.tooltip = "Click to interrupt jack-in or Connect to REPL Server";
         connectionStatus.command = "calva.disconnect";
@@ -87,7 +75,7 @@ function update() {
     } else {
         connectionStatus.text = "nREPL $(zap)";
         connectionStatus.tooltip = "Click to jack-in or Connect to REPL Server";
-        connectionStatus.color = colorValue("disconnectedColor", currentConf);
+        connectionStatus.color = color.disconnected;
         connectionStatus.command = "calva.jackInOrConnect";
     }
 
@@ -102,6 +90,5 @@ function update() {
 }
 
 export default {
-    update,
-    color
-};
+    update
+}