stream-monaco 0.0.20 → 0.0.21

package/dist/{preloadMonacoWorkers.shared-B2kXtXTi.cjs → preloadMonacoWorkers.shared-DAHEwJHs.cjs}

@@ -553,6 +553,7 @@ var DiffEditorManager = class DiffEditorManager {
 	diffHunkFallbackVersions = null;
 	diffHunkActionInFlight = false;
 	diffComputedVersions = null;
+	preserveNativeDiffDecorationsOnStaleAppend = false;
 	diffPresentationDisposables = [];
 	fallbackOriginalDecorationIds = [];
 	fallbackModifiedDecorationIds = [];
@@ -569,6 +570,52 @@ var DiffEditorManager = class DiffEditorManager {
 	diffRootAppearanceSignature = null;
 	diffPersistedUnchangedModelState = null;
 	pendingPreparedDiffViewModel = null;
+	cancelRafs() {
+		this.rafScheduler.cancel("sync-diff-presentation");
+		this.rafScheduler.cancel("capture-diff-unchanged-state");
+		this.rafScheduler.cancel("restore-diff-unchanged-state");
+		this.rafScheduler.cancel("patch-diff-unchanged-regions");
+		this.rafScheduler.cancel("maybe-scroll-diff");
+		this.rafScheduler.cancel("revealDiff");
+		this.rafScheduler.cancel("immediate-reveal-diff");
+		this.rafScheduler.cancel("maybe-resume-diff");
+		this.rafScheduler.cancel("content-size-change-diff");
+		this.rafScheduler.cancel("sync-last-known-modified");
+		this.rafScheduler.cancel("diff");
+		this.rafScheduler.cancel("appendDiff");
+	}
+	clearRevealTimers() {
+		if (this.revealDebounceIdDiff != null) {
+			clearTimeout(this.revealDebounceIdDiff);
+			this.revealDebounceIdDiff = null;
+		}
+		if (this.revealIdleTimerIdDiff != null) {
+			clearTimeout(this.revealIdleTimerIdDiff);
+			this.revealIdleTimerIdDiff = null;
+		}
+	}
+	resetAppendState() {
+		this.appendBufferDiffScheduled = false;
+		this.appendBufferOriginalDiff.length = 0;
+		this.appendBufferModifiedDiff.length = 0;
+		if (this.appendFlushThrottleTimerDiff != null) {
+			clearTimeout(this.appendFlushThrottleTimerDiff);
+			this.appendFlushThrottleTimerDiff = null;
+		}
+	}
+	clearAsyncWork() {
+		this.cancelRafs();
+		this.pendingDiffUpdate = null;
+		this.lastKnownModifiedDirty = false;
+		this.resetAppendState();
+		this.clearRevealTimers();
+		if (this.diffScrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.diffScrollWatcherSuppressionTimer);
+			this.diffScrollWatcherSuppressionTimer = null;
+		}
+		this.cancelScheduledHideDiffHunkActions();
+		this.clearPendingDiffThemeSync();
+	}
 	diffModelTransitionRequestId = 0;
 	pendingDiffScrollRestorePosition = null;
 	pendingDiffScrollRestoreBudget = 0;
@@ -952,15 +999,16 @@ var DiffEditorManager = class DiffEditorManager {
 				marginClassName: removed ? "stream-monaco-fallback-gutter-delete" : "stream-monaco-fallback-gutter-insert",
 				linesDecorationsClassName: removed ? "stream-monaco-fallback-lines-delete" : "stream-monaco-fallback-lines-insert",
 				lineNumberClassName: removed ? "stream-monaco-fallback-line-number-delete" : "stream-monaco-fallback-line-number-insert",
-				description: removed ? "stream-monaco-fallback-line-delete" : "stream-monaco-fallback-line-insert",
 				zIndex: 5
 			}
 		};
 	}
 	syncDiffPresentationDecorations() {
+		var _this$diffEditorView$3, _this$lastContainer$q, _this$lastContainer;
 		if (!this.diffEditorView || !this.lastContainer) return;
 		const nativeFresh = this.hasFreshNativeDiffResult();
-		this.lastContainer.classList.toggle("stream-monaco-diff-native-stale", !nativeFresh);
+		const keepNativeDecorationsWhileStale = !nativeFresh && this.preserveNativeDiffDecorationsOnStaleAppend && ((((_this$diffEditorView$3 = this.diffEditorView.getLineChanges()) === null || _this$diffEditorView$3 === void 0 ? void 0 : _this$diffEditorView$3.length) ?? 0) > 0 || !!((_this$lastContainer$q = (_this$lastContainer = this.lastContainer).querySelector) === null || _this$lastContainer$q === void 0 ? void 0 : _this$lastContainer$q.call(_this$lastContainer, ".line-insert, .line-delete, .gutter-insert, .gutter-delete")));
+		this.lastContainer.classList.toggle("stream-monaco-diff-native-stale", !nativeFresh && !keepNativeDecorationsWhileStale);
 		if (nativeFresh) {
 			this.clearFallbackDiffDecorations();
 			return;
@@ -3336,14 +3384,14 @@ var DiffEditorManager = class DiffEditorManager {
 		this.repositionDiffHunkNodes();
 	}
 	isOriginalEditorCollapsed() {
-		var _this$diffEditorView$3, _this$diffEditorView$4;
+		var _this$diffEditorView$4, _this$diffEditorView$5;
 		if (!this.diffEditorView) return true;
-		const info = (_this$diffEditorView$3 = (_this$diffEditorView$4 = this.diffEditorView.getOriginalEditor()).getLayoutInfo) === null || _this$diffEditorView$3 === void 0 ? void 0 : _this$diffEditorView$3.call(_this$diffEditorView$4);
+		const info = (_this$diffEditorView$4 = (_this$diffEditorView$5 = this.diffEditorView.getOriginalEditor()).getLayoutInfo) === null || _this$diffEditorView$4 === void 0 ? void 0 : _this$diffEditorView$4.call(_this$diffEditorView$5);
 		return !info || info.width < 24;
 	}
 	isDiffInlineMode() {
-		var _this$lastContainer;
-		const diffRoot = (_this$lastContainer = this.lastContainer) === null || _this$lastContainer === void 0 ? void 0 : _this$lastContainer.querySelector(".monaco-diff-editor");
+		var _this$lastContainer2;
+		const diffRoot = (_this$lastContainer2 = this.lastContainer) === null || _this$lastContainer2 === void 0 ? void 0 : _this$lastContainer2.querySelector(".monaco-diff-editor");
 		if (diffRoot instanceof HTMLElement) return !diffRoot.classList.contains("side-by-side");
 		return this.isOriginalEditorCollapsed();
 	}
@@ -3602,6 +3650,7 @@ var DiffEditorManager = class DiffEditorManager {
 		const text = this.appendBufferOriginalDiff.join("");
 		this.appendBufferOriginalDiff.length = 0;
 		if (!text) return;
+		this.preserveNativeDiffDecorationsOnStaleAppend = true;
 		this.appendToModel(this.originalModel, text);
 	}
 	computedHeight() {
@@ -3767,7 +3816,6 @@ var DiffEditorManager = class DiffEditorManager {
 			});
 			try {
 				var _this$diffEditorView29, _this$diffEditorView30, _this$diffEditorView31;
-				this.shouldAutoScrollDiff = true;
 				this.lastScrollTopDiff = ((_this$diffEditorView29 = this.diffEditorView) === null || _this$diffEditorView29 === void 0 || (_this$diffEditorView31 = (_this$diffEditorView30 = _this$diffEditorView29.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView31 === void 0 ? void 0 : _this$diffEditorView31.call(_this$diffEditorView30)) ?? this.lastScrollTopDiff;
 			} catch {}
 		});
@@ -3786,11 +3834,6 @@ var DiffEditorManager = class DiffEditorManager {
 			line,
 			ticket
 		});
-		try {
-			var _this$diffEditorView32, _this$diffEditorView33, _this$diffEditorView34;
-			this.shouldAutoScrollDiff = true;
-			this.lastScrollTopDiff = ((_this$diffEditorView32 = this.diffEditorView) === null || _this$diffEditorView32 === void 0 || (_this$diffEditorView34 = (_this$diffEditorView33 = _this$diffEditorView32.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView34 === void 0 ? void 0 : _this$diffEditorView34.call(_this$diffEditorView33)) ?? this.lastScrollTopDiff;
-		} catch {}
 	}
 	scheduleImmediateRevealAfterLayoutDiff(line) {
 		const ticket = ++this.revealTicketDiff;
@@ -3978,18 +4021,22 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.lastKnownModifiedCode == null) this.lastKnownModifiedCode = this.modifiedModel.getValue();
 		const prevO = this.lastKnownOriginalCode;
 		const prevM = this.lastKnownModifiedCode;
+		const originalTailAppend = originalCode !== prevO && originalCode.startsWith(prevO) && prevO.length < originalCode.length;
+		const modifiedTailAppend = modifiedCode !== prevM && modifiedCode.startsWith(prevM) && prevM.length < modifiedCode.length;
+		const hasContentChange = originalCode !== prevO || modifiedCode !== prevM;
 		if (originalCode !== prevO || modifiedCode !== prevM) this.markDiffStreamingActivity();
 		let didImmediate = false;
-		if (originalCode !== prevO && originalCode.startsWith(prevO)) {
+		if (originalTailAppend) {
 			this.appendOriginal(originalCode.slice(prevO.length));
 			this.lastKnownOriginalCode = originalCode;
 			didImmediate = true;
 		}
-		if (modifiedCode !== prevM && modifiedCode.startsWith(prevM)) {
+		if (modifiedTailAppend) {
 			this.appendModified(modifiedCode.slice(prevM.length));
 			this.lastKnownModifiedCode = modifiedCode;
 			didImmediate = true;
 		}
+		if (hasContentChange) this.preserveNativeDiffDecorationsOnStaleAppend = (originalCode === prevO || originalTailAppend) && (modifiedCode === prevM || modifiedTailAppend);
 		if (originalCode !== this.lastKnownOriginalCode || modifiedCode !== this.lastKnownModifiedCode) {
 			this.pendingDiffUpdate = {
 				original: originalCode,
@@ -4006,8 +4053,10 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		const prev = this.lastKnownOriginalCode ?? this.originalModel.getValue();
 		if (prev === newCode) return;
+		const tailAppend = newCode.startsWith(prev) && prev.length < newCode.length;
 		this.markDiffStreamingActivity();
-		if (newCode.startsWith(prev) && prev.length < newCode.length) this.appendOriginal(newCode.slice(prev.length), codeLanguage);
+		this.preserveNativeDiffDecorationsOnStaleAppend = tailAppend;
+		if (tailAppend) this.appendOriginal(newCode.slice(prev.length), codeLanguage);
 		else {
 			this.flushOriginalAppendBufferSync();
 			this.applyMinimalEditToModel(this.originalModel, prev, newCode);
@@ -4022,8 +4071,10 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		const prev = this.lastKnownModifiedCode ?? this.modifiedModel.getValue();
 		if (prev === newCode) return;
+		const tailAppend = newCode.startsWith(prev) && prev.length < newCode.length;
 		this.markDiffStreamingActivity();
-		if (newCode.startsWith(prev) && prev.length < newCode.length) this.appendModified(newCode.slice(prev.length), codeLanguage);
+		this.preserveNativeDiffDecorationsOnStaleAppend = tailAppend;
+		if (tailAppend) this.appendModified(newCode.slice(prev.length), codeLanguage);
 		else {
 			this.flushModifiedAppendBufferSync();
 			const prevAfterFlush = this.modifiedModel.getValue();
@@ -4047,6 +4098,7 @@ var DiffEditorManager = class DiffEditorManager {
 	appendOriginal(appendText, codeLanguage) {
 		if (!this.diffEditorView || !this.originalModel || !appendText) return;
 		this.markDiffStreamingActivity();
+		this.preserveNativeDiffDecorationsOnStaleAppend = true;
 		if (codeLanguage) {
 			const lang = processedLanguage(codeLanguage);
 			if (lang && this.originalModel.getLanguageId() !== lang) monaco_shim_exports.editor.setModelLanguage(this.originalModel, lang);
@@ -4057,6 +4109,7 @@ var DiffEditorManager = class DiffEditorManager {
 	appendModified(appendText, codeLanguage) {
 		if (!this.diffEditorView || !this.modifiedModel || !appendText) return;
 		this.markDiffStreamingActivity();
+		this.preserveNativeDiffDecorationsOnStaleAppend = true;
 		if (codeLanguage) {
 			const lang = processedLanguage(codeLanguage);
 			if (lang && this.modifiedModel.getLanguageId() !== lang) monaco_shim_exports.editor.setModelLanguage(this.modifiedModel, lang);
@@ -4073,9 +4126,10 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.modifiedModel && this.modifiedModel.getLanguageId() !== language) monaco_shim_exports.editor.setModelLanguage(this.modifiedModel, language);
 	}
 	async setDiffModels(models, options = {}) {
-		var _this$originalModel2, _this$modifiedModel5, _this$diffEditorView$5, _this$diffEditorView$6, _this$diffEditorView$7, _this$diffEditorView$8;
+		var _this$originalModel2, _this$modifiedModel5, _this$diffEditorView$6, _this$diffEditorView$7, _this$diffEditorView$8, _this$diffEditorView$9;
 		if (!this.diffEditorView) return;
 		const transitionRequestId = ++this.diffModelTransitionRequestId;
+		this.preserveNativeDiffDecorationsOnStaleAppend = false;
 		this.disposePendingPreparedDiffViewModel();
 		const nextOriginal = models.original;
 		const nextModified = models.modified;
@@ -4126,6 +4180,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.pendingDiffUpdate = null;
 		this.flushOriginalAppendBufferSync();
 		this.flushModifiedAppendBufferSync();
+		this.preserveNativeDiffDecorationsOnStaleAppend = false;
 		const currentOriginal = this.originalModel;
 		const currentModified = this.modifiedModel;
 		const shouldRestorePersistedUnchangedState = preserveViewState && !sameContent;
@@ -4135,8 +4190,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.queuePendingDiffScrollRestore(preservedScrollPosition, shouldRestorePersistedUnchangedState ? 2 : 0);
 		if (shouldRestorePersistedUnchangedState) this.capturePersistedDiffUnchangedState();
 		const applyModelSwap = () => {
-			var _this$diffEditorView35;
-			(_this$diffEditorView35 = this.diffEditorView) === null || _this$diffEditorView35 === void 0 || _this$diffEditorView35.setModel(nextModelTarget);
+			var _this$diffEditorView32;
+			(_this$diffEditorView32 = this.diffEditorView) === null || _this$diffEditorView32 === void 0 || _this$diffEditorView32.setModel(nextModelTarget);
 		};
 		if (preserveViewState) this.withLockedDiffScrollPosition(applyModelSwap);
 		else applyModelSwap();
@@ -4151,8 +4206,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.lastKnownModifiedLineCount = nextModified.getLineCount();
 		this.lastKnownModifiedDirty = false;
 		this._hasScrollBar = false;
-		this.cachedScrollHeightDiff = ((_this$diffEditorView$5 = (_this$diffEditorView$6 = this.diffEditorView.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView$5 === void 0 ? void 0 : _this$diffEditorView$5.call(_this$diffEditorView$6)) ?? null;
-		this.cachedLineHeightDiff = ((_this$diffEditorView$7 = (_this$diffEditorView$8 = this.diffEditorView.getModifiedEditor()).getOption) === null || _this$diffEditorView$7 === void 0 ? void 0 : _this$diffEditorView$7.call(_this$diffEditorView$8, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
+		this.cachedScrollHeightDiff = ((_this$diffEditorView$6 = (_this$diffEditorView$7 = this.diffEditorView.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView$6 === void 0 ? void 0 : _this$diffEditorView$6.call(_this$diffEditorView$7)) ?? null;
+		this.cachedLineHeightDiff = ((_this$diffEditorView$8 = (_this$diffEditorView$9 = this.diffEditorView.getModifiedEditor()).getOption) === null || _this$diffEditorView$8 === void 0 ? void 0 : _this$diffEditorView$8.call(_this$diffEditorView$9, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
 		this.cachedComputedHeightDiff = this.computedHeight();
 		this.diffHunkLineChanges = this.getEffectiveLineChanges();
 		this.hideDiffHunkActions();
@@ -4179,19 +4234,9 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	cleanup() {
 		this.diffModelTransitionRequestId += 1;
+		this.preserveNativeDiffDecorationsOnStaleAppend = false;
 		this.disposePendingPreparedDiffViewModel();
-		this.rafScheduler.cancel("diff");
-		this.pendingDiffUpdate = null;
-		this.rafScheduler.cancel("appendDiff");
-		this.appendBufferDiffScheduled = false;
-		this.appendBufferOriginalDiff.length = 0;
-		this.appendBufferModifiedDiff.length = 0;
-		if (this.appendFlushThrottleTimerDiff != null) {
-			clearTimeout(this.appendFlushThrottleTimerDiff);
-			this.appendFlushThrottleTimerDiff = null;
-		}
-		this.rafScheduler.cancel("content-size-change-diff");
-		this.rafScheduler.cancel("sync-last-known-modified");
+		this.clearAsyncWork();
 		this.disposeDiffHunkInteractions();
 		this.disposeDiffUnchangedRegionEnhancements();
 		this.disposeDiffPresentationTracking();
@@ -4222,18 +4267,6 @@ var DiffEditorManager = class DiffEditorManager {
 			this.lastContainer.innerHTML = "";
 			this.lastContainer = null;
 		}
-		if (this.revealDebounceIdDiff != null) {
-			clearTimeout(this.revealDebounceIdDiff);
-			this.revealDebounceIdDiff = null;
-		}
-		if (this.revealIdleTimerIdDiff != null) {
-			clearTimeout(this.revealIdleTimerIdDiff);
-			this.revealIdleTimerIdDiff = null;
-		}
-		if (this.diffScrollWatcherSuppressionTimer != null) {
-			clearTimeout(this.diffScrollWatcherSuppressionTimer);
-			this.diffScrollWatcherSuppressionTimer = null;
-		}
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
@@ -4241,23 +4274,13 @@ var DiffEditorManager = class DiffEditorManager {
 		this.pendingDiffScrollRestoreBudget = 0;
 		this.diffHideUnchangedRegionsResolved = null;
 		this.diffHideUnchangedRegionsDeferred = false;
-		this.clearPendingDiffThemeSync();
 	}
 	safeClean() {
 		this.diffModelTransitionRequestId += 1;
+		this.preserveNativeDiffDecorationsOnStaleAppend = false;
 		this.disposePendingPreparedDiffViewModel();
-		this.rafScheduler.cancel("diff");
-		this.pendingDiffUpdate = null;
-		this.rafScheduler.cancel("appendDiff");
-		this.appendBufferDiffScheduled = false;
-		this.appendBufferOriginalDiff.length = 0;
-		this.appendBufferModifiedDiff.length = 0;
-		if (this.appendFlushThrottleTimerDiff != null) {
-			clearTimeout(this.appendFlushThrottleTimerDiff);
-			this.appendFlushThrottleTimerDiff = null;
-		}
+		this.clearAsyncWork();
 		this.hideDiffHunkActions();
-		this.cancelScheduledHideDiffHunkActions();
 		this.disposeDiffUnchangedRegionEnhancements();
 		this.disposeDiffPresentationTracking();
 		if (this.diffScrollWatcher) {
@@ -4271,25 +4294,10 @@ var DiffEditorManager = class DiffEditorManager {
 			this.diffHeightManager.dispose();
 			this.diffHeightManager = null;
 		}
-		if (this.revealDebounceIdDiff != null) {
-			clearTimeout(this.revealDebounceIdDiff);
-			this.revealDebounceIdDiff = null;
-		}
-		if (this.revealIdleTimerIdDiff != null) {
-			clearTimeout(this.revealIdleTimerIdDiff);
-			this.revealIdleTimerIdDiff = null;
-		}
-		if (this.diffScrollWatcherSuppressionTimer != null) {
-			clearTimeout(this.diffScrollWatcherSuppressionTimer);
-			this.diffScrollWatcherSuppressionTimer = null;
-		}
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
 		this.diffHideUnchangedRegionsDeferred = false;
-		this.clearPendingDiffThemeSync();
-		this.rafScheduler.cancel("content-size-change-diff");
-		this.rafScheduler.cancel("sync-last-known-modified");
 	}
 	syncLastKnownModified() {
 		if (!this.diffEditorView || !this.lastKnownModifiedDirty) return;
@@ -4328,15 +4336,19 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.lastKnownOriginalCode == null) this.lastKnownOriginalCode = o.getValue();
 		if (this.lastKnownModifiedCode == null) this.lastKnownModifiedCode = m.getValue();
 		const prevO = this.lastKnownOriginalCode;
+		const originalTailAppend = prevO !== original && original.startsWith(prevO) && prevO.length < original.length;
 		if (prevO !== original) {
-			if (original.startsWith(prevO) && prevO.length < original.length) this.appendToModel(o, original.slice(prevO.length));
+			if (originalTailAppend) this.appendToModel(o, original.slice(prevO.length));
 			else this.applyMinimalEditToModel(o, prevO, original);
 			this.lastKnownOriginalCode = original;
 		}
 		const prevM = m.getValue();
 		const prevMLineCount = m.getLineCount();
+		const modifiedTailAppend = prevM !== modified && modified.startsWith(prevM) && prevM.length < modified.length;
+		const hasContentChange = prevO !== original || prevM !== modified;
+		if (hasContentChange) this.preserveNativeDiffDecorationsOnStaleAppend = (prevO === original || originalTailAppend) && (prevM === modified || modifiedTailAppend);
 		if (prevM !== modified) {
-			if (modified.startsWith(prevM) && prevM.length < modified.length) this.appendToModel(m, modified.slice(prevM.length));
+			if (modifiedTailAppend) this.appendToModel(m, modified.slice(prevM.length));
 			else this.applyMinimalEditToModel(m, prevM, modified);
 			this.lastKnownModifiedCode = modified;
 			const newMLineCount = m.getLineCount();
@@ -4361,6 +4373,7 @@ var DiffEditorManager = class DiffEditorManager {
 		const text = this.appendBufferModifiedDiff.join("");
 		this.appendBufferModifiedDiff.length = 0;
 		if (!text) return;
+		this.preserveNativeDiffDecorationsOnStaleAppend = true;
 		this.appendToModel(this.modifiedModel, text);
 	}
 	async flushAppendBufferDiff() {
@@ -4371,7 +4384,10 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.originalModel && this.appendBufferOriginalDiff.length > 0) {
 			const oText = this.appendBufferOriginalDiff.join("");
 			this.appendBufferOriginalDiff.length = 0;
-			if (oText) this.appendToModel(this.originalModel, oText);
+			if (oText) {
+				this.preserveNativeDiffDecorationsOnStaleAppend = true;
+				this.appendToModel(this.originalModel, oText);
+			}
 		}
 		const me = this.diffEditorView.getModifiedEditor();
 		const model = me.getModel();
@@ -4420,6 +4436,7 @@ var DiffEditorManager = class DiffEditorManager {
 				});
 				const lastColumn$1 = model.getLineMaxColumn(prevLine);
 				const range$1 = new monaco_shim_exports.Range(prevLine, lastColumn$1, prevLine, lastColumn$1);
+				this.preserveNativeDiffDecorationsOnStaleAppend = true;
 				model.applyEdits([{
 					range: range$1,
 					text: part,
@@ -4458,6 +4475,7 @@ var DiffEditorManager = class DiffEditorManager {
 		prevLine = model.getLineCount();
 		const lastColumn = model.getLineMaxColumn(prevLine);
 		const range = new monaco_shim_exports.Range(prevLine, lastColumn, prevLine, lastColumn);
+		this.preserveNativeDiffDecorationsOnStaleAppend = true;
 		model.applyEdits([{
 			range,
 			text,
@@ -4474,9 +4492,8 @@ var DiffEditorManager = class DiffEditorManager {
 		else this.maybeScrollDiffToBottom(newLine, prevLine);
 		if (suppressedByFlush) watcherApi.setSuppressed(false);
 		try {
-			var _this$diffEditorView36, _this$diffEditorView37, _this$diffEditorView38;
-			this.shouldAutoScrollDiff = true;
-			this.lastScrollTopDiff = ((_this$diffEditorView36 = this.diffEditorView) === null || _this$diffEditorView36 === void 0 || (_this$diffEditorView38 = (_this$diffEditorView37 = _this$diffEditorView36.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView38 === void 0 ? void 0 : _this$diffEditorView38.call(_this$diffEditorView37)) ?? this.lastScrollTopDiff;
+			var _this$diffEditorView33, _this$diffEditorView34, _this$diffEditorView35;
+			this.lastScrollTopDiff = ((_this$diffEditorView33 = this.diffEditorView) === null || _this$diffEditorView33 === void 0 || (_this$diffEditorView35 = (_this$diffEditorView34 = _this$diffEditorView33.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView35 === void 0 ? void 0 : _this$diffEditorView35.call(_this$diffEditorView34)) ?? this.lastScrollTopDiff;
 		} catch {}
 	}
 	applyMinimalEditToModel(model, prev, next) {
@@ -4524,6 +4541,9 @@ var EditorManager = class {
 	lastKnownCode = null;
 	pendingUpdate = null;
 	_hasScrollBar = false;
+	updateThrottleMs = 50;
+	lastUpdateFlushTime = 0;
+	updateThrottleTimer = null;
 	shouldAutoScroll = true;
 	scrollWatcher = null;
 	scrollWatcherSuppressionTimer = null;
@@ -4533,6 +4553,7 @@ var EditorManager = class {
 	cachedComputedHeight = null;
 	cachedLineCount = null;
 	lastKnownCodeDirty = false;
+	programmaticContentChangeDepth = 0;
 	debug = false;
 	measureViewport() {
 		var _this$editorView$getL, _this$editorView, _this$editorView$getS, _this$editorView2, _this$editorView$getS2, _this$editorView3;
@@ -4565,7 +4586,7 @@ var EditorManager = class {
 	revealStrategyOption;
 	revealBatchOnIdleMsOption;
 	scrollWatcherSuppressionMs = 500;
-	constructor(options, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, revealDebounceMsOption) {
+	constructor(options, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, revealDebounceMsOption, updateThrottleMsOption) {
 		this.options = options;
 		this.maxHeightValue = maxHeightValue;
 		this.maxHeightCSS = maxHeightCSS;
@@ -4574,6 +4595,47 @@ var EditorManager = class {
 		this.autoScrollThresholdPx = autoScrollThresholdPx;
 		this.autoScrollThresholdLines = autoScrollThresholdLines;
 		this.revealDebounceMsOption = revealDebounceMsOption;
+		this.updateThrottleMsOption = updateThrottleMsOption;
+		this.updateThrottleMs = this.updateThrottleMsOption ?? this.options.updateThrottleMs ?? 50;
+	}
+	cancelRafs() {
+		this.rafScheduler.cancel("update");
+		this.rafScheduler.cancel("sync-last-known");
+		this.rafScheduler.cancel("content-size-change");
+		this.rafScheduler.cancel("maybe-scroll");
+		this.rafScheduler.cancel("reveal");
+		this.rafScheduler.cancel("immediate-reveal");
+		this.rafScheduler.cancel("maybe-resume");
+		this.rafScheduler.cancel("append");
+	}
+	clearRevealTimers() {
+		if (this.revealDebounceId != null) {
+			clearTimeout(this.revealDebounceId);
+			this.revealDebounceId = null;
+		}
+		if (this.revealIdleTimerId != null) {
+			clearTimeout(this.revealIdleTimerId);
+			this.revealIdleTimerId = null;
+		}
+	}
+	resetAppendState() {
+		this.appendBufferScheduled = false;
+		this.appendBuffer.length = 0;
+	}
+	clearAsyncWork() {
+		this.cancelRafs();
+		this.pendingUpdate = null;
+		this.lastKnownCodeDirty = false;
+		this.resetAppendState();
+		this.clearRevealTimers();
+		if (this.scrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.scrollWatcherSuppressionTimer);
+			this.scrollWatcherSuppressionTimer = null;
+		}
+		if (this.updateThrottleTimer != null) {
+			clearTimeout(this.updateThrottleTimer);
+			this.updateThrottleTimer = null;
+		}
 	}
 	initDebugFlag() {
 		if (typeof window !== "undefined" && window.__STREAM_MONACO_DEBUG__ !== void 0) {
@@ -4590,6 +4652,14 @@ var EditorManager = class {
 		if (!this.debug) return;
 		log("EditorManager", ...args);
 	}
+	runAsProgrammaticContentChange(fn) {
+		this.programmaticContentChangeDepth += 1;
+		try {
+			return fn();
+		} finally {
+			this.programmaticContentChangeDepth -= 1;
+		}
+	}
 	hasVerticalScrollbar() {
 		if (!this.editorView) return false;
 		if (this._hasScrollBar) return true;
@@ -4816,6 +4886,7 @@ var EditorManager = class {
 			});
 		});
 		this.editorView.onDidChangeModelContent(() => {
+			if (this.programmaticContentChangeDepth > 0) return;
 			this.lastKnownCodeDirty = true;
 			this.rafScheduler.schedule("sync-last-known", () => this.syncLastKnownCode());
 		});
@@ -4910,7 +4981,24 @@ var EditorManager = class {
 			code: newCode,
 			lang: codeLanguage
 		};
-		this.rafScheduler.schedule("update", () => this.flushPendingUpdate());
+		this.rafScheduler.schedule("update", () => {
+			if (!this.updateThrottleMs) {
+				this.flushPendingUpdate();
+				return;
+			}
+			const now = Date.now();
+			const since = now - this.lastUpdateFlushTime;
+			if (since >= this.updateThrottleMs) {
+				this.flushPendingUpdate();
+				return;
+			}
+			if (this.updateThrottleTimer != null) return;
+			const wait = this.updateThrottleMs - since;
+			this.updateThrottleTimer = setTimeout(() => {
+				this.updateThrottleTimer = null;
+				this.rafScheduler.schedule("update", () => this.flushPendingUpdate());
+			}, wait);
+		});
 	}
 	flushPendingUpdate() {
 		if (!this.pendingUpdate || !this.editorView) return;
@@ -4918,12 +5006,15 @@ var EditorManager = class {
 		if (!model) return;
 		const { code: newCode, lang: codeLanguage } = this.pendingUpdate;
 		this.pendingUpdate = null;
+		this.lastUpdateFlushTime = Date.now();
 		const processedCodeLanguage = processedLanguage(codeLanguage);
 		const languageId = model.getLanguageId();
 		if (languageId !== processedCodeLanguage) {
 			if (processedCodeLanguage) monaco_shim_exports.editor.setModelLanguage(model, processedCodeLanguage);
 			const prevLineCount$1 = model.getLineCount();
-			model.setValue(newCode);
+			this.runAsProgrammaticContentChange(() => {
+				model.setValue(newCode);
+			});
 			this.lastKnownCode = newCode;
 			const newLineCount$1 = model.getLineCount();
 			this.cachedLineCount = newLineCount$1;
@@ -4936,8 +5027,21 @@ var EditorManager = class {
 			}
 			return;
 		}
-		const buffered = this.appendBuffer.length > 0 ? this.appendBuffer.join("") : "";
-		const prevCode = this.appendBuffer.length > 0 ? this.editorView.getValue() + buffered : this.lastKnownCode ?? this.editorView.getValue();
+		let prevCode;
+		if (this.appendBuffer.length > 0) {
+			this.resetAppendState();
+			this.rafScheduler.cancel("append");
+			try {
+				prevCode = model.getValue();
+				this.lastKnownCode = prevCode;
+			} catch {
+				prevCode = this.lastKnownCode ?? "";
+			}
+		} else if (this.lastKnownCode != null) prevCode = this.lastKnownCode;
+		else {
+			prevCode = this.editorView.getValue();
+			this.lastKnownCode = prevCode;
+		}
 		if (prevCode === newCode) return;
 		if (newCode.startsWith(prevCode) && prevCode.length < newCode.length) {
 			const suffix = newCode.slice(prevCode.length);
@@ -4981,7 +5085,9 @@ var EditorManager = class {
 		const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
 		if (prev.length + next.length > maxChars || changeRatio > ratio) {
 			const prevLineCount = model.getLineCount();
-			model.setValue(next);
+			this.runAsProgrammaticContentChange(() => {
+				model.setValue(next);
+			});
 			this.lastKnownCode = next;
 			const newLineCount = model.getLineCount();
 			this.cachedLineCount = newLineCount;
@@ -5000,8 +5106,10 @@ var EditorManager = class {
 			text: replaceText,
 			forceMoveMarkers: true
 		}];
-		if (isReadOnly) model.applyEdits(edit);
-		else this.editorView.executeEdits("minimal-replace", edit);
+		this.runAsProgrammaticContentChange(() => {
+			if (isReadOnly) model.applyEdits(edit);
+			else this.editorView.executeEdits("minimal-replace", edit);
+		});
 	}
 	flushAppendBuffer() {
 		if (!this.editorView) return;
@@ -5018,19 +5126,20 @@ var EditorManager = class {
 		const lastColumn = model.getLineMaxColumn(lastLine);
 		const range = new monaco_shim_exports.Range(lastLine, lastColumn, lastLine, lastColumn);
 		const isReadOnly = this.editorView.getOption(monaco_shim_exports.editor.EditorOption.readOnly);
-		if (isReadOnly) model.applyEdits([{
-			range,
-			text,
-			forceMoveMarkers: true
-		}]);
-		else this.editorView.executeEdits("append", [{
-			range,
-			text,
-			forceMoveMarkers: true
-		}]);
-		try {
-			this.lastKnownCode = model.getValue();
-		} catch {}
+		this.runAsProgrammaticContentChange(() => {
+			if (isReadOnly) model.applyEdits([{
+				range,
+				text,
+				forceMoveMarkers: true
+			}]);
+			else this.editorView.executeEdits("append", [{
+				range,
+				text,
+				forceMoveMarkers: true
+			}]);
+		});
+		if (this.lastKnownCode != null) this.lastKnownCode = this.lastKnownCode + text;
+		else this.lastKnownCode = model.getValue();
 		const newLineCount = model.getLineCount();
 		if (lastLine !== newLineCount) {
 			this.cachedLineCount = newLineCount;
@@ -5055,30 +5164,19 @@ var EditorManager = class {
 	getEditorView() {
 		return this.editorView;
 	}
-	cleanup() {
-		this.rafScheduler.cancel("update");
-		this.rafScheduler.cancel("sync-last-known");
-		this.rafScheduler.cancel("content-size-change");
-		this.rafScheduler.cancel("maybe-scroll");
-		this.rafScheduler.cancel("reveal");
-		this.rafScheduler.cancel("immediate-reveal");
-		this.rafScheduler.cancel("maybe-resume");
-		this.pendingUpdate = null;
-		this.rafScheduler.cancel("append");
-		this.appendBufferScheduled = false;
-		this.appendBuffer.length = 0;
-		if (this.revealDebounceId != null) {
-			clearTimeout(this.revealDebounceId);
-			this.revealDebounceId = null;
-		}
-		if (this.revealIdleTimerId != null) {
-			clearTimeout(this.revealIdleTimerId);
-			this.revealIdleTimerId = null;
-		}
-		if (this.scrollWatcherSuppressionTimer != null) {
-			clearTimeout(this.scrollWatcherSuppressionTimer);
-			this.scrollWatcherSuppressionTimer = null;
+	setUpdateThrottleMs(ms) {
+		this.updateThrottleMs = ms;
+		if (!this.updateThrottleMs && this.updateThrottleTimer != null) {
+			clearTimeout(this.updateThrottleTimer);
+			this.updateThrottleTimer = null;
+			this.rafScheduler.schedule("update", () => this.flushPendingUpdate());
 		}
+	}
+	getUpdateThrottleMs() {
+		return this.updateThrottleMs;
+	}
+	cleanup() {
+		this.clearAsyncWork();
 		if (this.editorView) {
 			this.editorView.dispose();
 			this.editorView = null;
@@ -5099,31 +5197,13 @@ var EditorManager = class {
 		}
 	}
 	safeClean() {
-		this.rafScheduler.cancel("update");
-		this.pendingUpdate = null;
-		this.rafScheduler.cancel("sync-last-known");
+		this.clearAsyncWork();
 		if (this.scrollWatcher) {
 			try {
 				this.scrollWatcher.dispose();
 			} catch {}
 			this.scrollWatcher = null;
 		}
-		if (this.revealDebounceId != null) {
-			clearTimeout(this.revealDebounceId);
-			this.revealDebounceId = null;
-		}
-		if (this.revealIdleTimerId != null) {
-			clearTimeout(this.revealIdleTimerId);
-			this.revealIdleTimerId = null;
-		}
-		if (this.scrollWatcherSuppressionTimer != null) {
-			clearTimeout(this.scrollWatcherSuppressionTimer);
-			this.scrollWatcherSuppressionTimer = null;
-		}
-		this.rafScheduler.cancel("maybe-scroll");
-		this.rafScheduler.cancel("reveal");
-		this.rafScheduler.cancel("immediate-reveal");
-		this.rafScheduler.cancel("maybe-resume");
 		this._hasScrollBar = false;
 		this.shouldAutoScroll = !!this.autoScrollInitial;
 		this.lastScrollTop = 0;
@@ -5662,7 +5742,7 @@ function useMonaco(monacoOptions = {}) {
 		}
 		const initialThemeName = monacoOptions.theme ?? requestedThemeName ?? globalRequestedThemeName ?? currentTheme.value;
 		await ensureThemeRegistered(initialThemeName);
-		editorMgr = new EditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, monacoOptions.revealDebounceMs);
+		editorMgr = new EditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, monacoOptions.revealDebounceMs, updateThrottleMs);
 		editorView = await editorMgr.createEditor(container, code, language, initialThemeName);
 		if (pendingUpdate && editorMgr) {
 			const { code: queuedCode, lang: queuedLang } = pendingUpdate;
@@ -5704,6 +5784,23 @@ function useMonaco(monacoOptions = {}) {
 		modifiedModel = models.modified;
 		return diffEditorView;
 	}
+	function clearFallbackAsyncWork() {
+		rafScheduler.cancel("update");
+		rafScheduler.cancel("append");
+		rafScheduler.cancel("reveal");
+		pendingUpdate = null;
+		appendBufferScheduled = false;
+		appendBuffer.length = 0;
+		if (revealDebounceId != null) {
+			clearTimeout(revealDebounceId);
+			revealDebounceId = null;
+		}
+		if (updateThrottleTimer != null) {
+			clearTimeout(updateThrottleTimer);
+			updateThrottleTimer = null;
+		}
+		lastFlushTime = 0;
+	}
 	function cleanupEditor() {
 		if (editorMgr) {
 			editorMgr.cleanup();
@@ -5713,11 +5810,7 @@ function useMonaco(monacoOptions = {}) {
 			diffMgr.cleanup();
 			diffMgr = null;
 		}
-		rafScheduler.cancel("update");
-		pendingUpdate = null;
-		rafScheduler.cancel("append");
-		appendBufferScheduled = false;
-		appendBuffer.length = 0;
+		clearFallbackAsyncWork();
 		if (!editorMgr && editorView) {
 			editorView.dispose();
 			editorView = null;
@@ -5731,10 +5824,6 @@ function useMonaco(monacoOptions = {}) {
 			themeWatcher();
 			themeWatcher = null;
 		}
-		if (updateThrottleTimer != null) {
-			clearTimeout(updateThrottleTimer);
-			updateThrottleTimer = null;
-		}
 		diffEditorView = null;
 		originalModel = null;
 		modifiedModel = null;
@@ -5800,13 +5889,17 @@ function useMonaco(monacoOptions = {}) {
 		pendingUpdate = null;
 		const processedCodeLanguage = processedLanguage(codeLanguage);
 		let prevCode = null;
-		if (appendBuffer.length > 0) try {
-			prevCode = model.getValue();
-			lastKnownCode = prevCode;
-		} catch {
-			prevCode = "";
-		}
-		else {
+		if (appendBuffer.length > 0) {
+			appendBuffer.length = 0;
+			appendBufferScheduled = false;
+			rafScheduler.cancel("append");
+			try {
+				prevCode = model.getValue();
+				lastKnownCode = prevCode;
+			} catch {
+				prevCode = lastKnownCode ?? "";
+			}
+		} else {
 			prevCode = lastKnownCode;
 			if (prevCode == null) try {
 				prevCode = model.getValue();
@@ -5923,9 +6016,10 @@ function useMonaco(monacoOptions = {}) {
 	}
 	function setUpdateThrottleMs(ms) {
 		updateThrottleMs = ms;
+		editorMgr === null || editorMgr === void 0 || editorMgr.setUpdateThrottleMs(ms);
 	}
 	function getUpdateThrottleMs() {
-		return updateThrottleMs;
+		return (editorMgr === null || editorMgr === void 0 ? void 0 : editorMgr.getUpdateThrottleMs()) ?? updateThrottleMs;
 	}
 	function updateDiff(originalCode, modifiedCode, codeLanguage) {
 		if (diffMgr) diffMgr.updateDiff(originalCode, modifiedCode, codeLanguage);
@@ -5957,8 +6051,7 @@ function useMonaco(monacoOptions = {}) {
 		createDiffEditor,
 		cleanupEditor,
 		safeClean() {
-			rafScheduler.cancel("update");
-			pendingUpdate = null;
+			clearFallbackAsyncWork();
 			if (editorMgr) try {
 				editorMgr.safeClean();
 			} catch {}