SingleUpdatedNextEdit: Correctly apply insertion changes

Author: yavanosta

src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts

@@ -673,7 +673,7 @@ class SingleUpdatedNextEdit {
 			if (isInsertion && !shouldPreserveEditShape && change.replaceRange.start === editStart && editReplaceText.startsWith(change.newText)) {
 				editStart += change.newText.length;
 				editReplaceText = editReplaceText.substring(change.newText.length);
-				editEnd = Math.max(editStart, editEnd);
+				editEnd += change.newText.length;
 				editHasChanged = true;
 				continue;
 			}

src/vs/editor/contrib/inlineCompletions/test/browser/inlineEdits.test.ts

@@ -18,6 +18,10 @@ class Point {
 	getLength2D(): number {
 		return↓ Math.sqrt(this.x * this.x + this.y * this.y↓);
 	}
+
+	getJson(): string {
+		return ↓Ü;
+	}
 }
 `);
 
@@ -57,6 +61,10 @@ class Point {
 	getLength3D(): number {
 		return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
 	}
+
+	getJson(): string {
+		return Ü;
+	}
 }
 `);
 		});
@@ -90,6 +98,24 @@ class Point {
 		});
 	});
 
+	test('Inline Edit Is Correctly Shifted When Typing', async () => {
+		await runTest(async ({ context, model, editor, editorViewModel }, provider, view) => {
+			provider.add(`Ü`, `{x: this.x, y: this.y}`);
+			await model.trigger();
+			await timeout(10000);
+			assert.deepStrictEqual(view.getAndClearViewStates(), ([
+				undefined,
+				"...\n\t\treturn ❰Ü↦{x: t...is.y}❱;\n"
+			]));
+			editor.setPosition(val.getMarkerPosition(2));
+			editorViewModel.type('{');
+
+			assert.deepStrictEqual(view.getAndClearViewStates(), ([
+				"...\t\treturn {❰Ü↦x: th...is.y}❱;\n"
+			]));
+		});
+	});
+
 	test('Inline Edit Stays On Unrelated Edit', async function () {
 		await runTest(async ({ context, model, editor, editorViewModel }, provider, view) => {
 			provider.add(`getLength2D(): number {