WIP on fix for gilamran#87. Only implemented for compilationComplete …

…so far.
david-alexander · Mar 22, 2022 · 935d7d2 · 935d7d2
1 parent a78bc97
commit 935d7d2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/lib/tsc-watch.js b/lib/tsc-watch.js
@@ -7,13 +7,15 @@ const run = require('./runner');
 const { extractArgs } = require('./args-manager');
 const { manipulate, detectState, deleteClear, print } = require('./stdout-manipulator');
 const readline = require('readline');
+const CancellationToken = require('cancellationtoken').default;
 
 let firstTime = true;
 let firstSuccessKiller = null;
 let successKiller = null;
 let failureKiller = null;
 let compilationStartedKiller = null;
 let compilationCompleteKiller = null;
+let compilationCompleteCancel = null;
 
 const {
   onFirstSuccessCommand,
@@ -122,7 +124,21 @@ rl.on('line', function (input) {
   }
 
   if (compilationComplete) {
+    if (compilationCompleteCancel)
+    {
+      compilationCompleteCancel();
+      compilationCompleteCancel = null;
+    }
+
+    const { cancel, token } = CancellationToken.create();
+    compilationCompleteCancel = cancel;
+
     killProcesses(false).then(() => {
+      if (token.isCancelled)
+      {
+        return;
+      }
+
       runOnCompilationComplete();
 
       if (compilationErrorSinceStart) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,6 +32,7 @@
     "printWidth": 100
   },
   "dependencies": {
+    "cancellationtoken": "^2.2.0",
     "cross-spawn": "^7.0.3",
     "node-cleanup": "^2.1.2",
     "ps-tree": "^1.2.0",