From 7f2e94c30c4fe067d45a2044543d988068845b67 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 18 Jun 2017 10:38:04 -0700 Subject: [PATCH 1/3] Don't select colon or brackets when double clicking Fixes #713 --- src/SelectionManager.test.ts | 35 +++++++++++++++++++++++++++++++++++ src/SelectionManager.ts | 19 +++++++++++++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts index e0ff6789..4de1d1cf 100644 --- a/src/SelectionManager.test.ts +++ b/src/SelectionManager.test.ts @@ -142,6 +142,41 @@ describe('SelectionManager', () => { selectionManager.selectWordAt([14, 0]); assert.equal(selectionManager.selectionText, 'foo'); }); + it('should select up to non-path characters that are commonly adjacent to paths', () => { + buffer.push(stringToRow(':ab:(cd)[ef]{gh}')); + selectionManager.selectWordAt([0, 0]); + assert.equal(selectionManager.selectionText, ':ab'); + selectionManager.selectWordAt([1, 0]); + assert.equal(selectionManager.selectionText, 'ab'); + selectionManager.selectWordAt([2, 0]); + assert.equal(selectionManager.selectionText, 'ab'); + selectionManager.selectWordAt([3, 0]); + assert.equal(selectionManager.selectionText, 'ab:'); + selectionManager.selectWordAt([4, 0]); + assert.equal(selectionManager.selectionText, '(cd'); + selectionManager.selectWordAt([5, 0]); + assert.equal(selectionManager.selectionText, 'cd'); + selectionManager.selectWordAt([6, 0]); + assert.equal(selectionManager.selectionText, 'cd'); + selectionManager.selectWordAt([7, 0]); + assert.equal(selectionManager.selectionText, 'cd)'); + selectionManager.selectWordAt([8, 0]); + assert.equal(selectionManager.selectionText, '[ef'); + selectionManager.selectWordAt([9, 0]); + assert.equal(selectionManager.selectionText, 'ef'); + selectionManager.selectWordAt([10, 0]); + assert.equal(selectionManager.selectionText, 'ef'); + selectionManager.selectWordAt([11, 0]); + assert.equal(selectionManager.selectionText, 'ef]'); + selectionManager.selectWordAt([12, 0]); + assert.equal(selectionManager.selectionText, '{gh'); + selectionManager.selectWordAt([13, 0]); + assert.equal(selectionManager.selectionText, 'gh'); + selectionManager.selectWordAt([14, 0]); + assert.equal(selectionManager.selectionText, 'gh'); + selectionManager.selectWordAt([15, 0]); + assert.equal(selectionManager.selectionText, 'gh}'); + }); }); describe('_selectLineAt', () => { diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts index 9cfa5302..d1ccecae 100644 --- a/src/SelectionManager.ts +++ b/src/SelectionManager.ts @@ -37,6 +37,12 @@ const CLEAR_MOUSE_DOWN_TIME = 400; */ const CLEAR_MOUSE_DISTANCE = 10; +/** + * A string containing all characters that are considered word separated by the + * double click to select work logic. + */ +const WORD_SEPARATORS = ' ()[]{}:'; + // TODO: Move these constants elsewhere, they belong in a buffer or buffer // data/line class. const LINE_DATA_CHAR_INDEX = 1; @@ -610,7 +616,7 @@ export class SelectionManager extends EventEmitter { endCol++; } // Expand the string in both directions until a space is hit - while (startIndex > 0 && line.charAt(startIndex - 1) !== ' ') { + while (startIndex > 0 && !this._isCharWordSeparator(line.charAt(startIndex - 1))) { if (bufferLine[startCol - 1][LINE_DATA_WIDTH_INDEX] === 0) { // If the next character is a wide char, record it and skip the column leftWideCharCount++; @@ -619,7 +625,7 @@ export class SelectionManager extends EventEmitter { startIndex--; startCol--; } - while (endIndex + 1 < line.length && line.charAt(endIndex + 1) !== ' ') { + while (endIndex + 1 < line.length && !this._isCharWordSeparator(line.charAt(endIndex + 1))) { if (bufferLine[endCol + 1][LINE_DATA_WIDTH_INDEX] === 2) { // If the next character is a wide char, record it and skip the column rightWideCharCount++; @@ -635,6 +641,15 @@ export class SelectionManager extends EventEmitter { this._model.selectionStartLength = Math.min(endIndex - startIndex + leftWideCharCount + rightWideCharCount + 1/*include endIndex char*/, this._terminal.cols); } + /** + * Gets whether the character is considered a word separator by the select + * word logic. + * @param char The character to check. + */ + private _isCharWordSeparator(char: string): boolean { + return WORD_SEPARATORS.indexOf(char) >= 0; + } + /** * Selects the line specified. * @param line The line index. From 07882c42dcb90572475925ac26f9304edafa63bd Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 18 Jun 2017 11:51:00 -0700 Subject: [PATCH 2/3] Also consider ' and " word separators For example URIs in json --- src/SelectionManager.test.ts | 10 +++++++++- src/SelectionManager.ts | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts index 4de1d1cf..eb9322b6 100644 --- a/src/SelectionManager.test.ts +++ b/src/SelectionManager.test.ts @@ -143,7 +143,7 @@ describe('SelectionManager', () => { assert.equal(selectionManager.selectionText, 'foo'); }); it('should select up to non-path characters that are commonly adjacent to paths', () => { - buffer.push(stringToRow(':ab:(cd)[ef]{gh}')); + buffer.push(stringToRow(':ab:(cd)[ef]{gh}\'ij"')); selectionManager.selectWordAt([0, 0]); assert.equal(selectionManager.selectionText, ':ab'); selectionManager.selectWordAt([1, 0]); @@ -176,6 +176,14 @@ describe('SelectionManager', () => { assert.equal(selectionManager.selectionText, 'gh'); selectionManager.selectWordAt([15, 0]); assert.equal(selectionManager.selectionText, 'gh}'); + selectionManager.selectWordAt([16, 0]); + assert.equal(selectionManager.selectionText, '\'ij'); + selectionManager.selectWordAt([17, 0]); + assert.equal(selectionManager.selectionText, 'ij'); + selectionManager.selectWordAt([18, 0]); + assert.equal(selectionManager.selectionText, 'ij'); + selectionManager.selectWordAt([19, 0]); + assert.equal(selectionManager.selectionText, 'ij"'); }); }); diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts index d1ccecae..b1da4926 100644 --- a/src/SelectionManager.ts +++ b/src/SelectionManager.ts @@ -41,7 +41,7 @@ const CLEAR_MOUSE_DISTANCE = 10; * A string containing all characters that are considered word separated by the * double click to select work logic. */ -const WORD_SEPARATORS = ' ()[]{}:'; +const WORD_SEPARATORS = ' ()[]{}:\'"'; // TODO: Move these constants elsewhere, they belong in a buffer or buffer // data/line class. From b05814e6a5429c9abed40c64becf5d73bb624011 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 18 Jun 2017 12:02:58 -0700 Subject: [PATCH 3/3] Improve selection cell selection Fixes #709 --- src/SelectionManager.ts | 2 +- src/utils/Mouse.ts | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts index 9cfa5302..71c712ed 100644 --- a/src/SelectionManager.ts +++ b/src/SelectionManager.ts @@ -309,7 +309,7 @@ export class SelectionManager extends EventEmitter { * @param event The mouse event. */ private _getMouseBufferCoords(event: MouseEvent): [number, number] { - const coords = Mouse.getCoords(event, this._rowContainer, this._charMeasure, this._terminal.cols, this._terminal.rows); + const coords = Mouse.getCoords(event, this._rowContainer, this._charMeasure, this._terminal.cols, this._terminal.rows, true); // Convert to 0-based coords[0]--; coords[1]--; diff --git a/src/utils/Mouse.ts b/src/utils/Mouse.ts index 79c5d5c1..a5d72c1e 100644 --- a/src/utils/Mouse.ts +++ b/src/utils/Mouse.ts @@ -30,12 +30,17 @@ export function getCoordsRelativeToElement(event: MouseEvent, element: HTMLEleme * @param event The mouse event. * @param rowContainer The terminal's row container. * @param charMeasure The char measure object used to determine character sizes. + * @param colCount The number of columns in the terminal. + * @param rowCount The number of rows n the terminal. + * @param isSelection Whether the request is for the selection or not. This will + * apply an offset to the x value such that the left half of the cell will + * select that cell and the right half will select the next cell. */ -export function getCoords(event: MouseEvent, rowContainer: HTMLElement, charMeasure: CharMeasure, colCount: number, rowCount: number): [number, number] { +export function getCoords(event: MouseEvent, rowContainer: HTMLElement, charMeasure: CharMeasure, colCount: number, rowCount: number, isSelection?: boolean): [number, number] { const coords = getCoordsRelativeToElement(event, rowContainer); - // Convert to cols/rows - coords[0] = Math.ceil(coords[0] / charMeasure.width); + // Convert to cols/rows. + coords[0] = Math.ceil((coords[0] + (isSelection ? charMeasure.width / 2 : 0)) / charMeasure.width); coords[1] = Math.ceil(coords[1] / charMeasure.height); // Ensure coordinates are within the terminal viewport.