@pierre/diffs 1.1.0-beta.9 → 1.1.0

package/dist/components/UnresolvedFile.js

@@ -0,0 +1,280 @@
+import { DEFAULT_THEMES } from "../constants.js";
+import { pluckInteractionOptions } from "../managers/InteractionManager.js";
+import { areFilesEqual } from "../utils/areFilesEqual.js";
+import { createAnnotationWrapperNode } from "../utils/createAnnotationWrapperNode.js";
+import { FileDiff } from "./FileDiff.js";
+import { getMergeConflictActionSlotName } from "../utils/getMergeConflictActionSlotName.js";
+import { getMergeConflictActionAnchor, parseMergeConflictDiffFromFile } from "../utils/parseMergeConflictDiffFromFile.js";
+import { UnresolvedFileHunksRenderer } from "../renderers/UnresolvedFileHunksRenderer.js";
+import { areMergeConflictActionsEqual } from "../utils/areMergeConflictActionsEqual.js";
+import { resolveMergeConflict } from "../utils/resolveMergeConflict.js";
+
+//#region src/components/UnresolvedFile.ts
+let instanceId = -1;
+var UnresolvedFile = class extends FileDiff {
+	__id = `unresolved-file:${++instanceId}`;
+	computedCache = {
+		file: void 0,
+		fileDiff: void 0,
+		actions: void 0
+	};
+	conflictActions = [];
+	conflictActionCache = /* @__PURE__ */ new Map();
+	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
+		super(void 0, workerManager, isContainerManaged);
+		this.options = options;
+		this.setOptions(options);
+	}
+	setOptions(options) {
+		if (options == null) return;
+		if (options.onMergeConflictAction != null && options.onMergeConflictResolve != null) throw new Error("UnresolvedFile: onMergeConflictAction and onMergeConflictResolve are mutually exclusive. Use only one callback.");
+		this.options = options;
+		this.hunksRenderer.setOptions(this.getHunksRendererOptions(options));
+		const hunkSeparators = this.options.hunkSeparators ?? "line-info";
+		this.interactionManager.setOptions(pluckInteractionOptions(this.options, typeof hunkSeparators === "function" || hunkSeparators === "line-info" || hunkSeparators === "line-info-basic" ? this.expandHunk : void 0, this.getLineIndex, this.handleMergeConflictActionClick));
+	}
+	createHunksRenderer(options) {
+		return new UnresolvedFileHunksRenderer(this.getHunksRendererOptions(options), this.handleHighlightRender, this.workerManager);
+	}
+	getHunksRendererOptions(options) {
+		return {
+			...this.options,
+			hunkSeparators: typeof options.hunkSeparators === "function" ? "custom" : options.hunkSeparators,
+			mergeConflictActionsType: typeof options.mergeConflictActionsType === "function" ? "custom" : options.mergeConflictActionsType
+		};
+	}
+	applyPreNodeAttributes(pre, result) {
+		super.applyPreNodeAttributes(pre, result, { "data-has-merge-conflict": "" });
+	}
+	cleanUp() {
+		this.clearMergeConflictActionCache();
+		this.computedCache = {
+			file: void 0,
+			fileDiff: void 0,
+			actions: void 0
+		};
+		this.conflictActions = [];
+		super.cleanUp();
+	}
+	getOrComputeDiff({ file, fileDiff, actions }) {
+		wrapper: if (this.options.onMergeConflictAction != null) {
+			if (fileDiff != null !== (actions != null)) throw new Error("UnresolvedFile.getOrComputeDiff: fileDiff and actions must be passed together");
+			if (fileDiff != null && actions != null) {
+				this.computedCache = {
+					file: file ?? this.computedCache.file,
+					fileDiff,
+					actions
+				};
+				break wrapper;
+			} else if (file != null || this.computedCache.file != null) {
+				file ??= this.computedCache.file;
+				if (file == null) throw new Error("UnresolvedFile.getOrComputeDiff: file is null, should be impossible");
+				if (!areFilesEqual(file, this.computedCache.file) || this.computedCache.fileDiff == null || this.computedCache.actions == null) {
+					const computed = parseMergeConflictDiffFromFile(file);
+					this.computedCache = {
+						file,
+						fileDiff: computed.fileDiff,
+						actions: computed.actions
+					};
+				}
+				fileDiff = this.computedCache.fileDiff;
+				actions = this.computedCache.actions;
+				break wrapper;
+			} else {
+				fileDiff = this.computedCache.fileDiff;
+				actions = this.computedCache.actions;
+				break wrapper;
+			}
+		} else {
+			if (fileDiff != null || actions != null) throw new Error("UnresolvedFile.getOrComputeDiff: fileDiff and actions are only usable in controlled mode, you must pass in `onMergeConflictAction`");
+			this.computedCache.file ??= file;
+			if (this.computedCache.fileDiff == null && this.computedCache.file != null) {
+				const computed = parseMergeConflictDiffFromFile(this.computedCache.file);
+				this.computedCache.fileDiff = computed.fileDiff;
+				this.computedCache.actions = computed.actions;
+			}
+			fileDiff = this.computedCache.fileDiff;
+			actions = this.computedCache.actions;
+			break wrapper;
+		}
+		if (fileDiff == null || actions == null) return;
+		return {
+			fileDiff,
+			actions
+		};
+	}
+	hydrate(props) {
+		const { file, fileDiff, actions, lineAnnotations,...rest } = props;
+		const source = this.getOrComputeDiff({
+			file,
+			fileDiff,
+			actions
+		});
+		if (source == null) return;
+		this.setActiveMergeConflictActions(source.actions);
+		super.hydrate({
+			...rest,
+			fileDiff: source.fileDiff,
+			lineAnnotations
+		});
+		this.renderMergeConflictActionSlots();
+	}
+	rerender() {
+		if (!this.enabled || this.fileDiff == null) return;
+		this.render({
+			forceRender: true,
+			renderRange: this.renderRange
+		});
+	}
+	render(props = {}) {
+		let { file, fileDiff, actions, lineAnnotations,...rest } = props;
+		const source = this.getOrComputeDiff({
+			file,
+			fileDiff,
+			actions
+		});
+		if (source == null) return false;
+		this.setActiveMergeConflictActions(source.actions);
+		const didRender = super.render({
+			...rest,
+			fileDiff: source.fileDiff,
+			lineAnnotations
+		});
+		this.renderMergeConflictActionSlots();
+		return didRender;
+	}
+	resolveConflict(conflictIndex, resolution, file = this.computedCache.file) {
+		const action = this.conflictActions[conflictIndex];
+		if (file == null || action == null) return;
+		if (action.conflictIndex !== conflictIndex) {
+			console.error({
+				conflictIndex,
+				action
+			});
+			throw new Error("UnresolvedFile.resolveConflict: conflictIndex and conflictAction don't match");
+		}
+		const contents = resolveMergeConflict(file.contents, {
+			resolution,
+			conflict: action.conflict
+		});
+		if (contents === file.contents) return;
+		return {
+			...file,
+			contents,
+			cacheKey: file.cacheKey != null ? `${file.cacheKey}:mc-${conflictIndex}-${resolution}` : void 0
+		};
+	}
+	resolveConflictAndRender(conflictIndex, resolution) {
+		const action = this.conflictActions[conflictIndex];
+		if (action == null) return;
+		if (action.conflictIndex !== conflictIndex) {
+			console.error({
+				conflictIndex,
+				action
+			});
+			throw new Error("UnresolvedFile.resolveConflictAndRender: conflictIndex and conflictAction don't match");
+		}
+		const payload = {
+			resolution,
+			conflict: action.conflict
+		};
+		const nextFile = this.resolveConflict(conflictIndex, resolution);
+		if (nextFile == null) return;
+		this.computedCache.file = nextFile;
+		this.computedCache.fileDiff = void 0;
+		this.computedCache.actions = void 0;
+		this.render();
+		this.options.onMergeConflictResolve?.(nextFile, payload);
+		return nextFile;
+	}
+	setActiveMergeConflictActions(actions) {
+		this.conflictActions = actions;
+		if (this.hunksRenderer instanceof UnresolvedFileHunksRenderer) this.hunksRenderer.setConflictActions(this.options.mergeConflictActionsType === "none" ? [] : actions);
+	}
+	handleMergeConflictActionClick = (target) => {
+		const action = this.conflictActions[target.conflictIndex];
+		if (action == null) return;
+		if (action.conflictIndex !== target.conflictIndex) {
+			console.error({
+				conflictIndex: target.conflictIndex,
+				action
+			});
+			throw new Error("UnresolvedFile.handleMergeConflictActionClick: conflictIndex and conflictAction don't match");
+		}
+		const payload = {
+			resolution: target.resolution,
+			conflict: action.conflict
+		};
+		if (this.options.onMergeConflictAction != null) {
+			this.options.onMergeConflictAction(payload, this);
+			return;
+		}
+		this.resolveConflictAndRender(target.conflictIndex, target.resolution);
+	};
+	renderMergeConflictActionSlots() {
+		if (this.isContainerManaged || this.fileContainer == null || typeof this.options.mergeConflictActionsType !== "function" || this.conflictActions.length === 0) {
+			this.clearMergeConflictActionCache();
+			return;
+		}
+		const staleActions = new Map(this.conflictActionCache);
+		for (let actionIndex = 0; actionIndex < this.conflictActions.length; actionIndex++) {
+			const action = this.conflictActions[actionIndex];
+			if (action == null) continue;
+			if (action.conflictIndex !== actionIndex) {
+				console.error({
+					conflictIndex: actionIndex,
+					action
+				});
+				throw new Error("UnresolvedFile.renderMergeConflictActionSlots: conflictIndex and conflictAction don't match");
+			}
+			const anchor = getMergeConflictActionAnchor(action);
+			if (anchor == null) continue;
+			const conflictIndex = action.conflictIndex;
+			const slotName = getMergeConflictActionSlotName({
+				side: anchor.side,
+				lineNumber: anchor.lineNumber,
+				conflictIndex
+			});
+			const id = `${actionIndex}-${slotName}`;
+			let cache = this.conflictActionCache.get(id);
+			if (cache == null || !areMergeConflictActionsEqual(cache.action, action)) {
+				cache?.element.remove();
+				const rendered = this.renderMergeConflictAction(action);
+				if (rendered == null) continue;
+				const element = createAnnotationWrapperNode(slotName);
+				element.appendChild(rendered);
+				this.fileContainer.appendChild(element);
+				cache = {
+					element,
+					action
+				};
+				this.conflictActionCache.set(id, cache);
+			}
+			staleActions.delete(id);
+		}
+		for (const [id, { element }] of staleActions.entries()) {
+			this.conflictActionCache.delete(id);
+			element.remove();
+		}
+	}
+	renderMergeConflictAction(action) {
+		if (typeof this.options.mergeConflictActionsType !== "function") return;
+		const rendered = this.options.mergeConflictActionsType(action, this);
+		if (rendered == null) return;
+		if (rendered instanceof HTMLElement) return rendered;
+		if (typeof DocumentFragment !== "undefined" && rendered instanceof DocumentFragment) {
+			const wrapper = document.createElement("div");
+			wrapper.style.display = "contents";
+			wrapper.appendChild(rendered);
+			return wrapper;
+		}
+	}
+	clearMergeConflictActionCache() {
+		for (const { element } of this.conflictActionCache.values()) element.remove();
+		this.conflictActionCache.clear();
+	}
+};
+
+//#endregion
+export { UnresolvedFile };
+//# sourceMappingURL=UnresolvedFile.js.map

