@adecore/editor-react 0.47.0 → 0.48.0

package/dist/DiffView.d.ts

@@ -1,6 +1,6 @@
 import { type Ref } from 'react';
 import type { Editor, EditorEngine, EditorTheme } from '@adecore/editor';
-import { type DiffDocument } from '@adecore/merge';
+import { type DiffDocument, type DiffSourceLine } from '@adecore/merge';
 import { type DiffSourceTokens } from './diff-syntax.ts';
 import { type DiffLimits } from './diff-expansion.ts';
 export interface DiffViewProps {
@@ -18,5 +18,11 @@ export interface DiffViewProps {
     className?: string;
     ref?: Ref<HTMLDivElement>;
     onMount?(editor: Editor, side?: 'old' | 'new'): void | (() => void);
+    onSource?(source: DiffSource): void | (() => void);
+}
+export interface DiffSource {
+    readonly editor: Editor;
+    readonly side?: 'old' | 'new';
+    at(): DiffSourceLine | null;
 }
 export declare function DiffView(props: DiffViewProps): import("react").JSX.Element;

package/dist/DiffView.js

@@ -2,7 +2,7 @@ import { c as _c } from "react/compiler-runtime";
 import { useLayoutEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { parseChord } from '@adecore/editor/keymap';
-import { diffDisplay, diffSplit } from '@adecore/merge';
+import { diffDisplay, diffSplit, sourceLineOf } from '@adecore/merge';
 import { wordMarks } from './diff-wordmarks.js';
 import { DiffOverlays } from "./diff-overlays.js";
 import { SplitDiffView } from "./SplitDiffView.js";
@@ -11,7 +11,7 @@ import { LineActionHost, RowHost } from './row-host.js';
 import { DEFAULT_UNFOLD_LIMITS, expandDiff } from './diff-expansion.js';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function UnifiedDiffView(t0) {
-  const $ = _c(69);
+  const $ = _c(76);
   const {
     engine,
     document,
@@ -26,7 +26,8 @@ function UnifiedDiffView(t0) {
     label,
     className,
     ref,
-    onMount
+    onMount,
+    onSource
   } = t0;
   const wrap = t1 === undefined ? true : t1;
   const fill = t2 === undefined ? false : t2;
@@ -44,8 +45,9 @@ function UnifiedDiffView(t0) {
   const emphasis = t3;
   const element = useRef(null);
   let t4;
-  if ($[2] !== display || $[3] !== label || $[4] !== theme || $[5] !== tokens || $[6] !== wrap) {
+  if ($[2] !== display || $[3] !== document || $[4] !== label || $[5] !== theme || $[6] !== tokens || $[7] !== wrap) {
     t4 = {
+      document,
       display,
       tokens,
       theme,
@@ -53,36 +55,38 @@ function UnifiedDiffView(t0) {
       label
     };
     $[2] = display;
-    $[3] = label;
-    $[4] = theme;
-    $[5] = tokens;
-    $[6] = wrap;
-    $[7] = t4;
+    $[3] = document;
+    $[4] = label;
+    $[5] = theme;
+    $[6] = tokens;
+    $[7] = wrap;
+    $[8] = t4;
   } else {
-    t4 = $[7];
+    t4 = $[8];
   }
   const current = useRef(t4);
   let t5;
-  if ($[8] !== label || $[9] !== theme || $[10] !== wrap) {
+  if ($[9] !== label || $[10] !== theme || $[11] !== wrap) {
     t5 = {
       theme,
       wrap,
       label
     };
-    $[8] = label;
-    $[9] = theme;
-    $[10] = wrap;
-    $[11] = t5;
+    $[9] = label;
+    $[10] = theme;
+    $[11] = wrap;
+    $[12] = t5;
   } else {
-    t5 = $[11];
+    t5 = $[12];
   }
   const applied = useRef(t5);
   const [mounted, setMounted] = useState(null);
   const [height, setHeight] = useState(0);
   let t6;
-  if ($[12] !== display || $[13] !== label || $[14] !== theme || $[15] !== tokens || $[16] !== wrap) {
+  if ($[13] !== display || $[14] !== document || $[15] !== label || $[16] !== theme || $[17] !== tokens || $[18] !== wrap) {
     t6 = () => {
       current.current = {
+        document,
         display,
         tokens,
         theme,
@@ -90,19 +94,20 @@ function UnifiedDiffView(t0) {
         label
       };
     };
-    $[12] = display;
-    $[13] = label;
-    $[14] = theme;
-    $[15] = tokens;
-    $[16] = wrap;
-    $[17] = t6;
+    $[13] = display;
+    $[14] = document;
+    $[15] = label;
+    $[16] = theme;
+    $[17] = tokens;
+    $[18] = wrap;
+    $[19] = t6;
   } else {
-    t6 = $[17];
+    t6 = $[19];
   }
   useLayoutEffect(t6);
   let t7;
   let t8;
-  if ($[18] !== engine) {
+  if ($[20] !== engine) {
     t7 = () => {
       const host = element.current;
       if (host === null) {
@@ -149,17 +154,17 @@ function UnifiedDiffView(t0) {
       };
     };
     t8 = [engine];
-    $[18] = engine;
-    $[19] = t7;
-    $[20] = t8;
+    $[20] = engine;
+    $[21] = t7;
+    $[22] = t8;
   } else {
-    t7 = $[19];
-    t8 = $[20];
+    t7 = $[21];
+    t8 = $[22];
   }
   useLayoutEffect(t7, t8);
   let t10;
   let t9;
-  if ($[21] !== display || $[22] !== emphasis || $[23] !== engine || $[24] !== mounted) {
+  if ($[23] !== display || $[24] !== emphasis || $[25] !== engine || $[26] !== mounted) {
     t9 = () => {
       if (mounted === null || mounted.engine !== engine) {
         return;
@@ -205,20 +210,20 @@ function UnifiedDiffView(t0) {
       actions.set(display.rows.flatMap(_temp2));
     };
     t10 = [mounted, engine, display, emphasis];
-    $[21] = display;
-    $[22] = emphasis;
-    $[23] = engine;
-    $[24] = mounted;
-    $[25] = t10;
-    $[26] = t9;
+    $[23] = display;
+    $[24] = emphasis;
+    $[25] = engine;
+    $[26] = mounted;
+    $[27] = t10;
+    $[28] = t9;
   } else {
-    t10 = $[25];
-    t9 = $[26];
+    t10 = $[27];
+    t9 = $[28];
   }
   useLayoutEffect(t9, t10);
   let t11;
   let t12;
-  if ($[27] !== display || $[28] !== engine || $[29] !== mounted || $[30] !== t) {
+  if ($[29] !== display || $[30] !== engine || $[31] !== mounted || $[32] !== t) {
     t11 = () => {
       if (mounted === null || mounted.engine !== engine) {
         return;
@@ -242,20 +247,20 @@ function UnifiedDiffView(t0) {
       });
     };
     t12 = [mounted, engine, display, t];
-    $[27] = display;
-    $[28] = engine;
-    $[29] = mounted;
-    $[30] = t;
-    $[31] = t11;
-    $[32] = t12;
+    $[29] = display;
+    $[30] = engine;
+    $[31] = mounted;
+    $[32] = t;
+    $[33] = t11;
+    $[34] = t12;
   } else {
-    t11 = $[31];
-    t12 = $[32];
+    t11 = $[33];
+    t12 = $[34];
   }
   useLayoutEffect(t11, t12);
   let t13;
   let t14;
-  if ($[33] !== engine || $[34] !== label || $[35] !== mounted || $[36] !== theme || $[37] !== wrap) {
+  if ($[35] !== engine || $[36] !== label || $[37] !== mounted || $[38] !== theme || $[39] !== wrap) {
     t13 = () => {
       if (mounted === null || mounted.engine !== engine) {
         return;
@@ -277,20 +282,20 @@ function UnifiedDiffView(t0) {
       };
     };
     t14 = [mounted, engine, theme, wrap, label];
-    $[33] = engine;
-    $[34] = label;
-    $[35] = mounted;
-    $[36] = theme;
-    $[37] = wrap;
-    $[38] = t13;
-    $[39] = t14;
+    $[35] = engine;
+    $[36] = label;
+    $[37] = mounted;
+    $[38] = theme;
+    $[39] = wrap;
+    $[40] = t13;
+    $[41] = t14;
   } else {
-    t13 = $[38];
-    t14 = $[39];
+    t13 = $[40];
+    t14 = $[41];
   }
   useLayoutEffect(t13, t14);
   let t15;
-  if ($[40] !== engine || $[41] !== mounted || $[42] !== tokens) {
+  if ($[42] !== engine || $[43] !== mounted || $[44] !== tokens) {
     t15 = () => {
       if (mounted === null || mounted.engine !== engine) {
         return;
@@ -304,109 +309,138 @@ function UnifiedDiffView(t0) {
       refresh();
       return repaintOnTokens(element.current?.ownerDocument.defaultView, tokens, refresh);
     };
-    $[40] = engine;
-    $[41] = mounted;
-    $[42] = tokens;
-    $[43] = t15;
+    $[42] = engine;
+    $[43] = mounted;
+    $[44] = tokens;
+    $[45] = t15;
   } else {
-    t15 = $[43];
+    t15 = $[45];
   }
   let t16;
-  if ($[44] !== display || $[45] !== engine || $[46] !== mounted || $[47] !== tokens) {
+  if ($[46] !== display || $[47] !== engine || $[48] !== mounted || $[49] !== tokens) {
     t16 = [mounted, engine, tokens, display];
-    $[44] = display;
-    $[45] = engine;
-    $[46] = mounted;
-    $[47] = tokens;
-    $[48] = t16;
+    $[46] = display;
+    $[47] = engine;
+    $[48] = mounted;
+    $[49] = tokens;
+    $[50] = t16;
   } else {
-    t16 = $[48];
+    t16 = $[50];
   }
   useLayoutEffect(t15, t16);
   let t17;
   let t18;
-  if ($[49] !== engine || $[50] !== mounted || $[51] !== onMount) {
+  if ($[51] !== engine || $[52] !== mounted || $[53] !== onMount) {
     t17 = () => {
       if (mounted !== null && mounted.engine === engine) {
         return onMount?.(mounted.editor);
       }
     };
     t18 = [mounted, engine, onMount];
-    $[49] = engine;
-    $[50] = mounted;
-    $[51] = onMount;
-    $[52] = t17;
-    $[53] = t18;
+    $[51] = engine;
+    $[52] = mounted;
+    $[53] = onMount;
+    $[54] = t17;
+    $[55] = t18;
   } else {
-    t17 = $[52];
-    t18 = $[53];
+    t17 = $[54];
+    t18 = $[55];
   }
   useLayoutEffect(t17, t18);
+  let t19;
+  let t20;
+  if ($[56] !== engine || $[57] !== mounted || $[58] !== onSource) {
+    t19 = () => {
+      if (mounted === null || mounted.engine !== engine || onSource === undefined) {
+        return;
+      }
+      const {
+        editor: editor_1
+      } = mounted;
+      return onSource({
+        editor: editor_1,
+        at: () => {
+          const caret = editor_1.getCaret();
+          return sourceLineOf(current.current.display.rows, current.current.document.hunks, caret.line, caret.character, "new");
+        }
+      });
+    };
+    t20 = [mounted, engine, onSource];
+    $[56] = engine;
+    $[57] = mounted;
+    $[58] = onSource;
+    $[59] = t19;
+    $[60] = t20;
+  } else {
+    t19 = $[59];
+    t20 = $[60];
+  }
+  useLayoutEffect(t19, t20);
   const limit = maxHeight !== undefined && Number.isFinite(maxHeight) && maxHeight > 0 ? maxHeight : Infinity;
-  const t19 = `adecore-editor-diff ${className ?? ""}`;
-  const t20 = fill || height > limit;
-  const t21 = fill ? "100%" : Math.min(height, limit);
-  let t22;
-  if ($[54] !== t21) {
-    t22 = {
+  const t21 = `adecore-editor-diff ${className ?? ""}`;
+  const t22 = fill || height > limit;
+  const t23 = fill ? "100%" : Math.min(height, limit);
+  let t24;
+  if ($[61] !== t23) {
+    t24 = {
       position: "relative",
       minHeight: 0,
-      height: t21
+      height: t23
     };
-    $[54] = t21;
-    $[55] = t22;
+    $[61] = t23;
+    $[62] = t24;
   } else {
-    t22 = $[55];
+    t24 = $[62];
   }
-  let t23;
-  if ($[56] === Symbol.for("react.memo_cache_sentinel")) {
-    t23 = /*#__PURE__*/_jsx("div", {
+  let t25;
+  if ($[63] === Symbol.for("react.memo_cache_sentinel")) {
+    t25 = /*#__PURE__*/_jsx("div", {
       ref: element,
       style: {
         position: "absolute",
         inset: 0
       }
     });
-    $[56] = t23;
+    $[63] = t25;
   } else {
-    t23 = $[56];
+    t25 = $[63];
   }
-  let t24;
-  if ($[57] !== blocked || $[58] !== display || $[59] !== engine || $[60] !== mounted || $[61] !== unfold) {
-    t24 = mounted !== null && mounted.engine === engine && /*#__PURE__*/_jsx(DiffOverlays, {
+  let t26;
+  if ($[64] !== blocked || $[65] !== display || $[66] !== engine || $[67] !== mounted || $[68] !== unfold) {
+    t26 = mounted !== null && mounted.engine === engine && /*#__PURE__*/_jsx(DiffOverlays, {
       mounted: mounted,
       display: display,
       unfold: unfold,
       blocked: blocked
     });
-    $[57] = blocked;
-    $[58] = display;
-    $[59] = engine;
-    $[60] = mounted;
-    $[61] = unfold;
-    $[62] = t24;
+    $[64] = blocked;
+    $[65] = display;
+    $[66] = engine;
+    $[67] = mounted;
+    $[68] = unfold;
+    $[69] = t26;
   } else {
-    t24 = $[62];
+    t26 = $[69];
   }
-  let t25;
-  if ($[63] !== ref || $[64] !== t19 || $[65] !== t20 || $[66] !== t22 || $[67] !== t24) {
-    t25 = /*#__PURE__*/_jsxs("div", {
-      className: t19,
+  let t27;
+  if ($[70] !== ref || $[71] !== t21 || $[72] !== t22 || $[73] !== t24 || $[74] !== t26) {
+    t27 = /*#__PURE__*/_jsxs("div", {
+      className: t21,
       ref: ref,
-      "data-scroll": t20,
-      style: t22,
-      children: [t23, t24]
+      "data-scroll": t22,
+      style: t24,
+      children: [t25, t26]
     });
-    $[63] = ref;
-    $[64] = t19;
-    $[65] = t20;
-    $[66] = t22;
-    $[67] = t24;
-    $[68] = t25;
+    $[70] = ref;
+    $[71] = t21;
+    $[72] = t22;
+    $[73] = t24;
+    $[74] = t26;
+    $[75] = t27;
   } else {
-    t25 = $[68];
+    t27 = $[75];
   }
-  return t25;
+  return t27;
 }
 function _temp2(row_3, line_1) {
   return row_3.noNewline === undefined ? [] : [{

package/dist/SplitDiffView.d.ts

@@ -1,9 +1,9 @@
-import type { DiffSplit } from '@adecore/merge';
+import { type DiffSplit } from '@adecore/merge';
 import type { DiffViewProps } from './DiffView.tsx';
 interface SplitViewProps extends DiffViewProps {
     display: DiffSplit;
     unfold(id: number): void;
     blocked: ReadonlySet<number>;
 }
-export declare function SplitDiffView({ engine, document, display, unfold, blocked, theme, tokens, wrap, fill, maxHeight, label, className, ref, onMount }: SplitViewProps): import("react").JSX.Element;
+export declare function SplitDiffView({ engine, document, display, unfold, blocked, theme, tokens, wrap, fill, maxHeight, label, className, ref, onMount, onSource }: SplitViewProps): import("react").JSX.Element;
 export {};

package/dist/SplitDiffView.js

@@ -1,6 +1,7 @@
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { parseChord } from '@adecore/editor/keymap';
+import { sourceLineOf } from '@adecore/merge';
 import { repaintOnTokens } from './diff-syntax.js';
 import { DiffOverlays } from "./diff-overlays.js";
 import { wordMarks } from './diff-wordmarks.js';
@@ -23,7 +24,8 @@ export function SplitDiffView({
   label,
   className,
   ref,
-  onMount
+  onMount,
+  onSource
 }) {
   const {
     t
@@ -32,6 +34,7 @@ export function SplitDiffView({
   const oldElement = useRef(null);
   const newElement = useRef(null);
   const current = useRef({
+    document,
     display,
     tokens,
     theme,
@@ -48,6 +51,7 @@ export function SplitDiffView({
   const [height, setHeight] = useState(0);
   useLayoutEffect(() => {
     current.current = {
+      document,
       display,
       tokens,
       theme,
@@ -295,6 +299,31 @@ export function SplitDiffView({
       }
     };
   }, [mounted, engine, onMount]);
+  useLayoutEffect(() => {
+    if (mounted === null || mounted.old.engine !== engine || onSource === undefined) {
+      return;
+    }
+    // The old pane's rows lose their new side in the split, so it reads the rows as they were aligned.
+    const rowsOf = side_8 => side_8 === 'new' ? current.current.display.new.rows : current.current.display.aligned.flatMap(entry => entry.kind === 'line' && entry.old !== undefined ? [entry.row] : []);
+    const stops_1 = SIDES.map(side_9 => {
+      const {
+        editor: editor_1
+      } = mounted[side_9];
+      return onSource({
+        editor: editor_1,
+        side: side_9,
+        at: () => {
+          const caret = editor_1.getCaret();
+          return sourceLineOf(rowsOf(side_9), current.current.document.hunks, caret.line, caret.character, side_9);
+        }
+      });
+    });
+    return () => {
+      for (const stop_1 of stops_1) {
+        stop_1?.();
+      }
+    };
+  }, [mounted, engine, onSource]);
   const limit = maxHeight !== undefined && Number.isFinite(maxHeight) && maxHeight > 0 ? maxHeight : Infinity;
   if (failure !== null) {
     throw failure.error;
@@ -308,29 +337,29 @@ export function SplitDiffView({
     style: {
       height: fill ? '100%' : Math.min(height, limit)
     },
-    children: SIDES.map(side_8 => {
+    children: SIDES.map(side_10 => {
       const drive = () => {
-        mounted?.drive(side_8);
+        mounted?.drive(side_10);
       };
       return /*#__PURE__*/_jsxs("div", {
         className: "adecore-editor-diff-side",
-        "data-side": side_8,
+        "data-side": side_10,
         role: "group",
-        "aria-label": t(`diff.${side_8}Side`),
+        "aria-label": t(`diff.${side_10}Side`),
         onWheelCapture: drive,
         onFocusCapture: drive,
         onPointerDownCapture: drive,
         onKeyDownCapture: drive,
         children: [/*#__PURE__*/_jsx("div", {
-          ref: side_8 === 'old' ? oldElement : newElement,
+          ref: side_10 === 'old' ? oldElement : newElement,
           className: "adecore-editor-diff-surface"
-        }), mounted !== null && mounted[side_8].engine === engine && /*#__PURE__*/_jsx(DiffOverlays, {
-          mounted: mounted[side_8],
-          display: display[side_8],
+        }), mounted !== null && mounted[side_10].engine === engine && /*#__PURE__*/_jsx(DiffOverlays, {
+          mounted: mounted[side_10],
+          display: display[side_10],
           unfold: unfold,
           blocked: blocked
         })]
-      }, side_8);
+      }, side_10);
     })
   });
 }

package/dist/index.d.ts

@@ -53,7 +53,7 @@ export type { AttributionCardProps } from './AttributionCard.tsx';
 export { ReviewGroup, joinReviewGroup } from './review-group.ts';
 export type { ReviewMember } from './review-group.ts';
 export { DiffView } from './DiffView.tsx';
-export type { DiffViewProps } from './DiffView.tsx';
+export type { DiffSource, DiffViewProps } from './DiffView.tsx';
 export type { DiffLimits } from './diff-expansion.ts';
 export { diffSyntaxDocument } from './diff-syntax.ts';
 export type { DiffSourceSide, DiffSourceTokens, DiffSyntaxSources } from './diff-syntax.ts';

package/dist/shortcut-keys.d.ts

@@ -54,6 +54,7 @@ export declare function shortcutsOf(keymap: Keymap, apple: boolean): {
     inlineEdit: LanguageShortcut | null;
     insertLiveTemplate: LanguageShortcut | null;
     joinLines: LanguageShortcut | null;
+    jumpToSource: LanguageShortcut | null;
     lastEditLocation: LanguageShortcut | null;
     matchBrace: LanguageShortcut | null;
     methodDown: LanguageShortcut | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-react",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "type": "module",
   "description": "Language-enabled editors, feature coordination and React popups over injected language services.",
   "license": "FSL-1.1-MIT",
@@ -62,9 +62,9 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor": "0.47.0",
-    "@adecore/lsp": "0.47.0",
-    "@adecore/merge": "0.47.0",
+    "@adecore/editor": "0.48.0",
+    "@adecore/lsp": "0.48.0",
+    "@adecore/merge": "0.48.0",
     "emmet": "^2.4.11",
     "lucide-react": "^1.61.0",
     "react-markdown": "^10.1.0",
@@ -73,14 +73,14 @@
     "zustand": "^5.0.16"
   },
   "peerDependencies": {
-    "@adecore/ui": "^0.47.0",
+    "@adecore/ui": "^0.48.0",
     "i18next": "^26.4.2",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "react-i18next": "^17.0.15"
   },
   "devDependencies": {
-    "@adecore/ui": "0.47.0",
+    "@adecore/ui": "0.48.0",
     "@types/bun": "^1.4.4",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",

package/src/DiffView.tsx

@@ -2,7 +2,7 @@ import { useLayoutEffect, useRef, useState, type Ref } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { Editor, EditorEngine, EditorLineHighlight, EditorTheme } from '@adecore/editor';
 import { parseChord } from '@adecore/editor/keymap';
-import { diffDisplay, diffSplit, type DiffDocument, type DiffDisplay } from '@adecore/merge';
+import { diffDisplay, diffSplit, sourceLineOf, type DiffDocument, type DiffDisplay, type DiffSourceLine } from '@adecore/merge';
 import { wordMarks } from './diff-wordmarks.ts';
 import { DiffOverlays, type MountedDiff } from './diff-overlays.tsx';
 import { SplitDiffView } from './SplitDiffView.tsx';
@@ -29,6 +29,16 @@ export interface DiffViewProps {
     className?: string;
     ref?: Ref<HTMLDivElement>;
     onMount?(editor: Editor, side?: 'old' | 'new'): void | (() => void);
+    /* Runs per editor like `onMount`, with a way to ask where its caret stands in the new file, for a host that opens the file there. */
+    onSource?(source: DiffSource): void | (() => void);
+}
+
+export interface DiffSource {
+    readonly editor: Editor;
+    /* `old` or `new` in split, absent in unified. */
+    readonly side?: 'old' | 'new';
+    /* The line and column of the new file under the caret, or null where the new file has none. */
+    at(): DiffSourceLine | null;
 }
 
 interface UnifiedViewProps extends DiffViewProps {
@@ -51,18 +61,19 @@ function UnifiedDiffView({
     label,
     className,
     ref,
-    onMount
+    onMount,
+    onSource
 }: UnifiedViewProps) {
     const { t } = useTranslation('editor');
     const emphasis = wordMarks(document);
     const element = useRef<HTMLDivElement>(null);
-    const current = useRef({ display, tokens, theme, wrap, label });
+    const current = useRef({ document, display, tokens, theme, wrap, label });
     const applied = useRef({ theme, wrap, label });
     const [mounted, setMounted] = useState<MountedDiff | null>(null);
     const [height, setHeight] = useState(0);
 
     useLayoutEffect(() => {
-        current.current = { display, tokens, theme, wrap, label };
+        current.current = { document, display, tokens, theme, wrap, label };
     });
 
     useLayoutEffect(() => {
@@ -231,6 +242,23 @@ function UnifiedDiffView({
         }
     }, [mounted, engine, onMount]);
 
+    useLayoutEffect(() => {
+        if (mounted === null || mounted.engine !== engine || onSource === undefined) {
+            return;
+        }
+
+        const { editor } = mounted;
+
+        return onSource({
+            editor,
+            at: () => {
+                const caret = editor.getCaret();
+
+                return sourceLineOf(current.current.display.rows, current.current.document.hunks, caret.line, caret.character, 'new');
+            }
+        });
+    }, [mounted, engine, onSource]);
+
     const limit = maxHeight !== undefined && Number.isFinite(maxHeight) && maxHeight > 0 ? maxHeight : Infinity;
 
     return (

package/src/SplitDiffView.tsx

@@ -2,7 +2,7 @@ import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { parseChord } from '@adecore/editor/keymap';
 import type { EditorLineHighlight } from '@adecore/editor';
-import type { DiffSplit } from '@adecore/merge';
+import { sourceLineOf, type DiffLineRow, type DiffSplit } from '@adecore/merge';
 import type { DiffViewProps } from './DiffView.tsx';
 import { repaintOnTokens, type DiffSourceSide } from './diff-syntax.ts';
 import { DiffOverlays, type MountedDiff } from './diff-overlays.tsx';
@@ -41,20 +41,21 @@ export function SplitDiffView({
     label,
     className,
     ref,
-    onMount
+    onMount,
+    onSource
 }: SplitViewProps) {
     const { t } = useTranslation('editor');
     const emphasis = useMemo(() => wordMarks(document), [document]);
     const oldElement = useRef<HTMLDivElement>(null);
     const newElement = useRef<HTMLDivElement>(null);
-    const current = useRef({ display, tokens, theme, wrap, label });
+    const current = useRef({ document, display, tokens, theme, wrap, label });
     const applied = useRef({ theme, wrap, label });
     const [failure, setFailure] = useState<{ error: unknown } | null>(null);
     const [mounted, setMounted] = useState<MountedSplit | null>(null);
     const [height, setHeight] = useState(0);
 
     useLayoutEffect(() => {
-        current.current = { display, tokens, theme, wrap, label };
+        current.current = { document, display, tokens, theme, wrap, label };
     });
 
     useLayoutEffect(() => {
@@ -328,6 +329,38 @@ export function SplitDiffView({
         };
     }, [mounted, engine, onMount]);
 
+    useLayoutEffect(() => {
+        if (mounted === null || mounted.old.engine !== engine || onSource === undefined) {
+            return;
+        }
+
+        // The old pane's rows lose their new side in the split, so it reads the rows as they were aligned.
+        const rowsOf = (side: DiffSourceSide): readonly DiffLineRow[] =>
+            side === 'new'
+                ? current.current.display.new.rows
+                : current.current.display.aligned.flatMap((entry) => (entry.kind === 'line' && entry.old !== undefined ? [entry.row] : []));
+
+        const stops = SIDES.map((side) => {
+            const { editor } = mounted[side];
+
+            return onSource({
+                editor,
+                side,
+                at: () => {
+                    const caret = editor.getCaret();
+
+                    return sourceLineOf(rowsOf(side), current.current.document.hunks, caret.line, caret.character, side);
+                }
+            });
+        });
+
+        return () => {
+            for (const stop of stops) {
+                stop?.();
+            }
+        };
+    }, [mounted, engine, onSource]);
+
     const limit = maxHeight !== undefined && Number.isFinite(maxHeight) && maxHeight > 0 ? maxHeight : Infinity;
 
     if (failure !== null) {

package/src/index.ts

@@ -99,7 +99,7 @@ export type { AttributionCardProps } from './AttributionCard.tsx';
 export { ReviewGroup, joinReviewGroup } from './review-group.ts';
 export type { ReviewMember } from './review-group.ts';
 export { DiffView } from './DiffView.tsx';
-export type { DiffViewProps } from './DiffView.tsx';
+export type { DiffSource, DiffViewProps } from './DiffView.tsx';
 export type { DiffLimits } from './diff-expansion.ts';
 export { diffSyntaxDocument } from './diff-syntax.ts';
 export type { DiffSourceSide, DiffSourceTokens, DiffSyntaxSources } from './diff-syntax.ts';