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();
 
@@ -104,7 +107,9 @@ function activate(context: vscode.ExtensionContext) {
 
     chan.appendLine("Calva activated.");
 
-    status.update();
+    const statusbars = statusbar.init();
+    context.subscriptions.push(...statusbars);
+    util.updateREPLSessionType();
 
     // COMMANDS
     context.subscriptions.push(vscode.commands.registerCommand('calva.jackInOrConnect', jackIn.calvaJackInOrConnect));
@@ -159,7 +164,7 @@ function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(vscode.languages.registerHoverProvider(state.documentSelector, new HoverProvider()));
     context.subscriptions.push(vscode.languages.registerDefinitionProvider(state.documentSelector, new DefinitionProvider()));
     context.subscriptions.push(vscode.languages.registerSignatureHelpProvider(state.documentSelector, new CalvaSignatureHelpProvider(),  ' ', ' '));
-        
+
 
     vscode.workspace.registerTextDocumentContentProvider('jar', new TextDocumentContentProvider());
 

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/cljs-build.ts

@@ -0,0 +1,44 @@
+import { window, StatusBarAlignment, StatusBarItem } from "vscode";
+import * as state from '../state';
+import * as util from '../utilities';
+
+export class CljsBuildStatusBarItem {
+    private statusBarItem: StatusBarItem;
+    constructor(alignment: StatusBarAlignment) {
+        this.statusBarItem = window.createStatusBarItem(alignment);
+        this.statusBarItem.command = "calva.switchCljsBuild";
+    }
+
+    update() {
+        const current = state.deref();
+        const cljsBuild = current.get('cljsBuild');
+        const connected = current.get("connected");
+        const sessionType = util.getREPLSessionType();
+
+        let text = null;
+        let tooltip = null;
+
+        if(connected && sessionType === 'cljs' && state.extensionContext.workspaceState.get('cljsReplTypeHasBuilds')) {
+            if (cljsBuild !== null) {
+                this.statusBarItem.text = cljsBuild;
+                this.statusBarItem.tooltip = "Click to switch CLJS build REPL";
+            } else {
+                this.statusBarItem.text = "no build connected"
+                this.statusBarItem.tooltip = "Click to connect to a CLJS build REPL";
+            }
+        }
+
+        this.statusBarItem.text = text;
+        this.statusBarItem.tooltip = tooltip;
+
+        if(this.statusBarItem.text) {
+            this.statusBarItem.show();
+        } else {
+            this.statusBarItem.hide();
+        }
+    }
+
+    dispose() {
+        this.statusBarItem.dispose();
+    }
+}

src/statusbar/connection.ts

@@ -0,0 +1,49 @@
+import { window, StatusBarAlignment, StatusBarItem } from "vscode";
+import configReader from "../configReader";
+import * as state from '../state';
+import * as util from '../utilities';
+
+export class ConnectionStatusBarItem {
+    private statusBarItem: StatusBarItem;
+
+    constructor(alignment: StatusBarAlignment) {
+        this.statusBarItem = window.createStatusBarItem(alignment);
+    }
+
+    update() {
+        let current = state.deref();
+        const colors = configReader.colors;
+
+        let text = "nREPL $(zap)";
+        let tooltip = "Click to jack-in or connect";
+        let command = "calva.jackInOrConnect";
+        let color = colors.disconnected;
+
+        if (current.get('connected')) {
+            text = "nREPL $(zap)";
+            color = colors.connected;
+            tooltip = `nrepl://${current.get('hostname')}:${current.get('port')} (Click to reset connection)`;
+        } else if (util.getLaunchingState()) {
+            color = colors.launching;
+            text = "Launching REPL using " + util.getLaunchingState();
+            tooltip = "Click to interrupt jack-in or Connect to REPL Server";
+            command = "calva.disconnect";
+        } else if (util.getConnectingState()) {
+            color = colors.launching;
+            text = "nREPL - trying to connect";
+            tooltip = "Click to interrupt jack-in or Connect to REPL Server";
+            command = "calva.disconnect";
+        }
+
+        this.statusBarItem.text = text;
+        this.statusBarItem.tooltip = tooltip;
+        this.statusBarItem.command = command;
+        this.statusBarItem.color = color;
+
+        this.statusBarItem.show();
+    }
+
+    dispose() {
+        this.statusBarItem.dispose();
+    }
+}