stream-monaco 0.0.21 → 0.0.22

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

@@ -555,8 +555,14 @@ var DiffEditorManager = class DiffEditorManager {
 	diffComputedVersions = null;
 	preserveNativeDiffDecorationsOnStaleAppend = false;
 	diffPresentationDisposables = [];
+	diffPresentationObserver = null;
 	fallbackOriginalDecorationIds = [];
 	fallbackModifiedDecorationIds = [];
+	fallbackInlineDeletedZoneIds = [];
+	fallbackInlineDeletedZoneSignature = null;
+	inlineDiffStreamingPresentationActive = false;
+	inlineDiffStreamingPresentationIdleTimer = null;
+	inlineDiffStreamingHeightFloor = 0;
 	diffHunkHideTimer = null;
 	diffUnchangedRegionDisposables = [];
 	diffUnchangedRegionObserver = null;
@@ -569,9 +575,11 @@ var DiffEditorManager = class DiffEditorManager {
 	diffUnchangedOverlayScrollLeft = 0;
 	diffRootAppearanceSignature = null;
 	diffPersistedUnchangedModelState = null;
+	diffPreviousUnchangedModelState = null;
 	pendingPreparedDiffViewModel = null;
 	cancelRafs() {
 		this.rafScheduler.cancel("sync-diff-presentation");
+		this.rafScheduler.cancel("sync-diff-layout");
 		this.rafScheduler.cancel("capture-diff-unchanged-state");
 		this.rafScheduler.cancel("restore-diff-unchanged-state");
 		this.rafScheduler.cancel("patch-diff-unchanged-regions");
@@ -658,6 +666,9 @@ var DiffEditorManager = class DiffEditorManager {
 			revealLineCount: 5
 		};
 	}
+	resolveDiffGlyphMarginOption(hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption()) {
+		return (hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) ? true : this.options.glyphMargin;
+	}
 	resolveDiffLineStyleOption() {
 		return this.options.diffLineStyle === "bar" ? "bar" : "background";
 	}
@@ -987,6 +998,220 @@ var DiffEditorManager = class DiffEditorManager {
 		else this.fallbackOriginalDecorationIds = [];
 		if (modifiedEditor && this.fallbackModifiedDecorationIds.length > 0) this.fallbackModifiedDecorationIds = modifiedEditor.deltaDecorations(this.fallbackModifiedDecorationIds, []);
 		else this.fallbackModifiedDecorationIds = [];
+		this.clearFallbackInlineDeletedZones();
+	}
+	clearFallbackInlineDeletedZones() {
+		var _this$diffEditorView13;
+		const modifiedEditor = (_this$diffEditorView13 = this.diffEditorView) === null || _this$diffEditorView13 === void 0 ? void 0 : _this$diffEditorView13.getModifiedEditor();
+		if (modifiedEditor && this.fallbackInlineDeletedZoneIds.length > 0) try {
+			var _modifiedEditor$chang;
+			(_modifiedEditor$chang = modifiedEditor.changeViewZones) === null || _modifiedEditor$chang === void 0 || _modifiedEditor$chang.call(modifiedEditor, (accessor) => {
+				for (const id of this.fallbackInlineDeletedZoneIds) accessor.removeZone(id);
+			});
+		} catch {}
+		this.fallbackInlineDeletedZoneIds = [];
+		this.clearFallbackInlineDeletedZoneWrapperContent();
+		this.fallbackInlineDeletedZoneSignature = null;
+	}
+	clearFallbackInlineDeletedZoneWrapperContent() {
+		var _this$lastContainer, _this$lastContainer2, _node$parentElement;
+		const querySelectorAll = typeof ((_this$lastContainer = this.lastContainer) === null || _this$lastContainer === void 0 ? void 0 : _this$lastContainer.querySelectorAll) === "function" ? (_this$lastContainer2 = this.lastContainer) === null || _this$lastContainer2 === void 0 ? void 0 : _this$lastContainer2.querySelectorAll.bind(this.lastContainer) : null;
+		if (!querySelectorAll) return;
+		const nodes = Array.from(querySelectorAll(".stream-monaco-fallback-inline-delete-zone[data-stream-monaco-native-wrapper=\"true\"], .stream-monaco-fallback-inline-delete-margin[data-stream-monaco-native-wrapper=\"true\"]") ?? []);
+		for (const node of nodes) (_node$parentElement = node.parentElement) === null || _node$parentElement === void 0 || _node$parentElement.removeChild(node);
+	}
+	clearInlineDiffStreamingPresentationIdleTimer() {
+		if (this.inlineDiffStreamingPresentationIdleTimer != null) {
+			clearTimeout(this.inlineDiffStreamingPresentationIdleTimer);
+			this.inlineDiffStreamingPresentationIdleTimer = null;
+		}
+	}
+	resetInlineDiffStreamingHeightFloor() {
+		this.inlineDiffStreamingHeightFloor = 0;
+	}
+	syncDiffEditorLayoutToContainer() {
+		if (!this.diffEditorView || !this.lastContainer) return;
+		const width = this.lastContainer.clientWidth || this.lastContainer.getBoundingClientRect().width;
+		const height = this.lastContainer.clientHeight || this.lastContainer.getBoundingClientRect().height;
+		if (!(width > 0) || !(height > 0)) return;
+		try {
+			var _layout, _ref;
+			(_layout = (_ref = this.diffEditorView).layout) === null || _layout === void 0 || _layout.call(_ref, {
+				width: Math.round(width),
+				height: Math.round(height)
+			});
+		} catch {
+			try {
+				var _layout2, _ref2;
+				(_layout2 = (_ref2 = this.diffEditorView).layout) === null || _layout2 === void 0 || _layout2.call(_ref2);
+			} catch {}
+		}
+	}
+	scheduleSyncDiffEditorLayoutToContainer() {
+		this.rafScheduler.schedule("sync-diff-layout", () => {
+			this.syncDiffEditorLayoutToContainer();
+		});
+	}
+	readModelLineContent(model, lineNumber) {
+		const direct = model.getLineContent;
+		if (typeof direct === "function") return direct.call(model, lineNumber);
+		return model.getValue().split(/\r?\n/)[lineNumber - 1] ?? "";
+	}
+	hasVisibleNativeInlineDeleteNodes() {
+		if (!this.lastContainer) return false;
+		const querySelectorAll = typeof this.lastContainer.querySelectorAll === "function" ? this.lastContainer.querySelectorAll.bind(this.lastContainer) : null;
+		if (!querySelectorAll) return false;
+		const nodes = Array.from(querySelectorAll(".editor.modified .view-zones .line-delete, .editor.modified .inline-deleted-text, .editor.modified .inline-deleted-margin-view-zone") ?? []);
+		return nodes.some((node) => {
+			var _node$getBoundingClie, _globalThis$getComput, _globalThis;
+			if (!(node instanceof HTMLElement)) return false;
+			const rect = (_node$getBoundingClie = node.getBoundingClientRect) === null || _node$getBoundingClie === void 0 ? void 0 : _node$getBoundingClie.call(node);
+			const style = (_globalThis$getComput = (_globalThis = globalThis).getComputedStyle) === null || _globalThis$getComput === void 0 ? void 0 : _globalThis$getComput.call(_globalThis, node);
+			return ((rect === null || rect === void 0 ? void 0 : rect.width) ?? 0) > 0 && ((rect === null || rect === void 0 ? void 0 : rect.height) ?? 0) > 0 && (style === null || style === void 0 ? void 0 : style.display) !== "none" && (style === null || style === void 0 ? void 0 : style.visibility) !== "hidden" && Number.parseFloat((style === null || style === void 0 ? void 0 : style.opacity) || "1") > .01;
+		});
+	}
+	countNativeInlineDeleteZoneNodes() {
+		if (!this.lastContainer) return 0;
+		const querySelectorAll = typeof this.lastContainer.querySelectorAll === "function" ? this.lastContainer.querySelectorAll.bind(this.lastContainer) : null;
+		if (!querySelectorAll) return 0;
+		const nodes = Array.from(querySelectorAll(".editor.modified .view-zones [monaco-view-zone], .editor.modified .margin-view-zones [monaco-view-zone]") ?? []);
+		return nodes.filter((node) => {
+			if (!(node instanceof HTMLElement)) return false;
+			return node.matches(".view-lines.line-delete") || !!node.querySelector(".view-lines.line-delete") || node.matches(".inline-deleted-margin-view-zone") || !!node.querySelector(".inline-deleted-margin-view-zone");
+		}).length;
+	}
+	syncFallbackInlineDeletedZones(lineChanges) {
+		var _modifiedEditor$getMo, _EditorOption, _modifiedEditor$getOp, _this$lastContainer3, _this$lastContainer3$, _this$lastContainer4, _this$lastContainer4$;
+		if (typeof document === "undefined" || !this.diffEditorView || !this.originalModel || !this.isDiffInlineMode()) {
+			this.clearFallbackInlineDeletedZones();
+			return;
+		}
+		const modifiedEditor = this.diffEditorView.getModifiedEditor();
+		const modifiedModel = modifiedEditor === null || modifiedEditor === void 0 || (_modifiedEditor$getMo = modifiedEditor.getModel) === null || _modifiedEditor$getMo === void 0 ? void 0 : _modifiedEditor$getMo.call(modifiedEditor);
+		const originalModel = this.originalModel;
+		if (!modifiedEditor || !modifiedModel || !originalModel) {
+			this.fallbackInlineDeletedZoneIds = [];
+			return;
+		}
+		const lineHeightOption = (_EditorOption = monaco_shim_exports.editor.EditorOption) === null || _EditorOption === void 0 ? void 0 : _EditorOption.lineHeight;
+		const lineHeight = ((_modifiedEditor$getOp = modifiedEditor.getOption) === null || _modifiedEditor$getOp === void 0 ? void 0 : _modifiedEditor$getOp.call(modifiedEditor, lineHeightOption)) ?? 20;
+		const relevantChanges = lineChanges.filter((change) => this.hasOriginalLines(change));
+		const nativeViewWrappers = Array.from(((_this$lastContainer3 = this.lastContainer) === null || _this$lastContainer3 === void 0 || (_this$lastContainer3$ = _this$lastContainer3.querySelectorAll) === null || _this$lastContainer3$ === void 0 ? void 0 : _this$lastContainer3$.call(_this$lastContainer3, ".editor.modified .view-zones [monaco-view-zone]")) ?? []).filter((node) => {
+			return node instanceof HTMLElement && !!node.querySelector(".view-lines.line-delete");
+		});
+		const nativeMarginWrappers = Array.from(((_this$lastContainer4 = this.lastContainer) === null || _this$lastContainer4 === void 0 || (_this$lastContainer4$ = _this$lastContainer4.querySelectorAll) === null || _this$lastContainer4$ === void 0 ? void 0 : _this$lastContainer4$.call(_this$lastContainer4, ".editor.modified .margin-view-zones [monaco-view-zone]")) ?? []).filter((node) => {
+			return node instanceof HTMLElement && !!node.querySelector(".inline-deleted-margin-view-zone");
+		});
+		const nativePairs = nativeViewWrappers.map((viewWrapper) => {
+			const id = viewWrapper.getAttribute("monaco-view-zone");
+			if (!id) return null;
+			const marginWrapper = nativeMarginWrappers.find((candidate) => candidate.getAttribute("monaco-view-zone") === id);
+			return {
+				id,
+				top: Number.parseFloat(viewWrapper.style.top || "NaN"),
+				viewWrapper,
+				marginWrapper: marginWrapper ?? null
+			};
+		}).filter((entry) => !!entry && Number.isFinite(entry.top)).sort((left, right) => left.top - right.top);
+		if (nativePairs.length >= relevantChanges.length && relevantChanges.length > 0) {
+			const nextSignature$1 = nativePairs.slice(0, relevantChanges.length).map((pair, index) => {
+				const change = relevantChanges[index];
+				const text = Array.from({ length: change.originalEndLineNumber - change.originalStartLineNumber + 1 }, (_, offset) => this.readModelLineContent(originalModel, change.originalStartLineNumber + offset)).join("\n");
+				return `${pair.id}:${text}`;
+			}).join("|");
+			if (nextSignature$1 && this.fallbackInlineDeletedZoneSignature === nextSignature$1 && this.fallbackInlineDeletedZoneIds.length === 0) return;
+			if (this.fallbackInlineDeletedZoneIds.length > 0) {
+				try {
+					var _modifiedEditor$chang2;
+					(_modifiedEditor$chang2 = modifiedEditor.changeViewZones) === null || _modifiedEditor$chang2 === void 0 || _modifiedEditor$chang2.call(modifiedEditor, (accessor) => {
+						for (const id of this.fallbackInlineDeletedZoneIds) accessor.removeZone(id);
+					});
+				} catch {}
+				this.fallbackInlineDeletedZoneIds = [];
+			}
+			this.clearFallbackInlineDeletedZoneWrapperContent();
+			relevantChanges.forEach((change, index) => {
+				var _modifiedEditor$apply;
+				const pair = nativePairs[index];
+				const domNode = document.createElement("div");
+				domNode.className = "stream-monaco-fallback-inline-delete-zone";
+				domNode.setAttribute("aria-hidden", "true");
+				domNode.setAttribute("data-stream-monaco-native-wrapper", "true");
+				(_modifiedEditor$apply = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply === void 0 || _modifiedEditor$apply.call(modifiedEditor, domNode);
+				for (let line = change.originalStartLineNumber; line <= change.originalEndLineNumber; line++) {
+					const lineNode = document.createElement("div");
+					lineNode.className = "stream-monaco-fallback-inline-delete-line";
+					lineNode.textContent = this.readModelLineContent(originalModel, line);
+					lineNode.style.height = `${lineHeight}px`;
+					lineNode.style.lineHeight = `${lineHeight}px`;
+					domNode.append(lineNode);
+				}
+				pair.viewWrapper.append(domNode);
+				if (pair.marginWrapper) {
+					var _modifiedEditor$apply2;
+					const marginDomNode = document.createElement("div");
+					marginDomNode.className = "stream-monaco-fallback-inline-delete-margin";
+					marginDomNode.setAttribute("aria-hidden", "true");
+					marginDomNode.setAttribute("data-stream-monaco-native-wrapper", "true");
+					marginDomNode.style.height = "100%";
+					(_modifiedEditor$apply2 = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply2 === void 0 || _modifiedEditor$apply2.call(modifiedEditor, marginDomNode);
+					pair.marginWrapper.append(marginDomNode);
+				}
+			});
+			this.fallbackInlineDeletedZoneSignature = nextSignature$1 || null;
+			return;
+		}
+		this.clearFallbackInlineDeletedZoneWrapperContent();
+		const nextZones = relevantChanges.map((change) => {
+			var _modifiedEditor$apply3, _modifiedEditor$apply4;
+			const lineCount = change.originalEndLineNumber - change.originalStartLineNumber + 1;
+			if (lineCount < 1) return null;
+			const domNode = document.createElement("div");
+			domNode.className = "stream-monaco-fallback-inline-delete-zone";
+			domNode.setAttribute("aria-hidden", "true");
+			(_modifiedEditor$apply3 = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply3 === void 0 || _modifiedEditor$apply3.call(modifiedEditor, domNode);
+			for (let line = change.originalStartLineNumber; line <= change.originalEndLineNumber; line++) {
+				const lineNode = document.createElement("div");
+				lineNode.className = "stream-monaco-fallback-inline-delete-line";
+				lineNode.textContent = this.readModelLineContent(originalModel, line);
+				lineNode.style.height = `${lineHeight}px`;
+				lineNode.style.lineHeight = `${lineHeight}px`;
+				domNode.append(lineNode);
+			}
+			const marginDomNode = document.createElement("div");
+			marginDomNode.className = "stream-monaco-fallback-inline-delete-margin";
+			marginDomNode.setAttribute("aria-hidden", "true");
+			(_modifiedEditor$apply4 = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply4 === void 0 || _modifiedEditor$apply4.call(modifiedEditor, marginDomNode);
+			const anchorLine = Math.max(0, Math.min(modifiedModel.getLineCount(), (change.modifiedStartLineNumber || 1) - 1));
+			return {
+				afterLineNumber: anchorLine,
+				heightInLines: lineCount,
+				domNode,
+				marginDomNode
+			};
+		}).filter(Boolean);
+		const nextSignature = nextZones.map((zone) => {
+			var _zone$domNode;
+			const text = typeof ((_zone$domNode = zone.domNode) === null || _zone$domNode === void 0 ? void 0 : _zone$domNode.textContent) === "string" ? zone.domNode.textContent : "";
+			return `${zone.afterLineNumber}:${zone.heightInLines}:${text}`;
+		}).join("|");
+		if (nextSignature && this.fallbackInlineDeletedZoneSignature === nextSignature && this.fallbackInlineDeletedZoneIds.length === nextZones.length) return;
+		try {
+			var _modifiedEditor$chang3;
+			(_modifiedEditor$chang3 = modifiedEditor.changeViewZones) === null || _modifiedEditor$chang3 === void 0 || _modifiedEditor$chang3.call(modifiedEditor, (accessor) => {
+				for (const id of this.fallbackInlineDeletedZoneIds) accessor.removeZone(id);
+				this.fallbackInlineDeletedZoneIds = nextZones.map((zone) => accessor.addZone(zone));
+			});
+			this.fallbackInlineDeletedZoneSignature = nextSignature || null;
+		} catch {
+			this.fallbackInlineDeletedZoneIds = [];
+			this.fallbackInlineDeletedZoneSignature = null;
+		}
+		try {
+			var _modifiedEditor$layou, _render;
+			(_modifiedEditor$layou = modifiedEditor.layout) === null || _modifiedEditor$layou === void 0 || _modifiedEditor$layou.call(modifiedEditor);
+			(_render = modifiedEditor.render) === null || _render === void 0 || _render.call(modifiedEditor, true);
+		} catch {}
 	}
 	toWholeLineDecoration(side, startLineNumber, endLineNumber) {
 		if (endLineNumber < startLineNumber || startLineNumber < 1) return null;
@@ -1004,26 +1229,45 @@ var DiffEditorManager = class DiffEditorManager {
 		};
 	}
 	syncDiffPresentationDecorations() {
-		var _this$diffEditorView$3, _this$lastContainer$q, _this$lastContainer;
+		var _this$diffEditorView$3, _this$lastContainer$q, _this$lastContainer5;
 		if (!this.diffEditorView || !this.lastContainer) return;
 		const nativeFresh = this.hasFreshNativeDiffResult();
-		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")));
+		const useInlineMode = this.isDiffInlineMode();
+		const lineChanges = this.getEffectiveLineChanges();
+		const nativeInlineDeleteZoneCount = useInlineMode ? this.countNativeInlineDeleteZoneNodes() : 0;
+		const hasNativeInlineDeleteZoneNodes = nativeInlineDeleteZoneCount > 0;
+		const hasNativeInlineDeleteNodes = useInlineMode && this.hasVisibleNativeInlineDeleteNodes();
+		const shouldKeepInlineFallback = useInlineMode && lineChanges.some((change) => this.hasOriginalLines(change)) && !hasNativeInlineDeleteZoneNodes;
+		const useInlineStaleFallback = shouldKeepInlineFallback;
+		this.lastContainer.classList.toggle("stream-monaco-diff-inline-native-ready", useInlineMode && !shouldKeepInlineFallback && (nativeFresh || hasNativeInlineDeleteNodes || hasNativeInlineDeleteZoneNodes));
+		const keepNativeDecorationsWhileStale = !useInlineStaleFallback && !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$lastContainer5 = this.lastContainer).querySelector) === null || _this$lastContainer$q === void 0 ? void 0 : _this$lastContainer$q.call(_this$lastContainer5, ".line-insert, .line-delete, .gutter-insert, .gutter-delete")));
 		this.lastContainer.classList.toggle("stream-monaco-diff-native-stale", !nativeFresh && !keepNativeDecorationsWhileStale);
-		if (nativeFresh) {
+		if (nativeFresh && !shouldKeepInlineFallback) {
 			this.clearFallbackDiffDecorations();
 			return;
 		}
 		const originalEditor = this.diffEditorView.getOriginalEditor();
 		const modifiedEditor = this.diffEditorView.getModifiedEditor();
-		const lineChanges = this.getEffectiveLineChanges();
 		const originalDecorations = lineChanges.map((change) => this.toWholeLineDecoration("original", change.originalStartLineNumber, change.originalEndLineNumber)).filter(Boolean);
 		const modifiedDecorations = lineChanges.map((change) => this.toWholeLineDecoration("modified", change.modifiedStartLineNumber, change.modifiedEndLineNumber)).filter(Boolean);
 		this.fallbackOriginalDecorationIds = originalEditor.deltaDecorations(this.fallbackOriginalDecorationIds, originalDecorations);
 		this.fallbackModifiedDecorationIds = modifiedEditor.deltaDecorations(this.fallbackModifiedDecorationIds, modifiedDecorations);
+		if (useInlineStaleFallback) this.syncFallbackInlineDeletedZones(lineChanges);
+		else this.clearFallbackInlineDeletedZones();
 	}
 	disposeDiffPresentationTracking() {
 		this.clearFallbackDiffDecorations();
-		if (this.lastContainer) this.lastContainer.classList.remove("stream-monaco-diff-native-stale");
+		if (this.diffPresentationObserver) {
+			this.diffPresentationObserver.disconnect();
+			this.diffPresentationObserver = null;
+		}
+		this.clearInlineDiffStreamingPresentationIdleTimer();
+		this.inlineDiffStreamingPresentationActive = false;
+		this.resetInlineDiffStreamingHeightFloor();
+		if (this.lastContainer) {
+			this.lastContainer.classList.remove("stream-monaco-diff-native-stale");
+			this.lastContainer.classList.remove("stream-monaco-diff-inline-native-ready");
+		}
 		this.diffComputedVersions = null;
 		this.diffPresentationDisposables.forEach((disposable) => disposable.dispose());
 		this.diffPresentationDisposables = [];
@@ -1374,6 +1618,31 @@ var DiffEditorManager = class DiffEditorManager {
   border: 0 !important;
   box-shadow: var(--stream-monaco-removed-line-shadow);
 }
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-inline-delete-zone {
+  box-sizing: border-box;
+  width: 100%;
+  pointer-events: none;
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-inline-delete-line {
+  box-sizing: border-box;
+  width: 100%;
+  overflow: hidden;
+  white-space: pre;
+  color: inherit;
+  background: var(--stream-monaco-removed-line-fill);
+  box-shadow: var(--stream-monaco-removed-line-shadow);
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-inline-delete-margin {
+  box-sizing: border-box;
+  width: 100%;
+  background: var(--stream-monaco-removed-gutter);
+  pointer-events: none;
+}
+.stream-monaco-diff-root.stream-monaco-diff-inline-native-ready .stream-monaco-fallback-inline-delete-zone,
+.stream-monaco-diff-root.stream-monaco-diff-inline-native-ready .stream-monaco-fallback-inline-delete-line,
+.stream-monaco-diff-root.stream-monaco-diff-inline-native-ready .stream-monaco-fallback-inline-delete-margin {
+  display: none !important;
+}
 .stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-gutter-insert,
 .stream-monaco-diff-root .monaco-diff-editor .stream-monaco-fallback-gutter-insert {
   background: var(--stream-monaco-added-gutter) !important;
@@ -1503,6 +1772,9 @@ var DiffEditorManager = class DiffEditorManager {
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.original .current-line {
   width: var(--stream-monaco-original-margin-width, auto) !important;
+  display: none !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.original .monaco-scrollable-element.editor-scrollable {
   left: var(--stream-monaco-original-scrollable-left, auto) !important;
@@ -1515,6 +1787,9 @@ var DiffEditorManager = class DiffEditorManager {
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.modified .current-line {
   width: var(--stream-monaco-modified-margin-width) !important;
+  display: none !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.modified .monaco-scrollable-element.editor-scrollable {
   left: var(--stream-monaco-modified-scrollable-left, var(--stream-monaco-modified-margin-width)) !important;
@@ -1545,15 +1820,39 @@ var DiffEditorManager = class DiffEditorManager {
   border: 0 !important;
   overflow: hidden !important;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .monaco-editor,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .monaco-editor-background,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .lines-content {
+  width: 0 !important;
+  min-width: 0 !important;
+  background: transparent !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
+}
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .monaco-scrollable-element.editor-scrollable {
   left: 0 !important;
   width: 0 !important;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .margin,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .margin-view-overlays,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .margin-view-zones,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .overflow-guard {
+  display: none !important;
+  width: 0 !important;
+  min-width: 0 !important;
+}
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.modified {
   left: 0 !important;
   width: 100% !important;
   border-left: 0 !important;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline.stream-monaco-diff-native-stale .monaco-diff-editor .editor.modified .view-lines.line-delete,
+.stream-monaco-diff-root.stream-monaco-diff-inline.stream-monaco-diff-native-stale .monaco-diff-editor .editor.modified .inline-deleted-margin-view-zone {
+  display: none !important;
+  height: 0 !important;
+  min-height: 0 !important;
+  overflow: hidden !important;
+}
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .gutter-delete,
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .gutter-insert,
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .line-delete,
@@ -2143,6 +2442,9 @@ var DiffEditorManager = class DiffEditorManager {
   opacity: 0.92 !important;
   transition: background-color 0.14s ease, border-color 0.14s ease, transform 0.14s ease, opacity 0.14s ease, box-shadow 0.14s ease;
 }
+.stream-monaco-diff-root .monaco-editor .fold-unchanged.stream-monaco-fold-unchanged-hidden {
+  display: none !important;
+}
 .stream-monaco-diff-root .monaco-editor .fold-unchanged:hover,
 .stream-monaco-diff-root .monaco-editor .fold-unchanged.stream-monaco-focus-visible {
   opacity: 1 !important;
@@ -2240,6 +2542,8 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	capturePersistedDiffUnchangedState() {
 		if (!this.diffEditorView) return;
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved ?? this.resolveDiffHideUnchangedRegionsOption();
+		if (!(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) || this.diffHideUnchangedRegionsDeferred) return;
 		const state = this.diffEditorView.saveViewState();
 		if (!(state === null || state === void 0 ? void 0 : state.modelState)) {
 			this.diffPersistedUnchangedModelState = null;
@@ -2247,6 +2551,14 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		this.diffPersistedUnchangedModelState = this.cloneSerializableValue(state.modelState);
 	}
+	capturePreviousDiffUnchangedState() {
+		if (!this.diffEditorView) return;
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved ?? this.resolveDiffHideUnchangedRegionsOption();
+		if (!(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) || this.diffHideUnchangedRegionsDeferred) return;
+		const state = this.diffEditorView.saveViewState();
+		if (!(state === null || state === void 0 ? void 0 : state.modelState)) return;
+		this.diffPreviousUnchangedModelState = this.cloneSerializableValue(state.modelState);
+	}
 	scheduleCapturePersistedDiffUnchangedState(frames = 1) {
 		this.rafScheduler.schedule("capture-diff-unchanged-state", () => {
 			let remaining = Math.max(0, frames);
@@ -2272,6 +2584,20 @@ var DiffEditorManager = class DiffEditorManager {
 		});
 		this.applyPendingDiffScrollRestore();
 	}
+	restorePreviousDiffUnchangedState() {
+		if (!this.diffEditorView || !this.diffPreviousUnchangedModelState) return false;
+		const current = this.diffEditorView.saveViewState();
+		if (!current) return false;
+		const previous = this.cloneSerializableValue(this.diffPreviousUnchangedModelState);
+		this.diffEditorView.restoreViewState({
+			original: current.original,
+			modified: current.modified,
+			modelState: previous
+		});
+		this.diffPersistedUnchangedModelState = this.cloneSerializableValue(previous);
+		this.applyPendingDiffScrollRestore();
+		return true;
+	}
 	scheduleRestorePersistedDiffUnchangedState() {
 		if (this.diffHideUnchangedRegionsDeferred) return;
 		if (!this.diffPersistedUnchangedModelState) return;
@@ -2435,7 +2761,7 @@ var DiffEditorManager = class DiffEditorManager {
 			readOnly: this.options.readOnly ?? true,
 			lineDecorationsWidth: this.options.lineDecorationsWidth,
 			lineNumbersMinChars: this.options.lineNumbersMinChars,
-			glyphMargin: this.options.glyphMargin,
+			glyphMargin: this.resolveDiffGlyphMarginOption(hideUnchangedRegions),
 			fontFamily: this.options.fontFamily,
 			fontSize: this.options.fontSize,
 			lineHeight: this.options.lineHeight,
@@ -2455,9 +2781,10 @@ var DiffEditorManager = class DiffEditorManager {
 		};
 	}
 	refreshDiffPresentation() {
-		var _this$diffHeightManag;
+		var _this$diffHideUnchang, _this$diffHeightManag;
 		if (!this.diffEditorView) return;
 		const hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption();
+		const shouldRecomputeDiffViewModelForUnchangedRegions = !this.diffHideUnchangedRegionsDeferred && (hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) === true && ((_this$diffHideUnchang = this.diffHideUnchangedRegionsResolved) === null || _this$diffHideUnchang === void 0 ? void 0 : _this$diffHideUnchang.enabled) === false && !!this.originalModel && !!this.modifiedModel;
 		const presentationOptions = this.resolveDiffPresentationEditorOptions(hideUnchangedRegions);
 		this.diffHideUnchangedRegionsResolved = hideUnchangedRegions;
 		this.diffUpdateThrottleMs = this.resolveDiffStreamingThrottleMs();
@@ -2467,13 +2794,20 @@ var DiffEditorManager = class DiffEditorManager {
 			this.lastContainer.style.removeProperty("--stream-monaco-editor-fg");
 		}
 		this.withLockedDiffScrollPosition(() => {
-			var _this$diffEditorView13;
-			(_this$diffEditorView13 = this.diffEditorView) === null || _this$diffEditorView13 === void 0 || _this$diffEditorView13.updateOptions(presentationOptions);
+			var _this$diffEditorView14;
+			(_this$diffEditorView14 = this.diffEditorView) === null || _this$diffEditorView14 === void 0 || _this$diffEditorView14.updateOptions(presentationOptions);
 		});
 		(_this$diffHeightManag = this.diffHeightManager) === null || _this$diffHeightManag === void 0 || _this$diffHeightManag.update();
 		this.applyDiffRootAppearanceClass();
 		this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
 		this.repositionDiffHunkNodes();
+		if (shouldRecomputeDiffViewModelForUnchangedRegions) this.setDiffModels({
+			original: this.originalModel,
+			modified: this.modifiedModel
+		}, {
+			preserveViewState: true,
+			preserveModelState: false
+		});
 	}
 	restoreDeferredDiffUnchangedRegions() {
 		this.clearDeferredDiffUnchangedRegionsIdleTimer();
@@ -2483,8 +2817,8 @@ var DiffEditorManager = class DiffEditorManager {
 		if (!this.diffHideUnchangedRegionsDeferred) return;
 		this.diffHideUnchangedRegionsDeferred = false;
 		this.withLockedDiffScrollPosition(() => {
-			var _this$diffEditorView14;
-			(_this$diffEditorView14 = this.diffEditorView) === null || _this$diffEditorView14 === void 0 || _this$diffEditorView14.updateOptions({ hideUnchangedRegions });
+			var _this$diffEditorView15;
+			(_this$diffEditorView15 = this.diffEditorView) === null || _this$diffEditorView15 === void 0 || _this$diffEditorView15.updateOptions({ hideUnchangedRegions });
 		});
 		this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
 		if (this.shouldAutoScrollDiff) {
@@ -2493,6 +2827,22 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 	}
 	markDiffStreamingActivity() {
+		var _this$lastContainer6;
+		(_this$lastContainer6 = this.lastContainer) === null || _this$lastContainer6 === void 0 || _this$lastContainer6.classList.remove("stream-monaco-diff-inline-native-ready");
+		if (this.isDiffInlineMode()) {
+			var _this$diffHeightManag2, _this$lastContainer7, _this$lastContainer7$;
+			this.inlineDiffStreamingPresentationActive = true;
+			this.inlineDiffStreamingHeightFloor = Math.max(this.inlineDiffStreamingHeightFloor, ((_this$diffHeightManag2 = this.diffHeightManager) === null || _this$diffHeightManag2 === void 0 ? void 0 : _this$diffHeightManag2.getLastApplied()) ?? 0, ((_this$lastContainer7 = this.lastContainer) === null || _this$lastContainer7 === void 0 || (_this$lastContainer7$ = _this$lastContainer7.getBoundingClientRect) === null || _this$lastContainer7$ === void 0 ? void 0 : _this$lastContainer7$.call(_this$lastContainer7).height) ?? 0);
+			this.clearInlineDiffStreamingPresentationIdleTimer();
+			this.inlineDiffStreamingPresentationIdleTimer = setTimeout(() => {
+				var _this$diffHeightManag3;
+				this.inlineDiffStreamingPresentationIdleTimer = null;
+				this.inlineDiffStreamingPresentationActive = false;
+				this.resetInlineDiffStreamingHeightFloor();
+				this.scheduleSyncDiffPresentationDecorations();
+				(_this$diffHeightManag3 = this.diffHeightManager) === null || _this$diffHeightManag3 === void 0 || _this$diffHeightManag3.update();
+			}, 3e3);
+		}
 		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved;
 		if (!this.diffEditorView || !(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled)) return;
 		this.clearDeferredDiffUnchangedRegionsIdleTimer();
@@ -2504,8 +2854,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffHideUnchangedRegionsDeferred = true;
 		this.hideAllDiffUnchangedBridgeEntries();
 		this.withLockedDiffScrollPosition(() => {
-			var _this$diffEditorView15;
-			(_this$diffEditorView15 = this.diffEditorView) === null || _this$diffEditorView15 === void 0 || _this$diffEditorView15.updateOptions({ hideUnchangedRegions: {
+			var _this$diffEditorView16;
+			(_this$diffEditorView16 = this.diffEditorView) === null || _this$diffEditorView16 === void 0 || _this$diffEditorView16.updateOptions({ hideUnchangedRegions: {
 				...hideUnchangedRegions,
 				enabled: false
 			} });
@@ -2603,8 +2953,8 @@ var DiffEditorManager = class DiffEditorManager {
 		return this.diffUnchangedBridgeOverlay;
 	}
 	readDiffUnchangedOverlayScrollState() {
-		var _this$diffEditorView16, _modifiedEditor$getSc6, _modifiedEditor$getSc7;
-		const modifiedEditor = (_this$diffEditorView16 = this.diffEditorView) === null || _this$diffEditorView16 === void 0 ? void 0 : _this$diffEditorView16.getModifiedEditor();
+		var _this$diffEditorView17, _modifiedEditor$getSc6, _modifiedEditor$getSc7;
+		const modifiedEditor = (_this$diffEditorView17 = this.diffEditorView) === null || _this$diffEditorView17 === void 0 ? void 0 : _this$diffEditorView17.getModifiedEditor();
 		return {
 			top: (modifiedEditor === null || modifiedEditor === void 0 || (_modifiedEditor$getSc6 = modifiedEditor.getScrollTop) === null || _modifiedEditor$getSc6 === void 0 ? void 0 : _modifiedEditor$getSc6.call(modifiedEditor)) ?? 0,
 			left: (modifiedEditor === null || modifiedEditor === void 0 || (_modifiedEditor$getSc7 = modifiedEditor.getScrollLeft) === null || _modifiedEditor$getSc7 === void 0 ? void 0 : _modifiedEditor$getSc7.call(modifiedEditor)) ?? 0
@@ -2961,7 +3311,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.scheduleCapturePersistedDiffUnchangedState(1);
 	}
 	resolveDiffUnchangedRevealLayout(primaryNode, countText, pairIndex, pairCount) {
-		var _this$diffEditorView17, _this$diffEditorView18;
+		var _this$diffEditorView18, _this$diffEditorView19;
 		let showTopHandle = pairCount === 1 || pairIndex > 0;
 		let showBottomHandle = pairCount === 1 || pairIndex < pairCount - 1;
 		const countMatch = countText.match(/\d+/);
@@ -2991,7 +3341,7 @@ var DiffEditorManager = class DiffEditorManager {
 			showTopHandle = false;
 			showBottomHandle = true;
 		}
-		const modelLineCount = ((_this$diffEditorView17 = this.diffEditorView) === null || _this$diffEditorView17 === void 0 || (_this$diffEditorView17 = _this$diffEditorView17.getModifiedEditor().getModel()) === null || _this$diffEditorView17 === void 0 || (_this$diffEditorView18 = _this$diffEditorView17.getLineCount) === null || _this$diffEditorView18 === void 0 ? void 0 : _this$diffEditorView18.call(_this$diffEditorView17)) ?? null;
+		const modelLineCount = ((_this$diffEditorView18 = this.diffEditorView) === null || _this$diffEditorView18 === void 0 || (_this$diffEditorView18 = _this$diffEditorView18.getModifiedEditor().getModel()) === null || _this$diffEditorView18 === void 0 || (_this$diffEditorView19 = _this$diffEditorView18.getLineCount) === null || _this$diffEditorView19 === void 0 ? void 0 : _this$diffEditorView19.call(_this$diffEditorView18)) ?? null;
 		if (previousVisibleLine != null && modelLineCount != null && previousVisibleLine + hiddenCount === modelLineCount) {
 			showTopHandle = true;
 			showBottomHandle = false;
@@ -3002,13 +3352,13 @@ var DiffEditorManager = class DiffEditorManager {
 		};
 	}
 	resolveDiffUnchangedMergeRole(node) {
-		var _this$diffEditorView19, _this$diffEditorView20, _this$diffEditorView21, _this$diffEditorView22, _this$diffEditorView23, _this$diffEditorView24;
+		var _this$diffEditorView20, _this$diffEditorView21, _this$diffEditorView22, _this$diffEditorView23, _this$diffEditorView24, _this$diffEditorView25;
 		const diffRoot = node.closest(".monaco-diff-editor.side-by-side");
 		if (!(diffRoot instanceof HTMLElement)) return "none";
 		const nodeRect = node.getBoundingClientRect();
 		const nodeCenter = nodeRect.left + nodeRect.width / 2;
-		const originalHost = (_this$diffEditorView19 = this.diffEditorView) === null || _this$diffEditorView19 === void 0 || (_this$diffEditorView21 = (_this$diffEditorView20 = _this$diffEditorView19.getOriginalEditor()).getContainerDomNode) === null || _this$diffEditorView21 === void 0 ? void 0 : _this$diffEditorView21.call(_this$diffEditorView20);
-		const modifiedHost = (_this$diffEditorView22 = this.diffEditorView) === null || _this$diffEditorView22 === void 0 || (_this$diffEditorView24 = (_this$diffEditorView23 = _this$diffEditorView22.getModifiedEditor()).getContainerDomNode) === null || _this$diffEditorView24 === void 0 ? void 0 : _this$diffEditorView24.call(_this$diffEditorView23);
+		const originalHost = (_this$diffEditorView20 = this.diffEditorView) === null || _this$diffEditorView20 === void 0 || (_this$diffEditorView22 = (_this$diffEditorView21 = _this$diffEditorView20.getOriginalEditor()).getContainerDomNode) === null || _this$diffEditorView22 === void 0 ? void 0 : _this$diffEditorView22.call(_this$diffEditorView21);
+		const modifiedHost = (_this$diffEditorView23 = this.diffEditorView) === null || _this$diffEditorView23 === void 0 || (_this$diffEditorView25 = (_this$diffEditorView24 = _this$diffEditorView23.getModifiedEditor()).getContainerDomNode) === null || _this$diffEditorView25 === void 0 ? void 0 : _this$diffEditorView25.call(_this$diffEditorView24);
 		if (originalHost instanceof HTMLElement && modifiedHost instanceof HTMLElement) {
 			const originalRect = originalHost.getBoundingClientRect();
 			const modifiedRect = modifiedHost.getBoundingClientRect();
@@ -3048,6 +3398,11 @@ var DiffEditorManager = class DiffEditorManager {
 			action.tabIndex = shouldUseMergedSecondary ? -1 : 0;
 			if (action.dataset.streamMonacoExpandPatched !== "true") {
 				action.dataset.streamMonacoExpandPatched = "true";
+				const handleCaptureExpand = () => {
+					this.capturePreviousDiffUnchangedState();
+				};
+				action.addEventListener("click", handleCaptureExpand, { capture: true });
+				this.diffUnchangedRegionDisposables.push({ dispose: () => action.removeEventListener("click", handleCaptureExpand, true) });
 				this.createDomDisposable(this.diffUnchangedRegionDisposables, action, "click", () => {
 					this.hideAllDiffUnchangedBridgeEntries();
 					this.scheduleCapturePersistedDiffUnchangedState(1);
@@ -3060,7 +3415,10 @@ var DiffEditorManager = class DiffEditorManager {
 			this.bindFocusWithinClass(this.diffUnchangedRegionDisposables, node, "stream-monaco-focus-within");
 			const activate = () => {
 				const action$1 = node.querySelector("a");
-				if (action$1 instanceof HTMLElement) action$1.click();
+				if (action$1 instanceof HTMLElement) {
+					this.capturePreviousDiffUnchangedState();
+					action$1.click();
+				}
 			};
 			this.createDomDisposable(this.diffUnchangedRegionDisposables, node, "click", (event) => {
 				const mouseEvent = event;
@@ -3154,6 +3512,7 @@ var DiffEditorManager = class DiffEditorManager {
 		entry.activate = () => {
 			const action = primaryNode.querySelector("a, button") ?? secondaryNode.querySelector("a, button");
 			if (action instanceof HTMLElement) {
+				this.capturePreviousDiffUnchangedState();
 				action.click();
 				this.scheduleCapturePersistedDiffUnchangedState(1);
 			}
@@ -3172,10 +3531,22 @@ var DiffEditorManager = class DiffEditorManager {
 		node.title = node.title || "Collapse unchanged lines";
 		this.bindFocusVisibleClass(this.diffUnchangedRegionDisposables, node);
 		this.bindPersistOnMouseRelease(this.diffUnchangedRegionDisposables, node);
+		this.createDomDisposable(this.diffUnchangedRegionDisposables, node, "mouseup", (event) => {
+			const mouseEvent = event;
+			if (mouseEvent.button !== 0) return;
+			if (!this.restorePreviousDiffUnchangedState()) return;
+			event.preventDefault();
+			event.stopPropagation();
+			this.schedulePatchDiffUnchangedRegionsAfterInteraction();
+		});
 		this.createDomDisposable(this.diffUnchangedRegionDisposables, node, "keydown", (event) => {
 			const keyboardEvent = event;
 			if (keyboardEvent.key !== "Enter" && keyboardEvent.key !== " ") return;
 			keyboardEvent.preventDefault();
+			if (this.restorePreviousDiffUnchangedState()) {
+				this.schedulePatchDiffUnchangedRegionsAfterInteraction();
+				return;
+			}
 			this.dispatchSyntheticMouseDown(node);
 			this.scheduleCapturePersistedDiffUnchangedState(1);
 		});
@@ -3185,6 +3556,11 @@ var DiffEditorManager = class DiffEditorManager {
 		this.applyDiffRootAppearanceClass();
 		const viewZoneHeightsChanged = this.syncDiffUnchangedViewZoneHeights();
 		const centers = this.lastContainer.querySelectorAll(".diff-hidden-lines .center");
+		const modifiedHiddenSummaryMidpoints = Array.from(this.lastContainer.querySelectorAll(".editor.modified .diff-hidden-lines .center")).map((node) => {
+			const rect = node.getBoundingClientRect();
+			if (rect.width <= 0 || rect.height <= 0) return null;
+			return rect.top + rect.height / 2;
+		}).filter((value) => value !== null);
 		Array.from(centers).sort((a, b) => a.getBoundingClientRect().top - b.getBoundingClientRect().top).forEach((node, index) => this.patchDiffUnchangedCenter(node, index));
 		const partialRevealHandles = this.lastContainer.querySelectorAll(".diff-hidden-lines .top, .diff-hidden-lines .bottom");
 		partialRevealHandles.forEach((node) => {
@@ -3209,7 +3585,13 @@ var DiffEditorManager = class DiffEditorManager {
 		this.pruneDiffUnchangedBridgeEntries(visibleKeys);
 		this.syncDiffUnchangedOverlayScrollBaseline();
 		const foldGlyphs = this.lastContainer.querySelectorAll(".fold-unchanged");
-		foldGlyphs.forEach((node) => this.patchDiffUnchangedFoldGlyph(node));
+		foldGlyphs.forEach((node) => {
+			const rect = node.getBoundingClientRect();
+			const midpoint = rect.top + rect.height / 2;
+			const overlapsHiddenSummary = modifiedHiddenSummaryMidpoints.some((summaryMidpoint) => Math.abs(summaryMidpoint - midpoint) <= 8);
+			node.classList.toggle("stream-monaco-fold-unchanged-hidden", overlapsHiddenSummary);
+			this.patchDiffUnchangedFoldGlyph(node);
+		});
 		if (viewZoneHeightsChanged) this.schedulePatchDiffUnchangedRegions();
 	}
 	schedulePatchDiffUnchangedRegions() {
@@ -3222,12 +3604,12 @@ var DiffEditorManager = class DiffEditorManager {
 		this.schedulePatchDiffUnchangedRegions();
 	}
 	setupDiffUnchangedRegionEnhancements() {
-		var _globalThis$getComput, _globalThis;
+		var _globalThis$getComput2, _globalThis2;
 		this.disposeDiffUnchangedRegionEnhancements();
 		if (!this.diffEditorView || !this.lastContainer) return;
 		if (typeof document === "undefined") return;
 		this.ensureDiffUiStyle();
-		const containerStyle = (_globalThis$getComput = (_globalThis = globalThis).getComputedStyle) === null || _globalThis$getComput === void 0 ? void 0 : _globalThis$getComput.call(_globalThis, this.lastContainer);
+		const containerStyle = (_globalThis$getComput2 = (_globalThis2 = globalThis).getComputedStyle) === null || _globalThis$getComput2 === void 0 ? void 0 : _globalThis$getComput2.call(_globalThis2, this.lastContainer);
 		if (!containerStyle || containerStyle.position === "static") this.lastContainer.style.position = "relative";
 		this.applyDiffRootAppearanceClass();
 		this.schedulePatchDiffUnchangedRegions();
@@ -3255,6 +3637,20 @@ var DiffEditorManager = class DiffEditorManager {
 			this.applyDiffRootAppearanceClass();
 			this.schedulePatchDiffUnchangedRegions();
 		};
+		const handleFoldMouseUp = (event) => {
+			var _event$event, _event$target, _event$event2, _event$event2$prevent, _event$event3, _event$event3$stopPro;
+			if (event === null || event === void 0 || (_event$event = event.event) === null || _event$event === void 0 ? void 0 : _event$event.rightButton) return;
+			const targetElement = event === null || event === void 0 || (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.element;
+			const className = typeof (targetElement === null || targetElement === void 0 ? void 0 : targetElement.className) === "string" ? targetElement.className : "";
+			if (!className.includes("fold-unchanged")) return;
+			if (!this.diffPreviousUnchangedModelState) return;
+			event === null || event === void 0 || (_event$event2 = event.event) === null || _event$event2 === void 0 || (_event$event2$prevent = _event$event2.preventDefault) === null || _event$event2$prevent === void 0 || _event$event2$prevent.call(_event$event2);
+			event === null || event === void 0 || (_event$event3 = event.event) === null || _event$event3 === void 0 || (_event$event3$stopPro = _event$event3.stopPropagation) === null || _event$event3$stopPro === void 0 || _event$event3$stopPro.call(_event$event3);
+			requestAnimationFrame(() => {
+				if (!this.restorePreviousDiffUnchangedState()) return;
+				this.schedulePatchDiffUnchangedRegionsAfterInteraction();
+			});
+		};
 		this.diffUnchangedRegionDisposables.push(this.diffEditorView.onDidUpdateDiff(() => {
 			repatch();
 			this.scheduleRestorePersistedDiffUnchangedState();
@@ -3263,16 +3659,18 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffUnchangedRegionDisposables.push(modifiedEditor.onDidLayoutChange(repatch));
 		this.diffUnchangedRegionDisposables.push(originalEditor.onDidScrollChange(() => this.schedulePatchDiffUnchangedRegionsAfterScroll()));
 		this.diffUnchangedRegionDisposables.push(modifiedEditor.onDidScrollChange(() => this.schedulePatchDiffUnchangedRegionsAfterScroll()));
+		this.diffUnchangedRegionDisposables.push(originalEditor.onMouseUp(handleFoldMouseUp));
+		this.diffUnchangedRegionDisposables.push(modifiedEditor.onMouseUp(handleFoldMouseUp));
 		this.createDomDisposable(this.diffUnchangedRegionDisposables, this.lastContainer, "scroll", () => this.schedulePatchDiffUnchangedRegionsAfterScroll());
 	}
 	setupDiffHunkInteractions() {
-		var _globalThis$getComput2, _globalThis2;
+		var _globalThis$getComput3, _globalThis3;
 		this.disposeDiffHunkInteractions();
 		if (!this.diffEditorView || !this.lastContainer) return;
 		if (this.options.diffHunkActionsOnHover !== true) return;
 		if (typeof document === "undefined") return;
 		this.ensureDiffUiStyle();
-		const containerStyle = (_globalThis$getComput2 = (_globalThis2 = globalThis).getComputedStyle) === null || _globalThis$getComput2 === void 0 ? void 0 : _globalThis$getComput2.call(_globalThis2, this.lastContainer);
+		const containerStyle = (_globalThis$getComput3 = (_globalThis3 = globalThis).getComputedStyle) === null || _globalThis$getComput3 === void 0 ? void 0 : _globalThis$getComput3.call(_globalThis3, this.lastContainer);
 		if (!containerStyle || containerStyle.position === "static") this.lastContainer.style.position = "relative";
 		const overlay = document.createElement("div");
 		overlay.className = "stream-monaco-diff-hunk-overlay";
@@ -3390,9 +3788,9 @@ var DiffEditorManager = class DiffEditorManager {
 		return !info || info.width < 24;
 	}
 	isDiffInlineMode() {
-		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");
+		var _this$lastContainer8, _this$lastContainer9;
+		const diffRoot = typeof ((_this$lastContainer8 = this.lastContainer) === null || _this$lastContainer8 === void 0 ? void 0 : _this$lastContainer8.querySelector) === "function" ? (_this$lastContainer9 = this.lastContainer) === null || _this$lastContainer9 === void 0 ? void 0 : _this$lastContainer9.querySelector(".monaco-diff-editor") : null;
+		if (typeof HTMLElement !== "undefined" && diffRoot instanceof HTMLElement) return !diffRoot.classList.contains("side-by-side");
 		return this.isOriginalEditorCollapsed();
 	}
 	getEditorBySide(side) {
@@ -3440,8 +3838,8 @@ var DiffEditorManager = class DiffEditorManager {
 		if (!this.diffEditorView || !viewState) return;
 		const restore = () => {
 			try {
-				var _this$diffEditorView25;
-				(_this$diffEditorView25 = this.diffEditorView) === null || _this$diffEditorView25 === void 0 || _this$diffEditorView25.restoreViewState(viewState);
+				var _this$diffEditorView26;
+				(_this$diffEditorView26 = this.diffEditorView) === null || _this$diffEditorView26 === void 0 || _this$diffEditorView26.restoreViewState(viewState);
 			} catch {}
 		};
 		restore();
@@ -3459,7 +3857,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.pendingPreparedDiffViewModel = null;
 	}
 	syncDiffKnownValues() {
-		var _this$diffEditorView26, _this$diffEditorView27, _this$diffEditorView28, _this$diffHeightManag2;
+		var _this$diffEditorView27, _this$diffEditorView28, _this$diffEditorView29, _this$diffHeightManag4;
 		if (this.originalModel) this.lastKnownOriginalCode = this.originalModel.getValue();
 		if (this.modifiedModel) {
 			this.lastKnownModifiedCode = this.modifiedModel.getValue();
@@ -3468,8 +3866,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.lastKnownModifiedDirty = false;
 		this._hasScrollBar = false;
 		this.cachedComputedHeightDiff = this.computedHeight();
-		this.cachedScrollHeightDiff = ((_this$diffEditorView26 = this.diffEditorView) === null || _this$diffEditorView26 === void 0 || (_this$diffEditorView28 = (_this$diffEditorView27 = _this$diffEditorView26.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView28 === void 0 ? void 0 : _this$diffEditorView28.call(_this$diffEditorView27)) ?? this.cachedScrollHeightDiff;
-		(_this$diffHeightManag2 = this.diffHeightManager) === null || _this$diffHeightManag2 === void 0 || _this$diffHeightManag2.update();
+		this.cachedScrollHeightDiff = ((_this$diffEditorView27 = this.diffEditorView) === null || _this$diffEditorView27 === void 0 || (_this$diffEditorView29 = (_this$diffEditorView28 = _this$diffEditorView27.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView29 === void 0 ? void 0 : _this$diffEditorView29.call(_this$diffEditorView28)) ?? this.cachedScrollHeightDiff;
+		(_this$diffHeightManag4 = this.diffHeightManager) === null || _this$diffHeightManag4 === void 0 || _this$diffHeightManag4.update();
 	}
 	applyDefaultDiffHunkAction(context) {
 		const { action, side, lineChange } = context;
@@ -3653,24 +4051,49 @@ var DiffEditorManager = class DiffEditorManager {
 		this.preserveNativeDiffDecorationsOnStaleAppend = true;
 		this.appendToModel(this.originalModel, text);
 	}
-	computedHeight() {
-		var _originalEditor$getMo, _modifiedEditor$getMo, _originalEditor$getSc5, _modifiedEditor$getSc10;
+	computeRawHeight() {
+		var _originalEditor$getMo, _modifiedEditor$getMo2, _originalEditor$getSc5, _modifiedEditor$getSc10;
 		if (!this.diffEditorView) return Math.min(1 * 18 + padding, this.maxHeightValue);
 		const modifiedEditor = this.diffEditorView.getModifiedEditor();
 		const originalEditor = this.diffEditorView.getOriginalEditor();
 		const lineHeight = modifiedEditor.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
 		const oCount = ((_originalEditor$getMo = originalEditor.getModel()) === null || _originalEditor$getMo === void 0 ? void 0 : _originalEditor$getMo.getLineCount()) ?? 1;
-		const mCount = ((_modifiedEditor$getMo = modifiedEditor.getModel()) === null || _modifiedEditor$getMo === void 0 ? void 0 : _modifiedEditor$getMo.getLineCount()) ?? 1;
+		const mCount = ((_modifiedEditor$getMo2 = modifiedEditor.getModel()) === null || _modifiedEditor$getMo2 === void 0 ? void 0 : _modifiedEditor$getMo2.getLineCount()) ?? 1;
 		const lineCount = Math.max(oCount, mCount);
 		const fromLines = lineCount * lineHeight + padding;
 		const scrollH = Math.max(((_originalEditor$getSc5 = originalEditor.getScrollHeight) === null || _originalEditor$getSc5 === void 0 ? void 0 : _originalEditor$getSc5.call(originalEditor)) ?? 0, ((_modifiedEditor$getSc10 = modifiedEditor.getScrollHeight) === null || _modifiedEditor$getSc10 === void 0 ? void 0 : _modifiedEditor$getSc10.call(modifiedEditor)) ?? 0);
 		const desired = Math.max(fromLines, scrollH);
 		return Math.min(desired, this.maxHeightValue);
 	}
+	computedHeight() {
+		const rawHeight = this.computeRawHeight();
+		if (!this.isDiffInlineMode()) return rawHeight;
+		if (!this.inlineDiffStreamingPresentationActive && this.inlineDiffStreamingHeightFloor <= 0) return rawHeight;
+		const lockedHeight = Math.max(rawHeight, this.inlineDiffStreamingHeightFloor);
+		this.inlineDiffStreamingHeightFloor = lockedHeight;
+		return lockedHeight;
+	}
+	eagerlyGrowDiffContainerHeight() {
+		var _this$lastContainer$g, _this$lastContainer10;
+		if (!this.lastContainer) return;
+		const next = this.computedHeight();
+		if (!Number.isFinite(next) || next <= 0) return;
+		const applied = Number.parseFloat(this.lastContainer.style.height || "0") || 0;
+		const measured = ((_this$lastContainer$g = (_this$lastContainer10 = this.lastContainer).getBoundingClientRect) === null || _this$lastContainer$g === void 0 ? void 0 : _this$lastContainer$g.call(_this$lastContainer10).height) ?? this.lastContainer.clientHeight ?? 0;
+		const baseline = Math.max(applied, measured);
+		if (next <= baseline + 1) return;
+		this.lastContainer.style.height = `${next}px`;
+		this.cachedComputedHeightDiff = next;
+		this.scheduleSyncDiffEditorLayoutToContainer();
+	}
 	isOverflowAutoDiff() {
 		if (!this.lastContainer) return false;
 		return this.computedHeight() >= this.maxHeightValue - 1;
 	}
+	shouldAvoidOptimisticMaxHeightWriteDiff() {
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved;
+		return this.isDiffInlineMode() && (hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) === true && !this.diffHideUnchangedRegionsDeferred;
+	}
 	shouldPerformImmediateRevealDiff() {
 		return this.autoScrollOnUpdate && this.shouldAutoScrollDiff && !this.diffHideUnchangedRegionsDeferred && this.hasVerticalScrollbarModified() && this.isOverflowAutoDiff();
 	}
@@ -3815,8 +4238,8 @@ var DiffEditorManager = class DiffEditorManager {
 				lastRevealLineDiff: this.lastRevealLineDiff
 			});
 			try {
-				var _this$diffEditorView29, _this$diffEditorView30, _this$diffEditorView31;
-				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;
+				var _this$diffEditorView30, _this$diffEditorView31, _this$diffEditorView32;
+				this.lastScrollTopDiff = ((_this$diffEditorView30 = this.diffEditorView) === null || _this$diffEditorView30 === void 0 || (_this$diffEditorView32 = (_this$diffEditorView31 = _this$diffEditorView30.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView32 === void 0 ? void 0 : _this$diffEditorView32.call(_this$diffEditorView31)) ?? this.lastScrollTopDiff;
 			} catch {}
 		});
 	}
@@ -3842,6 +4265,7 @@ var DiffEditorManager = class DiffEditorManager {
 			if (target !== -1 && this.diffHeightManager) {
 				if (this.lastContainer) this.lastContainer.style.height = `${target}px`;
 				await this.waitForHeightAppliedDiff(target);
+				this.syncDiffEditorLayoutToContainer();
 			}
 			this.performImmediateRevealDiff(line, ticket);
 		});
@@ -3865,11 +4289,19 @@ var DiffEditorManager = class DiffEditorManager {
 		});
 	}
 	async createDiffEditor(container, originalCode, modifiedCode, language, currentTheme) {
-		var _me$getScrollHeight2, _me$getOption, _oEditor$onDidContent, _mEditor$onDidContent;
+		var _me$getScrollHeight2, _me$getOption, _oEditor$onDidLayoutC, _mEditor$onDidLayoutC, _oEditor$onDidContent, _mEditor$onDidContent;
 		this.cleanup();
 		this.lastContainer = container;
 		container.style.overflow = "hidden";
 		container.style.maxHeight = this.maxHeightCSS;
+		container.innerHTML = "";
+		const editorMount = typeof document !== "undefined" ? document.createElement("div") : container;
+		if (editorMount !== container) {
+			editorMount.style.width = "100%";
+			editorMount.style.height = "100%";
+			editorMount.style.overflow = "hidden";
+			container.append(editorMount);
+		}
 		const lang = processedLanguage(language) || language;
 		this.originalModel = monaco_shim_exports.editor.createModel(originalCode, lang);
 		this.modifiedModel = monaco_shim_exports.editor.createModel(modifiedCode, lang);
@@ -3878,7 +4310,7 @@ var DiffEditorManager = class DiffEditorManager {
 		const hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption();
 		this.diffHideUnchangedRegionsResolved = hideUnchangedRegions;
 		this.diffHideUnchangedRegionsDeferred = false;
-		this.diffEditorView = monaco_shim_exports.editor.createDiffEditor(container, {
+		this.diffEditorView = monaco_shim_exports.editor.createDiffEditor(editorMount, {
 			automaticLayout: true,
 			scrollBeyondLastLine: false,
 			renderSideBySide: true,
@@ -3892,6 +4324,7 @@ var DiffEditorManager = class DiffEditorManager {
 				...this.options.scrollbar || {}
 			},
 			...this.options,
+			glyphMargin: this.resolveDiffGlyphMarginOption(hideUnchangedRegions),
 			hideUnchangedRegions
 		});
 		monaco_shim_exports.editor.setTheme(currentTheme);
@@ -3928,8 +4361,10 @@ var DiffEditorManager = class DiffEditorManager {
 			autoScrollInitial: this.autoScrollInitial,
 			diffAutoScroll: this.diffAutoScroll
 		});
-		const MIN_VISIBLE_HEIGHT = Math.min(120, this.maxHeightValue);
-		container.style.minHeight = `${MIN_VISIBLE_HEIGHT}px`;
+		const minVisibleHeight = this.shouldDeferTailAppendForInlineStreaming() ? 0 : Math.min(120, this.maxHeightValue);
+		if (minVisibleHeight > 0) container.style.minHeight = `${minVisibleHeight}px`;
+		else if (typeof container.style.removeProperty === "function") container.style.removeProperty("min-height");
+		else delete container.style.minHeight;
 		if (this.diffHeightManager) {
 			this.diffHeightManager.dispose();
 			this.diffHeightManager = null;
@@ -3948,6 +4383,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffComputedVersions = null;
 		this.diffPresentationDisposables.push(this.diffEditorView.onDidUpdateDiff(() => {
 			this.diffComputedVersions = this.captureCurrentDiffVersions();
+			this.syncDiffEditorLayoutToContainer();
 			this.scheduleSyncDiffPresentationDecorations();
 		}));
 		this.diffPresentationDisposables.push(oEditor.onDidChangeModelContent(() => {
@@ -3956,16 +4392,46 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffPresentationDisposables.push(mEditor.onDidChangeModelContent(() => {
 			this.scheduleSyncDiffPresentationDecorations();
 		}));
+		const originalLayoutDisposable = (_oEditor$onDidLayoutC = oEditor.onDidLayoutChange) === null || _oEditor$onDidLayoutC === void 0 ? void 0 : _oEditor$onDidLayoutC.call(oEditor, () => {
+			this.scheduleSyncDiffPresentationDecorations();
+		});
+		if (originalLayoutDisposable) this.diffPresentationDisposables.push(originalLayoutDisposable);
+		const modifiedLayoutDisposable = (_mEditor$onDidLayoutC = mEditor.onDidLayoutChange) === null || _mEditor$onDidLayoutC === void 0 ? void 0 : _mEditor$onDidLayoutC.call(mEditor, () => {
+			this.scheduleSyncDiffPresentationDecorations();
+		});
+		if (modifiedLayoutDisposable) this.diffPresentationDisposables.push(modifiedLayoutDisposable);
+		if (typeof MutationObserver !== "undefined" && this.lastContainer) {
+			this.diffPresentationObserver = new MutationObserver((mutations) => {
+				const shouldSync = mutations.some((mutation) => {
+					if (mutation.type !== "childList") return false;
+					const nodes = Array.from(mutation.addedNodes).concat(Array.from(mutation.removedNodes));
+					return nodes.some((node) => {
+						if (!(node instanceof HTMLElement)) return false;
+						return node.matches(".line-delete, .inline-deleted-text, .inline-deleted-margin-view-zone") || !!node.querySelector(".line-delete, .inline-deleted-text, .inline-deleted-margin-view-zone") || !!node.closest(".editor.modified .view-zones, .editor.modified .margin-view-zones");
+					});
+				});
+				if (shouldSync) this.scheduleSyncDiffPresentationDecorations();
+			});
+			this.diffPresentationObserver.observe(this.lastContainer, {
+				childList: true,
+				subtree: true
+			});
+		}
 		(_oEditor$onDidContent = oEditor.onDidContentSizeChange) === null || _oEditor$onDidContent === void 0 || _oEditor$onDidContent.call(oEditor, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change-diff", () => {
-				var _oEditor$getScrollHei, _oEditor$getOption, _this$diffHeightManag3, _this$diffHeightManag4;
+				var _oEditor$getScrollHei, _oEditor$getOption, _this$diffHeightManag5, _this$diffHeightManag6;
 				this.cachedScrollHeightDiff = ((_oEditor$getScrollHei = oEditor.getScrollHeight) === null || _oEditor$getScrollHei === void 0 ? void 0 : _oEditor$getScrollHei.call(oEditor)) ?? this.cachedScrollHeightDiff;
 				this.cachedLineHeightDiff = ((_oEditor$getOption = oEditor.getOption) === null || _oEditor$getOption === void 0 ? void 0 : _oEditor$getOption.call(oEditor, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? this.cachedLineHeightDiff;
 				this.cachedComputedHeightDiff = this.computedHeight();
-				if ((_this$diffHeightManag3 = this.diffHeightManager) === null || _this$diffHeightManag3 === void 0 ? void 0 : _this$diffHeightManag3.isSuppressed()) return;
-				(_this$diffHeightManag4 = this.diffHeightManager) === null || _this$diffHeightManag4 === void 0 || _this$diffHeightManag4.update();
-				const computed$1 = this.computedHeight();
+				if (this.lastContainer) {
+					const applied = Number.parseFloat(this.lastContainer.style.height || "0") || 0;
+					if (this.cachedComputedHeightDiff > applied + 1 && (this.cachedComputedHeightDiff < this.maxHeightValue - 1 || !this.shouldAvoidOptimisticMaxHeightWriteDiff())) this.lastContainer.style.height = `${this.cachedComputedHeightDiff}px`;
+				}
+				if ((_this$diffHeightManag5 = this.diffHeightManager) === null || _this$diffHeightManag5 === void 0 ? void 0 : _this$diffHeightManag5.isSuppressed()) return;
+				(_this$diffHeightManag6 = this.diffHeightManager) === null || _this$diffHeightManag6 === void 0 || _this$diffHeightManag6.update();
+				this.scheduleSyncDiffEditorLayoutToContainer();
+				const computed$1 = this.cachedComputedHeightDiff;
 				if (this.lastContainer) {
 					this.lastContainer.style.overflow = "hidden";
 					if (computed$1 >= this.maxHeightValue - 1 && this.shouldAutoScrollDiff && !this.diffHideUnchangedRegionsDeferred) {
@@ -3978,13 +4444,18 @@ var DiffEditorManager = class DiffEditorManager {
 		(_mEditor$onDidContent = mEditor.onDidContentSizeChange) === null || _mEditor$onDidContent === void 0 || _mEditor$onDidContent.call(mEditor, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change-diff", () => {
-				var _mEditor$getScrollHei, _mEditor$getOption, _this$diffHeightManag5, _this$diffHeightManag6;
+				var _mEditor$getScrollHei, _mEditor$getOption, _this$diffHeightManag7, _this$diffHeightManag8;
 				this.cachedScrollHeightDiff = ((_mEditor$getScrollHei = mEditor.getScrollHeight) === null || _mEditor$getScrollHei === void 0 ? void 0 : _mEditor$getScrollHei.call(mEditor)) ?? this.cachedScrollHeightDiff;
 				this.cachedLineHeightDiff = ((_mEditor$getOption = mEditor.getOption) === null || _mEditor$getOption === void 0 ? void 0 : _mEditor$getOption.call(mEditor, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? this.cachedLineHeightDiff;
 				this.cachedComputedHeightDiff = this.computedHeight();
-				if ((_this$diffHeightManag5 = this.diffHeightManager) === null || _this$diffHeightManag5 === void 0 ? void 0 : _this$diffHeightManag5.isSuppressed()) return;
-				(_this$diffHeightManag6 = this.diffHeightManager) === null || _this$diffHeightManag6 === void 0 || _this$diffHeightManag6.update();
-				const computed$1 = this.computedHeight();
+				if (this.lastContainer) {
+					const applied = Number.parseFloat(this.lastContainer.style.height || "0") || 0;
+					if (this.cachedComputedHeightDiff > applied + 1 && (this.cachedComputedHeightDiff < this.maxHeightValue - 1 || !this.shouldAvoidOptimisticMaxHeightWriteDiff())) this.lastContainer.style.height = `${this.cachedComputedHeightDiff}px`;
+				}
+				if ((_this$diffHeightManag7 = this.diffHeightManager) === null || _this$diffHeightManag7 === void 0 ? void 0 : _this$diffHeightManag7.isSuppressed()) return;
+				(_this$diffHeightManag8 = this.diffHeightManager) === null || _this$diffHeightManag8 === void 0 || _this$diffHeightManag8.update();
+				this.scheduleSyncDiffEditorLayoutToContainer();
+				const computed$1 = this.cachedComputedHeightDiff;
 				if (this.lastContainer) {
 					this.lastContainer.style.overflow = "hidden";
 					if (computed$1 >= this.maxHeightValue - 1 && this.shouldAutoScrollDiff && !this.diffHideUnchangedRegionsDeferred) {
@@ -4025,13 +4496,14 @@ var DiffEditorManager = class DiffEditorManager {
 		const modifiedTailAppend = modifiedCode !== prevM && modifiedCode.startsWith(prevM) && prevM.length < modifiedCode.length;
 		const hasContentChange = originalCode !== prevO || modifiedCode !== prevM;
 		if (originalCode !== prevO || modifiedCode !== prevM) this.markDiffStreamingActivity();
+		const deferTailAppendForInline = this.shouldDeferTailAppendForInlineStreaming();
 		let didImmediate = false;
-		if (originalTailAppend) {
+		if (originalTailAppend && !deferTailAppendForInline) {
 			this.appendOriginal(originalCode.slice(prevO.length));
 			this.lastKnownOriginalCode = originalCode;
 			didImmediate = true;
 		}
-		if (modifiedTailAppend) {
+		if (modifiedTailAppend && !deferTailAppendForInline) {
 			this.appendModified(modifiedCode.slice(prevM.length));
 			this.lastKnownModifiedCode = modifiedCode;
 			didImmediate = true;
@@ -4045,6 +4517,16 @@ var DiffEditorManager = class DiffEditorManager {
 			this.rafScheduler.schedule("diff", () => this.flushPendingDiffUpdate());
 		} else if (didImmediate) {}
 	}
+	shouldDeferTailAppendForInlineStreaming() {
+		var _this$lastContainer11, _this$lastContainer12, _this$lastContainer13;
+		const renderSideBySide = this.options.renderSideBySide ?? true;
+		if (renderSideBySide === false) return true;
+		const useInlineViewWhenSpaceIsLimited = this.options.useInlineViewWhenSpaceIsLimited ?? true;
+		if (!useInlineViewWhenSpaceIsLimited) return false;
+		const breakpoint = this.options.renderSideBySideInlineBreakpoint ?? 900;
+		const width = ((_this$lastContainer11 = this.lastContainer) === null || _this$lastContainer11 === void 0 || (_this$lastContainer12 = _this$lastContainer11.getBoundingClientRect) === null || _this$lastContainer12 === void 0 ? void 0 : _this$lastContainer12.call(_this$lastContainer11).width) ?? ((_this$lastContainer13 = this.lastContainer) === null || _this$lastContainer13 === void 0 ? void 0 : _this$lastContainer13.clientWidth) ?? 0;
+		return width > 0 && width <= breakpoint;
+	}
 	updateOriginal(newCode, codeLanguage) {
 		if (!this.diffEditorView || !this.originalModel) return;
 		if (codeLanguage) {
@@ -4082,10 +4564,11 @@ var DiffEditorManager = class DiffEditorManager {
 			this.applyMinimalEditToModel(this.modifiedModel, prevAfterFlush, newCode);
 			const newLine = this.modifiedModel.getLineCount();
 			if (newLine !== prevLine) {
+				this.eagerlyGrowDiffContainerHeight();
 				const shouldImmediate = this.shouldPerformImmediateRevealDiff();
 				if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 				const computed$1 = this.computedHeight();
-				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
+				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
 					this.lastContainer.style.overflow = "hidden";
 				}
@@ -4184,14 +4667,15 @@ var DiffEditorManager = class DiffEditorManager {
 		const currentOriginal = this.originalModel;
 		const currentModified = this.modifiedModel;
 		const shouldRestorePersistedUnchangedState = preserveViewState && !sameContent;
+		const shouldRestoreSavedModelState = options.preserveModelState ?? true;
 		const preservedScrollPosition = preserveViewState ? this.captureDiffScrollPosition() : null;
 		const preservedViewportAnchor = preserveViewState && sameContent ? this.captureModifiedViewportAnchor() : null;
-		const viewState = preserveViewState ? this.diffEditorView.saveViewState() : null;
+		const viewState = preserveViewState && shouldRestoreSavedModelState ? this.diffEditorView.saveViewState() : null;
 		this.queuePendingDiffScrollRestore(preservedScrollPosition, shouldRestorePersistedUnchangedState ? 2 : 0);
 		if (shouldRestorePersistedUnchangedState) this.capturePersistedDiffUnchangedState();
 		const applyModelSwap = () => {
-			var _this$diffEditorView32;
-			(_this$diffEditorView32 = this.diffEditorView) === null || _this$diffEditorView32 === void 0 || _this$diffEditorView32.setModel(nextModelTarget);
+			var _this$diffEditorView33;
+			(_this$diffEditorView33 = this.diffEditorView) === null || _this$diffEditorView33 === void 0 || _this$diffEditorView33.setModel(nextModelTarget);
 		};
 		if (preserveViewState) this.withLockedDiffScrollPosition(applyModelSwap);
 		else applyModelSwap();
@@ -4270,6 +4754,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
+		this.diffPreviousUnchangedModelState = null;
 		this.pendingDiffScrollRestorePosition = null;
 		this.pendingDiffScrollRestoreBudget = 0;
 		this.diffHideUnchangedRegionsResolved = null;
@@ -4297,7 +4782,11 @@ var DiffEditorManager = class DiffEditorManager {
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
+		this.diffPreviousUnchangedModelState = null;
 		this.diffHideUnchangedRegionsDeferred = false;
+		this.clearInlineDiffStreamingPresentationIdleTimer();
+		this.inlineDiffStreamingPresentationActive = false;
+		this.resetInlineDiffStreamingHeightFloor();
 	}
 	syncLastKnownModified() {
 		if (!this.diffEditorView || !this.lastKnownModifiedDirty) return;
@@ -4353,10 +4842,11 @@ var DiffEditorManager = class DiffEditorManager {
 			this.lastKnownModifiedCode = modified;
 			const newMLineCount = m.getLineCount();
 			if (newMLineCount !== prevMLineCount) {
+				this.eagerlyGrowDiffContainerHeight();
 				const shouldImmediate = this.shouldPerformImmediateRevealDiff();
 				if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 				const computed$1 = this.computedHeight();
-				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
+				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
 					this.lastContainer.style.overflow = "hidden";
 				}
@@ -4446,6 +4936,7 @@ var DiffEditorManager = class DiffEditorManager {
 				const newLine$1 = model.getLineCount();
 				this.lastKnownModifiedLineCount = newLine$1;
 				await new Promise((resolve) => typeof requestAnimationFrame !== "undefined" ? requestAnimationFrame(resolve) : setTimeout(resolve, 0));
+				this.eagerlyGrowDiffContainerHeight();
 				const shouldImmediate$1 = this.shouldPerformImmediateRevealDiff();
 				log("diff", "flushAppendBufferDiff chunk metrics", {
 					idx,
@@ -4455,7 +4946,7 @@ var DiffEditorManager = class DiffEditorManager {
 				});
 				if (shouldImmediate$1) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 				const computed$2 = this.computedHeight();
-				if (computed$2 >= this.maxHeightValue - 1 && this.lastContainer) {
+				if (computed$2 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
 					this.lastContainer.style.overflow = "hidden";
 				}
@@ -4484,16 +4975,17 @@ var DiffEditorManager = class DiffEditorManager {
 		this.lastKnownModifiedCode = model.getValue();
 		const newLine = model.getLineCount();
 		this.lastKnownModifiedLineCount = newLine;
+		this.eagerlyGrowDiffContainerHeight();
 		const shouldImmediate = this.shouldPerformImmediateRevealDiff();
 		if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 		const computed$1 = this.computedHeight();
-		if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
+		if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) this.lastContainer.style.height = `${this.maxHeightValue}px`;
 		if (shouldImmediate) this.scheduleImmediateRevealAfterLayoutDiff(newLine);
 		else this.maybeScrollDiffToBottom(newLine, prevLine);
 		if (suppressedByFlush) watcherApi.setSuppressed(false);
 		try {
-			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;
+			var _this$diffEditorView34, _this$diffEditorView35, _this$diffEditorView36;
+			this.lastScrollTopDiff = ((_this$diffEditorView34 = this.diffEditorView) === null || _this$diffEditorView34 === void 0 || (_this$diffEditorView36 = (_this$diffEditorView35 = _this$diffEditorView34.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView36 === void 0 ? void 0 : _this$diffEditorView36.call(_this$diffEditorView35)) ?? this.lastScrollTopDiff;
 		} catch {}
 	}
 	applyMinimalEditToModel(model, prev, next) {