Added config and build type to status bar

Author: WebFreak001

package.json

@@ -92,6 +92,10 @@
 				"command": "code-d.switchConfiguration",
 				"title": "code-d: Switch Configuration"
 			},
+			{
+				"command": "code-d.switchBuildType",
+				"title": "code-d: Switch Build Type"
+			},
 			{
 				"command": "code-d.killServer",
 				"title": "code-d: Kill DCD Server"

src/extension.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import { D_MODE } from "./dmode"
 import { WorkspaceD } from "./workspace-d"
+import * as statusbar from "./statusbar"
 
 let diagnosticCollection: vscode.DiagnosticCollection;
 
@@ -21,6 +22,7 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.languages.registerDefinitionProvider(D_MODE, workspaced));
 	context.subscriptions.push(vscode.languages.registerDocumentFormattingEditProvider(D_MODE, workspaced));
 	context.subscriptions.push(workspaced);
+	context.subscriptions.push(statusbar.setup(workspaced));
 
 	vscode.languages.setLanguageConfiguration(D_MODE.language, {
 		__electricCharacterSupport: {
@@ -69,6 +71,16 @@ export function activate(context: vscode.ExtensionContext) {
 		vscode.window.showErrorMessage("Failed to switch configuration. See console for details.");
 	});
 
+	vscode.commands.registerCommand("code-d.switchBuildType", () => {
+		vscode.window.showQuickPick(workspaced.listBuildTypes()).then((config) => {
+			if (config)
+				workspaced.setBuildType(config);
+		});
+	}, (err) => {
+		console.error(err);
+		vscode.window.showErrorMessage("Failed to switch build type. See console for details.");
+	});
+
 	vscode.commands.registerCommand("code-d.killServer", () => {
 		workspaced.killServer().then((res) => {
 			vscode.window.showInformationMessage("Killed DCD-Server", "Restart").then((pick) => {

src/statusbar.ts

@@ -0,0 +1,62 @@
+import * as vscode from 'vscode';
+import { D_MODE } from "./dmode"
+import { WorkspaceD } from "./workspace-d"
+
+export function setup(workspaced: WorkspaceD): vscode.Disposable {
+	let subscriptions: vscode.Disposable[] = [];
+
+	subscriptions.push(new ConfigSelector(workspaced));
+	subscriptions.push(new BuildSelector(workspaced));
+
+	return vscode.Disposable.from(...subscriptions);
+}
+
+class ConfigSelector implements vscode.Disposable {
+	subscriptions: vscode.Disposable[] = [];
+	private item: vscode.StatusBarItem;
+
+	constructor(private workspaced: WorkspaceD) {
+		workspaced.once("dub-ready", this.create.bind(this));
+	}
+
+	private create() {
+		this.item = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 2);
+		this.item.command = "code-d.switchConfiguration";
+		this.item.show();
+		this.workspaced.on("configuration-change", config => {
+			this.item.text = config;
+		});
+		this.workspaced.getConfiguration().then(config => {
+			this.item.text = config;
+		});
+	}
+
+	dispose() {
+		vscode.Disposable.from(...this.subscriptions).dispose();
+	}
+}
+
+class BuildSelector implements vscode.Disposable {
+	subscriptions: vscode.Disposable[] = [];
+	private item: vscode.StatusBarItem;
+
+	constructor(private workspaced: WorkspaceD) {
+		workspaced.once("dub-ready", this.create.bind(this));
+	}
+
+	private create() {
+		this.item = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1);
+		this.item.command = "code-d.switchBuildType";
+		this.item.show();
+		this.workspaced.on("build-type-change", config => {
+			this.item.text = config;
+		});
+		this.workspaced.getBuildType().then(config => {
+			this.item.text = config;
+		});
+	}
+
+	dispose() {
+		vscode.Disposable.from(...this.subscriptions).dispose();
+	}
+}

src/workspace-d.ts

@@ -278,10 +278,16 @@ export class WorkspaceD extends EventEmitter implements
 		return this.request({ cmd: "dub", subcmd: "list:configurations" });
 	}
 
+	getConfiguration(): Thenable<string> {
+		return this.request({ cmd: "dub", subcmd: "get:configuration" });
+	}
+
 	setConfiguration(config: string) {
 		this.request({ cmd: "dub", subcmd: "set:configuration", configuration: config }).then((success) => {
-			if (success)
+			if (success) {
 				this.request({ cmd: "dub", subcmd: "list:import" }).then(console.log);
+				this.emit("configuration-change", config);
+			}
 			else
 				vscode.window.showInformationMessage("No import paths available for this project. Autocompletion could be broken!", "Switch Configuration").then((s) => {
 					if (s == "Switch Configuration") {
@@ -291,6 +297,29 @@ export class WorkspaceD extends EventEmitter implements
 		});
 	}
 
+	listBuildTypes(): Thenable<string[]> {
+		return this.request({ cmd: "dub", subcmd: "list:build-types" });
+	}
+
+	getBuildType(): Thenable<string> {
+		return this.request({ cmd: "dub", subcmd: "get:build-type" });
+	}
+
+	setBuildType(config: string) {
+		this.request({ cmd: "dub", subcmd: "set:build-type", "build-type": config }).then((success) => {
+			if (success) {
+				this.request({ cmd: "dub", subcmd: "list:import" }).then(console.log);
+				this.emit("build-type-change", config);
+			}
+			else
+				vscode.window.showInformationMessage("No import paths available for this build type. Autocompletion could be broken!", "Switch Build Type").then((s) => {
+					if (s == "Switch Build Type") {
+						vscode.commands.executeCommand("code-d.switchBuildType");
+					}
+				});
+		});
+	}
+
 	killServer(): Thenable<any> {
 		if (!this.dcdReady)
 			return new Promise((resolve, reject) => { reject(); });
@@ -338,6 +367,7 @@ export class WorkspaceD extends EventEmitter implements
 		this.request({ cmd: "load", components: ["dub"], dir: this.projectRoot }).then((data) => {
 			console.log("dub is ready");
 			self.dubReady = true;
+			self.emit("dub-ready");
 			self.setupDCD();
 			self.setupDScanner();
 			self.setupDfmt();
@@ -357,6 +387,7 @@ export class WorkspaceD extends EventEmitter implements
 		let self = this;
 		this.request({ cmd: "load", components: ["dscanner"], dir: this.projectRoot, dscannerPath: config().get("dscannerPath", "dscanner") }).then((data) => {
 			console.log("DScanner is ready");
+			self.emit("dscanner-ready");
 			self.dscannerReady = true;
 		});
 	}
@@ -381,6 +412,7 @@ export class WorkspaceD extends EventEmitter implements
 		let self = this;
 		this.request({ cmd: "load", components: ["dfmt"], dir: this.projectRoot, dfmtPath: config().get("dfmtPath", "dfmt") }).then((data) => {
 			console.log("Dfmt is ready");
+			self.emit("dfmt-ready");
 			self.dfmtReady = true;
 		});
 	}
@@ -413,6 +445,7 @@ export class WorkspaceD extends EventEmitter implements
 			this.request({ cmd: "dcd", subcmd: "setup-server" }).then((data) => {
 				this.request({ cmd: "dcd", subcmd: "add-imports", imports: ["/usr/include/dmd/druntime/import", "/usr/include/dmd/phobos"] }).then((data) => {
 					console.log("DCD is ready");
+					this.emit("dcd-ready");
 					this.dcdReady = true;
 				}, (err) => {
 					vscode.window.showErrorMessage("Could not initialize DCD. See console for details!");