Permitir interromper a transpilação do código

dgadelha · Mar 8, 2024 · 37f4876 · 37f4876
1 parent ebd6ffe
commit 37f4876
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/packages/ide/src/app/tab-editor/tab-editor.component.html b/packages/ide/src/app/tab-editor/tab-editor.component.html
@@ -17,7 +17,7 @@
     type="button"
     class="sidebar-button"
     (click)="stopCode()"
-    [disabled]="!executor.running || transpiling"
+    [disabled]="!executor.running && !transpiling"
     title="Parar execução"
   >
     <svg-icon src="assets/icon-stop.svg"></svg-icon>

diff --git a/packages/ide/src/app/tab-editor/tab-editor.component.ts b/packages/ide/src/app/tab-editor/tab-editor.component.ts
@@ -182,6 +182,12 @@ export class TabEditorComponent implements OnInit, OnDestroy {
   stopCode() {
     this.gaService.event("editor_stop_execution", "Editor", "Botão de Parar Execução");
     this.executor.stop();
+
+    if (this.transpiling) {
+      this.worker.abortTranspilation();
+      this.transpiling = false;
+    }
+
     this.stdOutEditorCursorEnd();
   }
 

diff --git a/packages/ide/src/app/worker.service.ts b/packages/ide/src/app/worker.service.ts
@@ -4,6 +4,7 @@ import { PortugolCodeError } from "@portugol-webstudio/antlr";
 @Injectable({ providedIn: "root" })
 export class WorkerService {
   worker?: Worker;
+  busy = false;
 
   init() {
     this.worker = new Worker("assets/portugol-worker/worker.js");
@@ -44,6 +45,8 @@ export class WorkerService {
       this.init();
     }
 
+    this.busy = true;
+
     return new Promise(resolve => {
       const id = Math.random().toString(36).substring(2, 9);
       const now = Date.now();
@@ -52,6 +55,7 @@ export class WorkerService {
         if (e.data.id === id) {
           console.log("Transpiler Result", e.data, `${Date.now() - now}ms`);
           this.worker?.removeEventListener("message", listener);
+          this.busy = false;
           resolve(e.data);
         }
       };
@@ -60,4 +64,11 @@ export class WorkerService {
       this.worker?.postMessage({ code, id, action: "transpile" });
     });
   }
+
+  async abortTranspilation() {
+    if (this.worker && this.busy) {
+      this.worker.terminate();
+      this.worker = undefined;
+    }
+  }
 }