refactor and improvement

Author: Meowcolm024

CHANGELOG.md

@@ -9,6 +9,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 - fix typo
 - use absolute path for GHCi
 - add activation event (in a stack project)
+- change behavior of `Load GHCi` when not in a Haskell file
 
 ## [0.1.2]
 

README.md

@@ -17,11 +17,9 @@ Required: `ghc` and `stack`.
 
 The following configurations are available:
 
-* `runner2.stackPath`: path for `stack` executable (default `stack`)
+* `runner2.stackPath`: path for stack executable (default `stack`)
 * `runner2.stackRepl`: use `stack repl` instead of `ghci`, you may like to turn it on in stack projects (default `false`)
-* `runner2.stackRun`: show `stack run` button (default `false`)
-
-> You need to reload the extension after updating config
+* `runner2.stackRun`: show "Stack Run" button, *reload required* (default `false`)
 
 ## Release Notes
 

src/config.ts

@@ -12,12 +12,11 @@ export function getConfig(): Config {
     function getConfOption<T>(name: string, def: T): T {
         return option.option<T>(config.get(name)).orelse(def);
     }
-
-    let stack = getConfOption<string>("runner2.stackPath", "stack");
-    let repl = getConfOption<boolean>("runner2.stackRepl", false);
+    let stack = getConfOption("runner2.stackPath", "stack");
+    let repl = getConfOption("runner2.stackRepl", false);
     return {
         stackPath: stack,
         ghciTool: repl ? (stack + " repl") : "ghci",
-        enableStackRun: getConfOption<boolean>("runner2.stackRun", false)
+        enableStackRun: getConfOption("runner2.stackRun", false)
     };
 }

src/extension.ts

@@ -6,60 +6,52 @@ import * as conf from './config';
 import * as util from './util';
 
 // configuration
-const config = conf.getConfig();
-
+var config: conf.Config = conf.getConfig();
+// current terminal
 var terminal: option.Option<vscode.Terminal> = option.none();
 
-// this method is called when your extension is activated
-// your extension is activated the very first time the command is executed
+// I'm not sure if we can do `async` here
 export async function activate(context: vscode.ExtensionContext) {
     // setup terminal
     vscode.window.onDidChangeActiveTerminal(e => { terminal = option.option(e); });
+    // update config
+    vscode.workspace.onDidChangeConfiguration(e => { config = conf.getConfig(); });
 
     // check stack project
     let stackproj = (await vscode.workspace.findFiles("stack.yaml")).length > 0;
 
     // GHCi command
     let ghci = vscode.commands.registerCommand("runner2.ghci", () => {
-        let doc = option.option(vscode.window.activeTextEditor).map(e => e.document);
-        let filename = doc
-            .flatmap(d => util.isHaskell(d) ? option.some(d) : option.none<vscode.TextDocument>())
+        let filename = option.option(vscode.window.activeTextEditor)
+            .map(e => e.document)
+            .flatmap(d => option.filterOption(util.isHaskell, d))
             .map(s => `\"${s.fileName}\"`);
         // currently at GHCi
         if (terminal.map(t => t.name).contains("GHCi")) {
             filename.map(f => terminal.unwrap().sendText(stackproj ? ":r" : (":l " + f)));
         } else {
-            filename.map(f => {
-                let t = vscode.window.createTerminal("GHCi");
-                t.sendText(config.ghciTool + " " + (stackproj ? "" : f));
-                t.show();
-            });
+            let term = vscode.window.createTerminal("GHCi");
+            term.sendText(config.ghciTool + " " + (stackproj ? "" : filename.orelse("")));
+            term.show();
         }
     });
     context.subscriptions.push(ghci);
 
     // stack project commands
-    context.subscriptions.push(vscode.commands.registerCommand(
-        "runner2.stacktest", util.simplTerm("Stack Test", config.stackPath + " test")));
-    context.subscriptions.push(vscode.commands.registerCommand(
-        "runner2.stackbuild", util.simplTerm("Stack Build", config.stackPath + " build")));
-    context.subscriptions.push(vscode.commands.registerCommand(
-        "runner2.stackrun", util.simplTerm("Stack Run", config.stackPath + " run")));
+    util.registerSimplTerm(context, "runner2.stacktest", "Stack Test", config.stackPath + " test");
+    util.registerSimplTerm(context, "runner2.stackbuild", "Stack Build", config.stackPath + " build");
+    util.registerSimplTerm(context, "runner2.stackrun", "Stack Run", config.stackPath + " run");
 
     // button setup
-    context.subscriptions.push(util.statButton("Load GHCi", "runner2.ghci"));
+    util.resgisterStatButton(context, "Load GHCi", "runner2.ghci");
     // button for stack project
     if (stackproj) {
-        context.subscriptions.push(
-            util.statButton("Stack Build", "runner2.stackbuild"),
-            util.statButton("Stack Test", "runner2.stacktest")
-        );
+        util.resgisterStatButton(context, "Stack Build", "runner2.stackbuild");
+        util.resgisterStatButton(context, "Stack Test", "runner2.stacktest");
         if (config.enableStackRun) {
-            context.subscriptions.push(
-                util.statButton("Stack Run", "runner2.stackrun"));
+            util.resgisterStatButton(context, "Stack Run", "runner2.stackrun");
         }
     }
-
 }
 
 // this method is called when your extension is deactivated

src/option.ts

@@ -29,6 +29,7 @@ class Some<T> implements Option<T> {
     }
 }
 
+// note: it should be Option[Nothing] instead of Option[Any]
 class None implements Option<any> {
     isEmpty: boolean;
     constructor() {
@@ -64,3 +65,7 @@ export function some<T>(u: T): Option<T> {
 export function none<T>(): Option<T> {
     return new None;
 }
+
+export function filterOption<T>(p: (v: T) => Boolean, v: T): Option<T> {
+    return p(v) ? new Some(v) : new None;
+}

src/util.ts

@@ -1,21 +1,27 @@
 import * as vscode from 'vscode';
 
 // create status bar button
-export function statButton(name: string, command: string, align = vscode.StatusBarAlignment.Left, priority = 10) {
+export function resgisterStatButton(
+    context: vscode.ExtensionContext,
+    name: string,
+    command: string,
+    align = vscode.StatusBarAlignment.Left,
+    priority = 10) {
+
     let stat = vscode.window.createStatusBarItem(align, priority);
     stat.text = name;
     stat.command = command;
     stat.show();
-    return stat;
+    context.subscriptions.push(stat);
 }
 
 // create a terminal and send command
-export function simplTerm(name: string, cmd: string) {
-    return () => {
+export function registerSimplTerm(context: vscode.ExtensionContext, command: string, name: string, cmd: string) {
+    context.subscriptions.push(vscode.commands.registerCommand(command, () => {
         let t = vscode.window.createTerminal(name);
         t.sendText(cmd);
         t.show();
-    };
+    }));
 }
 
 // is a haskell file