Fixes microsoft#7100

alexdima · alexdima · commit 0c90b53899a5 · 2017-09-27T15:04:13.000+02:00
diff --git a/src/vs/editor/common/controller/coreCommands.ts b/src/vs/editor/common/controller/coreCommands.ts
@@ -1273,7 +1273,8 @@ export namespace CoreNavigationCommands {
 			const lastAddedCursorIndex = cursors.getLastAddedCursorIndex();
 
 			let newStates = cursors.getAll().slice(0);
-			newStates[lastAddedCursorIndex] = CursorMoveCommands.word(context, newStates[lastAddedCursorIndex], true, args.position);
+			let lastAddedState = newStates[lastAddedCursorIndex];
+			newStates[lastAddedCursorIndex] = CursorMoveCommands.word(context, lastAddedState, lastAddedState.modelState.hasSelection(), args.position);
 
 			context.model.pushStackElement();
 			cursors.setStates(
diff --git a/src/vs/editor/common/controller/cursorWordOperations.ts b/src/vs/editor/common/controller/cursorWordOperations.ts
@@ -378,7 +378,7 @@ export class WordOperations {
 		let nextWord = WordOperations._findNextWordOnLine(wordSeparators, model, position);
 		let isInNextWord = (nextWord && nextWord.wordType === WordType.Regular && nextWord.start < position.column - 1 && position.column - 1 <= nextWord.end);
 
-		if (!inSelectionMode || !cursor.hasSelection()) {
+		if (!inSelectionMode) {
 			// Entering word selection for the first time
 
 			let startColumn: number;
@@ -439,6 +439,6 @@ export class WordOperations {
 			}
 		}
 
-		return cursor.move(cursor.hasSelection(), lineNumber, column, 0);
+		return cursor.move(true, lineNumber, column, 0);
 	}
 }
diff --git a/src/vs/editor/test/common/controller/cursor.test.ts b/src/vs/editor/test/common/controller/cursor.test.ts
@@ -3699,4 +3699,31 @@ suite('autoClosingPairs', () => {
 		model.dispose();
 		mode.dispose();
 	});
+
+	test('issue #7100: Mouse word selection is strange when non-word character is at the end of line', () => {
+		let model = Model.createFromString(
+			[
+				'before.a',
+				'before',
+				'hello:',
+				'there:',
+				'this is strange:',
+				'here',
+				'it',
+				'is',
+			].join('\n')
+		);
+
+		withMockCodeEditor(null, { model: model }, (editor, cursor) => {
+			CoreNavigationCommands.WordSelect.runEditorCommand(null, editor, {
+				position: new Position(3, 7)
+			});
+			assertCursor(cursor, new Selection(3, 7, 3, 7));
+
+			CoreNavigationCommands.WordSelectDrag.runEditorCommand(null, editor, {
+				position: new Position(4, 7)
+			});
+			assertCursor(cursor, new Selection(3, 7, 4, 7));
+		});
+	});
 });

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ export class WordOperations {`
`378`	`378`	`let nextWord = WordOperations._findNextWordOnLine(wordSeparators, model, position);`
`379`	`379`	`let isInNextWord = (nextWord && nextWord.wordType === WordType.Regular && nextWord.start < position.column - 1 && position.column - 1 <= nextWord.end);`
`380`	`380`
`381`		`- if (!inSelectionMode \|\| !cursor.hasSelection()) {`
	`381`	`+ if (!inSelectionMode) {`
`382`	`382`	`// Entering word selection for the first time`
`383`	`383`
`384`	`384`	`let startColumn: number;`
`@@ -439,6 +439,6 @@ export class WordOperations {`
`439`	`439`	`}`
`440`	`440`	`}`
`441`	`441`
`442`		`- return cursor.move(cursor.hasSelection(), lineNumber, column, 0);`
	`442`	`+ return cursor.move(true, lineNumber, column, 0);`
`443`	`443`	`}`
`444`	`444`	`}`