From 96a95af63785fabd0e9a9eb8a47b9ad414ca40c3 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 19 May 2017 23:15:21 +0200
Subject: [PATCH] Fixes #2106

---
 .../editor/common/controller/coreCommands.ts  | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/common/controller/coreCommands.ts b/src/vs/editor/common/controller/coreCommands.ts
index 02fade2c3d2b0..9ad0e099b2c92 100644
--- a/src/vs/editor/common/controller/coreCommands.ts
+++ b/src/vs/editor/common/controller/coreCommands.ts
@@ -712,14 +712,45 @@ export namespace CoreNavigationCommands {
 				newState = CursorMoveCommands.moveTo(context, cursors.getPrimaryCursor(), false, args.position, args.viewPosition);
 			}
 
-			let newStates = cursors.getAll().slice(0);
-			newStates.push(newState);
+			const states = cursors.getAll();
+
+			// Check if we should remove a cursor (sort of like a toggle)
+			if (states.length > 1) {
+				const newModelPosition = (newState.modelState ? newState.modelState.position : null);
+				const newViewPosition = (newState.viewState ? newState.viewState.position : null);
+
+				for (let i = 0, len = states.length; i < len; i++) {
+					const state = states[i];
+
+					if (newModelPosition && !state.modelState.selection.containsPosition(newModelPosition)) {
+						continue;
+					}
+
+					if (newViewPosition && !state.viewState.selection.containsPosition(newViewPosition)) {
+						continue;
+					}
+
+					// => Remove the cursor
+					states.splice(i, 1);
+
+					cursors.context.model.pushStackElement();
+					cursors.setStates(
+						args.source,
+						CursorChangeReason.Explicit,
+						states
+					);
+					return;
+				}
+			}
+
+			// => Add the new cursor
+			states.push(newState);
 
 			cursors.context.model.pushStackElement();
 			cursors.setStates(
 				args.source,
 				CursorChangeReason.Explicit,
-				newStates
+				states
 			);
 		}
 	});