From 62ff97c82d0c438ec1d06d71501260210674ca55 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 8 Jun 2019 17:58:56 -0700
Subject: [PATCH] Move BufferSet deps to common

---
 src/BufferSet.ts           |  5 ++---
 src/TestUtils.test.ts      |  4 ++--
 src/Types.ts               | 13 +------------
 src/common/buffer/Types.ts | 12 ++++++++++++
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/BufferSet.ts b/src/BufferSet.ts
index fc07b9a7..cc8fe737 100644
--- a/src/BufferSet.ts
+++ b/src/BufferSet.ts
@@ -3,10 +3,9 @@
  * @license MIT
  */
 
-import { IBufferSet } from './Types';
-import { IBuffer } from 'common/buffer/Types';
+import { IBuffer, IBufferSet } from 'common/buffer/Types';
 import { IAttributeData } from 'common/Types';
-import { Buffer } from './common/buffer/Buffer';
+import { Buffer } from 'common/buffer/Buffer';
 import { EventEmitter2, IEvent } from 'common/EventEmitter2';
 import { IOptionsService, IBufferService } from 'common/services/Services';
 
diff --git a/src/TestUtils.test.ts b/src/TestUtils.test.ts
index fa48b4b0..12267f98 100644
--- a/src/TestUtils.test.ts
+++ b/src/TestUtils.test.ts
@@ -4,8 +4,8 @@
  */
 
 import { IRenderer, IRenderDimensions } from './renderer/Types';
-import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminal, IBufferSet, IBrowser, ISelectionManager, ITerminalOptions, ILinkifier, IMouseHelper, ILinkMatcherOptions, CharacterJoinerHandler } from './Types';
-import { IBuffer, IBufferStringIterator } from 'common/buffer/Types';
+import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminal, IBrowser, ISelectionManager, ITerminalOptions, ILinkifier, IMouseHelper, ILinkMatcherOptions, CharacterJoinerHandler } from './Types';
+import { IBuffer, IBufferStringIterator, IBufferSet } from 'common/buffer/Types';
 import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener } from 'common/Types';
 import { Buffer } from './common/buffer/Buffer';
 import * as Browser from 'common/Platform';
diff --git a/src/Types.ts b/src/Types.ts
index 40328cf4..9dafbf79 100644
--- a/src/Types.ts
+++ b/src/Types.ts
@@ -8,7 +8,7 @@ import { ICharset, IAttributeData, CharData } from 'common/Types';
 import { IEvent } from 'common/EventEmitter2';
 import { IColorSet } from 'browser/Types';
 import { IOptionsService } from 'common/services/Services';
-import { IBuffer } from 'common/buffer/Types';
+import { IBuffer, IBufferSet } from 'common/buffer/Types';
 
 export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;
 
@@ -296,17 +296,6 @@ export interface ITerminalOptions extends IPublicTerminalOptions {
   useFlowControl?: boolean;
 }
 
-export interface IBufferSet {
-  alt: IBuffer;
-  normal: IBuffer;
-  active: IBuffer;
-
-  onBufferActivate: IEvent<{ activeBuffer: IBuffer, inactiveBuffer: IBuffer }>;
-
-  activateNormalBuffer(): void;
-  activateAltBuffer(fillAttr?: IAttributeData): void;
-}
-
 export interface ISelectionManager {
   selectionText: string;
   selectionStart: [number, number];
diff --git a/src/common/buffer/Types.ts b/src/common/buffer/Types.ts
index 9a483735..37ce2b7e 100644
--- a/src/common/buffer/Types.ts
+++ b/src/common/buffer/Types.ts
@@ -4,6 +4,7 @@
  */
 
 import { IAttributeData, ICircularList, IBufferLine, ICellData } from 'common/Types';
+import { IEvent } from 'common/EventEmitter2';
 
 // BufferIndex denotes a position in the buffer: [rowIndex, colIndex]
 export type BufferIndex = [number, number];
@@ -42,3 +43,14 @@ export interface IBuffer {
   getNullCell(attr?: IAttributeData): ICellData;
   getWhitespaceCell(attr?: IAttributeData): ICellData;
 }
+
+export interface IBufferSet {
+  alt: IBuffer;
+  normal: IBuffer;
+  active: IBuffer;
+
+  onBufferActivate: IEvent<{ activeBuffer: IBuffer, inactiveBuffer: IBuffer }>;
+
+  activateNormalBuffer(): void;
+  activateAltBuffer(fillAttr?: IAttributeData): void;
+}