Merge remote-tracking branch 'ups/v3' into 847_proper_scrollback_value

src/utils/BufferLine.ts

@@ -1,55 +0,0 @@
-/**
- * @license MIT
- */
-
-// TODO: This module should be merged into a buffer or buffer line class
-
-const LINE_DATA_CHAR_INDEX = 1;
-const LINE_DATA_WIDTH_INDEX = 2;
-
-/**
- * Translates a buffer line to a string, with optional start and end columns.
- * Wide characters will count as two columns in the resulting string. This
- * function is useful for getting the actual text underneath the raw selection
- * position.
- * @param line The line being translated.
- * @param trimRight Whether to trim whitespace to the right.
- * @param startCol The column to start at.
- * @param endCol The column to end at.
- */
-export function translateBufferLineToString(line: any, trimRight: boolean, startCol: number = 0, endCol: number = null): string {
-  // Get full line
-  let lineString = '';
-  let widthAdjustedStartCol = startCol;
-  let widthAdjustedEndCol = endCol;
-  for (let i = 0; i < line.length; i++) {
-    const char = line[i];
-    lineString += char[LINE_DATA_CHAR_INDEX];
-    // Adjust start and end cols for wide characters if they affect their
-    // column indexes
-    if (char[LINE_DATA_WIDTH_INDEX] === 0) {
-      if (startCol >= i) {
-        widthAdjustedStartCol--;
-      }
-      if (endCol >= i) {
-        widthAdjustedEndCol--;
-      }
-    }
-  }
-
-  // Calculate the final end col by trimming whitespace on the right of the
-  // line if needed.
-  let finalEndCol = widthAdjustedEndCol || line.length;
-  if (trimRight) {
-    const rightWhitespaceIndex = lineString.search(/\s+$/);
-    if (rightWhitespaceIndex !== -1) {
-      finalEndCol = Math.min(finalEndCol, rightWhitespaceIndex);
-    }
-    // Return the empty string if only trimmed whitespace is selected
-    if (finalEndCol <= widthAdjustedStartCol) {
-      return '';
-    }
-  }
-
-  return lineString.substring(widthAdjustedStartCol, finalEndCol);
-}

src/utils/TestUtils.test.ts

@@ -2,8 +2,9 @@
  * @license MIT
  */
 
-import { ITerminal, IBuffer, IBufferSet, IBrowser, ICharMeasure, ISelectionManager, ITerminalOptions, IListenerType, IInputHandlingTerminal, IViewport, ICircularList } from '../Interfaces';
+import { ITerminal, IBuffer, IBufferSet, IBrowser, ICharMeasure, ISelectionManager, ITerminalOptions, IListenerType, IInputHandlingTerminal, IViewport, ICircularList, ICompositionHelper } from '../Interfaces';
 import { LineData } from '../Types';
+import * as Browser from './Browser';
 
 export class MockTerminal implements ITerminal {
   options: ITerminalOptions = {};
@@ -15,7 +16,7 @@ export class MockTerminal implements ITerminal {
   textarea: HTMLTextAreaElement;
   rows: number;
   cols: number;
-  browser: IBrowser;
+  browser: IBrowser = <any>Browser;
   writeBuffer: string[];
   children: HTMLElement[];
   cursorHidden: boolean;
@@ -180,4 +181,38 @@ export class MockBuffer implements IBuffer {
   scrollTop: number;
   savedY: number;
   savedX: number;
+  translateBufferLineToString(lineIndex: number, trimRight: boolean, startCol?: number, endCol?: number): string {
+    throw new Error('Method not implemented.');
+  }
+}
+
+export class MockViewport implements IViewport {
+  onWheel(ev: WheelEvent): void {
+    throw new Error('Method not implemented.');
+  }
+  onTouchStart(ev: TouchEvent): void {
+    throw new Error('Method not implemented.');
+  }
+  onTouchMove(ev: TouchEvent): void {
+    throw new Error('Method not implemented.');
+  }
+  syncScrollArea(): void { }
+}
+
+export class MockCompositionHelper implements ICompositionHelper {
+  compositionstart(): void {
+    throw new Error('Method not implemented.');
+  }
+  compositionupdate(ev: CompositionEvent): void {
+    throw new Error('Method not implemented.');
+  }
+  compositionend(): void {
+    throw new Error('Method not implemented.');
+  }
+  updateCompositionElements(dontRecurse?: boolean): void {
+    throw new Error('Method not implemented.');
+  }
+  keydown(ev: KeyboardEvent): boolean {
+    return true;
+  }
 }