From 6f14b8b8dd123ae6b2b969dba3b920c5f81d3f06 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Thu, 12 Nov 2020 12:07:45 -0600
Subject: [PATCH] Add separate handler for error

Feels like it parallels better with the other handlers.
---
 src/node/vscode.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/node/vscode.ts b/src/node/vscode.ts
index 9ab22ef7..c3da8a24 100644
--- a/src/node/vscode.ts
+++ b/src/node/vscode.ts
@@ -122,9 +122,9 @@ export class VscodeProvider {
     proc: cp.ChildProcess,
     fn: (message: ipc.VscodeMessage) => message is T,
   ): Promise<T> {
-    return new Promise((resolve, _reject) => {
+    return new Promise((resolve, reject) => {
       const cleanup = () => {
-        proc.off("error", reject)
+        proc.off("error", onError)
         proc.off("exit", onExit)
         proc.off("message", onMessage)
         clearTimeout(timeout)
@@ -132,15 +132,16 @@ export class VscodeProvider {
 
       const timeout = setTimeout(() => {
         cleanup()
-        _reject(new Error("timed out"))
+        reject(new Error("timed out"))
       }, this.timeoutInterval)
 
-      const reject = (error: Error) => {
+      const onError = (error: Error) => {
         cleanup()
-        _reject(error)
+        reject(error)
       }
 
       const onExit = (code: number | null) => {
+        cleanup()
         reject(new Error(`VS Code exited unexpectedly with code ${code}`))
       }
 
@@ -153,7 +154,7 @@ export class VscodeProvider {
       }
 
       proc.on("message", onMessage)
-      proc.on("error", reject)
+      proc.on("error", onError)
       proc.on("exit", onExit)
     })
   }