Merge branch 'master' into parser_colon_notation

src/TestUtils.test.ts

@@ -16,7 +16,7 @@ import { IColorManager, IColorSet } from 'browser/Types';
 import { IOptionsService } from 'common/services/Services';
 import { EventEmitter } from 'common/EventEmitter';
 import { IParams } from 'common/parser/Types';
-import { ISelectionManager } from 'browser/selection/Types';
+import { ISelectionService } from 'browser/services/Services';
 
 export class TestTerminal extends Terminal {
   writeSync(data: string): void {
@@ -132,7 +132,7 @@ export class MockTerminal implements ITerminal {
   screenElement: HTMLElement;
   rowContainer: HTMLElement;
   selectionContainer: HTMLElement;
-  selectionManager: ISelectionManager;
+  selectionService: ISelectionService;
   textarea: HTMLTextAreaElement;
   rows: number;
   cols: number;
@@ -217,7 +217,7 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal {
   buffers: IBufferSet;
   buffer: IBuffer = new MockBuffer();
   viewport: IViewport;
-  selectionManager: ISelectionManager;
+  selectionService: ISelectionService;
   focus(): void {
     throw new Error('Method not implemented.');
   }