stream-monaco 0.0.40 → 0.0.42

package/dist/{preloadMonacoWorkers.shared-f9Ole_8P.js → preloadMonacoWorkers.shared-C6J5pk0l.js}

@@ -264,32 +264,45 @@ function error(tag, ...args) {
 
 //#endregion
 //#region src/utils/height.ts
-function createHeightManager(container, computeNext) {
+const DEFAULT_TRANSITION_MS = 120;
+const DEFAULT_TRANSITION_EASING = "cubic-bezier(0.4, 0, 0.2, 1)";
+const DEFAULT_HYSTERESIS_PX = 12;
+const DEFAULT_DEBOUNCE_MS = 0;
+function prefersReducedMotion() {
+	return typeof window !== "undefined" && typeof window.matchMedia === "function" && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+}
+function createHeightManager(container, computeNext, options = {}) {
+	const transitionMs = Math.max(0, options.transitionMs ?? DEFAULT_TRANSITION_MS);
+	const transitionEasing = options.transitionEasing ?? DEFAULT_TRANSITION_EASING;
+	const hysteresisPx = Math.max(0, options.hysteresisPx ?? DEFAULT_HYSTERESIS_PX);
+	const debounceMs = Math.max(0, options.debounceMs ?? DEFAULT_DEBOUNCE_MS);
+	const transitionEnabled = options.smooth === true && transitionMs > 0 && !prefersReducedMotion();
+	const previousTransition = container.style.transition || "";
+	const heightTransition = `height ${transitionMs}ms ${transitionEasing}`;
+	if (transitionEnabled) container.style.transition = previousTransition ? `${previousTransition}, ${heightTransition}` : heightTransition;
 	let raf = null;
 	let debounceTimer = null;
 	let lastApplied = -1;
 	let suppressed = false;
-	const HYSTERESIS_PX = 12;
-	const DEBOUNCE_MS = 0;
 	function apply() {
 		var _container$getBoundin;
 		const next = computeNext();
-		if (next == null) return;
+		if (next == null) return null;
 		log("heightManager", "computeNext ->", {
 			next,
 			lastApplied
 		});
 		if (!Number.isFinite(next) || next <= 0) {
 			log("heightManager", "invalid next height, ignoring", next);
-			return;
+			return null;
 		}
 		const currentHeight = Number.parseFloat(container.style.height || "") || ((_container$getBoundin = container.getBoundingClientRect) === null || _container$getBoundin === void 0 ? void 0 : _container$getBoundin.call(container).height) || 0;
-		if (currentHeight > 0 && Math.abs(next - currentHeight) <= HYSTERESIS_PX) {
+		if (currentHeight > 0 && Math.abs(next - currentHeight) <= hysteresisPx) {
 			lastApplied = next;
-			return;
+			return next;
 		}
-		if (lastApplied !== -1 && Math.abs(next - lastApplied) <= HYSTERESIS_PX) return;
-		if (next === lastApplied) return;
+		if (lastApplied !== -1 && Math.abs(next - lastApplied) <= hysteresisPx) return next;
+		if (next === lastApplied) return next;
 		suppressed = true;
 		container.style.height = `${next}px`;
 		lastApplied = next;
@@ -297,13 +310,14 @@ function createHeightManager(container, computeNext) {
 		queueMicrotask(() => {
 			suppressed = false;
 		});
+		return next;
 	}
 	function scheduleApply() {
 		if (debounceTimer != null) {
 			clearTimeout(debounceTimer);
 			debounceTimer = null;
 		}
-		if (DEBOUNCE_MS === 0) {
+		if (debounceMs === 0) {
 			if (raf != null) return;
 			raf = requestAnimationFrame(() => {
 				raf = null;
@@ -318,11 +332,22 @@ function createHeightManager(container, computeNext) {
 				raf = null;
 				apply();
 			});
-		}, DEBOUNCE_MS);
+		}, debounceMs);
 	}
 	function update() {
 		scheduleApply();
 	}
+	function updateNow() {
+		if (raf != null) {
+			cancelAnimationFrame(raf);
+			raf = null;
+		}
+		if (debounceTimer != null) {
+			clearTimeout(debounceTimer);
+			debounceTimer = null;
+		}
+		return apply();
+	}
 	function dispose() {
 		if (raf != null) {
 			cancelAnimationFrame(raf);
@@ -332,6 +357,10 @@ function createHeightManager(container, computeNext) {
 			clearTimeout(debounceTimer);
 			debounceTimer = null;
 		}
+		if (transitionEnabled) {
+			const currentTransition = container.style.transition || "";
+			if (currentTransition.includes(heightTransition)) container.style.transition = currentTransition.replace(heightTransition, "").replace(/\s*,\s*,\s*/g, ", ").replace(/^\s*,\s*|\s*,\s*$/g, "").trim();
+		}
 	}
 	function isSuppressed() {
 		return suppressed;
@@ -339,11 +368,16 @@ function createHeightManager(container, computeNext) {
 	function getLastApplied() {
 		return lastApplied;
 	}
+	function getTransitionMs() {
+		return transitionEnabled ? transitionMs : 0;
+	}
 	return {
 		update,
+		updateNow,
 		dispose,
 		isSuppressed,
-		getLastApplied
+		getLastApplied,
+		getTransitionMs
 	};
 }
 
@@ -1434,6 +1468,7 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 	}
 	clearAsyncWork() {
+		this.revealTicketDiff += 1;
 		this.cancelRafs();
 		this.pendingDiffUpdate = null;
 		this.lastKnownModifiedDirty = false;
@@ -4076,6 +4111,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkUpperNode, "mouseleave", () => this.scheduleHideDiffHunkActions());
 		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkLowerNode, "mouseenter", () => this.cancelScheduledHideDiffHunkActions());
 		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkLowerNode, "mouseleave", () => this.scheduleHideDiffHunkActions());
+		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkUpperNode, "wheel", (event) => this.handleDiffHunkWheel(event, "upper"));
+		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkLowerNode, "wheel", (event) => this.handleDiffHunkWheel(event, "lower"));
 		overlay.append(this.diffHunkUpperNode, this.diffHunkLowerNode);
 		const originalEditor = this.diffEditorView.getOriginalEditor();
 		const modifiedEditor = this.diffEditorView.getModifiedEditor();
@@ -4099,6 +4136,17 @@ var DiffEditorManager = class DiffEditorManager {
 		}));
 		this.diffHunkLineChanges = this.getEffectiveLineChanges();
 	}
