Rename EventEmitter2 to EventEmitter

Fixes #2029

src/common/CircularList.ts

@@ -4,7 +4,7 @@
  */
 
 import { ICircularList } from 'common/Types';
-import { EventEmitter2, IEvent } from 'common/EventEmitter2';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 
 export interface IInsertEvent {
   index: number;
@@ -25,11 +25,11 @@ export class CircularList<T> implements ICircularList<T> {
   private _startIndex: number;
   private _length: number;
 
-  public onDeleteEmitter = new EventEmitter2<IDeleteEvent>();
+  public onDeleteEmitter = new EventEmitter<IDeleteEvent>();
   public get onDelete(): IEvent<IDeleteEvent> { return this.onDeleteEmitter.event; }
-  public onInsertEmitter = new EventEmitter2<IInsertEvent>();
+  public onInsertEmitter = new EventEmitter<IInsertEvent>();
   public get onInsert(): IEvent<IInsertEvent> { return this.onInsertEmitter.event; }
-  public onTrimEmitter = new EventEmitter2<number>();
+  public onTrimEmitter = new EventEmitter<number>();
   public get onTrim(): IEvent<number> { return this.onTrimEmitter.event; }
 
   constructor(

src/common/EventEmitter.test.ts

@@ -4,12 +4,12 @@
  */
 
 import { assert } from 'chai';
-import { EventEmitter2 } from 'common/EventEmitter2';
+import { EventEmitter } from 'common/EventEmitter';
 
-describe('EventEmitter2', () => {
+describe('EventEmitter', () => {
   it('should fire listeners multiple times', () => {
     const order: string[] = [];
-    const emitter = new EventEmitter2<number>();
+    const emitter = new EventEmitter<number>();
     emitter.event(data => order.push(data + 'a'));
     emitter.event(data => order.push(data + 'b'));
     emitter.fire(1);
@@ -19,7 +19,7 @@ describe('EventEmitter2', () => {
 
   it('should not fire listeners once disposed', () => {
     const order: string[] = [];
-    const emitter = new EventEmitter2<number>();
+    const emitter = new EventEmitter<number>();
     emitter.event(data => order.push(data + 'a'));
     const disposeB = emitter.event(data => order.push(data + 'b'));
     emitter.event(data => order.push(data + 'c'));

src/common/EventEmitter.ts

@@ -13,7 +13,7 @@ export interface IEvent<T> {
   (listener: (e: T) => any): IDisposable;
 }
 
-export class EventEmitter2<T> {
+export class EventEmitter<T> {
   private _listeners: IListener<T>[] = [];
   private _event?: IEvent<T>;
 

src/common/TestUtils.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { IBufferService, IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/services/Services';
-import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
+import { IEvent, EventEmitter } from 'common/EventEmitter';
 import { clone } from 'common/Clone';
 import { DEFAULT_OPTIONS } from 'common/services/OptionsService';
 
@@ -21,7 +21,7 @@ export class MockBufferService implements IBufferService {
 
 export class MockOptionsService implements IOptionsService {
   options: ITerminalOptions = clone(DEFAULT_OPTIONS);
-  onOptionChange: IEvent<string> = new EventEmitter2<string>().event;
+  onOptionChange: IEvent<string> = new EventEmitter<string>().event;
   constructor(testOptions: IPartialTerminalOptions) {
     Object.keys(testOptions).forEach(key => this.options[key] = (<any>testOptions)[key]);
   }

src/common/Types.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
+import { IEvent, EventEmitter } from 'common/EventEmitter';
 import { IDeleteEvent, IInsertEvent } from 'common/CircularList';
 
 export const DEFAULT_COLOR = 256;
@@ -40,11 +40,11 @@ export interface ICircularList<T> {
   maxLength: number;
   isFull: boolean;
 
-  onDeleteEmitter: EventEmitter2<IDeleteEvent>;
+  onDeleteEmitter: EventEmitter<IDeleteEvent>;
   onDelete: IEvent<IDeleteEvent>;
-  onInsertEmitter: EventEmitter2<IInsertEvent>;
+  onInsertEmitter: EventEmitter<IInsertEvent>;
   onInsert: IEvent<IInsertEvent>;
-  onTrimEmitter: EventEmitter2<number>;
+  onTrimEmitter: EventEmitter<number>;
   onTrim: IEvent<number>;
 
   get(index: number): T | undefined;

src/common/buffer/BufferSet.ts

@@ -6,7 +6,7 @@
 import { IBuffer, IBufferSet } from 'common/buffer/Types';
 import { IAttributeData } from 'common/Types';
 import { Buffer } from 'common/buffer/Buffer';
-import { EventEmitter2, IEvent } from 'common/EventEmitter2';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { IOptionsService, IBufferService } from 'common/services/Services';
 
 /**
@@ -19,7 +19,7 @@ export class BufferSet implements IBufferSet {
   private _activeBuffer: Buffer;
 
 
-  private _onBufferActivate = new EventEmitter2<{activeBuffer: IBuffer, inactiveBuffer: IBuffer}>();
+  private _onBufferActivate = new EventEmitter<{activeBuffer: IBuffer, inactiveBuffer: IBuffer}>();
   public get onBufferActivate(): IEvent<{activeBuffer: IBuffer, inactiveBuffer: IBuffer}> { return this._onBufferActivate.event; }
 
   /**

src/common/buffer/Marker.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { EventEmitter2, IEvent } from 'common/EventEmitter2';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { Disposable } from 'common/Lifecycle';
 import { IMarker } from 'common/Types';
 
@@ -15,7 +15,7 @@ export class Marker extends Disposable implements IMarker {
 
   public get id(): number { return this._id; }
 
-  private _onDispose = new EventEmitter2<void>();
+  private _onDispose = new EventEmitter<void>();
   public get onDispose(): IEvent<void> { return this._onDispose.event; }
 
   constructor(

src/common/buffer/Types.ts

@@ -4,7 +4,7 @@
  */
 
 import { IAttributeData, ICircularList, IBufferLine, ICellData } from 'common/Types';
-import { IEvent } from 'common/EventEmitter2';
+import { IEvent } from 'common/EventEmitter';
 
 // BufferIndex denotes a position in the buffer: [rowIndex, colIndex]
 export type BufferIndex = [number, number];

src/common/services/OptionsService.ts

@@ -4,7 +4,7 @@
  */
 
 import { IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/services/Services';
-import { EventEmitter2, IEvent } from 'common/EventEmitter2';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { isMac } from 'common/Platform';
 import { clone } from 'common/Clone';
 
@@ -57,7 +57,7 @@ const CONSTRUCTOR_ONLY_OPTIONS = ['cols', 'rows'];
 export class OptionsService implements IOptionsService {
   public options: ITerminalOptions;
 
-  private _onOptionChange = new EventEmitter2<string>();
+  private _onOptionChange = new EventEmitter<string>();
   public get onOptionChange(): IEvent<string> { return this._onOptionChange.event; }
 
   constructor(options: IPartialTerminalOptions) {

src/common/services/Services.d.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IEvent } from 'common/EventEmitter2';
+import { IEvent } from 'common/EventEmitter';
 
 export interface IBufferService {
   readonly cols: number;