Merge remote-tracking branch 'origin/master' into pr/princjef/1460

src/utils/TestUtils.test.ts

@@ -107,7 +107,6 @@ export class MockTerminal implements ITerminal {
   children: HTMLElement[];
   cursorHidden: boolean;
   cursorState: number;
-  defAttr: number;
   scrollback: number;
   buffers: IBufferSet;
   buffer: IBuffer;
@@ -184,8 +183,8 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal {
   insertMode: boolean;
   wraparoundMode: boolean;
   bracketedPasteMode: boolean;
-  defAttr: number;
   curAttr: number;
+  savedCurAttr: number;
   savedCols: number;
   x10Mouse: boolean;
   vt200Mouse: boolean;
@@ -269,7 +268,7 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal {
     throw new Error('Method not implemented.');
   }
   setOption(key: string, value: any): void {
-    this.options[key] = value;
+    (<any>this.options)[key] = value;
   }
   on(type: string, listener: XtermListener): void {
     throw new Error('Method not implemented.');
@@ -304,6 +303,9 @@ export class MockBuffer implements IBuffer {
   translateBufferLineToString(lineIndex: number, trimRight: boolean, startCol?: number, endCol?: number): string {
     return Buffer.prototype.translateBufferLineToString.apply(this, arguments);
   }
+  getWrappedRangeForLine(y: number): { first: number; last: number; } {
+    throw new Error('Method not implemented.');
+  }
   nextStop(x?: number): number {
     throw new Error('Method not implemented.');
   }
@@ -316,6 +318,9 @@ export class MockBuffer implements IBuffer {
 }
 
 export class MockRenderer implements IRenderer {
+  dispose(): void {
+    throw new Error('Method not implemented.');
+  }
   colorManager: IColorManager;
   on(type: string, listener: XtermListener): void {
     throw new Error('Method not implemented.');
@@ -346,6 +351,9 @@ export class MockRenderer implements IRenderer {
 }
 
 export class MockViewport implements IViewport {
+  dispose(): void {
+    throw new Error('Method not implemented.');
+  }
   scrollBarWidth: number = 0;
   onThemeChanged(colors: IColorSet): void {
     throw new Error('Method not implemented.');