Slighty better code organization

Author: badsyntax

src/GradeTreeItem.ts

@@ -1,5 +1,4 @@
 import { Command, TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { join as pathJoin } from 'path';
 
 export default class GradleTreeItem extends TreeItem {
   constructor(

src/Gradle.ts

@@ -1,7 +1,9 @@
 import { window, workspace, Disposable, OutputChannel } from 'vscode';
 
 import ProcessRegistry from './ProcessRegistry';
-import { GradleTask } from './TaskRegistry';
+import GradleTask from './GradleTask';
+
+const TASK_REGEX: RegExp = /$\s*([a-z0-9]+)\s-\s(.*)$/gim;
 
 function getCommand(): string {
   return workspace.getConfiguration().get('gradle.useCommand', 'gradlew');
@@ -11,14 +13,31 @@ function getTasksArgs(): string {
   return workspace.getConfiguration().get('gradle.tasks.args', '');
 }
 
+function getTasks(): Thenable<GradleTask[]> {
+  const cmd = `${getCommand()} --console plain tasks ${getTasksArgs()}`;
+  const { rootPath: cwd } = workspace;
+  return ProcessRegistry.create(cmd, { cwd }).then(stdout => {
+    let match: RegExpExecArray | null = null;
+    const tasks: GradleTask[] = [];
+    while ((match = TASK_REGEX.exec(stdout)) !== null) {
+      tasks.push(new GradleTask(match[1], match[2]));
+    }
+    return tasks.sort((a, b) => a.label.localeCompare(b.label));
+  });
+}
+
 function runTask(
   task: GradleTask,
-  outputChannel?: OutputChannel
+  outputChannel: OutputChannel
 ): Thenable<void> {
   const cmd = `${getCommand()} ${task.label}`;
-  const statusbar: Disposable = window.setStatusBarMessage(`Running ${cmd}`);
+  const feedback = `Running ${cmd}`;
+  const statusbar: Disposable = window.setStatusBarMessage(feedback);
   const { rootPath: cwd } = workspace;
 
+  outputChannel.show();
+  outputChannel.append(`${feedback}\n`);
+
   return ProcessRegistry.create(cmd, { cwd }, outputChannel).then(
     () => statusbar.dispose(),
     err => {
@@ -28,4 +47,4 @@ function runTask(
   );
 }
 
-export default { getCommand, getTasksArgs, runTask };
+export default { getTasks, runTask };

src/GradleNodeProvider.ts

@@ -6,8 +6,6 @@ import {
   TreeItemCollapsibleState
 } from 'vscode';
 
-import { GradleTask } from './TaskRegistry';
-
 import TaskRegistry from './TaskRegistry';
 import GradleTreeItem from './GradeTreeItem';
 import WorkspaceTreeItem from './WorkspaceTreeItem';
@@ -22,7 +20,7 @@ export default class TreeProvider
 
   constructor() {}
 
-  refresh(): void {
+  refresh() {
     this._onDidChangeTreeData.fire();
   }
 

src/GradleTask.ts

@@ -0,0 +1,11 @@
+import { QuickPickItem } from 'vscode';
+
+export default class GradleTask implements QuickPickItem {
+  constructor(
+    public readonly label: string,
+    public readonly description?: string
+  ) {
+    this.label = label;
+    this.description = description;
+  }
+}

src/ProcessRegistry.ts

@@ -3,15 +3,15 @@ import { ChildProcess, ExecOptions, exec } from 'child_process';
 
 const processes: Set<ChildProcess> = new Set();
 
-function add(process: ChildProcess): void {
+function add(process: ChildProcess) {
   processes.add(process);
 }
 
-function remove(process: ChildProcess): void {
+function remove(process: ChildProcess) {
   processes.delete(process);
 }
 
-function killAll(): void {
+function killAll() {
   processes.forEach((process: ChildProcess, _: ChildProcess) => {
     process.kill('SIGINT');
   });
@@ -25,7 +25,6 @@ function writeOutput(
   { stdout, stderr }: ChildProcess,
   outputChannel: OutputChannel
 ) {
-  outputChannel.show();
   if (stdout) {
     stdout.on('data', data => outputChannel.append(data.toString()));
   }

src/TaskRegistry.ts

@@ -1,62 +1,32 @@
-import {
-  window,
-  workspace,
-  Disposable,
-  OutputChannel,
-  QuickPickItem
-} from 'vscode';
+import { window, Disposable, QuickPickItem } from 'vscode';
 
 import Gradle from './Gradle';
-import ProcessRegistry from './ProcessRegistry';
+import GradleTask from './GradleTask';
 
-export class GradleTask implements QuickPickItem {
-  label: string;
-  description: string | undefined;
-
-  constructor(label: string, description?: string) {
-    this.label = label;
-    this.description = description;
-  }
-}
-
-const TASK_REGEX: RegExp = /$\s*([a-z0-9]+)\s-\s(.*)$/gim;
 const tasks: Set<GradleTask> = new Set();
 const changeHandlers: Array<() => void> = [];
 
-function add(task: GradleTask): void {
+function add(task: GradleTask) {
   tasks.add(task);
 }
 
-function addAll(tasks: GradleTask[]): void {
+function addAll(tasks: GradleTask[]) {
   tasks.forEach(add);
 }
 
-function clear(): void {
+function clear() {
   tasks.clear();
 }
 
 function getTasks(): GradleTask[] {
   return Array.from(tasks);
 }
 
-function getTasksFromGradle(): Thenable<GradleTask[]> {
-  const cmd = `${Gradle.getCommand()} --console plain tasks ${Gradle.getTasksArgs()}`;
-  const { rootPath: cwd } = workspace;
-  return ProcessRegistry.create(cmd, { cwd }).then(stdout => {
-    let match: RegExpExecArray | null = null;
-    const tasks: GradleTask[] = [];
-    while ((match = TASK_REGEX.exec(stdout)) !== null) {
-      tasks.push(new GradleTask(match[1], match[2]));
-    }
-    return tasks.sort((a, b) => a.label.localeCompare(b.label));
-  });
-}
-
 function refresh(): Thenable<void> {
   const statusbar: Disposable = window.setStatusBarMessage(
     'Refreshing gradle tasks'
   );
-  return getTasksFromGradle().then(
+  return Gradle.getTasks().then(
     gradleTasks => {
       clear();
       addAll(gradleTasks);

src/extension.ts

@@ -7,7 +7,8 @@ import {
 } from 'vscode';
 
 import ProcessRegistry from './ProcessRegistry';
-import TaskRegistry, { GradleTask } from './TaskRegistry';
+import TaskRegistry from './TaskRegistry';
+import GradleTask from './GradleTask';
 import Gradle from './Gradle';
 import GradleTreeProvider from './GradleNodeProvider';