Merge pull request #746 from Tyriar/745_colon_word_sep

Remove colon from the selection word separators
xtermjs · Jul 2, 2017 · 31aab8e · 31aab8e
2 parents f80159f + 857d9bc
commit 31aab8e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts
@@ -143,46 +143,38 @@ 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}\'ij"'));
+ buffer.push(stringToRow('(cd)[ef]{gh}\'ij"'));
  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]);
+ selectionManager.selectWordAt([1, 0]);
  assert.equal(selectionManager.selectionText, 'cd');
- selectionManager.selectWordAt([6, 0]);
+ selectionManager.selectWordAt([2, 0]);
  assert.equal(selectionManager.selectionText, 'cd');
- selectionManager.selectWordAt([7, 0]);
+ selectionManager.selectWordAt([3, 0]);
  assert.equal(selectionManager.selectionText, 'cd)');
- selectionManager.selectWordAt([8, 0]);
+ selectionManager.selectWordAt([4, 0]);
  assert.equal(selectionManager.selectionText, '[ef');
- selectionManager.selectWordAt([9, 0]);
+ selectionManager.selectWordAt([5, 0]);
  assert.equal(selectionManager.selectionText, 'ef');
- selectionManager.selectWordAt([10, 0]);
+ selectionManager.selectWordAt([6, 0]);
  assert.equal(selectionManager.selectionText, 'ef');
- selectionManager.selectWordAt([11, 0]);
+ selectionManager.selectWordAt([7, 0]);
  assert.equal(selectionManager.selectionText, 'ef]');
- selectionManager.selectWordAt([12, 0]);
+ selectionManager.selectWordAt([8, 0]);
  assert.equal(selectionManager.selectionText, '{gh');
- selectionManager.selectWordAt([13, 0]);
+ selectionManager.selectWordAt([9, 0]);
  assert.equal(selectionManager.selectionText, 'gh');
- selectionManager.selectWordAt([14, 0]);
+ selectionManager.selectWordAt([10, 0]);
  assert.equal(selectionManager.selectionText, 'gh');
- selectionManager.selectWordAt([15, 0]);
+ selectionManager.selectWordAt([11, 0]);
  assert.equal(selectionManager.selectionText, 'gh}');
- selectionManager.selectWordAt([16, 0]);
+ selectionManager.selectWordAt([12, 0]);
  assert.equal(selectionManager.selectionText, '\'ij');
- selectionManager.selectWordAt([17, 0]);
+ selectionManager.selectWordAt([13, 0]);
  assert.equal(selectionManager.selectionText, 'ij');
- selectionManager.selectWordAt([18, 0]);
+ selectionManager.selectWordAt([14, 0]);
  assert.equal(selectionManager.selectionText, 'ij');
- selectionManager.selectWordAt([19, 0]);
+ selectionManager.selectWordAt([15, 0]);
  assert.equal(selectionManager.selectionText, 'ij"');
  });
  });

diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
@@ -42,7 +42,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.