From 9980457eefb85b533296b2eafa060e840dbd079c Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 15 Jun 2019 23:10:25 -0700
Subject: [PATCH] Remove terminal dep from SelectionModel

---
 src/SelectionManager.ts    |  2 +-
 src/SelectionModel.test.ts | 27 +++------------------------
 src/SelectionModel.ts      |  4 +---
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
index aa388d8a..08fcbaa0 100644
--- a/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@ -126,7 +126,7 @@ export class SelectionManager implements ISelectionManager {
     this._initListeners();
     this.enable();
 
-    this._model = new SelectionModel(_terminal, bufferService);
+    this._model = new SelectionModel(bufferService);
     this._activeSelectionMode = SelectionMode.NORMAL;
   }
 
diff --git a/src/SelectionModel.test.ts b/src/SelectionModel.test.ts
index 605ba9e8..29d916da 100644
--- a/src/SelectionModel.test.ts
+++ b/src/SelectionModel.test.ts
@@ -4,36 +4,15 @@
  */
 
 import { assert } from 'chai';
-import { ITerminal } from './Types';
 import { SelectionModel } from './SelectionModel';
-import { BufferSet } from 'common/buffer/BufferSet';
-import { MockTerminal } from './TestUtils.test';
-import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
-import { IBufferService } from 'common/services/Services';
-
-class TestSelectionModel extends SelectionModel {
-  constructor(
-    terminal: ITerminal,
-    bufferService: IBufferService
-  ) {
-    super(terminal, bufferService);
-  }
-}
+import { MockBufferService } from 'common/TestUtils.test';
 
 describe('SelectionManager', () => {
-  let terminal: ITerminal;
-  let model: TestSelectionModel;
+  let model: SelectionModel;
 
   beforeEach(() => {
-    terminal = new MockTerminal();
     const bufferService = new MockBufferService(80, 2);
-    terminal.buffers = new BufferSet(
-      new MockOptionsService({ scrollback: 10 }),
-      bufferService
-    );
-    terminal.buffer = terminal.buffers.active;
-
-    model = new TestSelectionModel(terminal, bufferService);
+    model = new SelectionModel(bufferService);
   });
 
   describe('clearSelection', () => {
diff --git a/src/SelectionModel.ts b/src/SelectionModel.ts
index 44cd4cac..c8010c1c 100644
--- a/src/SelectionModel.ts
+++ b/src/SelectionModel.ts
@@ -3,7 +3,6 @@
  * @license MIT
  */
 
-import { ITerminal } from './Types';
 import { IBufferService } from 'common/services/Services';
 
 /**
@@ -34,7 +33,6 @@ export class SelectionModel {
   public selectionEnd: [number, number];
 
   constructor(
-    private _terminal: ITerminal,
     private _bufferService: IBufferService
   ) {
     this.clearSelection();
@@ -71,7 +69,7 @@ export class SelectionModel {
    */
   public get finalSelectionEnd(): [number, number] {
     if (this.isSelectAllActive) {
-      return [this._bufferService.cols, this._terminal.buffer.ybase + this._bufferService.rows - 1];
+      return [this._bufferService.cols, this._bufferService.buffer.ybase + this._bufferService.rows - 1];
     }
 
     if (!this.selectionStart) {