Merge branch 'master' into buffer_optimizations

src/common/buffer/Buffer.ts

@@ -168,6 +168,7 @@ export class Buffer implements IBuffer {
       // Deal with columns increasing (reducing needs to happen after reflow)
       if (this._cols < newCols) {
         for (let i = 0; i < this.lines.length; i++) {
+          // +boolean for fast 0 or 1 conversion
           needsCleanup |= +this.lines.get(i)!.resize(newCols, nullCell);
         }
       }
@@ -247,6 +248,7 @@ export class Buffer implements IBuffer {
       // Trim the end of the line off if cols shrunk
       if (this._cols > newCols) {
         for (let i = 0; i < this.lines.length; i++) {
+          // +boolean for fast 0 or 1 conversion
           needsCleanup |= +this.lines.get(i)!.resize(newCols, nullCell);
         }
       }

src/common/buffer/BufferLine.ts

@@ -37,10 +37,8 @@ const enum Cell {
 
 export const DEFAULT_ATTR_DATA = Object.freeze(new AttributeData());
 
-/** Work variables to avoid garbage collection. */
-const w: { startIndex: number } = {
-  startIndex: 0
-};
+// Work variables to avoid garbage collection
+let $startIndex = 0;
 
 /** Factor when to cleanup underlying array buffer after shrinking. */
 const CLEANUP_THRESHOLD = 2;
@@ -181,10 +179,10 @@ export class BufferLine implements IBufferLine {
    * to GC as it significantly reduced the amount of new objects/references needed.
    */
   public loadCell(index: number, cell: ICellData): ICellData {
-    w.startIndex = index * CELL_SIZE;
-    cell.content = this._data[w.startIndex + Cell.CONTENT];
-    cell.fg = this._data[w.startIndex + Cell.FG];
-    cell.bg = this._data[w.startIndex + Cell.BG];
+    $startIndex = index * CELL_SIZE;
+    cell.content = this._data[$startIndex + Cell.CONTENT];
+    cell.fg = this._data[$startIndex + Cell.FG];
+    cell.bg = this._data[$startIndex + Cell.BG];
     if (cell.content & Content.IS_COMBINED_MASK) {
       cell.combinedData = this._combined[index];
     }

src/common/buffer/BufferSet.ts

@@ -19,8 +19,8 @@ export class BufferSet extends Disposable implements IBufferSet {
   private _alt!: Buffer;
   private _activeBuffer!: Buffer;
 
-  private _onBufferActivate = this.register(new EventEmitter<{activeBuffer: IBuffer, inactiveBuffer: IBuffer}>());
-  public get onBufferActivate(): IEvent<{activeBuffer: IBuffer, inactiveBuffer: IBuffer}> { return this._onBufferActivate.event; }
+  private readonly _onBufferActivate = this.register(new EventEmitter<{activeBuffer: IBuffer, inactiveBuffer: IBuffer}>());
+  public readonly onBufferActivate = this._onBufferActivate.event;
 
   /**
    * Create a new BufferSet for the given terminal.
@@ -32,6 +32,8 @@ export class BufferSet extends Disposable implements IBufferSet {
   ) {
     super();
     this.reset();
+    this.register(this._optionsService.onSpecificOptionChange('scrollback', () => this.resize(this._bufferService.cols, this._bufferService.rows)));
+    this.register(this._optionsService.onSpecificOptionChange('tabStopWidth', () => this.setupTabStops()));
   }
 
   public reset(): void {
@@ -119,6 +121,7 @@ export class BufferSet extends Disposable implements IBufferSet {
   public resize(newCols: number, newRows: number): void {
     this._normal.resize(newCols, newRows);
     this._alt.resize(newCols, newRows);
+    this.setupTabStops(newCols);
   }
 
   /**

src/common/buffer/Marker.ts

@@ -3,25 +3,25 @@
  * @license MIT
  */
 
-import { EventEmitter, IEvent } from 'common/EventEmitter';
-import { Disposable } from 'common/Lifecycle';
-import { IMarker } from 'common/Types';
+import { EventEmitter } from 'common/EventEmitter';
+import { disposeArray } from 'common/Lifecycle';
+import { IDisposable, IMarker } from 'common/Types';
 
-export class Marker extends Disposable implements IMarker {
+export class Marker implements IMarker {
   private static _nextId = 1;
 
-  private _id: number = Marker._nextId++;
   public isDisposed: boolean = false;
+  private _disposables: IDisposable[] = [];
 
+  private _id: number = Marker._nextId++;
   public get id(): number { return this._id; }
 
-  private _onDispose = new EventEmitter<void>();
-  public get onDispose(): IEvent<void> { return this._onDispose.event; }
+  private readonly _onDispose = this.register(new EventEmitter<void>());
+  public readonly onDispose = this._onDispose.event;
 
   constructor(
     public line: number
   ) {
-    super();
   }
 
   public dispose(): void {
@@ -32,6 +32,12 @@ export class Marker extends Disposable implements IMarker {
     this.line = -1;
     // Emit before super.dispose such that dispose listeners get a change to react
     this._onDispose.fire();
-    super.dispose();
+    disposeArray(this._disposables);
+    this._disposables.length = 0;
+  }
+
+  public register<T extends IDisposable>(disposable: T): T {
+    this._disposables.push(disposable);
+    return disposable;
   }
 }