Merge branch 'master' into master

src/browser/Terminal.ts

@@ -113,8 +113,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
   public get onSelectionChange(): IEvent<void> { return this._onSelectionChange.event; }
   private _onTitleChange = new EventEmitter<string>();
   public get onTitleChange(): IEvent<string> { return this._onTitleChange.event; }
-  private _onBell  = new EventEmitter<void>();
-  public get onBell (): IEvent<void> { return this._onBell.event; }
+  private _onBell = new EventEmitter<void>();
+  public get onBell(): IEvent<void> { return this._onBell.event; }
 
   private _onFocus = new EventEmitter<void>();
   public get onFocus(): IEvent<void> { return this._onFocus.event; }

src/browser/public/AddonManager.test.ts

@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2019 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import { assert } from 'chai';
-import { AddonManager, ILoadedAddon } from './AddonManager';
-import { ITerminalAddon } from 'xterm';
-
-class TestAddonManager extends AddonManager {
-  public get addons(): ILoadedAddon[] {
-    return this._addons;
-  }
-}
-
-describe('AddonManager', () => {
-  let manager: TestAddonManager;
-
-  beforeEach(() => {
-    manager = new TestAddonManager();
-  });
-
-  describe('loadAddon', () => {
-    it('should call addon constructor', () => {
-      let called = false;
-      class Addon implements ITerminalAddon {
-        public activate(terminal: any): void {
-          assert.equal(terminal, 'foo', 'The first constructor arg should be Terminal');
-          called = true;
-        }
-        public dispose(): void { }
-      }
-      manager.loadAddon('foo' as any, new Addon());
-      assert.equal(called, true);
-    });
-  });
-
-  describe('dispose', () => {
-    it('should dispose all loaded addons', () => {
-      let called = 0;
-      class Addon implements ITerminalAddon {
-        public activate(): void {}
-        public dispose(): void { called++; }
-      }
-      manager.loadAddon(null!, new Addon());
-      manager.loadAddon(null!, new Addon());
-      manager.loadAddon(null!, new Addon());
-      assert.equal(manager.addons.length, 3);
-      manager.dispose();
-      assert.equal(called, 3);
-      assert.equal(manager.addons.length, 0);
-    });
-  });
-});

src/browser/public/AddonManager.ts

@@ -1,56 +0,0 @@
-/**
- * Copyright (c) 2019 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import { ITerminalAddon, IDisposable, Terminal } from 'xterm';
-
-export interface ILoadedAddon {
-  instance: ITerminalAddon;
-  dispose: () => void;
-  isDisposed: boolean;
-}
-
-export class AddonManager implements IDisposable {
-  protected _addons: ILoadedAddon[] = [];
-
-  constructor() {
-  }
-
-  public dispose(): void {
-    for (let i = this._addons.length - 1; i >= 0; i--) {
-      this._addons[i].instance.dispose();
-    }
-  }
-
-  public loadAddon(terminal: Terminal, instance: ITerminalAddon): void {
-    const loadedAddon: ILoadedAddon = {
-      instance,
-      dispose: instance.dispose,
-      isDisposed: false
-    };
-    this._addons.push(loadedAddon);
-    instance.dispose = () => this._wrappedAddonDispose(loadedAddon);
-    instance.activate(terminal as any);
-  }
-
-  private _wrappedAddonDispose(loadedAddon: ILoadedAddon): void {
-    if (loadedAddon.isDisposed) {
-      // Do nothing if already disposed
-      return;
-    }
-    let index = -1;
-    for (let i = 0; i < this._addons.length; i++) {
-      if (this._addons[i] === loadedAddon) {
-        index = i;
-        break;
-      }
-    }
-    if (index === -1) {
-      throw new Error('Could not dispose an addon that has not been loaded');
-    }
-    loadedAddon.isDisposed = true;
-    loadedAddon.dispose.apply(loadedAddon.instance);
-    this._addons.splice(index, 1);
-  }
-}

src/browser/public/Terminal.ts

@@ -5,12 +5,12 @@
 
 import { Terminal as ITerminalApi, ITerminalOptions, IMarker, IDisposable, ILinkMatcherOptions, ITheme, ILocalizableStrings, ITerminalAddon, ISelectionPosition, IBufferNamespace as IBufferNamespaceApi, IParser, ILinkProvider, IUnicodeHandling, FontWeight } from 'xterm';
 import { ITerminal } from 'browser/Types';
-import { Terminal as TerminalCore } from '../Terminal';
-import * as Strings from '../LocalizableStrings';
+import { Terminal as TerminalCore } from 'browser/Terminal';
+import * as Strings from 'browser/LocalizableStrings';
 import { IEvent } from 'common/EventEmitter';
 import { ParserApi } from 'common/public/ParserApi';
 import { UnicodeApi } from 'common/public/UnicodeApi';
-import { AddonManager } from './AddonManager';
+import { AddonManager } from 'common/public/AddonManager';
 import { BufferNamespaceApi } from 'common/public/BufferNamespaceApi';
 
 export class Terminal implements ITerminalApi {
@@ -30,17 +30,17 @@ export class Terminal implements ITerminalApi {
     }
   }
 
-  public get onCursorMove(): IEvent<void> { return this._core.onCursorMove; }
-  public get onLineFeed(): IEvent<void> { return this._core.onLineFeed; }
-  public get onSelectionChange(): IEvent<void> { return this._core.onSelectionChange; }
-  public get onData(): IEvent<string> { return this._core.onData; }
-  public get onBinary(): IEvent<string> { return this._core.onBinary; }
-  public get onTitleChange(): IEvent<string> { return this._core.onTitleChange; }
   public get onBell(): IEvent<void> { return this._core.onBell; }
-  public get onScroll(): IEvent<number> { return this._core.onScroll; }
+  public get onBinary(): IEvent<string> { return this._core.onBinary; }
+  public get onCursorMove(): IEvent<void> { return this._core.onCursorMove; }
+  public get onData(): IEvent<string> { return this._core.onData; }
   public get onKey(): IEvent<{ key: string, domEvent: KeyboardEvent }> { return this._core.onKey; }
+  public get onLineFeed(): IEvent<void> { return this._core.onLineFeed; }
   public get onRender(): IEvent<{ start: number, end: number }> { return this._core.onRender; }
   public get onResize(): IEvent<{ cols: number, rows: number }> { return this._core.onResize; }
+  public get onScroll(): IEvent<number> { return this._core.onScroll; }
+  public get onSelectionChange(): IEvent<void> { return this._core.onSelectionChange; }
+  public get onTitleChange(): IEvent<string> { return this._core.onTitleChange; }
 
   public get element(): HTMLElement | undefined { return this._core.element; }
   public get parser(): IParser {