Add support to run code in Integrated Terminal

formulahendry · Oct 14, 2016 · aa16c6d · aa16c6d
1 parent aa5180a
commit aa16c6d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "publisher": "formulahendry",
     "icon": "images/logo.png",
     "engines": {
-        "vscode": "^1.0.0"
+        "vscode": "^1.6.0"
     },
     "categories": [
         "Languages",
@@ -152,6 +152,11 @@
                     "type": "boolean",
                     "default": true,
                     "description": "Whether to show extra execution message like [Running] ... and [Done] ..."
+                },
+                "code-runner.runInTerminal": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Whether to run code in Integrated Terminal"
                 }
             }
         },

diff --git a/src/codeManager.ts b/src/codeManager.ts
@@ -9,6 +9,7 @@ const TmpDir = os.tmpdir();
 
 export class CodeManager {
     private _outputChannel: vscode.OutputChannel;
+    private _terminal: vscode.Terminal;
     private _isRunning: boolean;
     private _process;
     private _codeFile: string;
@@ -20,9 +21,14 @@ export class CodeManager {
 
     constructor() {
         this._outputChannel = vscode.window.createOutputChannel('Code');
+        this._terminal = null;
         this._appInsightsClient = new AppInsightsClient();
     }
 
+    public onDidCloseTerminal(): void {
+        this._terminal = null;
+    }
+
     public run(languageId: string = null): void {
         if (this._isRunning) {
             vscode.window.showInformationMessage('Code is already running!');
@@ -167,18 +173,35 @@ export class CodeManager {
     }
 
     private executeCommand(executor: string) {
+        if (this._config.get<boolean>('runInTerminal')) {
+            this.executeCommandInTerminal(executor);
+        } else {
+            this.executeCommandInOutputChannel(executor);
+        }
+    }
+
+    private executeCommandInTerminal(executor: string) {
+        if (this._terminal === null) {
+            this._terminal = vscode.window.createTerminal('Code');
+        }
+        this._terminal.show();
+        let command = executor + ' \"' + this._codeFile + '\"';
+        this._terminal.sendText(command);
+    }
+
+    private executeCommandInOutputChannel(executor: string) {
         this._isRunning = true;
         let clearPreviousOutput = this._config.get<boolean>('clearPreviousOutput');
         if (clearPreviousOutput) {
             this._outputChannel.clear();
         }
-        let showExecutionMessage = this._config.get<boolean>('showExecutionMessage');        
+        let showExecutionMessage = this._config.get<boolean>('showExecutionMessage');
         this._outputChannel.show();
         let exec = require('child_process').exec;
         let command = executor + ' \"' + this._codeFile + '\"';
         if (showExecutionMessage) {
             this._outputChannel.appendLine('[Running] ' + command);
-        } 
+        }
         this._appInsightsClient.sendEvent(executor);
         let startTime = new Date();
         this._process = exec(command, { cwd: this._cwd });

diff --git a/src/extension.ts b/src/extension.ts
@@ -8,6 +8,10 @@ export function activate(context: vscode.ExtensionContext) {
 
     let codeManager = new CodeManager();
 
+    vscode.window.onDidCloseTerminal(() => {
+        codeManager.onDidCloseTerminal();
+    });
+
     let run = vscode.commands.registerCommand('code-runner.run', () => {
         codeManager.run();
     });