Fixes #5964: remove bogus code and fix tests

src/vs/editor/contrib/comment/common/lineCommentCommand.ts

@@ -200,13 +200,8 @@ export class LineCommentCommand implements editorCommon.ICommand {
 			ops = LineCommentCommand._createAddLineCommentsOperations(data.lines, s.startLineNumber);
 		}
 
-		var cursorPosition = new Position(s.positionLineNumber, s.positionColumn);
-
 		for (var i = 0, len = ops.length; i < len; i++) {
 			builder.addEditOperation(ops[i].range, ops[i].text);
-			if (ops[i].range.isEmpty() && ops[i].range.getStartPosition().equals(cursorPosition)) {
-				this._deltaColumn = ops[i].text.length;
-			}
 		}
 
 		this._selectionId = builder.trackSelection(s);

src/vs/editor/contrib/comment/test/common/lineCommentCommand.test.ts

@@ -41,7 +41,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'!@# some text',
 				'\tsome more text'
 			],
-			new Selection(1, 9, 1, 9)
+			new Selection(1, 5, 1, 5)
 		);
 	});
 
@@ -335,7 +335,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'!@# first!@#',
 				'\tsecond line'
 			],
-			new Selection(1, 9, 1, 9)
+			new Selection(1, 5, 1, 5)
 		);
 	});
 
@@ -371,7 +371,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 9, 2, 5)
+			new Selection(1, 5, 2, 1)
 		);
 	});
 
@@ -392,7 +392,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 9, 2, 12)
+			new Selection(1, 5, 2, 8)
 		);
 	});
 
@@ -413,7 +413,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'!@# fourth line',
 				'fifth'
 			],
-			new Selection(3, 9, 4, 12)
+			new Selection(3, 5, 4, 8)
 		);
 	});
 
@@ -434,7 +434,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 9, 1, 9)
+			new Selection(1, 5, 1, 5)
 		);
 
 		testLineCommentCommand(
@@ -474,7 +474,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 9, 2, 12)
+			new Selection(1, 5, 2, 8)
 		);
 
 		testLineCommentCommand(
@@ -497,6 +497,27 @@ suite('Editor Contrib - Line Comment Command', () => {
 		);
 	});
 
+	test('issue #5964: Ctrl+/ to create comment when cursor is at the beginning of the line puts the cursor in a strange position', () => {
+		testLineCommentCommand(
+			[
+				'first',
+				'\tsecond line',
+				'third line',
+				'fourth line',
+				'fifth'
+			],
+			new Selection(1, 1, 1, 1),
+			[
+				'!@# first',
+				'\tsecond line',
+				'third line',
+				'fourth line',
+				'fifth'
+			],
+			new Selection(1, 5, 1, 5)
+		);
+	});
+
 	test('issue #2837 "Add Line Comment" fault when blank lines involved', function () {
 		testAddLineCommentCommand(
 			[