From d0e05eb795c6ab4a22b3dc00ffb3f2e6e8de3e80 Mon Sep 17 00:00:00 2001
From: Revanth Mahesh <revanthmaheshperam@gmail.com>
Date: Sun, 27 Oct 2019 10:11:43 +0530
Subject: [PATCH 1/2] Support disposing of EventEmitters

---
 src/common/EventEmitter.ts | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/common/EventEmitter.ts b/src/common/EventEmitter.ts
index 34ac190f..ea9df48b 100644
--- a/src/common/EventEmitter.ts
+++ b/src/common/EventEmitter.ts
@@ -16,11 +16,13 @@ export interface IEvent<T> {
 export interface IEventEmitter<T> {
   event: IEvent<T>;
   fire(data: T): void;
+  dispose(): void;
 }
 
 export class EventEmitter<T> implements IEventEmitter<T> {
   private _listeners: IListener<T>[] = [];
   private _event?: IEvent<T>;
+  private _disposed: boolean = false;
 
   public get event(): IEvent<T> {
     if (!this._event) {
@@ -28,10 +30,12 @@ export class EventEmitter<T> implements IEventEmitter<T> {
         this._listeners.push(listener);
         const disposable = {
           dispose: () => {
-            for (let i = 0; i < this._listeners.length; i++) {
-              if (this._listeners[i] === listener) {
-                this._listeners.splice(i, 1);
-                return;
+            if (!this._disposed) {
+              for (let i = 0; i < this._listeners.length; i++) {
+                if (this._listeners[i] === listener) {
+                  this._listeners.splice(i, 1);
+                  return;
+                }
               }
             }
           }
@@ -51,4 +55,12 @@ export class EventEmitter<T> implements IEventEmitter<T> {
       queue[i].call(undefined, data);
     }
   }
+
+public dispose(): void {
+  if (this._listeners) {
+    this._listeners.splice(0, this._listeners.length);
+  }
+  this._disposed = true;
+}
+
 }

From f3bbcb35e4421c112d81f66f0ea1f3286e8e5ed4 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Sat, 26 Oct 2019 21:52:11 -0700
Subject: [PATCH 2/2] Clean up

---
 src/common/EventEmitter.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/common/EventEmitter.ts b/src/common/EventEmitter.ts
index ea9df48b..5991e338 100644
--- a/src/common/EventEmitter.ts
+++ b/src/common/EventEmitter.ts
@@ -56,11 +56,10 @@ export class EventEmitter<T> implements IEventEmitter<T> {
     }
   }
 
-public dispose(): void {
-  if (this._listeners) {
-    this._listeners.splice(0, this._listeners.length);
+  public dispose(): void {
+    if (this._listeners) {
+      this._listeners.length = 0;
+    }
+    this._disposed = true;
   }
-  this._disposed = true;
-}
-
 }