Add cross-spawn to dependencies and code organization

Author: badsyntax

package-lock.json

@@ -95,12 +95,14 @@
     "lint": "prettier --check \"src/**/*.{ts,js,json}\"",
     "format": "prettier --write \"src/**/*.{ts,js,json}\""
   },
+  "dependencies": {
+    "cross-spawn": "^7.0.1"
+  },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.1",
     "@types/glob": "^7.1.1",
     "@types/mocha": "^5.2.7",
     "@types/node": "^12.11.1",
-    "cross-spawn": "^7.0.1",
     "glob": "^7.1.4",
     "mocha": "^6.2.2",
     "prettier": "^1.18.2",

package.json

@@ -7,15 +7,6 @@ import {
 import path from 'path';
 
 export default class GradleTreeItem extends TreeItem {
-  constructor(
-    public readonly context: ExtensionContext,
-    public readonly label: string,
-    public readonly collapsibleState: TreeItemCollapsibleState,
-    public readonly tooltip: string,
-    public readonly command?: Command
-  ) {
-    super(label, collapsibleState);
-  }
   contextValue = 'script';
   iconPath = {
     light: this.context.asAbsolutePath(
@@ -25,4 +16,13 @@ export default class GradleTreeItem extends TreeItem {
       path.join('resources', 'dark', 'script.svg')
     )
   };
+  constructor(
+    public readonly context: ExtensionContext,
+    public readonly label: string,
+    public readonly collapsibleState: TreeItemCollapsibleState,
+    public readonly tooltip: string,
+    public readonly command?: Command
+  ) {
+    super(label, collapsibleState);
+  }
 }

src/GradeTreeItem.ts

@@ -29,12 +29,12 @@ function runTask(
   task: GradleTask,
   outputChannel: OutputChannel
 ): Promise<string> {
-  const cmd = getCommand();
-  const args = [task.label];
-  const options = { cwd: workspace.rootPath };
   const statusbar: Disposable = window.setStatusBarMessage(
     'Running gradle task'
   );
+  const cmd = getCommand();
+  const args = [task.label];
+  const options = { cwd: workspace.rootPath };
 
   outputChannel.show();
   outputChannel.append(`Running ${cmd} ${task.label}\n`);

src/Gradle.ts

@@ -11,9 +11,10 @@ import TaskRegistry from './TaskRegistry';
 import GradleTreeItem from './GradeTreeItem';
 
 export default class TreeProvider implements TreeDataProvider<GradleTreeItem> {
-  private _onDidChangeTreeData: EventEmitter<GradleTreeItem> = new EventEmitter<
+  private readonly _onDidChangeTreeData: EventEmitter<
     GradleTreeItem
-  >();
+  > = new EventEmitter<GradleTreeItem>();
+
   readonly onDidChangeTreeData: Event<GradleTreeItem> = this
     ._onDidChangeTreeData.event;
 

src/GradleNodeProvider.ts

@@ -48,6 +48,18 @@ async function gradleRunTaskCommand(
 export async function activate(context: ExtensionContext) {
   outputChannel = window.createOutputChannel('Gradle');
 
+  context.subscriptions.push(
+    commands.registerCommand('gradle:refresh', gradleRefreshTasksCommand)
+  );
+  context.subscriptions.push(
+    commands.registerCommand('gradle:runtask', gradleRunTaskCommand)
+  );
+  context.subscriptions.push(
+    commands.registerCommand('gradle:kill', gradleKillCommand)
+  );
+
+  await commands.executeCommand('gradle:refresh');
+
   workspace
     .createFileSystemWatcher('/build.gradle')
     .onDidChange(gradleRefreshTasksCommand);
@@ -56,24 +68,12 @@ export async function activate(context: ExtensionContext) {
     .getConfiguration()
     .get('gradle.enableTasksExplorer');
 
-  await gradleRefreshTasksCommand();
-
   if (explorerEnabled) {
     const treeProvider: GradleTreeProvider = new GradleTreeProvider(context);
     TaskRegistry.registerChangeHandler(() => treeProvider.refresh());
     window.registerTreeDataProvider('gradleTasks', treeProvider);
   }
 
-  context.subscriptions.push(
-    commands.registerCommand('gradle:refresh', gradleRefreshTasksCommand)
-  );
-  context.subscriptions.push(
-    commands.registerCommand('gradle:runtask', gradleRunTaskCommand)
-  );
-  context.subscriptions.push(
-    commands.registerCommand('gradle:kill', gradleKillCommand)
-  );
-
   commands.executeCommand('setContext', 'gradleTasksExtensionActive', true);
 
   return {