Use es2018.promise

Author: badsyntax

TODO.md

@@ -1,6 +1,6 @@
 # TODO
 
-- [ ] Windows support
+- [x] Windows support
 - [ ] Tests
 - [ ] `'workspace.rootPath' is deprecated and should no longer be used. Please use 'workspace.workspaceFolders' instead. More details: https://aka.ms/vscode-eliminating-rootpath`
 - [x] Run tasks from collapsible sidebar panel

src/Deferred.ts

@@ -3,7 +3,7 @@ function noop() {}
 export default class Deferred {
   resolve: Function;
   reject: Function;
-  promise: Thenable<any>;
+  promise: Promise<any>;
 
   constructor() {
     this.resolve = noop;

src/Gradle.ts

@@ -12,7 +12,7 @@ function getTasksArgs(): string {
   return workspace.getConfiguration().get('gradle.tasks.args', '');
 }
 
-function getTasks(): Thenable<GradleTask[]> {
+function getTasks(): Promise<GradleTask[]> {
   const cmd = getCommand();
   const args = ['--console', 'plain', 'tasks'].concat(
     getTasksArgs().split(' ')
@@ -28,7 +28,7 @@ function getTasks(): Thenable<GradleTask[]> {
 function runTask(
   task: GradleTask,
   outputChannel: OutputChannel
-): Thenable<void> {
+): Promise<string> {
   const cmd = getCommand();
   const args = [task.label];
   const options = { cwd: workspace.rootPath };
@@ -39,11 +39,9 @@ function runTask(
   outputChannel.show();
   outputChannel.append(`Running ${cmd} ${task.label}\n`);
 
-  return ProcessRegistry.create(cmd, args, options, outputChannel).then(
-    () => statusbar.dispose(),
-    err => {
+  return ProcessRegistry.create(cmd, args, options, outputChannel).finally(
+    () => {
       statusbar.dispose();
-      return Promise.reject(err);
     }
   );
 }

src/GradleOutputParser.ts

@@ -5,7 +5,7 @@ const TASK_REGEX: RegExp = /$\s*([a-z0-9]+)\s-\s(.*)$/gim;
 export default class GradleOutputParser {
   private constructor() {}
 
-  static parseTasks(stdout: string) {
+  static parseTasks(stdout: string): GradleTask[] {
     const tasks: GradleTask[] = [];
     let match: RegExpExecArray | null = null;
     while ((match = TASK_REGEX.exec(stdout)) !== null) {

src/Process.ts

@@ -52,7 +52,7 @@ export default class Process {
     });
   }
 
-  complete(): Thenable<string> {
+  complete(): Promise<string> {
     return this.deferred.promise;
   }
 }

src/ProcessRegistry.ts

@@ -5,19 +5,19 @@ import { Writable } from 'stream';
 
 import ProcessLogger from './ProcessLogger';
 
-const processes: Set<ChildProcess> = new Set();
+const processes: Set<Process> = new Set();
 
-function add(process: ChildProcess) {
+function add(process: Process) {
   processes.add(process);
 }
 
-function remove(process: ChildProcess) {
+function remove(process: Process) {
   processes.delete(process);
 }
 
 function killAll() {
-  processes.forEach((process: ChildProcess, _: ChildProcess) => {
-    process.kill('SIGINT');
+  processes.forEach((process: Process, _: Process) => {
+    process.childProcess.kill('SIGINT');
   });
   window.showInformationMessage(
     `Killed ${processes.size} process${processes.size === 1 ? '' : 'es'}`
@@ -30,28 +30,16 @@ function create(
   args?: ReadonlyArray<string>,
   options?: ExecOptions,
   outputChannel?: OutputChannel
-): Thenable<string> {
+): Promise<string> {
   let processLogger: ProcessLogger | undefined;
-
   if (outputChannel) {
     processLogger = new ProcessLogger(outputChannel);
   }
-
   const process = new Process(command, args, options, processLogger);
-  const childProcess = process.childProcess;
-
-  add(childProcess);
-
-  return process.complete().then(
-    stdout => {
-      remove(childProcess);
-      return stdout;
-    },
-    err => {
-      remove(childProcess);
-      return Promise.reject(err);
-    }
-  );
+  add(process);
+  return process.complete().finally(() => {
+    remove(process);
+  });
 }
 
 export default { remove, killAll, create };

src/TaskRegistry.ts

@@ -22,22 +22,19 @@ function getTasks(): GradleTask[] {
   return Array.from(tasks);
 }
 
-function refresh(): Thenable<void> {
+function refresh(): Promise<void> {
   const statusbar: Disposable = window.setStatusBarMessage(
     'Refreshing gradle tasks'
   );
   return Gradle.getTasks().then(
     gradleTasks => {
       clear();
       addAll(gradleTasks);
-      statusbar.dispose();
       changeHandlers.forEach(handler => handler());
     },
-    err => {
-      statusbar.dispose();
-      return Promise.reject(err);
-    }
-  );
+  ).finally(() => {
+    statusbar.dispose();
+  });
 }
 
 function registerChangeHandler(handler: () => void) {

src/extension.ts

@@ -18,26 +18,30 @@ function gradleKillCommand() {
   ProcessRegistry.killAll();
 }
 
-function gradleRefreshTasksCommand(): Thenable<void> {
-  return TaskRegistry.refresh().then(undefined, err => {
+async function gradleRefreshTasksCommand(): Promise<void> {
+  try {
+    TaskRegistry.refresh();
+  } catch (err) {
     window.showErrorMessage(`Unable to refresh gradle tasks: ${err.message}`);
-  });
+  }
 }
 
-async function gradleRunTaskCommand(taskName?: string): Promise<Error | void> {
+async function gradleRunTaskCommand(
+  taskName?: string
+): Promise<string | Error | void> {
   if (taskName) {
-    return Gradle.runTask(new GradleTask(taskName), outputChannel);
+    return await Gradle.runTask(new GradleTask(taskName), outputChannel);
   }
 
   let tasks: GradleTask[] = TaskRegistry.getTasks();
 
   if (!tasks.length) {
-    return Promise.reject('No tasks found. Try running gradle:refresh');
+    throw new Error('No tasks found. Try running gradle:refresh');
   }
 
   const pickedTask: GradleTask | void = await window.showQuickPick(tasks);
   if (pickedTask) {
-    return Gradle.runTask(pickedTask, outputChannel);
+    return await Gradle.runTask(pickedTask, outputChannel);
   }
 }
 

tsconfig.json

@@ -3,7 +3,7 @@
     "module": "commonjs",
     "target": "es6",
     "outDir": "out",
-    "lib": ["es6"],
+    "lib": ["es6","es2018.promise"],
     "sourceMap": true,
     "rootDir": "src",
     "strict": true,