Merge pull request #75 from DudeBro249/feat/run-command

feat(extension): finish run command
srinivasayush · Jun 26, 2021 · fca93cf · fca93cf
2 parents 793e68c + 81df6ab
commit fca93cf
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 60 deletions.
diff --git a/extension/.vscode/launch.json b/extension/.vscode/launch.json
@@ -15,7 +15,6 @@
 			"outFiles": [
 				"${workspaceFolder}/dist/**/*.js"
 			],
-			"preLaunchTask": "${defaultBuildTask}"
 		},
 		{
 			"name": "Extension Tests",

diff --git a/extension/.vscode/tasks.json b/extension/.vscode/tasks.json
@@ -3,22 +3,6 @@
 {
 	"version": "2.0.0",
 	"tasks": [
-		{
-			"type": "npm",
-			"script": "watch",
-			"problemMatcher": [
-                "$ts-webpack-watch",
-                "$tslint-webpack-watch"
-			],
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			}
-		},
 		{
 			"type": "npm",
 			"script": "test-watch",

diff --git a/extension/package-lock.json b/extension/package-lock.json
diff --git a/extension/package.json b/extension/package.json
@@ -10,7 +10,8 @@
     "Other"
   ],
   "activationEvents": [
-    "onCommand:docrunner.init"
+    "onCommand:docrunner.init",
+    "onCommand:docrunner.run"
   ],
   "main": "./dist/extension.js",
   "contributes": {
@@ -19,6 +20,11 @@
         "command": "docrunner.init",
         "category": "Docrunner",
         "title": "Init"
+      },
+      {
+        "command": "docrunner.run",
+        "category": "Docrunner",
+        "title": "Run"
       }
     ]
   },
@@ -48,5 +54,8 @@
     "vscode-test": "^1.5.2",
     "webpack": "^5.38.1",
     "webpack-cli": "^4.7.0"
+  },
+  "dependencies": {
+    "strip-ansi": "^6.0.0"
   }
 }
diff --git a/extension/src/commands/init.ts b/extension/src/commands/init.ts
@@ -1,31 +1,12 @@
 import * as vscode from 'vscode'
-import { streamingRunCommand } from '../utils/command'
+import { runCommandWithProgressOutput } from '../utils/command'
 
 const init = () => {
-    vscode.window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-            title: 'Running docrunner init',
-            cancellable: true,
-        },
-        async (_progress, token) => {
-            token.onCancellationRequested((_event) => {
-                vscode.window.showInformationMessage('Cancelled!')
-            })
-
-            const rootPath = vscode.workspace.workspaceFolders![0].uri.fsPath
-
-            streamingRunCommand('docrunner', ['init'], {
-                onStdout: (data) => {
-                    console.log(data.toString())
-                },
-                onStdErr: (error) => {
-                    console.log(error.toString())
-                },
-                spawnOptions: { cwd: rootPath },
-            })
-        }
-    )
+    runCommandWithProgressOutput('docrunner', ['init'], {
+        location: vscode.ProgressLocation.Notification,
+        title: 'Running docrunner run',
+        cancellable: true,
+    })
 }
 
 export const registerInitCommand = (context: vscode.ExtensionContext) => {

diff --git a/extension/src/commands/run.ts b/extension/src/commands/run.ts
@@ -0,0 +1,16 @@
+import stripAnsi = require('strip-ansi')
+import * as vscode from 'vscode'
+import { runCommandWithProgressOutput } from '../utils/command'
+
+const run = () => {
+    runCommandWithProgressOutput('docrunner', ['run'], {
+        location: vscode.ProgressLocation.Notification,
+        title: 'Running docrunner run',
+        cancellable: true,
+    })
+}
+
+export const registerRunCommand = (context: vscode.ExtensionContext) => {
+    const runCommand = vscode.commands.registerCommand('docrunner.run', run)
+    context.subscriptions.push(runCommand)
+}
diff --git a/extension/src/extension.ts b/extension/src/extension.ts
@@ -1,8 +1,10 @@
 import * as vscode from 'vscode'
 import { registerInitCommand } from './commands/init'
+import { registerRunCommand } from './commands/run'
 
 export function activate(context: vscode.ExtensionContext) {
     registerInitCommand(context)
+    registerRunCommand(context)
 }
 
 // this method is called when your extension is deactivated

diff --git a/extension/src/utils/command.ts b/extension/src/utils/command.ts
@@ -3,6 +3,8 @@ import {
     spawn,
     SpawnOptionsWithoutStdio,
 } from 'child_process'
+import stripAnsi = require('strip-ansi')
+import * as vscode from 'vscode'
 
 interface StreamingRunCommandOptions {
     onStdout: (data: Buffer) => void
@@ -11,7 +13,7 @@ interface StreamingRunCommandOptions {
     spawnOptions: SpawnOptionsWithoutStdio
 }
 
-export const streamingRunCommand = (
+export const runCommandWithOutputCallbacks = (
     entryPoint: string,
     commandArgs: string[],
     options: StreamingRunCommandOptions
@@ -29,3 +31,32 @@ export const streamingRunCommand = (
     }
     return process
 }
+
+export const runCommandWithProgressOutput = (
+    entryPoint: string,
+    commandArgs: string[],
+    options: vscode.ProgressOptions
+) => {
+    vscode.window.withProgress(options, async (_progress, token) => {
+        token.onCancellationRequested((_event) => {
+            vscode.window.showInformationMessage('Cancelled!')
+        })
+
+        const rootPath = vscode.workspace.workspaceFolders![0].uri.fsPath
+
+        runCommandWithOutputCallbacks(entryPoint, commandArgs, {
+            onStdout: async (data) => {
+                const dataString = stripAnsi(data.toString())
+                if (dataString.includes('Warning')) {
+                    await vscode.window.showWarningMessage(dataString)
+                }
+                await vscode.window.showInformationMessage(dataString)
+            },
+            onStdErr: async (error) => {
+                const errorString = stripAnsi(error.toString())
+                await vscode.window.showErrorMessage(errorString)
+            },
+            spawnOptions: { cwd: rootPath },
+        })
+    })
+}