fix(vscode): handle empty selection in getTrimmedNewText

Author: johnsoncodehk

extensions/vscode/lib/rangeFormatting.ts

@@ -29,10 +29,13 @@ export function restrictFormattingEditsToRange(
 			continue;
 		}
 
-		const trimmedEdit = getTrimmedNewText(document, selectionStart, selectionEnd, edit, editStart, editEnd);
-		if (trimmedEdit) {
-			result.push(replace(trimmedEdit.start, trimmedEdit.end, trimmedEdit.newText));
+		if (editStart === editEnd) {
+			result.push(edit);
+			continue;
 		}
+
+		const trimmedEdit = getTrimmedNewText(document, selectionStart, selectionEnd, edit, editStart, editEnd);
+		result.push(replace(trimmedEdit.start, trimmedEdit.end, trimmedEdit.newText));
 	}
 
 	return result;
@@ -46,24 +49,14 @@ function getTrimmedNewText(
 	editStart: number,
 	editEnd: number,
 ) {
-	if (editStart === editEnd) {
-		return {
-			start: editStart,
-			end: editEnd,
-			newText: edit.newText,
-		};
-	}
 	const oldText = document.getText(edit.range);
 	let overlapStart = Math.max(editStart, selectionStart) - editStart;
 	let overlapEnd = Math.min(editEnd, selectionEnd) - editStart;
-	if (overlapStart === overlapEnd) {
-		return;
-	}
-
 	let oldTextIndex = 0;
 	let newTextIndex = 0;
 	let newStart!: number;
 	let newEnd!: number;
+
 	while (true) {
 		if (oldTextIndex === overlapStart) {
 			newStart = newTextIndex;
@@ -78,7 +71,7 @@ function getTrimmedNewText(
 		}
 		if (!isWhitespaceChar(oldCharCode) && !isWhitespaceChar(newCharCode)) {
 			newStart = newTextIndex;
-			overlapStart -= overlapStart - oldTextIndex;
+			overlapStart = oldTextIndex;
 			break;
 		}
 		if (isWhitespaceChar(oldCharCode)) {
@@ -91,6 +84,7 @@ function getTrimmedNewText(
 
 	oldTextIndex = oldText.length - 1;
 	newTextIndex = edit.newText.length - 1;
+
 	while (true) {
 		if (oldTextIndex + 1 === overlapEnd) {
 			newEnd = newTextIndex + 1;
@@ -105,7 +99,7 @@ function getTrimmedNewText(
 		}
 		if (!isWhitespaceChar(oldCharCode) && !isWhitespaceChar(newCharCode)) {
 			newEnd = newTextIndex + 1;
-			overlapEnd += overlapEnd - oldTextIndex + 1;
+			overlapEnd = oldTextIndex + 1;
 			break;
 		}
 		if (isWhitespaceChar(oldCharCode)) {

extensions/vscode/tests/rangeFormatting.spec.ts

@@ -73,7 +73,7 @@ describe('provideDocumentRangeFormattingEdits', () => {
 			createTextEdit(2, 2, 'X'),
 		];
 		const result = restrictFormattingEditsToRange(document, selection, edits, createTextEdit);
-		expect(applyEdits(document, result)).toMatchInlineSnapshot(`"01X23456789"`);
+		expect(applyEdits(document, result)).toMatchInlineSnapshot(`"01X234Z6789"`);
 	});
 
 	test('handles deletion where newText is shorter than oldText in selection', () => {
@@ -129,7 +129,7 @@ describe('provideDocumentRangeFormattingEdits', () => {
 		const selection = createRange(5, 5); // empty selection at position 5
 		const edits = [createTextEdit(3, 7, 'ABCD')];
 		const result = restrictFormattingEditsToRange(document, selection, edits, createTextEdit);
-		expect(applyEdits(document, result)).toMatchInlineSnapshot(`"0123456789"`);
+		expect(applyEdits(document, result)).toMatchInlineSnapshot(`"012ABCD789"`);
 	});
 
 	test('handles empty edit (pure insertion)', () => {
@@ -166,15 +166,6 @@ describe('provideDocumentRangeFormattingEdits', () => {
 		const result = restrictFormattingEditsToRange(document, selection, edits, createTextEdit);
 		expect(applyEdits(document, result)).toMatchInlineSnapshot(`"你好朋友"`);
 	});
-
-	test('handles overlapStart equals overlapEnd', () => {
-		// When edit and selection don't actually overlap in content
-		const document = createDocument('0123456789');
-		const selection = createRange(5, 5);
-		const edits = [createTextEdit(3, 7, 'WXYZ')];
-		const result = restrictFormattingEditsToRange(document, selection, edits, createTextEdit);
-		expect(applyEdits(document, result)).toMatchInlineSnapshot(`"0123456789"`);
-	});
 });
 
 // self implementation of vscode test utils