package/dist/components/UnresolvedFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnresolvedFile.js","names":["options: UnresolvedFileOptions<LAnnotation>","payload: MergeConflictActionPayload"],"sources":["../../src/components/UnresolvedFile.ts"],"sourcesContent":["import { DEFAULT_THEMES } from '../constants';\nimport type { MergeConflictActionTarget } from '../managers/InteractionManager';\nimport { pluckInteractionOptions } from '../managers/InteractionManager';\nimport type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport {\n  UnresolvedFileHunksRenderer,\n  type UnresolvedFileHunksRendererOptions,\n} from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictResolution,\n} from '../types';\nimport { areFilesEqual } from '../utils/areFilesEqual';\nimport { areMergeConflictActionsEqual } from '../utils/areMergeConflictActionsEqual';\nimport { createAnnotationWrapperNode } from '../utils/createAnnotationWrapperNode';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport { resolveMergeConflict } from '../utils/resolveMergeConflict';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  FileDiff,\n  type FileDiffOptions,\n  type FileDiffRenderProps,\n} from './FileDiff';\n\nexport type RenderMergeConflictActions<LAnnotation> = (\n  action: MergeConflictDiffAction,\n  instance: UnresolvedFile<LAnnotation>\n) => HTMLElement | DocumentFragment | undefined;\n\nexport type MergeConflictActionsTypeOption<LAnnotation> =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions<LAnnotation>;\n\nexport interface UnresolvedFileOptions<\n  LAnnotation,\n> extends FileDiffOptions<LAnnotation> {\n  mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n  onMergeConflictAction?(\n    payload: MergeConflictActionPayload,\n    instance: UnresolvedFile<LAnnotation>\n  ): void;\n  onMergeConflictResolve?(\n    file: FileContents,\n    payload: MergeConflictActionPayload\n  ): void;\n}\n\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<\n  FileDiffRenderProps<LAnnotation>,\n  'oldFile' | 'newFile'\n> {\n  file?: FileContents;\n  actions?: MergeConflictDiffAction[];\n}\n\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<\n  UnresolvedFileRenderProps<LAnnotation>,\n  'file'\n> {\n  file?: FileContents;\n  fileDiff?: FileDiffMetadata;\n  actions?: MergeConflictDiffAction[];\n  fileContainer: HTMLElement;\n  prerenderedHTML?: string;\n}\n\ninterface MergeConflictActionElementCache {\n  element: HTMLElement;\n  action: MergeConflictDiffAction;\n}\n\ninterface GetOrComputeDiffProps {\n  file: FileContents | undefined;\n  fileDiff: FileDiffMetadata | undefined;\n  actions: MergeConflictDiffAction[] | undefined;\n}\n\ninterface GetOrComputeDiffResult {\n  fileDiff: FileDiffMetadata;\n  actions: MergeConflictDiffAction[];\n}\n\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\n\nlet instanceId = -1;\n\nexport class UnresolvedFile<\n  LAnnotation = undefined,\n> extends FileDiff<LAnnotation> {\n  override readonly __id: string = `unresolved-file:${++instanceId}`;\n  protected computedCache: UnresolvedFileDataCache = {\n    file: undefined,\n    fileDiff: undefined,\n    actions: undefined,\n  };\n  private conflictActions: MergeConflictDiffAction[] = [];\n  private conflictActionCache: Map<string, MergeConflictActionElementCache> =\n    new Map();\n\n  constructor(\n    public override options: UnresolvedFileOptions<LAnnotation> = {\n      theme: DEFAULT_THEMES,\n    },\n    workerManager?: WorkerPoolManager | undefined,\n    isContainerManaged = false\n  ) {\n    super(undefined, workerManager, isContainerManaged);\n    this.setOptions(options);\n  }\n\n  override setOptions(\n    options: UnresolvedFileOptions<LAnnotation> | undefined\n  ): void {\n    if (options == null) {\n      return;\n    }\n\n    if (\n      options.onMergeConflictAction != null &&\n      options.onMergeConflictResolve != null\n    ) {\n      throw new Error(\n        'UnresolvedFile: onMergeConflictAction and onMergeConflictResolve are mutually exclusive. Use only one callback.'\n      );\n    }\n\n    this.options = options;\n    this.hunksRenderer.setOptions(this.getHunksRendererOptions(options));\n\n    const hunkSeparators = this.options.hunkSeparators ?? 'line-info';\n    this.interactionManager.setOptions(\n      pluckInteractionOptions(\n        this.options,\n        typeof hunkSeparators === 'function' ||\n          hunkSeparators === 'line-info' ||\n          hunkSeparators === 'line-info-basic'\n          ? this.expandHunk\n          : undefined,\n        this.getLineIndex,\n        this.handleMergeConflictActionClick\n      )\n    );\n  }\n\n  protected override createHunksRenderer(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRenderer<LAnnotation> {\n    const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n      this.getHunksRendererOptions(options),\n      this.handleHighlightRender,\n      this.workerManager\n    );\n    return renderer;\n  }\n\n  protected override getHunksRendererOptions(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRendererOptions {\n    return {\n      ...this.options,\n      hunkSeparators:\n        typeof options.hunkSeparators === 'function'\n          ? 'custom'\n          : options.hunkSeparators,\n      mergeConflictActionsType:\n        typeof options.mergeConflictActionsType === 'function'\n          ? 'custom'\n          : options.mergeConflictActionsType,\n    };\n  }\n\n  protected override applyPreNodeAttributes(\n    pre: HTMLPreElement,\n    result: HunksRenderResult\n  ): void {\n    super.applyPreNodeAttributes(pre, result, {\n      'data-has-merge-conflict': '',\n    });\n  }\n\n  override cleanUp(): void {\n    this.clearMergeConflictActionCache();\n    this.computedCache = {\n      file: undefined,\n      fileDiff: undefined,\n      actions: undefined,\n    };\n    this.conflictActions = [];\n    super.cleanUp();\n  }\n\n  private getOrComputeDiff({\n    file,\n    fileDiff,\n    actions,\n  }: GetOrComputeDiffProps): GetOrComputeDiffResult | undefined {\n    wrapper: {\n      // We are dealing with a controlled component\n      if (this.options.onMergeConflictAction != null) {\n        const hasFileDiff = fileDiff != null;\n        const hasActions = actions != null;\n        if (hasFileDiff !== hasActions) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff and actions must be passed together'\n          );\n        }\n        // If we were provided a new fileDiff and actions, we are a FULLY\n        // controlled component, which means we will not do any computation\n        if (fileDiff != null && actions != null) {\n          this.computedCache = {\n            file: file ?? this.computedCache.file,\n            fileDiff,\n            actions,\n          };\n          break wrapper;\n        }\n        // If we were provided a new file, we should attempt to parse out a new\n        // diff/actions if we haven't computed it before\n        else if (file != null || this.computedCache.file != null) {\n          file ??= this.computedCache.file;\n          if (file == null) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file is null, should be impossible'\n            );\n          }\n          if (\n            !areFilesEqual(file, this.computedCache.file) ||\n            this.computedCache.fileDiff == null ||\n            this.computedCache.actions == null\n          ) {\n            const computed = parseMergeConflictDiffFromFile(file);\n            this.computedCache = {\n              file,\n              fileDiff: computed.fileDiff,\n              actions: computed.actions,\n            };\n          }\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          break wrapper;\n        }\n        // Otherwise we should fall through and try to use the cache if it exists\n        else {\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          break wrapper;\n        }\n      }\n      // If we are uncontrolled we only rely on the file and only use the first\n      // version, otherwise utilize the cached version\n      else {\n        if (fileDiff != null || actions != null) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff and actions are only usable in controlled mode, you must pass in `onMergeConflictAction`'\n          );\n        }\n        this.computedCache.file ??= file;\n        if (\n          this.computedCache.fileDiff == null &&\n          this.computedCache.file != null\n        ) {\n          const computed = parseMergeConflictDiffFromFile(\n            this.computedCache.file\n          );\n          this.computedCache.fileDiff = computed.fileDiff;\n          this.computedCache.actions = computed.actions;\n        }\n        // Because we are uncontrolled, the source of truth is the\n        // computedCache\n        fileDiff = this.computedCache.fileDiff;\n        actions = this.computedCache.actions;\n        break wrapper;\n      }\n    }\n    if (fileDiff == null || actions == null) {\n      return undefined;\n    }\n    return { fileDiff, actions };\n  }\n\n  override hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void {\n    const { file, fileDiff, actions, lineAnnotations, ...rest } = props;\n    const source = this.getOrComputeDiff({ file, fileDiff, actions });\n    if (source == null) {\n      return;\n    }\n    this.setActiveMergeConflictActions(source.actions);\n    super.hydrate({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n    });\n    this.renderMergeConflictActionSlots();\n  }\n\n  override rerender(): void {\n    if (!this.enabled || this.fileDiff == null) {\n      return;\n    }\n    this.render({ forceRender: true, renderRange: this.renderRange });\n  }\n\n  override render(props: UnresolvedFileRenderProps<LAnnotation> = {}): boolean {\n    let { file, fileDiff, actions, lineAnnotations, ...rest } = props;\n    const source = this.getOrComputeDiff({ file, fileDiff, actions });\n    if (source == null) {\n      return false;\n    }\n    this.setActiveMergeConflictActions(source.actions);\n    const didRender = super.render({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n    });\n    this.renderMergeConflictActionSlots();\n    return didRender;\n  }\n\n  public resolveConflict(\n    conflictIndex: number,\n    resolution: MergeConflictResolution,\n    file: FileContents | undefined = this.computedCache.file\n  ): FileContents | undefined {\n    const action = this.conflictActions[conflictIndex];\n    if (file == null || action == null) {\n      return undefined;\n    }\n\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflict: conflictIndex and conflictAction don't match\"\n      );\n    }\n\n    const contents = resolveMergeConflict(file.contents, {\n      resolution,\n      conflict: action.conflict,\n    });\n    if (contents === file.contents) {\n      return undefined;\n    }\n\n    return {\n      ...file,\n      contents,\n      cacheKey:\n        file.cacheKey != null\n          ? `${file.cacheKey}:mc-${conflictIndex}-${resolution}`\n          : undefined,\n    };\n  }\n\n  private resolveConflictAndRender(\n    conflictIndex: number,\n    resolution: MergeConflictResolution\n  ): FileContents | undefined {\n    const action = this.conflictActions[conflictIndex];\n    if (action == null) {\n      return undefined;\n    }\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflictAndRender: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution,\n      conflict: action.conflict,\n    };\n    const nextFile = this.resolveConflict(conflictIndex, resolution);\n    if (nextFile == null) {\n      return undefined;\n    }\n\n    this.computedCache.file = nextFile;\n    // Clear out the diff cache to force a new compute next render\n    this.computedCache.fileDiff = undefined;\n    this.computedCache.actions = undefined;\n    this.render();\n    this.options.onMergeConflictResolve?.(nextFile, payload);\n    return nextFile;\n  }\n\n  private setActiveMergeConflictActions(\n    actions: MergeConflictDiffAction[]\n  ): void {\n    this.conflictActions = actions;\n    if (this.hunksRenderer instanceof UnresolvedFileHunksRenderer) {\n      this.hunksRenderer.setConflictActions(\n        this.options.mergeConflictActionsType === 'none' ? [] : actions\n      );\n    }\n  }\n\n  private handleMergeConflictActionClick = (\n    target: MergeConflictActionTarget\n  ): void => {\n    const action = this.conflictActions[target.conflictIndex];\n    if (action == null) {\n      return;\n    }\n    if (action.conflictIndex !== target.conflictIndex) {\n      console.error({ conflictIndex: target.conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.handleMergeConflictActionClick: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution: target.resolution,\n      conflict: action.conflict,\n    };\n    if (this.options.onMergeConflictAction != null) {\n      this.options.onMergeConflictAction(payload, this);\n      return;\n    }\n    this.resolveConflictAndRender(target.conflictIndex, target.resolution);\n  };\n\n  private renderMergeConflictActionSlots(): void {\n    if (\n      this.isContainerManaged ||\n      this.fileContainer == null ||\n      typeof this.options.mergeConflictActionsType !== 'function' ||\n      this.conflictActions.length === 0\n    ) {\n      this.clearMergeConflictActionCache();\n      return;\n    }\n    const staleActions = new Map(this.conflictActionCache);\n    for (\n      let actionIndex = 0;\n      actionIndex < this.conflictActions.length;\n      actionIndex++\n    ) {\n      const action = this.conflictActions[actionIndex];\n      if (action == null) {\n        continue;\n      }\n      if (action.conflictIndex !== actionIndex) {\n        console.error({ conflictIndex: actionIndex, action });\n        throw new Error(\n          \"UnresolvedFile.renderMergeConflictActionSlots: conflictIndex and conflictAction don't match\"\n        );\n      }\n      const anchor = getMergeConflictActionAnchor(action);\n      if (anchor == null) {\n        continue;\n      }\n      const conflictIndex = action.conflictIndex;\n      const slotName = getMergeConflictActionSlotName({\n        side: anchor.side,\n        lineNumber: anchor.lineNumber,\n        conflictIndex,\n      });\n      const id = `${actionIndex}-${slotName}`;\n      let cache = this.conflictActionCache.get(id);\n      if (\n        cache == null ||\n        !areMergeConflictActionsEqual(cache.action, action)\n      ) {\n        cache?.element.remove();\n        const rendered = this.renderMergeConflictAction(action);\n        if (rendered == null) {\n          continue;\n        }\n        const element = createAnnotationWrapperNode(slotName);\n        element.appendChild(rendered);\n        this.fileContainer.appendChild(element);\n        cache = { element, action };\n        this.conflictActionCache.set(id, cache);\n      }\n      staleActions.delete(id);\n    }\n    for (const [id, { element }] of staleActions.entries()) {\n      this.conflictActionCache.delete(id);\n      element.remove();\n    }\n  }\n\n  private renderMergeConflictAction(\n    action: MergeConflictDiffAction\n  ): HTMLElement | undefined {\n    if (typeof this.options.mergeConflictActionsType !== 'function') {\n      return undefined;\n    }\n    const rendered = this.options.mergeConflictActionsType(action, this);\n    if (rendered == null) {\n      return undefined;\n    }\n    if (rendered instanceof HTMLElement) {\n      return rendered;\n    }\n    if (\n      typeof DocumentFragment !== 'undefined' &&\n      rendered instanceof DocumentFragment\n    ) {\n      const wrapper = document.createElement('div');\n      wrapper.style.display = 'contents';\n      wrapper.appendChild(rendered);\n      return wrapper;\n    }\n    return undefined;\n  }\n\n  private clearMergeConflictActionCache(): void {\n    for (const { element } of this.conflictActionCache.values()) {\n      element.remove();\n    }\n    this.conflictActionCache.clear();\n  }\n}\n"],"mappings":"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"}

package/dist/components/VirtualizedFile.js

@@ -24,8 +24,9 @@ var VirtualizedFile = class extends File {
 	setOptions(options) {
 		if (options == null) return;
 		const previousOverflow = this.options.overflow;
+		const previousCollapsed = this.options.collapsed;
 		super.setOptions(options);
-		if (previousOverflow !== this.options.overflow) {
+		if (previousOverflow !== this.options.overflow || previousCollapsed !== this.options.collapsed) {
 			this.heightCache.clear();
 			this.computeApproximateSize();
 			this.renderRange = void 0;
@@ -73,13 +74,15 @@ var VirtualizedFile = class extends File {
 		super.cleanUp();
 	}
 	computeApproximateSize() {
+		const isFirstCompute = this.height === 0;
 		this.height = 0;
 		if (this.file == null) return;
-		const { disableFileHeader = false, overflow = "scroll" } = this.options;
+		const { disableFileHeader = false, collapsed = false, overflow = "scroll" } = this.options;
 		const { diffHeaderHeight, fileGap, lineHeight } = this.metrics;
 		const lines = this.getOrCreateLineCache(this.file);
 		if (!disableFileHeader) this.height += diffHeaderHeight;
 		else this.height += fileGap;
+		if (collapsed) return;
 		if (overflow === "scroll" && this.lineAnnotations.length === 0) this.height += this.getOrCreateLineCache(this.file).length * lineHeight;
 		else iterateOverFile({
 			lines,
@@ -88,7 +91,7 @@ var VirtualizedFile = class extends File {
 			}
 		});
 		if (lines.length > 0) this.height += fileGap;
-		if (this.fileContainer != null && this.virtualizer.config.resizeDebugging) {
+		if (this.fileContainer != null && this.virtualizer.config.resizeDebugging && !isFirstCompute) {
 			const rect = this.fileContainer.getBoundingClientRect();
 			if (rect.height !== this.height) console.log("VirtualizedFile.computeApproximateSize: computed height doesnt match", {
 				name: this.file.name,
@@ -116,12 +119,12 @@ var VirtualizedFile = class extends File {
 			console.error("VirtualizedFile.render: attempting to virtually render when we dont have file");
 			return false;
 		}
-		this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
 		if (isFirstRender) {
 			this.computeApproximateSize();
 			this.virtualizer.connect(fileContainer, this);
+			this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
 			this.isVisible = this.virtualizer.isInstanceVisible(this.top, this.height);
-		}
+		} else this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
 		if (!this.isVisible) return this.renderPlaceholder(this.height);
 		const windowSpecs = this.virtualizer.getWindowSpecs();
 		const renderRange = this.computeRenderRangeFromWindow(this.file, this.top, windowSpecs);

package/dist/components/VirtualizedFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualizedFile.js","names":["virtualizer: Virtualizer","metrics: VirtualFileMetrics","idealStartHunk","startingLine","clampedTotalLines","bufferBefore","hunkOffsets: number[]","firstVisibleHunk: number | undefined","centerHunk: number | undefined","overflowCounter: number | undefined","lineHeight"],"sources":["../../src/components/VirtualizedFile.ts"],"sourcesContent":["import { DEFAULT_VIRTUAL_FILE_METRICS } from '../constants';\nimport type {\n  FileContents,\n  RenderRange,\n  RenderWindow,\n  VirtualFileMetrics,\n} from '../types';\nimport { iterateOverFile } from '../utils/iterateOverFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { File, type FileOptions, type FileRenderProps } from './File';\nimport type { Virtualizer } from './Virtualizer';\n\nlet instanceId = -1;\n\nexport class VirtualizedFile<\n  LAnnotation = undefined,\n> extends File<LAnnotation> {\n  override readonly __id: string = `virtualized-file:${++instanceId}`;\n\n  public top: number | undefined;\n  public height: number = 0;\n  // Sparse map: line index -> measured height\n  // Only stores lines that differ from what is returned from default line\n  // height\n  private heightCache: Map<number, number> = new Map();\n  private isVisible: boolean = false;\n\n  constructor(\n    options: FileOptions<LAnnotation> | undefined,\n    private virtualizer: Virtualizer,\n    private metrics: VirtualFileMetrics = DEFAULT_VIRTUAL_FILE_METRICS,\n    workerManager?: WorkerPoolManager,\n    isContainerManaged = false\n  ) {\n    super(options, workerManager, isContainerManaged);\n  }\n\n  // Get the height for a line, using cached value if available.\n  // If not cached and hasMetadataLine is true, adds lineHeight for the\n  // metadata.\n  public getLineHeight(lineIndex: number, hasMetadataLine = false): number {\n    const cached = this.heightCache.get(lineIndex);\n    if (cached != null) {\n      return cached;\n    }\n    const multiplier = hasMetadataLine ? 2 : 1;\n    return this.metrics.lineHeight * multiplier;\n  }\n\n  // Override setOptions to clear height cache when overflow changes\n  override setOptions(options: FileOptions<LAnnotation> | undefined): void {\n    if (options == null) return;\n    const previousOverflow = this.options.overflow;\n\n    super.setOptions(options);\n\n    if (previousOverflow !== this.options.overflow) {\n      this.heightCache.clear();\n      this.computeApproximateSize();\n      this.renderRange = undefined;\n    }\n    this.virtualizer.instanceChanged(this);\n  }\n\n  // Measure rendered lines and update height cache.\n  // Called after render to reconcile estimated vs actual heights.\n  public reconcileHeights(): void {\n    if (this.fileContainer == null || this.file == null) {\n      this.height = 0;\n      return;\n    }\n    const { overflow = 'scroll' } = this.options;\n    this.top = this.virtualizer.getOffsetInScrollContainer(this.fileContainer);\n\n    // If the file has no annotations and we are using the scroll variant, then\n    // we can probably skip everything\n    if (\n      overflow === 'scroll' &&\n      this.lineAnnotations.length === 0 &&\n      !this.virtualizer.config.resizeDebugging\n    ) {\n      return;\n    }\n\n    let hasLineHeightChange = false;\n\n    // Single code element (no split mode)\n    if (this.code == null) return;\n    const content = this.code.children[1]; // Content column (gutter is [0])\n    if (!(content instanceof HTMLElement)) return;\n\n    for (const line of content.children) {\n      if (!(line instanceof HTMLElement)) continue;\n\n      const lineIndexAttr = line.dataset.lineIndex;\n      if (lineIndexAttr == null) continue;\n\n      const lineIndex = Number(lineIndexAttr);\n      let measuredHeight = line.getBoundingClientRect().height;\n      let hasMetadata = false;\n\n      // Annotations or noNewline metadata increase the size of their attached line\n      if (\n        line.nextElementSibling instanceof HTMLElement &&\n        ('lineAnnotation' in line.nextElementSibling.dataset ||\n          'noNewline' in line.nextElementSibling.dataset)\n      ) {\n        if ('noNewline' in line.nextElementSibling.dataset) {\n          hasMetadata = true;\n        }\n        measuredHeight +=\n          line.nextElementSibling.getBoundingClientRect().height;\n      }\n\n      const expectedHeight = this.getLineHeight(lineIndex, hasMetadata);\n\n      if (measuredHeight === expectedHeight) {\n        continue;\n      }\n\n      hasLineHeightChange = true;\n      // Line is back to standard height (e.g., after window resize)\n      // Remove from cache\n      if (measuredHeight === this.metrics.lineHeight * (hasMetadata ? 2 : 1)) {\n        this.heightCache.delete(lineIndex);\n      }\n      // Non-standard height, cache it\n      else {\n        this.heightCache.set(lineIndex, measuredHeight);\n      }\n    }\n\n    if (hasLineHeightChange || this.virtualizer.config.resizeDebugging) {\n      this.computeApproximateSize();\n    }\n  }\n\n  public onRender = (dirty: boolean): boolean => {\n    if (this.fileContainer == null || this.file == null) {\n      return false;\n    }\n    if (dirty) {\n      this.top = this.virtualizer.getOffsetInScrollContainer(\n        this.fileContainer\n      );\n    }\n    return this.render({ file: this.file });\n  };\n\n  override cleanUp(): void {\n    if (this.fileContainer != null) {\n      this.virtualizer.disconnect(this.fileContainer);\n    }\n    super.cleanUp();\n  }\n\n  // Compute the approximate size of the file using cached line heights.\n  // Uses lineHeight for lines without cached measurements.\n  private computeApproximateSize(): void {\n    this.height = 0;\n    if (this.file == null) {\n      return;\n    }\n\n    const { disableFileHeader = false, overflow = 'scroll' } = this.options;\n    const { diffHeaderHeight, fileGap, lineHeight } = this.metrics;\n    const lines = this.getOrCreateLineCache(this.file);\n\n    // Header or initial padding\n    if (!disableFileHeader) {\n      this.height += diffHeaderHeight;\n    } else {\n      this.height += fileGap;\n    }\n\n    if (overflow === 'scroll' && this.lineAnnotations.length === 0) {\n      this.height += this.getOrCreateLineCache(this.file).length * lineHeight;\n    } else {\n      iterateOverFile({\n        lines,\n        callback: ({ lineIndex }) => {\n          this.height += this.getLineHeight(lineIndex, false);\n        },\n      });\n    }\n\n    // Bottom padding\n    if (lines.length > 0) {\n      this.height += fileGap;\n    }\n\n    if (this.fileContainer != null && this.virtualizer.config.resizeDebugging) {\n      const rect = this.fileContainer.getBoundingClientRect();\n      if (rect.height !== this.height) {\n        console.log(\n          'VirtualizedFile.computeApproximateSize: computed height doesnt match',\n          {\n            name: this.file.name,\n            elementHeight: rect.height,\n            computedHeight: this.height,\n          }\n        );\n      } else {\n        console.log(\n          'VirtualizedFile.computeApproximateSize: computed height IS CORRECT'\n        );\n      }\n    }\n  }\n\n  public setVisibility(visible: boolean): void {\n    if (this.fileContainer == null) {\n      return;\n    }\n    if (visible && !this.isVisible) {\n      this.top = this.virtualizer.getOffsetInScrollContainer(\n        this.fileContainer\n      );\n      this.isVisible = true;\n    } else if (!visible && this.isVisible) {\n      this.isVisible = false;\n      this.rerender();\n    }\n  }\n\n  override render({\n    fileContainer,\n    file,\n    ...props\n  }: FileRenderProps<LAnnotation>): boolean {\n    const isFirstRender = this.fileContainer == null;\n\n    this.file ??= file;\n\n    fileContainer = this.getOrCreateFileContainerNode(fileContainer);\n\n    if (this.file == null) {\n      console.error(\n        'VirtualizedFile.render: attempting to virtually render when we dont have file'\n      );\n      return false;\n    }\n\n    this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);\n    if (isFirstRender) {\n      this.computeApproximateSize();\n      this.virtualizer.connect(fileContainer, this);\n      this.isVisible = this.virtualizer.isInstanceVisible(\n        this.top,\n        this.height\n      );\n    }\n\n    if (!this.isVisible) {\n      return this.renderPlaceholder(this.height);\n    }\n\n    const windowSpecs = this.virtualizer.getWindowSpecs();\n    const renderRange = this.computeRenderRangeFromWindow(\n      this.file,\n      this.top,\n      windowSpecs\n    );\n    return super.render({\n      file: this.file,\n      fileContainer,\n      renderRange,\n      ...props,\n    });\n  }\n\n  private computeRenderRangeFromWindow(\n    file: FileContents,\n    fileTop: number,\n    { top, bottom }: RenderWindow\n  ): RenderRange {\n    const { disableFileHeader = false, overflow = 'scroll' } = this.options;\n    const { diffHeaderHeight, fileGap, hunkLineCount, lineHeight } =\n      this.metrics;\n    const lines = this.getOrCreateLineCache(file);\n    const lineCount = lines.length;\n    const fileHeight = this.height;\n    const headerRegion = disableFileHeader ? fileGap : diffHeaderHeight;\n\n    // File is outside render window\n    if (fileTop < top - fileHeight || fileTop > bottom) {\n      return {\n        startingLine: 0,\n        totalLines: 0,\n        bufferBefore: 0,\n        bufferAfter: fileHeight - headerRegion - fileGap,\n      };\n    }\n\n    // Small file, just render it all\n    if (lineCount <= hunkLineCount) {\n      return {\n        startingLine: 0,\n        totalLines: hunkLineCount,\n        bufferBefore: 0,\n        bufferAfter: 0,\n      };\n    }\n\n    // Calculate totalLines based on viewport size\n    const estimatedTargetLines = Math.ceil(\n      Math.max(bottom - top, 0) / lineHeight\n    );\n    const totalLines =\n      Math.ceil(estimatedTargetLines / hunkLineCount) * hunkLineCount +\n      hunkLineCount * 2;\n    const totalHunks = totalLines / hunkLineCount;\n    const viewportCenter = (top + bottom) / 2;\n\n    // Simple case: overflow scroll with no annotations - pure math!\n    if (overflow === 'scroll' && this.lineAnnotations.length === 0) {\n      // Find which line is at viewport center\n      const centerLine = Math.floor(\n        (viewportCenter - (fileTop + headerRegion)) / lineHeight\n      );\n      const centerHunk = Math.floor(centerLine / hunkLineCount);\n\n      // Calculate ideal start centered around viewport\n      const idealStartHunk = centerHunk - Math.floor(totalHunks / 2);\n      const totalHunksInFile = Math.ceil(lineCount / hunkLineCount);\n      const startingLine =\n        Math.max(0, Math.min(idealStartHunk, totalHunksInFile)) * hunkLineCount;\n\n      const clampedTotalLines =\n        idealStartHunk < 0\n          ? totalLines + idealStartHunk * hunkLineCount\n          : totalLines;\n\n      const bufferBefore = startingLine * lineHeight;\n      const renderedLines = Math.min(\n        clampedTotalLines,\n        lineCount - startingLine\n      );\n      const bufferAfter = Math.max(\n        0,\n        (lineCount - startingLine - renderedLines) * lineHeight\n      );\n\n      return {\n        startingLine,\n        totalLines: clampedTotalLines,\n        bufferBefore,\n        bufferAfter,\n      };\n    }\n\n    // Complex case: need to account for line annotations or wrap overflow\n    const overflowHunks = totalHunks;\n    const hunkOffsets: number[] = [];\n\n    let absoluteLineTop = fileTop + headerRegion;\n    let currentLine = 0;\n    let firstVisibleHunk: number | undefined;\n    let centerHunk: number | undefined;\n    let overflowCounter: number | undefined;\n\n    iterateOverFile({\n      lines,\n      callback: ({ lineIndex }) => {\n        const isAtHunkBoundary = currentLine % hunkLineCount === 0;\n\n        if (isAtHunkBoundary) {\n          hunkOffsets.push(absoluteLineTop - (fileTop + headerRegion));\n\n          if (overflowCounter != null) {\n            if (overflowCounter <= 0) {\n              return true;\n            }\n            overflowCounter--;\n          }\n        }\n\n        const lineHeight = this.getLineHeight(lineIndex, false);\n        const currentHunk = Math.floor(currentLine / hunkLineCount);\n\n        // Track visible region\n        if (absoluteLineTop > top - lineHeight && absoluteLineTop < bottom) {\n          firstVisibleHunk ??= currentHunk;\n        }\n\n        // Track which hunk contains the viewport center\n        if (absoluteLineTop + lineHeight > viewportCenter) {\n          centerHunk ??= currentHunk;\n        }\n\n        // Start overflow when we are out of the viewport at a hunk boundary\n        if (\n          overflowCounter == null &&\n          absoluteLineTop >= bottom &&\n          isAtHunkBoundary\n        ) {\n          overflowCounter = overflowHunks;\n        }\n\n        currentLine++;\n        absoluteLineTop += lineHeight;\n\n        return false;\n      },\n    });\n\n    // No visible lines found\n    if (firstVisibleHunk == null) {\n      return {\n        startingLine: 0,\n        totalLines: 0,\n        bufferBefore: 0,\n        bufferAfter: fileHeight - headerRegion - fileGap,\n      };\n    }\n\n    // Calculate balanced startingLine centered around the viewport center\n    const collectedHunks = hunkOffsets.length;\n    centerHunk ??= firstVisibleHunk;\n    const idealStartHunk = Math.round(centerHunk - totalHunks / 2);\n\n    // Clamp startHunk: at the beginning, reduce totalLines; at the end, shift startHunk back\n    const maxStartHunk = Math.max(0, collectedHunks - totalHunks);\n    const startHunk = Math.max(0, Math.min(idealStartHunk, maxStartHunk));\n    const startingLine = startHunk * hunkLineCount;\n\n    // If we wanted to start before 0, reduce totalLines by the clamped amount\n    const clampedTotalLines =\n      idealStartHunk < 0\n        ? totalLines + idealStartHunk * hunkLineCount\n        : totalLines;\n\n    // Use hunkOffsets array for efficient buffer calculations\n    const bufferBefore = hunkOffsets[startHunk] ?? 0;\n\n    // Calculate bufferAfter\n    const finalHunkIndex = startHunk + clampedTotalLines / hunkLineCount;\n    const bufferAfter =\n      finalHunkIndex < hunkOffsets.length\n        ? fileHeight - headerRegion - hunkOffsets[finalHunkIndex] - fileGap\n        : fileHeight - (absoluteLineTop - fileTop) - fileGap;\n\n    return {\n      startingLine,\n      totalLines: clampedTotalLines,\n      bufferBefore,\n      bufferAfter,\n    };\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"VirtualizedFile.js","names":["virtualizer: Virtualizer","metrics: VirtualFileMetrics","idealStartHunk","startingLine","clampedTotalLines","bufferBefore","hunkOffsets: number[]","firstVisibleHunk: number | undefined","centerHunk: number | undefined","overflowCounter: number | undefined","lineHeight"],"sources":["../../src/components/VirtualizedFile.ts"],"sourcesContent":["import { DEFAULT_VIRTUAL_FILE_METRICS } from '../constants';\nimport type {\n  FileContents,\n  RenderRange,\n  RenderWindow,\n  VirtualFileMetrics,\n} from '../types';\nimport { iterateOverFile } from '../utils/iterateOverFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { File, type FileOptions, type FileRenderProps } from './File';\nimport type { Virtualizer } from './Virtualizer';\n\nlet instanceId = -1;\n\nexport class VirtualizedFile<\n  LAnnotation = undefined,\n> extends File<LAnnotation> {\n  override readonly __id: string = `virtualized-file:${++instanceId}`;\n\n  public top: number | undefined;\n  public height: number = 0;\n  // Sparse map: line index -> measured height\n  // Only stores lines that differ from what is returned from default line\n  // height\n  private heightCache: Map<number, number> = new Map();\n  private isVisible: boolean = false;\n\n  constructor(\n    options: FileOptions<LAnnotation> | undefined,\n    private virtualizer: Virtualizer,\n    private metrics: VirtualFileMetrics = DEFAULT_VIRTUAL_FILE_METRICS,\n    workerManager?: WorkerPoolManager,\n    isContainerManaged = false\n  ) {\n    super(options, workerManager, isContainerManaged);\n  }\n\n  // Get the height for a line, using cached value if available.\n  // If not cached and hasMetadataLine is true, adds lineHeight for the\n  // metadata.\n  public getLineHeight(lineIndex: number, hasMetadataLine = false): number {\n    const cached = this.heightCache.get(lineIndex);\n    if (cached != null) {\n      return cached;\n    }\n    const multiplier = hasMetadataLine ? 2 : 1;\n    return this.metrics.lineHeight * multiplier;\n  }\n\n  // Override setOptions to clear height cache when overflow changes\n  override setOptions(options: FileOptions<LAnnotation> | undefined): void {\n    if (options == null) return;\n    const previousOverflow = this.options.overflow;\n    const previousCollapsed = this.options.collapsed;\n\n    super.setOptions(options);\n\n    if (\n      previousOverflow !== this.options.overflow ||\n      previousCollapsed !== this.options.collapsed\n    ) {\n      this.heightCache.clear();\n      this.computeApproximateSize();\n      this.renderRange = undefined;\n    }\n    this.virtualizer.instanceChanged(this);\n  }\n\n  // Measure rendered lines and update height cache.\n  // Called after render to reconcile estimated vs actual heights.\n  public reconcileHeights(): void {\n    if (this.fileContainer == null || this.file == null) {\n      this.height = 0;\n      return;\n    }\n    const { overflow = 'scroll' } = this.options;\n    this.top = this.virtualizer.getOffsetInScrollContainer(this.fileContainer);\n\n    // If the file has no annotations and we are using the scroll variant, then\n    // we can probably skip everything\n    if (\n      overflow === 'scroll' &&\n      this.lineAnnotations.length === 0 &&\n      !this.virtualizer.config.resizeDebugging\n    ) {\n      return;\n    }\n\n    let hasLineHeightChange = false;\n\n    // Single code element (no split mode)\n    if (this.code == null) return;\n    const content = this.code.children[1]; // Content column (gutter is [0])\n    if (!(content instanceof HTMLElement)) return;\n\n    for (const line of content.children) {\n      if (!(line instanceof HTMLElement)) continue;\n\n      const lineIndexAttr = line.dataset.lineIndex;\n      if (lineIndexAttr == null) continue;\n\n      const lineIndex = Number(lineIndexAttr);\n      let measuredHeight = line.getBoundingClientRect().height;\n      let hasMetadata = false;\n\n      // Annotations or noNewline metadata increase the size of their attached line\n      if (\n        line.nextElementSibling instanceof HTMLElement &&\n        ('lineAnnotation' in line.nextElementSibling.dataset ||\n          'noNewline' in line.nextElementSibling.dataset)\n      ) {\n        if ('noNewline' in line.nextElementSibling.dataset) {\n          hasMetadata = true;\n        }\n        measuredHeight +=\n          line.nextElementSibling.getBoundingClientRect().height;\n      }\n\n      const expectedHeight = this.getLineHeight(lineIndex, hasMetadata);\n\n      if (measuredHeight === expectedHeight) {\n        continue;\n      }\n\n      hasLineHeightChange = true;\n      // Line is back to standard height (e.g., after window resize)\n      // Remove from cache\n      if (measuredHeight === this.metrics.lineHeight * (hasMetadata ? 2 : 1)) {\n        this.heightCache.delete(lineIndex);\n      }\n      // Non-standard height, cache it\n      else {\n        this.heightCache.set(lineIndex, measuredHeight);\n      }\n    }\n\n    if (hasLineHeightChange || this.virtualizer.config.resizeDebugging) {\n      this.computeApproximateSize();\n    }\n  }\n\n  public onRender = (dirty: boolean): boolean => {\n    if (this.fileContainer == null || this.file == null) {\n      return false;\n    }\n    if (dirty) {\n      this.top = this.virtualizer.getOffsetInScrollContainer(\n        this.fileContainer\n      );\n    }\n    return this.render({ file: this.file });\n  };\n\n  override cleanUp(): void {\n    if (this.fileContainer != null) {\n      this.virtualizer.disconnect(this.fileContainer);\n    }\n    super.cleanUp();\n  }\n\n  // Compute the approximate size of the file using cached line heights.\n  // Uses lineHeight for lines without cached measurements.\n  private computeApproximateSize(): void {\n    const isFirstCompute = this.height === 0;\n    this.height = 0;\n    if (this.file == null) {\n      return;\n    }\n\n    const {\n      disableFileHeader = false,\n      collapsed = false,\n      overflow = 'scroll',\n    } = this.options;\n    const { diffHeaderHeight, fileGap, lineHeight } = this.metrics;\n    const lines = this.getOrCreateLineCache(this.file);\n\n    // Header or initial padding\n    if (!disableFileHeader) {\n      this.height += diffHeaderHeight;\n    } else {\n      this.height += fileGap;\n    }\n    if (collapsed) {\n      return;\n    }\n\n    if (overflow === 'scroll' && this.lineAnnotations.length === 0) {\n      this.height += this.getOrCreateLineCache(this.file).length * lineHeight;\n    } else {\n      iterateOverFile({\n        lines,\n        callback: ({ lineIndex }) => {\n          this.height += this.getLineHeight(lineIndex, false);\n        },\n      });\n    }\n\n    // Bottom padding\n    if (lines.length > 0) {\n      this.height += fileGap;\n    }\n\n    if (\n      this.fileContainer != null &&\n      this.virtualizer.config.resizeDebugging &&\n      !isFirstCompute\n    ) {\n      const rect = this.fileContainer.getBoundingClientRect();\n      if (rect.height !== this.height) {\n        console.log(\n          'VirtualizedFile.computeApproximateSize: computed height doesnt match',\n          {\n            name: this.file.name,\n            elementHeight: rect.height,\n            computedHeight: this.height,\n          }\n        );\n      } else {\n        console.log(\n          'VirtualizedFile.computeApproximateSize: computed height IS CORRECT'\n        );\n      }\n    }\n  }\n\n  public setVisibility(visible: boolean): void {\n    if (this.fileContainer == null) {\n      return;\n    }\n    if (visible && !this.isVisible) {\n      this.top = this.virtualizer.getOffsetInScrollContainer(\n        this.fileContainer\n      );\n      this.isVisible = true;\n    } else if (!visible && this.isVisible) {\n      this.isVisible = false;\n      this.rerender();\n    }\n  }\n\n  override render({\n    fileContainer,\n    file,\n    ...props\n  }: FileRenderProps<LAnnotation>): boolean {\n    const isFirstRender = this.fileContainer == null;\n\n    this.file ??= file;\n\n    fileContainer = this.getOrCreateFileContainerNode(fileContainer);\n\n    if (this.file == null) {\n      console.error(\n        'VirtualizedFile.render: attempting to virtually render when we dont have file'\n      );\n      return false;\n    }\n\n    if (isFirstRender) {\n      this.computeApproximateSize();\n      this.virtualizer.connect(fileContainer, this);\n      this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);\n      this.isVisible = this.virtualizer.isInstanceVisible(\n        this.top,\n        this.height\n      );\n    } else {\n      this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);\n    }\n\n    if (!this.isVisible) {\n      return this.renderPlaceholder(this.height);\n    }\n\n    const windowSpecs = this.virtualizer.getWindowSpecs();\n    const renderRange = this.computeRenderRangeFromWindow(\n      this.file,\n      this.top,\n      windowSpecs\n    );\n    return super.render({\n      file: this.file,\n      fileContainer,\n      renderRange,\n      ...props,\n    });\n  }\n\n  private computeRenderRangeFromWindow(\n    file: FileContents,\n    fileTop: number,\n    { top, bottom }: RenderWindow\n  ): RenderRange {\n    const { disableFileHeader = false, overflow = 'scroll' } = this.options;\n    const { diffHeaderHeight, fileGap, hunkLineCount, lineHeight } =\n      this.metrics;\n    const lines = this.getOrCreateLineCache(file);\n    const lineCount = lines.length;\n    const fileHeight = this.height;\n    const headerRegion = disableFileHeader ? fileGap : diffHeaderHeight;\n\n    // File is outside render window\n    if (fileTop < top - fileHeight || fileTop > bottom) {\n      return {\n        startingLine: 0,\n        totalLines: 0,\n        bufferBefore: 0,\n        bufferAfter: fileHeight - headerRegion - fileGap,\n      };\n    }\n\n    // Small file, just render it all\n    if (lineCount <= hunkLineCount) {\n      return {\n        startingLine: 0,\n        totalLines: hunkLineCount,\n        bufferBefore: 0,\n        bufferAfter: 0,\n      };\n    }\n\n    // Calculate totalLines based on viewport size\n    const estimatedTargetLines = Math.ceil(\n      Math.max(bottom - top, 0) / lineHeight\n    );\n    const totalLines =\n      Math.ceil(estimatedTargetLines / hunkLineCount) * hunkLineCount +\n      hunkLineCount * 2;\n    const totalHunks = totalLines / hunkLineCount;\n    const viewportCenter = (top + bottom) / 2;\n\n    // Simple case: overflow scroll with no annotations - pure math!\n    if (overflow === 'scroll' && this.lineAnnotations.length === 0) {\n      // Find which line is at viewport center\n      const centerLine = Math.floor(\n        (viewportCenter - (fileTop + headerRegion)) / lineHeight\n      );\n      const centerHunk = Math.floor(centerLine / hunkLineCount);\n\n      // Calculate ideal start centered around viewport\n      const idealStartHunk = centerHunk - Math.floor(totalHunks / 2);\n      const totalHunksInFile = Math.ceil(lineCount / hunkLineCount);\n      const startingLine =\n        Math.max(0, Math.min(idealStartHunk, totalHunksInFile)) * hunkLineCount;\n\n      const clampedTotalLines =\n        idealStartHunk < 0\n          ? totalLines + idealStartHunk * hunkLineCount\n          : totalLines;\n\n      const bufferBefore = startingLine * lineHeight;\n      const renderedLines = Math.min(\n        clampedTotalLines,\n        lineCount - startingLine\n      );\n      const bufferAfter = Math.max(\n        0,\n        (lineCount - startingLine - renderedLines) * lineHeight\n      );\n\n      return {\n        startingLine,\n        totalLines: clampedTotalLines,\n        bufferBefore,\n        bufferAfter,\n      };\n    }\n\n    // Complex case: need to account for line annotations or wrap overflow\n    const overflowHunks = totalHunks;\n    const hunkOffsets: number[] = [];\n\n    let absoluteLineTop = fileTop + headerRegion;\n    let currentLine = 0;\n    let firstVisibleHunk: number | undefined;\n    let centerHunk: number | undefined;\n    let overflowCounter: number | undefined;\n\n    iterateOverFile({\n      lines,\n      callback: ({ lineIndex }) => {\n        const isAtHunkBoundary = currentLine % hunkLineCount === 0;\n\n        if (isAtHunkBoundary) {\n          hunkOffsets.push(absoluteLineTop - (fileTop + headerRegion));\n\n          if (overflowCounter != null) {\n            if (overflowCounter <= 0) {\n              return true;\n            }\n            overflowCounter--;\n          }\n        }\n\n        const lineHeight = this.getLineHeight(lineIndex, false);\n        const currentHunk = Math.floor(currentLine / hunkLineCount);\n\n        // Track visible region\n        if (absoluteLineTop > top - lineHeight && absoluteLineTop < bottom) {\n          firstVisibleHunk ??= currentHunk;\n        }\n\n        // Track which hunk contains the viewport center\n        if (absoluteLineTop + lineHeight > viewportCenter) {\n          centerHunk ??= currentHunk;\n        }\n\n        // Start overflow when we are out of the viewport at a hunk boundary\n        if (\n          overflowCounter == null &&\n          absoluteLineTop >= bottom &&\n          isAtHunkBoundary\n        ) {\n          overflowCounter = overflowHunks;\n        }\n\n        currentLine++;\n        absoluteLineTop += lineHeight;\n\n        return false;\n      },\n    });\n\n    // No visible lines found\n    if (firstVisibleHunk == null) {\n      return {\n        startingLine: 0,\n        totalLines: 0,\n        bufferBefore: 0,\n        bufferAfter: fileHeight - headerRegion - fileGap,\n      };\n    }\n\n    // Calculate balanced startingLine centered around the viewport center\n    const collectedHunks = hunkOffsets.length;\n    centerHunk ??= firstVisibleHunk;\n    const idealStartHunk = Math.round(centerHunk - totalHunks / 2);\n\n    // Clamp startHunk: at the beginning, reduce totalLines; at the end, shift startHunk back\n    const maxStartHunk = Math.max(0, collectedHunks - totalHunks);\n    const startHunk = Math.max(0, Math.min(idealStartHunk, maxStartHunk));\n    const startingLine = startHunk * hunkLineCount;\n\n    // If we wanted to start before 0, reduce totalLines by the clamped amount\n    const clampedTotalLines =\n      idealStartHunk < 0\n        ? totalLines + idealStartHunk * hunkLineCount\n        : totalLines;\n\n    // Use hunkOffsets array for efficient buffer calculations\n    const bufferBefore = hunkOffsets[startHunk] ?? 0;\n\n    // Calculate bufferAfter\n    const finalHunkIndex = startHunk + clampedTotalLines / hunkLineCount;\n    const bufferAfter =\n      finalHunkIndex < hunkOffsets.length\n        ? fileHeight - headerRegion - hunkOffsets[finalHunkIndex] - fileGap\n        : fileHeight - (absoluteLineTop - fileTop) - fileGap;\n\n    return {\n      startingLine,\n      totalLines: clampedTotalLines,\n      bufferBefore,\n      bufferAfter,\n    };\n  }\n}\n"],"mappings":"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"}

package/dist/components/VirtualizedFileDiff.d.ts

@@ -19,7 +19,7 @@ declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnn
   reconcileHeights(): void;
   onRender: (dirty: boolean) => boolean;
   cleanUp(): void;
-  expandHunk(hunkIndex: number, direction: ExpansionDirections): void;
+  expandHunk: (hunkIndex: number, direction: ExpansionDirections, expansionLineCountOverride?: number | undefined) => void;
   setVisibility(visible: boolean): void;
   private computeApproximateSize;
   render({

package/dist/components/VirtualizedFileDiff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualizedFileDiff.d.ts","names":["ExpansionDirections","VirtualFileMetrics","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","Virtualizer","VirtualizedFileDiff","LAnnotation","Partial","fileContainer","oldFile","newFile","fileDiff"],"sources":["../../src/components/VirtualizedFileDiff.d.ts"],"sourcesContent":["import type { ExpansionDirections, VirtualFileMetrics } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nimport type { Virtualizer } from './Virtualizer';\nexport declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    readonly __id: string;\n    top: number | undefined;\n    height: number;\n    private metrics;\n    private heightCache;\n    private isVisible;\n    private virtualizer;\n    constructor(options: FileDiffOptions<LAnnotation> | undefined, virtualizer: Virtualizer, metrics?: Partial<VirtualFileMetrics>, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);\n    private getLineHeight;\n    setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;\n    reconcileHeights(): void;\n    onRender: (dirty: boolean) => boolean;\n    cleanUp(): void;\n    expandHunk(hunkIndex: number, direction: ExpansionDirections): void;\n    setVisibility(visible: boolean): void;\n    private computeApproximateSize;\n    render({ fileContainer, oldFile, newFile, fileDiff, ...props }?: FileDiffRenderProps<LAnnotation>): boolean;\n    private getDiffStyle;\n    private getExpandedRegion;\n    private getExpandedLineCount;\n    private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFileDiff.d.ts.map"],"mappings":";;;;;;;cAIqBO,qDAAqDJ,SAASK;;;EAA9DD,MAAAA,EAAAA,MAAAA;EAA8DC,QAAAA,OAAAA;EAQ1CA,QAAAA,WAAAA;EAAhBJ,QAAAA,SAAAA;EAAuDE,QAAAA,WAAAA;EAA+BL,WAAAA,CAAAA,OAAAA,EAAtFG,eAAsFH,CAAtEO,WAAsEP,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EAA/BK,WAA+BL,EAAAA,OAAAA,CAAAA,EAARQ,OAAQR,CAAAA,kBAAAA,CAAAA,EAAAA,aAAAA,CAAAA,EAAqCC,iBAArCD,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAARQ,QAAAA,aAAAA;EAA6CP,UAAAA,CAAAA,OAAAA,EAE5HE,eAF4HF,CAE5GM,WAF4GN,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAE5GM,gBAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAAhBJ,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAIqBJ,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAGhCU,UAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAHgCV,mBAGhCU,CAAAA,EAAAA,IAAAA;EAAeC,aAAAA,CAAAA,OAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAASC,QAAAA,sBAAAA;EAASC,MAAAA,CAAAA;IAAAA,aAAAA;IAAAA,OAAAA;IAAAA,OAAAA;IAAAA,QAAAA;IAAAA,GAAAA;EAAAA,CAAAA,CAAAA,EAAuBR,mBAAvBQ,CAA2CL,WAA3CK,CAAAA,CAAAA,EAAAA,OAAAA;EAA2CL,QAAAA,YAAAA;EAApBH,QAAAA,iBAAAA;EAjBKF,QAAAA,oBAAAA;EAAQ,QAAA,4BAAA"}
+{"version":3,"file":"VirtualizedFileDiff.d.ts","names":["ExpansionDirections","VirtualFileMetrics","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","Virtualizer","VirtualizedFileDiff","LAnnotation","Partial","fileContainer","oldFile","newFile","fileDiff"],"sources":["../../src/components/VirtualizedFileDiff.d.ts"],"sourcesContent":["import type { ExpansionDirections, VirtualFileMetrics } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nimport type { Virtualizer } from './Virtualizer';\nexport declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    readonly __id: string;\n    top: number | undefined;\n    height: number;\n    private metrics;\n    private heightCache;\n    private isVisible;\n    private virtualizer;\n    constructor(options: FileDiffOptions<LAnnotation> | undefined, virtualizer: Virtualizer, metrics?: Partial<VirtualFileMetrics>, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);\n    private getLineHeight;\n    setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;\n    reconcileHeights(): void;\n    onRender: (dirty: boolean) => boolean;\n    cleanUp(): void;\n    expandHunk: (hunkIndex: number, direction: ExpansionDirections, expansionLineCountOverride?: number | undefined) => void;\n    setVisibility(visible: boolean): void;\n    private computeApproximateSize;\n    render({ fileContainer, oldFile, newFile, fileDiff, ...props }?: FileDiffRenderProps<LAnnotation>): boolean;\n    private getDiffStyle;\n    private getExpandedRegion;\n    private getExpandedLineCount;\n    private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFileDiff.d.ts.map"],"mappings":";;;;;;;cAIqBO,qDAAqDJ,SAASK;;;EAA9DD,MAAAA,EAAAA,MAAAA;EAA8DC,QAAAA,OAAAA;EAQ1CA,QAAAA,WAAAA;EAAhBJ,QAAAA,SAAAA;EAAuDE,QAAAA,WAAAA;EAA+BL,WAAAA,CAAAA,OAAAA,EAAtFG,eAAsFH,CAAtEO,WAAsEP,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EAA/BK,WAA+BL,EAAAA,OAAAA,CAAAA,EAARQ,OAAQR,CAAAA,kBAAAA,CAAAA,EAAAA,aAAAA,CAAAA,EAAqCC,iBAArCD,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAARQ,QAAAA,aAAAA;EAA6CP,UAAAA,CAAAA,OAAAA,EAE5HE,eAF4HF,CAE5GM,WAF4GN,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAE5GM,gBAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAAhBJ,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAIuBJ,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAGlCU,UAAAA,EAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAHkCV,mBAGlCU,EAAAA,0BAAAA,CAAAA,EAAAA,MAAAA,GAAAA,SAAAA,EAAAA,GAAAA,IAAAA;EAAeC,aAAAA,CAAAA,OAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAASC,QAAAA,sBAAAA;EAASC,MAAAA,CAAAA;IAAAA,aAAAA;IAAAA,OAAAA;IAAAA,OAAAA;IAAAA,QAAAA;IAAAA,GAAAA;EAAAA,CAAAA,CAAAA,EAAuBR,mBAAvBQ,CAA2CL,WAA3CK,CAAAA,CAAAA,EAAAA,OAAAA;EAA2CL,QAAAA,YAAAA;EAApBH,QAAAA,iBAAAA;EAjBKF,QAAAA,oBAAAA;EAAQ,QAAA,4BAAA"}

package/dist/components/VirtualizedFileDiff.js

@@ -30,8 +30,9 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (options == null) return;
 		const previousDiffStyle = this.options.diffStyle;
 		const previousOverflow = this.options.overflow;
+		const previousCollapsed = this.options.collapsed;
 		super.setOptions(options);
-		if (previousDiffStyle !== this.options.diffStyle || previousOverflow !== this.options.overflow) {
+		if (previousDiffStyle !== this.options.diffStyle || previousOverflow !== this.options.overflow || previousCollapsed !== this.options.collapsed) {
 			this.heightCache.clear();
 			this.computeApproximateSize();
 			this.renderRange = void 0;
@@ -82,14 +83,15 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (this.fileContainer != null) this.virtualizer.disconnect(this.fileContainer);
 		super.cleanUp();
 	}
-	expandHunk(hunkIndex, direction) {
-		this.hunksRenderer.expandHunk(hunkIndex, direction);
+	expandHunk = (hunkIndex, direction, expansionLineCountOverride) => {
+		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
 		this.computeApproximateSize();
 		this.renderRange = void 0;
 		this.virtualizer.instanceChanged(this);
-	}
+	};
 	setVisibility(visible) {
 		if (this.fileContainer == null) return;
+		this.renderRange = void 0;
 		if (visible && !this.isVisible) {
 			this.top = this.virtualizer.getOffsetInScrollContainer(this.fileContainer);
 			this.isVisible = true;
@@ -99,14 +101,16 @@ var VirtualizedFileDiff = class extends FileDiff {
 		}
 	}
 	computeApproximateSize() {
+		const isFirstCompute = this.height === 0;
 		this.height = 0;
 		if (this.fileDiff == null) return;
-		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, hunkSeparators = "line-info" } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, hunkSeparators = "line-info" } = this.options;
 		const { diffHeaderHeight, fileGap, hunkSeparatorHeight } = this.metrics;
 		const diffStyle = this.getDiffStyle();
-		const separatorGap = hunkSeparators === "simple" || hunkSeparators === "metadata" ? 0 : fileGap;
+		const separatorGap = hunkSeparators !== "simple" && hunkSeparators !== "metadata" && hunkSeparators !== "line-info-basic" ? fileGap : 0;
 		if (!disableFileHeader) this.height += diffHeaderHeight;
 		else if (hunkSeparators !== "simple" && hunkSeparators !== "metadata") this.height += fileGap;
+		if (collapsed) return;
 		iterateOverDiff({
 			diff: this.fileDiff,
 			diffStyle,
@@ -125,7 +129,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 			}
 		});
 		if (this.fileDiff.hunks.length > 0) this.height += fileGap;
-		if (this.fileContainer != null && this.virtualizer.config.resizeDebugging) {
+		if (this.fileContainer != null && this.virtualizer.config.resizeDebugging && !isFirstCompute) {
 			const rect = this.fileContainer.getBoundingClientRect();
 			if (rect.height !== this.height) console.log("VirtualizedFileDiff.computeApproximateSize: computed height doesnt match", {
 				name: this.fileDiff.name,
@@ -143,12 +147,12 @@ var VirtualizedFileDiff = class extends FileDiff {
 			console.error("VirtualizedFileDiff.render: attempting to virtually render when we dont have the correct data");
 			return false;
 		}
-		this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
 		if (isFirstRender) {
 			this.computeApproximateSize();
 			this.virtualizer.connect(fileContainer, this);
+			this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
 			this.isVisible = this.virtualizer.isInstanceVisible(this.top, this.height);
-		}
+		} else this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
 		if (!this.isVisible) return this.renderPlaceholder(this.height);
 		const windowSpecs = this.virtualizer.getWindowSpecs();
 		const renderRange = this.computeRenderRangeFromWindow(this.fileDiff, this.top, windowSpecs);
@@ -241,7 +245,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const overflowHunks = totalHunks;
 		const hunkOffsets = [];
 		const viewportCenter = (top + bottom) / 2;
-		const separatorGap = hunkSeparators === "simple" || hunkSeparators === "metadata" ? 0 : fileGap;
+		const separatorGap = hunkSeparators === "simple" || hunkSeparators === "metadata" || hunkSeparators === "line-info-basic" ? 0 : fileGap;
 		let absoluteLineTop = fileTop + headerRegion;
 		let currentLine = 0;
 		let firstVisibleHunk;
@@ -274,7 +278,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 				if (overflowCounter == null && absoluteLineTop >= bottom && isAtHunkBoundary) overflowCounter = overflowHunks;
 				currentLine++;
 				absoluteLineTop += lineHeight$1;
-				if (collapsedAfter > 0 && hunkSeparators !== "simple") absoluteLineTop += hunkSeparatorHeight + fileGap;
+				if (collapsedAfter > 0 && hunkSeparators !== "simple") absoluteLineTop += hunkSeparatorHeight + separatorGap;
 				return false;
 			}
 		});