Merge branch 'master' into 1360_dom_renderer

src/utils/TestUtils.test.ts

@@ -265,7 +265,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.');
@@ -300,6 +300,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.');
   }