Fixes #34618: Recover from wrong fix for #30358 (5c58b8cb)

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

@@ -45,34 +45,58 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 		const endLineNumber = selection.endLineNumber;
 		const endColumn = selection.endColumn;
 
+		const startLineText = model.getLineContent(startLineNumber);
+		const endLineText = model.getLineContent(endLineNumber);
+
 		let startToken = config.blockCommentStartToken;
 		let endToken = config.blockCommentEndToken;
 
-		const startTokenIndex = model.getLineContent(startLineNumber).lastIndexOf(startToken, startColumn - 1 + startToken.length);
-		let endTokenIndex = model.getLineContent(endLineNumber).indexOf(endToken, endColumn - 1 - endToken.length);
+		let startTokenIndex = startLineText.lastIndexOf(startToken, startColumn - 1 + startToken.length);
+		let endTokenIndex = endLineText.indexOf(endToken, endColumn - 1 - endToken.length);
+
+		if (startTokenIndex !== -1 && endTokenIndex !== -1) {
+
+			if (startLineNumber === endLineNumber) {
+				const lineBetweenTokens = startLineText.substring(startTokenIndex + startToken.length, endTokenIndex);
+
+				if (lineBetweenTokens.indexOf(endToken) >= 0) {
+					// force to add a block comment
+					startTokenIndex = -1;
+					endTokenIndex = -1;
+				}
+			} else {
+				const startLineAfterStartToken = startLineText.substring(startTokenIndex + startToken.length);
+				const endLineBeforeEndToken = endLineText.substring(0, endTokenIndex);
+
+				if (startLineAfterStartToken.indexOf(endToken) >= 0 || endLineBeforeEndToken.indexOf(endToken) >= 0) {
+					// force to add a block comment
+					startTokenIndex = -1;
+					endTokenIndex = -1;
+				}
+			}
+		}
 
 		let ops: editorCommon.IIdentifiedSingleEditOperation[];
 
 		if (startTokenIndex !== -1 && endTokenIndex !== -1) {
-			const endTokenBeforeCursorIndex = model.getLineContent(startLineNumber).lastIndexOf(endToken, startColumn - 1 + endToken.length);
-			if (endTokenBeforeCursorIndex > startTokenIndex + startToken.length - 1) {
-				ops = BlockCommentCommand._createAddBlockCommentOperations(selection, startToken, endToken);
-				this._usedEndToken = ops.length === 1 ? endToken : null;
-			} else {
-				// We have to adjust to possible inner white space
-				// For Space after startToken, add Space to startToken - range math will work out
-				if (model.getLineContent(startLineNumber).charCodeAt(startTokenIndex + startToken.length) === CharCode.Space) {
-					startToken += ' ';
+			// Consider spaces as part of the comment tokens
+			if (startTokenIndex + startToken.length < startLineText.length) {
+				if (startLineText.charCodeAt(startTokenIndex + startToken.length) === CharCode.Space) {
+					// Pretend the start token contains a trailing space
+					startToken = startToken + ' ';
 				}
-				// For Space before endToken, add Space before endToken and shift index one left
-				if (model.getLineContent(endLineNumber).charCodeAt(endTokenIndex - 1) === CharCode.Space) {
+			}
+
+			if (endTokenIndex > 0) {
+				if (endLineText.charCodeAt(endTokenIndex - 1) === CharCode.Space) {
+					// Pretend the end token contains a leading space
 					endToken = ' ' + endToken;
 					endTokenIndex -= 1;
 				}
-				ops = BlockCommentCommand._createRemoveBlockCommentOperations(
-					new Range(startLineNumber, startTokenIndex + 1 + startToken.length, endLineNumber, endTokenIndex + 1), startToken, endToken
-				);
 			}
+			ops = BlockCommentCommand._createRemoveBlockCommentOperations(
+				new Range(startLineNumber, startTokenIndex + startToken.length + 1, endLineNumber, endTokenIndex + 1), startToken, endToken
+			);
 		} else {
 			ops = BlockCommentCommand._createAddBlockCommentOperations(selection, startToken, endToken);
 			this._usedEndToken = ops.length === 1 ? endToken : null;
@@ -134,8 +158,8 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 		const startColumn = this._selection.startColumn;
 
 		model.tokenizeIfCheap(startLineNumber);
-		let languageId = model.getLanguageIdAtPosition(startLineNumber, startColumn);
-		let config = LanguageConfigurationRegistry.getComments(languageId);
+		const languageId = model.getLanguageIdAtPosition(startLineNumber, startColumn);
+		const config = LanguageConfigurationRegistry.getComments(languageId);
 		if (!config || !config.blockCommentStartToken || !config.blockCommentEndToken) {
 			// Mode does not support block comments
 			return;

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

@@ -457,4 +457,17 @@ suite('Editor Contrib - Block Comment Command', () => {
 			new Selection(1, 16, 1, 22)
 		);
 	});
+
+	test('issue #34618', function () {
+		testBlockCommentCommand(
+			[
+				'<0  0> middle end',
+			],
+			new Selection(1, 4, 1, 4),
+			[
+				' middle end'
+			],
+			new Selection(1, 1, 1, 1)
+		);
+	});
 });