+	handleDiffHunkWheel(event, side) {
+		var _editor$setScrollLeft, _editor$getScrollLeft, _editor$setScrollTop, _editor$getScrollTop2;
+		if (Math.abs(event.deltaX) < .5 && Math.abs(event.deltaY) < .5) return;
+		if (!this.diffEditorView) return;
+		const editor = this.isDiffInlineMode() || side === "lower" ? this.diffEditorView.getModifiedEditor() : this.diffEditorView.getOriginalEditor();
+		event.preventDefault();
+		event.stopPropagation();
+		(_editor$setScrollLeft = editor.setScrollLeft) === null || _editor$setScrollLeft === void 0 || _editor$setScrollLeft.call(editor, (((_editor$getScrollLeft = editor.getScrollLeft) === null || _editor$getScrollLeft === void 0 ? void 0 : _editor$getScrollLeft.call(editor)) ?? 0) + event.deltaX);
+		(_editor$setScrollTop = editor.setScrollTop) === null || _editor$setScrollTop === void 0 || _editor$setScrollTop.call(editor, (((_editor$getScrollTop2 = editor.getScrollTop) === null || _editor$getScrollTop2 === void 0 ? void 0 : _editor$getScrollTop2.call(editor)) ?? 0) + event.deltaY);
+		this.hideDiffHunkActions();
+	}
 	cancelScheduledHideDiffHunkActions() {
 		if (this.diffHunkHideTimer != null) {
 			clearTimeout(this.diffHunkHideTimer);
@@ -4971,7 +5019,6 @@ var DiffEditorManager = class DiffEditorManager {
 			this.lastContainer.innerHTML = "";
 			this.lastContainer = null;
 		}
-		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
 		this.diffPreviousUnchangedModelState = null;
@@ -4999,7 +5046,6 @@ var DiffEditorManager = class DiffEditorManager {
 			this.diffHeightManager.dispose();
 			this.diffHeightManager = null;
 		}
-		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
 		this.diffPreviousUnchangedModelState = null;
@@ -5278,6 +5324,12 @@ var DiffEditorManager = class DiffEditorManager {
 
 //#endregion
 //#region src/core/EditorManager.ts
+const defaultHeightTransitionMs = 120;
+const defaultHeightTransitionEasing = "cubic-bezier(0.4, 0, 0.2, 1)";
+const smoothHeightTolerancePx = 1;
+const legacyHeightTolerancePx = 12;
+const smoothHeightDebounceMs = 16;
+const legacyHeightDebounceMs = 0;
 var EditorManager = class {
 	editorView = null;
 	lastContainer = null;
@@ -5324,10 +5376,12 @@ var EditorManager = class {
 	appendBufferScheduled = false;
 	rafScheduler = createRafScheduler();
 	editorHeightManager = null;
+	previousScrollbarGutter = null;
 	revealDebounceId = null;
 	revealDebounceMs = defaultRevealDebounceMs;
 	revealIdleTimerId = null;
 	revealTicket = 0;
+	layoutTicket = 0;
 	revealStrategyOption;
 	revealBatchOnIdleMsOption;
 	scrollWatcherSuppressionMs = 500;
@@ -5352,6 +5406,7 @@ var EditorManager = class {
 		this.rafScheduler.cancel("maybe-scroll");
 		this.rafScheduler.cancel("reveal");
 		this.rafScheduler.cancel("immediate-reveal");
+		this.rafScheduler.cancel("layout-after-height");
 		this.rafScheduler.cancel("maybe-resume");
 		this.rafScheduler.cancel("append");
 	}
@@ -5370,6 +5425,8 @@ var EditorManager = class {
 		this.appendBuffer.length = 0;
 	}
 	clearAsyncWork() {
+		this.revealTicket += 1;
+		this.layoutTicket += 1;
 		this.cancelRafs();
 		this.pendingUpdate = null;
 		this.lastKnownCodeDirty = false;
@@ -5414,6 +5471,37 @@ var EditorManager = class {
 		if (!m) return false;
 		return this._hasScrollBar = m.scrollHeight > m.computedHeight + padding / 2;
 	}
+	isSmoothHeightTransitionEnabled() {
+		return this.options.smoothHeightTransition ?? false;
+	}
+	isAutomaticLayoutEnabled() {
+		return this.options.automaticLayout !== false;
+	}
+	getHeightChangeTolerancePx() {
+		return this.options.heightChangeTolerancePx ?? (this.isSmoothHeightTransitionEnabled() ? smoothHeightTolerancePx : legacyHeightTolerancePx);
+	}
+	getHeightManagerOptions() {
+		const smooth = this.isSmoothHeightTransitionEnabled();
+		return {
+			smooth,
+			transitionMs: this.options.heightTransitionMs ?? defaultHeightTransitionMs,
+			transitionEasing: this.options.heightTransitionEasing ?? defaultHeightTransitionEasing,
+			debounceMs: this.options.heightUpdateDebounceMs ?? (smooth ? smoothHeightDebounceMs : legacyHeightDebounceMs),
+			hysteresisPx: this.getHeightChangeTolerancePx()
+		};
+	}
+	setOverflowForHeight(computed$2) {
+		if (!this.lastContainer) return null;
+		const next = computed$2 >= this.maxHeightValue - 1 ? "auto" : "hidden";
+		const prev = this.lastContainer.style.overflow;
+		if (prev !== next) this.lastContainer.style.overflow = next;
+		if (next === "hidden") this._hasScrollBar = false;
+		return {
+			prev,
+			next,
+			changed: prev !== next
+		};
+	}
 	userIsNearBottom() {
 		if (!this.editorView) return true;
 		const m = this.measureViewport();
@@ -5548,46 +5636,89 @@ var EditorManager = class {
 			this.lastScrollTop = ((_this$editorView4 = this.editorView) === null || _this$editorView4 === void 0 || (_this$editorView4$get = _this$editorView4.getScrollTop) === null || _this$editorView4$get === void 0 ? void 0 : _this$editorView4$get.call(_this$editorView4)) ?? this.lastScrollTop;
 		} catch {}
 	}
-	isOverflowAuto() {
-		try {
-			return !!this.lastContainer && this.lastContainer.style.overflow === "auto";
-		} catch {
-			return false;
-		}
-	}
-	shouldPerformImmediateReveal() {
-		return this.autoScrollOnUpdate && this.shouldAutoScroll && this.hasVerticalScrollbar() && this.isOverflowAuto();
+	shouldRevealAfterLayout() {
+		return this.autoScrollOnUpdate && this.shouldAutoScroll;
+	}
+	getRevealSuppressionMs() {
+		var _this$editorHeightMan, _this$editorHeightMan2;
+		const transitionMs = ((_this$editorHeightMan = this.editorHeightManager) === null || _this$editorHeightMan === void 0 || (_this$editorHeightMan2 = _this$editorHeightMan.getTransitionMs) === null || _this$editorHeightMan2 === void 0 ? void 0 : _this$editorHeightMan2.call(_this$editorHeightMan)) ?? 0;
+		return Math.max(this.scrollWatcherSuppressionMs, transitionMs + 100);
+	}
+	syncHeightAndRevealAfterContentChange(targetLine) {
+		const shouldReveal = this.shouldRevealAfterLayout();
+		const willReveal = !!(shouldReveal && this.editorView && this.computedHeight(this.editorView) >= this.maxHeightValue - 1);
+		if (willReveal) this.suppressScrollWatcher(this.getRevealSuppressionMs());
+		const computed$2 = this.syncNonOverflowingLayout();
+		if (computed$2 != null && computed$2 >= this.maxHeightValue - 1 && shouldReveal) {
+			var _this$editorView5;
+			const line = targetLine ?? ((_this$editorView5 = this.editorView) === null || _this$editorView5 === void 0 || (_this$editorView5 = _this$editorView5.getModel()) === null || _this$editorView5 === void 0 ? void 0 : _this$editorView5.getLineCount()) ?? 1;
+			if (this.isSmoothHeightTransitionEnabled()) this.scheduleImmediateRevealAfterLayout(line);
+			else this.forceReveal(line);
+		} else if (!shouldReveal && targetLine != null) this.maybeScrollToBottom(targetLine);
+		return computed$2;
 	}
 	syncNonOverflowingLayout() {
-		var _this$lastContainer$g, _this$lastContainer;
+		var _this$editorHeightMan3, _this$editorHeightMan4;
 		if (!this.editorView || !this.lastContainer) return null;
 		const computed$2 = this.computedHeight(this.editorView);
+		const needsRevealSync = computed$2 >= this.maxHeightValue - 1 && this.shouldRevealAfterLayout();
+		const useSmoothHeightTransition = this.isSmoothHeightTransitionEnabled();
+		if (needsRevealSync || !useSmoothHeightTransition) (_this$editorHeightMan3 = this.editorHeightManager) === null || _this$editorHeightMan3 === void 0 || _this$editorHeightMan3.updateNow();
+		else (_this$editorHeightMan4 = this.editorHeightManager) === null || _this$editorHeightMan4 === void 0 || _this$editorHeightMan4.update();
+		this.setOverflowForHeight(computed$2);
 		if (computed$2 >= this.maxHeightValue - 1) {
-			this.lastContainer.style.height = `${this.maxHeightValue}px`;
+			if (useSmoothHeightTransition) this.scheduleLayoutAfterHeightApplied(computed$2);
 			return computed$2;
 		}
-		const currentHeight = Number.parseFloat(this.lastContainer.style.height || "") || ((_this$lastContainer$g = (_this$lastContainer = this.lastContainer).getBoundingClientRect) === null || _this$lastContainer$g === void 0 ? void 0 : _this$lastContainer$g.call(_this$lastContainer).height) || 0;
-		if (currentHeight <= 0 || Math.abs(computed$2 - currentHeight) > 12) this.lastContainer.style.height = `${computed$2}px`;
-		this.lastContainer.style.overflow = "hidden";
 		this._hasScrollBar = false;
+		if (useSmoothHeightTransition) {
+			this.scheduleLayoutAfterHeightApplied(computed$2);
+			try {
+				var _this$editorView$getS3, _this$editorView6, _this$editorView$setS, _this$editorView7;
+				if ((((_this$editorView$getS3 = (_this$editorView6 = this.editorView).getScrollTop) === null || _this$editorView$getS3 === void 0 ? void 0 : _this$editorView$getS3.call(_this$editorView6)) ?? 0) !== 0) (_this$editorView$setS = (_this$editorView7 = this.editorView).setScrollTop) === null || _this$editorView$setS === void 0 || _this$editorView$setS.call(_this$editorView7, 0);
+				this.lastScrollTop = 0;
+			} catch {}
+			return computed$2;
+		}
 		try {
-			var _this$editorView$layo, _this$editorView5;
-			(_this$editorView$layo = (_this$editorView5 = this.editorView).layout) === null || _this$editorView$layo === void 0 || _this$editorView$layo.call(_this$editorView5);
+			var _this$editorView$layo, _this$editorView8;
+			(_this$editorView$layo = (_this$editorView8 = this.editorView).layout) === null || _this$editorView$layo === void 0 || _this$editorView$layo.call(_this$editorView8);
 		} catch {}
 		try {
-			var _this$editorView$getS3, _this$editorView6, _this$editorView$setS, _this$editorView7;
-			if ((((_this$editorView$getS3 = (_this$editorView6 = this.editorView).getScrollTop) === null || _this$editorView$getS3 === void 0 ? void 0 : _this$editorView$getS3.call(_this$editorView6)) ?? 0) !== 0) (_this$editorView$setS = (_this$editorView7 = this.editorView).setScrollTop) === null || _this$editorView$setS === void 0 || _this$editorView$setS.call(_this$editorView7, 0);
+			var _this$editorView$getS4, _this$editorView9, _this$editorView$setS2, _this$editorView10;
+			if ((((_this$editorView$getS4 = (_this$editorView9 = this.editorView).getScrollTop) === null || _this$editorView$getS4 === void 0 ? void 0 : _this$editorView$getS4.call(_this$editorView9)) ?? 0) !== 0) (_this$editorView$setS2 = (_this$editorView10 = this.editorView).setScrollTop) === null || _this$editorView$setS2 === void 0 || _this$editorView$setS2.call(_this$editorView10, 0);
 			this.lastScrollTop = 0;
 		} catch {}
 		return computed$2;
 	}
+	scheduleLayoutAfterHeightApplied(target) {
+		if (this.isAutomaticLayoutEnabled() || !this.editorView) return;
+		const editor = this.editorView;
+		const ticket = ++this.layoutTicket;
+		this.rafScheduler.schedule("layout-after-height", async () => {
+			try {
+				var _editor$layout;
+				await this.waitForHeightApplied(target, 500);
+				if (ticket !== this.layoutTicket || this.editorView !== editor) return;
+				(_editor$layout = editor.layout) === null || _editor$layout === void 0 || _editor$layout.call(editor);
+				this.measureViewport();
+			} catch (err) {
+				error("EditorManager", "scheduleLayoutAfterHeightApplied error", err);
+			}
+		});
+	}
 	async createEditor(container, code, language, currentTheme) {
-		var _this$editorView$getS4, _this$editorView8, _this$editorView$getO, _this$editorView9, _this$editorView$getM, _this$editorView$onDi, _this$editorView10;
+		var _this$editorView$getS5, _this$editorView11, _this$editorView$getO, _this$editorView12, _this$editorView$getM, _this$editorView$onDi, _this$editorView13;
 		this.cleanup();
 		this.lastContainer = container;
 		this.initDebugFlag();
 		this.dlog("createEditor container, maxHeight", this.maxHeightValue);
 		container.style.overflow = "hidden";
+		this.previousScrollbarGutter = null;
+		if (this.isSmoothHeightTransitionEnabled()) {
+			this.previousScrollbarGutter = container.style.scrollbarGutter || "";
+			container.style.scrollbarGutter = "stable";
+		}
 		container.style.maxHeight = this.maxHeightCSS;
 		this.editorView = monaco_shim_exports.editor.create(container, {
 			value: code,
@@ -5621,43 +5752,29 @@ var EditorManager = class {
 		this.editorHeightManager = createHeightManager(container, () => {
 			const computed$2 = this.computedHeight(this.editorView);
 			return Math.min(computed$2, this.maxHeightValue);
-		});
-		this.editorHeightManager.update();
-		const initialComputed = this.computedHeight(this.editorView);
-		if (initialComputed >= this.maxHeightValue - 1) {
-			container.style.height = `${this.maxHeightValue}px`;
-			container.style.overflow = "auto";
-			this.dlog("applied immediate maxHeight on createEditor", this.maxHeightValue);
-		}
-		this.cachedScrollHeight = ((_this$editorView$getS4 = (_this$editorView8 = this.editorView).getScrollHeight) === null || _this$editorView$getS4 === void 0 ? void 0 : _this$editorView$getS4.call(_this$editorView8)) ?? null;
-		this.cachedLineHeight = ((_this$editorView$getO = (_this$editorView9 = this.editorView).getOption) === null || _this$editorView$getO === void 0 ? void 0 : _this$editorView$getO.call(_this$editorView9, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
+		}, this.getHeightManagerOptions());
+		const initialComputed = this.editorHeightManager.updateNow();
+		if (initialComputed != null) this.setOverflowForHeight(initialComputed);
+		this.cachedScrollHeight = ((_this$editorView$getS5 = (_this$editorView11 = this.editorView).getScrollHeight) === null || _this$editorView$getS5 === void 0 ? void 0 : _this$editorView$getS5.call(_this$editorView11)) ?? null;
+		this.cachedLineHeight = ((_this$editorView$getO = (_this$editorView12 = this.editorView).getOption) === null || _this$editorView$getO === void 0 ? void 0 : _this$editorView$getO.call(_this$editorView12, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
 		this.cachedComputedHeight = this.computedHeight(this.editorView);
 		this.cachedLineCount = ((_this$editorView$getM = this.editorView.getModel()) === null || _this$editorView$getM === void 0 ? void 0 : _this$editorView$getM.getLineCount()) ?? null;
-		(_this$editorView$onDi = (_this$editorView10 = this.editorView).onDidContentSizeChange) === null || _this$editorView$onDi === void 0 || _this$editorView$onDi.call(_this$editorView10, () => {
+		(_this$editorView$onDi = (_this$editorView13 = this.editorView).onDidContentSizeChange) === null || _this$editorView$onDi === void 0 || _this$editorView$onDi.call(_this$editorView13, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change", () => {
 				try {
-					var _this$editorView11, _this$editorHeightMan, _this$editorHeightMan2;
+					var _this$editorView14, _this$editorHeightMan5;
 					this.dlog("content-size-change frame");
-					this.cachedLineCount = ((_this$editorView11 = this.editorView) === null || _this$editorView11 === void 0 || (_this$editorView11 = _this$editorView11.getModel()) === null || _this$editorView11 === void 0 ? void 0 : _this$editorView11.getLineCount()) ?? this.cachedLineCount;
+					this.cachedLineCount = ((_this$editorView14 = this.editorView) === null || _this$editorView14 === void 0 || (_this$editorView14 = _this$editorView14.getModel()) === null || _this$editorView14 === void 0 ? void 0 : _this$editorView14.getLineCount()) ?? this.cachedLineCount;
 					this.cachedComputedHeight = null;
 					const m = this.measureViewport();
 					this.dlog("content-size-change measure", m);
-					if ((_this$editorHeightMan = this.editorHeightManager) === null || _this$editorHeightMan === void 0 ? void 0 : _this$editorHeightMan.isSuppressed()) {
+					if ((_this$editorHeightMan5 = this.editorHeightManager) === null || _this$editorHeightMan5 === void 0 ? void 0 : _this$editorHeightMan5.isSuppressed()) {
 						this.dlog("content-size-change skipped height update (suppressed)");
 						return;
 					}
-					this.dlog("content-size-change calling heightManager.update");
-					(_this$editorHeightMan2 = this.editorHeightManager) === null || _this$editorHeightMan2 === void 0 || _this$editorHeightMan2.update();
-					const computed$2 = this.computedHeight(this.editorView);
-					if (this.lastContainer) {
-						const prevOverflow = this.lastContainer.style.overflow;
-						const newOverflow = computed$2 >= this.maxHeightValue - 1 ? "auto" : "hidden";
-						if (prevOverflow !== newOverflow) {
-							this.lastContainer.style.overflow = newOverflow;
-							if (newOverflow === "auto" && this.shouldAutoScroll) this.maybeScrollToBottom();
-						}
-					}
+					this.dlog("content-size-change syncing height/reveal");
+					this.syncHeightAndRevealAfterContentChange();
 				} catch (err) {
 					error("EditorManager", "content-size-change error", err);
 				}
@@ -5725,6 +5842,11 @@ var EditorManager = class {
 				if (target !== -1 && this.editorHeightManager) await this.waitForHeightApplied(target, 500);
 				else await new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(() => r())));
 				this.dlog("running delayed immediate reveal", "ticket=", ticket, "line=", line);
+				if (ticket !== this.revealTicket) {
+					this.dlog("delayed immediate reveal skipped, stale ticket", ticket, "current", this.revealTicket);
+					return;
+				}
+				this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
 				this.performImmediateReveal(line, ticket);
 			} catch (err) {
 				error("EditorManager", "scheduleImmediateRevealAfterLayout error", err);
@@ -5733,20 +5855,33 @@ var EditorManager = class {
 	}
 	waitForHeightApplied(target, timeoutMs = 500) {
 		return new Promise((resolve) => {
+			var _this$editorHeightMan6, _this$editorHeightMan7;
 			const start = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+			const tolerance = this.getHeightChangeTolerancePx();
+			const transitionMs = ((_this$editorHeightMan6 = this.editorHeightManager) === null || _this$editorHeightMan6 === void 0 || (_this$editorHeightMan7 = _this$editorHeightMan6.getTransitionMs) === null || _this$editorHeightMan7 === void 0 ? void 0 : _this$editorHeightMan7.call(_this$editorHeightMan6)) ?? 0;
+			let settled = false;
+			const resolveAfterSettle = () => {
+				if (settled) return;
+				settled = true;
+				if (transitionMs > 0) {
+					setTimeout(resolve, transitionMs);
+					return;
+				}
+				requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
+			};
 			const check = () => {
 				try {
-					var _this$editorHeightMan3, _this$editorHeightMan4;
-					const last = ((_this$editorHeightMan3 = this.editorHeightManager) === null || _this$editorHeightMan3 === void 0 || (_this$editorHeightMan4 = _this$editorHeightMan3.getLastApplied) === null || _this$editorHeightMan4 === void 0 ? void 0 : _this$editorHeightMan4.call(_this$editorHeightMan3)) ?? -1;
-					if (last !== -1 && Math.abs(last - target) <= 12) {
+					var _this$editorHeightMan8, _this$editorHeightMan9;
+					const last = ((_this$editorHeightMan8 = this.editorHeightManager) === null || _this$editorHeightMan8 === void 0 || (_this$editorHeightMan9 = _this$editorHeightMan8.getLastApplied) === null || _this$editorHeightMan9 === void 0 ? void 0 : _this$editorHeightMan9.call(_this$editorHeightMan8)) ?? -1;
+					if (last !== -1 && Math.abs(last - target) <= tolerance) {
 						this.dlog("waitForHeightApplied satisfied", last, "target=", target);
-						resolve();
+						resolveAfterSettle();
 						return;
 					}
 					const now = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
 					if (now - start > timeoutMs) {
 						log("EditorManager", "waitForHeightApplied timeout", last, "target=", target);
-						resolve();
+						resolveAfterSettle();
 						return;
 					}
 				} catch {}
@@ -5798,12 +5933,7 @@ var EditorManager = class {
 			const newLineCount$1 = model.getLineCount();
 			this.cachedLineCount = newLineCount$1;
 			this.cachedComputedHeight = null;
-			if (newLineCount$1 !== prevLineCount$1) {
-				const shouldImmediate = this.shouldPerformImmediateReveal();
-				if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
-				const computed$2 = this.syncNonOverflowingLayout();
-				if (computed$2 != null && computed$2 >= this.maxHeightValue - 1) this.forceReveal(newLineCount$1);
-			}
+			if (newLineCount$1 !== prevLineCount$1) this.syncHeightAndRevealAfterContentChange(newLineCount$1);
 			return;
 		}
 		let prevCode;
@@ -5833,13 +5963,7 @@ var EditorManager = class {
 		const newLineCount = model.getLineCount();
 		this.cachedLineCount = newLineCount;
 		this.cachedComputedHeight = null;
-		if (newLineCount !== prevLineCount) {
-			const shouldImmediate = this.shouldPerformImmediateReveal();
-			if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
-			this.syncNonOverflowingLayout();
-			if (shouldImmediate) this.scheduleImmediateRevealAfterLayout(newLineCount);
-			else this.maybeScrollToBottom(newLineCount);
-		}
+		if (newLineCount !== prevLineCount) this.syncHeightAndRevealAfterContentChange(newLineCount);
 	}
 	appendCode(appendText, codeLanguage) {
 		if (!this.editorView) return;
@@ -5871,10 +5995,7 @@ var EditorManager = class {
 			this.lastKnownCode = next;
 			const newLineCount = model.getLineCount();
 			this.cachedLineCount = newLineCount;
-			if (newLineCount !== prevLineCount) {
-				this.syncNonOverflowingLayout();
-				this.maybeScrollToBottom(newLineCount);
-			}
+			if (newLineCount !== prevLineCount) this.syncHeightAndRevealAfterContentChange(newLineCount);
 			return;
 		}
 		const res = computeMinimalEdit(prev, next);
@@ -5927,13 +6048,7 @@ var EditorManager = class {
 		if (lastLine !== newLineCount) {
 			this.cachedLineCount = newLineCount;
 			this.cachedComputedHeight = null;
-			const shouldImmediate = this.shouldPerformImmediateReveal();
-			if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
-			this.syncNonOverflowingLayout();
-			if (shouldImmediate) try {
-				this.forceReveal(newLineCount);
-			} catch {}
-			else this.maybeScrollToBottom(newLineCount);
+			this.syncHeightAndRevealAfterContentChange(newLineCount);
 		}
 	}
 	setLanguage(language, languages$1) {
@@ -5948,8 +6063,8 @@ var EditorManager = class {
 		return this.editorView;
 	}
 	getCode() {
-		var _this$editorView12;
-		return ((_this$editorView12 = this.editorView) === null || _this$editorView12 === void 0 || (_this$editorView12 = _this$editorView12.getModel()) === null || _this$editorView12 === void 0 ? void 0 : _this$editorView12.getValue()) ?? null;
+		var _this$editorView15;
+		return ((_this$editorView15 = this.editorView) === null || _this$editorView15 === void 0 || (_this$editorView15 = _this$editorView15.getModel()) === null || _this$editorView15 === void 0 ? void 0 : _this$editorView15.getValue()) ?? null;
 	}
 	setUpdateThrottleMs(ms) {
 		this.updateThrottleMs = ms;
@@ -5970,6 +6085,8 @@ var EditorManager = class {
 		}
 		this.lastKnownCode = null;
 		if (this.lastContainer) {
+			if (this.previousScrollbarGutter != null) this.lastContainer.style.scrollbarGutter = this.previousScrollbarGutter;
+			this.previousScrollbarGutter = null;
 			this.lastContainer.style.minHeight = "";
 			this.lastContainer.innerHTML = "";
 			this.lastContainer = null;
@@ -5994,6 +6111,8 @@ var EditorManager = class {
 		this._hasScrollBar = false;
 		this.shouldAutoScroll = !!this.autoScrollInitial;
 		this.lastScrollTop = 0;
+		if (this.lastContainer && this.previousScrollbarGutter != null) this.lastContainer.style.scrollbarGutter = this.previousScrollbarGutter;
+		this.previousScrollbarGutter = null;
 		if (this.editorHeightManager) {
 			this.editorHeightManager.dispose();
 			this.editorHeightManager = null;
@@ -6300,7 +6419,7 @@ let globalAppliedThemeName = null;
 * @param {MonacoLanguage[]} [monacoOptions.languages] - 支持的编程语言数组
 * @param {string} [monacoOptions.theme] - 初始主题名称
 * @param {boolean} [monacoOptions.isCleanOnBeforeCreate] - 是否在创建前清理之前注册的资源, 默认为 true
-* @param {(monaco: typeof import('monaco-editor')) => monaco.IDisposable[]} [monacoOptions.onBeforeCreate] - 编辑器创建前的钩子函数
+* @param {(monaco: typeof import('monaco-editor/esm/vs/editor/editor.api')) => monaco.IDisposable[]} [monacoOptions.onBeforeCreate] - 编辑器创建前的钩子函数
 *
 * @returns {{
 *   createEditor: (container: HTMLElement, code: string, language: string) => Promise<monaco.editor.IStandaloneCodeEditor>,