Fixes microsoft#33788: Wrong cursor position when double click to select a word

alexdima · alexdima · commit 8e1402b8aced · 2017-10-21T10:50:58.000+02:00
diff --git a/src/vs/editor/common/controller/cursorWordOperations.ts b/src/vs/editor/common/controller/cursorWordOperations.ts
@@ -425,7 +425,9 @@ export class WordOperations {
 
 		let lineNumber = position.lineNumber;
 		let column: number;
-		if (position.isBeforeOrEqual(cursor.selectionStart.getStartPosition())) {
+		if (cursor.selectionStart.containsPosition(position)) {
+			column = cursor.selectionStart.endColumn;
+		} else if (position.isBeforeOrEqual(cursor.selectionStart.getStartPosition())) {
 			column = startColumn;
 			let possiblePosition = new Position(lineNumber, column);
 			if (cursor.selectionStart.containsPosition(possiblePosition)) {
diff --git a/src/vs/editor/test/common/controller/cursor.test.ts b/src/vs/editor/test/common/controller/cursor.test.ts
@@ -1629,6 +1629,24 @@ suite('Editor Controller - Regression tests', () => {
 		});
 	});
 
+	test('issue #33788: Wrong cursor position when double click to select a word', () => {
+		let model = Model.createFromString(
+			[
+				'Just some text'
+			].join('\n')
+		);
+
+		withMockCodeEditor(null, { model: model }, (editor, cursor) => {
+			CoreNavigationCommands.WordSelect.runCoreEditorCommand(cursor, { position: new Position(1, 8) });
+			assert.deepEqual(cursor.getSelection(), new Selection(1, 6, 1, 10));
+
+			CoreNavigationCommands.WordSelectDrag.runCoreEditorCommand(cursor, { position: new Position(1, 8) });
+			assert.deepEqual(cursor.getSelection(), new Selection(1, 6, 1, 10));
+		});
+
+		model.dispose();
+	});
+
 	test('issue #9675: Undo/Redo adds a stop in between CHN Characters', () => {
 		usingCursor({
 			text: [
