reslop 0.2.4 → 0.2.6

package/lib/render/commits.js

@@ -2,16 +2,16 @@
 
 const ansi = require('../ansi.js');
 const files = require('../files.js');
-const primitives = require('./primitives.js');
 const wrap = require('../wrap.js');
+const primitives = require('./primitives.js');
+
 const { shortAge } = files;
-const { wrapMultiline, cursorInWrap } = wrap;
+const { wrapMultiline, wrapDoc, cursorInWrap } = wrap;
+const { THEME, paint, visibleWidth, trimVisible, seq, EL } = ansi;
+const { MARK_W, markPrefix, padVisible } = primitives;
+const { editSpan, fieldWindow, paintBodyFill, listLine } = primitives;
+const { paintListWindow, paintCursorList } = primitives;
 const { measureColumns, padColumns, joinColumns, paintColumns } = primitives;
-const { padVisible } = primitives;
-
-const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
-const { FILE_MARK, paneResult, paintCursorList } = primitives;
-const { paintBodyFill, listWindowStart } = primitives;
 
 const COMMIT_COL_ALIGN = {
   sha: 'end',
@@ -21,6 +21,8 @@ const COMMIT_COL_ALIGN = {
   date: 'start',
 };
 
+const COUNT_ALIGN = { add: 'start', del: 'start' };
+
 const COMMIT_COL_FG = {
   sha: THEME.shaFg,
   refs: THEME.warnFg,
@@ -30,70 +32,53 @@ const COMMIT_COL_FG = {
 };
 
 const COMMIT_CURRENT_COL_FG = {
+  ...COMMIT_COL_FG,
   sha: THEME.shaDarkFg,
+  refs: THEME.shaDarkFg,
   date: THEME.headerFg,
 };
 
 const REFS_MAX = 28;
-const LIST_PAD = 1;
 const COMMIT_TAIL = 1;
-const lineCounts = (entry) => {
-  const added = entry.added ?? 0;
-  const removed = entry.removed ?? 0;
-  if (!added && !removed) return null;
-  return { added, removed };
-};
+const DIFF_LABEL = 'Diffs:';
+const DIFF_GAP = '  ';
+const COL_GAP = 2;
+const MIN_LEFT = 8;
+const FULL_INDENT = ' '.repeat(MARK_W);
+const NO_COUNT = { add: '', del: '' };
 
 const countLabel = (entry) => {
-  if (entry && entry.pending) {
+  if (entry.pending) {
     const stagedAdd = entry.stagedAdded ?? 0;
     const unstagedAdd = entry.unstagedAdded ?? 0;
     const stagedDel = entry.stagedRemoved ?? 0;
     const unstagedDel = entry.unstagedRemoved ?? 0;
     const any = stagedAdd || unstagedAdd || stagedDel || unstagedDel;
-    if (!any) return null;
+    if (!any) return NO_COUNT;
     return {
       add: `+${stagedAdd}/${unstagedAdd}`,
       del: `-${stagedDel}/${unstagedDel}`,
     };
   }
-  const counts = lineCounts(entry);
-  if (!counts) return null;
-  return { add: `+${counts.added}`, del: `-${counts.removed}` };
+  const added = entry.added ?? 0;
+  const removed = entry.removed ?? 0;
+  if (!added && !removed) return NO_COUNT;
+  return { add: `+${added}`, del: `-${removed}` };
 };
 
-const DIFF_LABEL = 'Diffs:';
-const DIFF_GAP = '  ';
-
-const entryCountWidth = (entry) => {
-  const label = countLabel(entry);
-  if (!label) return { add: 0, del: 0 };
-  return {
-    add: visibleWidth(label.add),
-    del: visibleWidth(label.del),
-  };
-};
+const countWidths = (entries) =>
+  measureColumns(entries, countLabel, COUNT_ALIGN);
 
-const listCountWidth = (commits) => {
-  let add = 0;
-  let del = 0;
-  for (const entry of commits) {
-    const width = entryCountWidth(entry);
-    add = Math.max(add, width.add);
-    del = Math.max(del, width.del);
-  }
-  return { add, del };
-};
+const refsText = (entry) => `${entry.refs ?? ''}`.trim();
 
 const commitRowFields = (entry) => {
-  const refs = `${entry.refs ?? ''}`.trim();
-  const label = countLabel(entry);
+  const { add, del } = countLabel(entry);
   return {
     sha: entry.shortSha ?? '',
-    refs: refs ? truncateVisible(refs, REFS_MAX) : '',
-    add: label ? label.add : '',
-    del: label ? label.del : '',
-    date: shortAge(entry.date ?? ''),
+    refs: trimVisible(refsText(entry), REFS_MAX),
+    add,
+    del,
+    date: shortAge(entry.date),
   };
 };
 
@@ -115,18 +100,11 @@ const commitText = (entry) => {
 const commitLine = (entry) => splitMessage(commitText(entry)).line;
 
 const viewedCommit = (entry, rev, revShort) => {
-  const want = `${rev ?? ''}`;
-  const short = `${revShort ?? ''}`;
-  if (entry && entry.pending) return !want && !short;
-  const sha = entry && entry.sha ? `${entry.sha}` : '';
-  const brief = entry && entry.shortSha ? `${entry.shortSha}` : '';
-  if (want && (sha === want || brief === want)) return true;
-  if (short && (sha === short || brief === short)) return true;
-  return false;
+  if (entry.pending) return !rev && !revShort;
+  const ids = [rev, revShort].filter(Boolean);
+  return ids.some((id) => entry.sha === id || entry.shortSha === id);
 };
 
-const FULL_INDENT = ' '.repeat(visibleWidth(` ${FILE_MARK} `));
-
 const commitTone = (selected, current) => {
   if (current) {
     return {
@@ -153,119 +131,79 @@ const commitTone = (selected, current) => {
 };
 
 const paintCommitRow = (entry, width, color, selected, cols, current) => {
-  const inner = contentWidth(width);
-  const mark = selected ? FILE_MARK : ' ';
-  const prefix = ` ${mark} `;
+  const prefix = markPrefix(selected);
   const parts = padColumns(commitRowFields(entry), cols, COMMIT_COL_ALIGN);
   const suffix = joinColumns(parts, cols);
-  const rest = Math.max(1, inner - visibleWidth(prefix + suffix));
-  const subject = truncateVisible(commitLine(entry), rest);
-  const pad = Math.max(0, rest - visibleWidth(subject));
-  const after = `${' '.repeat(pad)}`;
-  const left = `${prefix}${subject}${after}`;
+  const rest = Math.max(1, contentWidth(width) - visibleWidth(prefix + suffix));
+  const subject = trimVisible(commitLine(entry), rest);
+  const after = ' '.repeat(Math.max(0, rest - visibleWidth(subject)));
   const tail = ' '.repeat(COMMIT_TAIL);
+  if (!color) return `${prefix}${subject}${after}${suffix}${tail}`;
   const tone = commitTone(selected, current);
-  const tones = current
-    ? { ...COMMIT_COL_FG, ...COMMIT_CURRENT_COL_FG }
-    : COMMIT_COL_FG;
-  if (!color) return `${left}${suffix}${tail}`;
+  const tones = current ? COMMIT_CURRENT_COL_FG : COMMIT_COL_FG;
   let out = `${seq(tone.fgRgb, tone.bgRgb)}${EL}`;
   out += paint(prefix, tone.fgRgb, tone.bgRgb, color);
   out += paint(subject, tone.nameFg, tone.bgRgb, color);
   out += paint(after, tone.fgRgb, tone.bgRgb, color);
   out += paintColumns(parts, cols, tone.fgRgb, tone.bgRgb, color, tones);
-  out += paint(tail, tone.fgRgb, tone.bgRgb, color);
-  return out;
+  return out + paint(tail, tone.fgRgb, tone.bgRgb, color);
 };
 
-const paintCommitEdit = (compose, width, color, entry, cols) => {
+const paintCommitEdit = (compose, width, color, entry, cols, index) => {
   const text = splitMessage(compose.text).line;
-  if (entry && cols) {
-    const shown = { ...entry, body: text, subject: text };
-    const row = paintCommitRow(shown, width, color, true, cols);
-    const inner = contentWidth(width);
-    const prefix = ` ${FILE_MARK} `;
-    const parts = padColumns(commitRowFields(entry), cols, COMMIT_COL_ALIGN);
-    const suffix = joinColumns(parts, cols);
-    const rest = Math.max(1, inner - visibleWidth(prefix + suffix));
-    const clipped = truncateVisible(text, rest);
-    const prefixW = visibleWidth(prefix);
-    const col = Math.min(compose.cursor ?? 0, visibleWidth(clipped));
-    return {
-      row,
-      cursor: { x: prefixW + col + 1 },
-      at: 'replace',
-    };
-  }
-  const inner = contentWidth(width);
-  const prefix = ` ${FILE_MARK} `;
-  const prefixW = visibleWidth(prefix);
-  const rest = Math.max(1, inner - prefixW);
-  const clipped = truncateVisible(text, rest);
-  const pad = Math.max(0, rest - visibleWidth(clipped));
-  const gap = ' '.repeat(pad);
-  const tail = ' '.repeat(COMMIT_TAIL);
-  const fgRgb = THEME.chromeFg;
-  const bgRgb = THEME.buttonBg;
-  const nameFg = THEME.buttonHotFg;
-  let row = `${prefix}${clipped}${gap}${tail}`;
-  if (color) {
-    row = `${seq(fgRgb, bgRgb)}${EL}`;
-    row += paint(prefix, fgRgb, bgRgb, color);
-    row += paint(clipped, nameFg, bgRgb, color);
-    row += paint(gap, fgRgb, bgRgb, color);
-    row += paint(tail, fgRgb, bgRgb, color);
-  }
-  const col = Math.min(compose.cursor ?? 0, visibleWidth(clipped));
-  return { row, cursor: { x: prefixW + col + 1 }, at: 'start' };
+  const prefix = markPrefix(true);
+  const fields = commitRowFields(entry ?? {});
+  const suffix = joinColumns(padColumns(fields, cols, COMMIT_COL_ALIGN), cols);
+  const rest = Math.max(1, contentWidth(width) - visibleWidth(prefix + suffix));
+  const win = fieldWindow(text, compose.cursor, compose.scrollCol, rest);
+  const shown = { ...entry, body: win.text, subject: win.text };
+  const textX = MARK_W + 1;
+  const edit = editSpan(1, textX, textX + rest, 0, text);
+  return {
+    row: paintCommitRow(shown, width, color, true, cols),
+    cursor: { x: textX + win.col, scroll: win.scroll },
+    at: entry ? 'replace' : 'start',
+    index,
+    edits: [{ ...edit, scroll: win.scroll }],
+  };
 };
 
-const pendingAt = (commits) => {
-  for (let i = 0; i < commits.length; i++) {
-    if (commits[i] && commits[i].pending) return i;
+const editTarget = (compose, commits, cursor) => {
+  if (compose?.kind !== 'commit') return null;
+  const kind = compose.commitKind;
+  if (kind === 'amend' || kind === 'reword') return cursor;
+  if (kind === 'commit' || kind === 'fixup') {
+    return commits.findIndex((entry) => entry.pending);
   }
   return -1;
 };
 
-const editsCursor = (compose) =>
-  compose.commitKind === 'amend' || compose.commitKind === 'reword';
-
-const editsPending = (compose) =>
-  compose.commitKind === 'commit' || compose.commitKind === 'fixup';
-
-const commitEditRow = (compose, commits, cursor, width, color, cols) => {
-  if (!compose || compose.kind !== 'commit') return null;
-  let at = -1;
-  if (editsCursor(compose)) at = cursor;
-  if (editsPending(compose)) at = pendingAt(commits);
-  if (at >= 0) {
-    const entry = commits[at];
-    if (!entry) return null;
-    const painted = paintCommitEdit(compose, width, color, entry, cols);
-    painted.index = at;
-    return painted;
-  }
-  return paintCommitEdit(compose, width, color);
+const commitEditRow = (compose, commits, target, width, color, cols) => {
+  if (target === null) return null;
+  if (target < 0) return paintCommitEdit(compose, width, color, null, {}, -1);
+  const entry = commits[target];
+  if (!entry) return null;
+  return paintCommitEdit(compose, width, color, entry, cols, target);
 };
 
-const paintPieces = (pieces, width, color, selected, current) => {
-  const tone = commitTone(selected, current);
-  const inner = contentWidth(width);
+const fitPieces = (pieces, width) => {
   const shown = [];
   let used = 0;
   for (const piece of pieces) {
-    const room = inner - used;
-    if (room <= 0) break;
-    const text = truncateVisible(piece.text, room);
+    if (used >= width) break;
+    const text = trimVisible(piece.text, width - used);
     if (!text) continue;
     shown.push({ text, fg: piece.fg });
     used += visibleWidth(text);
   }
-  const pad = ' '.repeat(Math.max(0, inner - used));
+  return { shown, pad: ' '.repeat(Math.max(0, width - used)) };
+};
+
+const paintPieces = (pieces, width, color, tone) => {
+  const { shown, pad } = fitPieces(pieces, contentWidth(width));
   const tail = ' '.repeat(COMMIT_TAIL);
   if (!color) {
-    let plain = '';
-    for (const piece of shown) plain += piece.text;
+    const plain = shown.map((piece) => piece.text).join('');
     return `${plain}${pad}${tail}`;
   }
   let out = `${seq(tone.fgRgb, tone.bgRgb)}${EL}`;
@@ -273,41 +211,25 @@ const paintPieces = (pieces, width, color, selected, current) => {
     out += paint(piece.text, piece.fg, tone.bgRgb, color);
   }
   out += paint(pad, tone.fgRgb, tone.bgRgb, color);
-  out += paint(tail, tone.fgRgb, tone.bgRgb, color);
-  return out;
+  return out + paint(tail, tone.fgRgb, tone.bgRgb, color);
 };
 
-const COL_GAP = 2;
-const MIN_LEFT = 8;
+const messageText = (entry) =>
+  `${entry.body ?? ''}`.trimEnd() || `${entry.subject ?? ''}`.trimEnd();
 
-const messageText = (entry) => {
-  const body = `${entry.body ?? ''}`.replace(/\s+$/, '');
-  if (body) return body;
-  return `${entry.subject ?? ''}`.replace(/\s+$/, '');
-};
-
-const wrapKind = (text, width, kind) => {
-  const rows = wrapMultiline(text, Math.max(1, width));
-  const lines = [];
-  for (const row of rows) lines.push({ text: row, kind });
-  return lines;
-};
-
-const messagePartsFrom = (text, width) => {
-  const raw = `${text ?? ''}`;
-  if (!raw) return [{ text: '', kind: 'text' }];
-  const split = raw.split('\n');
-  const lines = wrapKind(split[0], width, 'text');
-  for (let i = 1; i < split.length; i++) {
-    const rest = wrapKind(split[i], width, 'body');
-    for (const line of rest) lines.push(line);
+const messageParts = (text, width) => {
+  if (!text) return [{ text: '', kind: 'text' }];
+  const parts = [];
+  const lines = text.split('\n');
+  for (let i = 0; i < lines.length; i++) {
+    const kind = i ? 'body' : 'text';
+    for (const row of wrapMultiline(lines[i], Math.max(1, width))) {
+      parts.push({ text: row, kind });
+    }
   }
-  return lines;
+  return parts;
 };
 
-const messageParts = (entry, width) =>
-  messagePartsFrom(messageText(entry), width);
-
 const authorParts = (entry) => {
   const name = `${entry.author ?? ''}`.trim();
   const email = `${entry.email ?? ''}`.trim();
@@ -322,24 +244,23 @@ const authorParts = (entry) => {
   return [];
 };
 
-const partsWidth = (parts) => {
-  let width = 0;
-  for (const part of parts) width += visibleWidth(part.text);
-  return width;
-};
+const partsWidth = (parts) =>
+  parts.reduce((width, part) => width + visibleWidth(part.text), 0);
+
+const timeFields = (entry) => ({
+  when: `${entry.when ?? ''}`.trim(),
+  ago: shortAge(entry.date),
+});
 
 const timeNeed = (entry) => {
-  const when = `${entry.when ?? ''}`.trim();
-  const ago = shortAge(entry.date ?? '');
+  const { when, ago } = timeFields(entry);
   if (when && ago) return visibleWidth(when) + COL_GAP + visibleWidth(ago);
   return visibleWidth(when || ago);
 };
 
-const refsText = (entry) => `${entry.refs ?? ''}`.trim();
-
 const diffLine = (entry, widths) => {
   const label = countLabel(entry);
-  if (!label) return null;
+  if (!label.add) return null;
   const add = padVisible(label.add, widths.add, 'start');
   const del = padVisible(label.del, widths.del, 'start');
   const text = `${DIFF_LABEL}${DIFF_GAP}${add}${DIFF_GAP}${del}`;
@@ -360,7 +281,7 @@ const diffCountParts = (entry, widths, rightW) => {
   ];
 };
 
-const rightNeed = (entry, widths = entryCountWidth(entry)) => {
+const rightNeed = (entry, widths) => {
   const line = diffLine(entry, widths);
   return Math.max(
     partsWidth(authorParts(entry)),
@@ -373,11 +294,11 @@ const rightNeed = (entry, widths = entryCountWidth(entry)) => {
 const spreadTime = (when, ago, width) => {
   const agoW = visibleWidth(ago);
   if (agoW >= width) {
-    return [{ text: truncateVisible(ago, width), kind: 'meta' }];
+    return [{ text: trimVisible(ago, width), kind: 'meta' }];
   }
   const room = width - agoW;
   const minGap = Math.min(COL_GAP, room);
-  const left = truncateVisible(when, room - minGap);
+  const left = trimVisible(when, room - minGap);
   const gap = width - visibleWidth(left) - agoW;
   return [
     { text: left, kind: 'meta' },
@@ -387,7 +308,7 @@ const spreadTime = (when, ago, width) => {
 };
 
 const alignEnd = (text, width, kind) => {
-  const shown = truncateVisible(text, width);
+  const shown = trimVisible(text, width);
   const pad = Math.max(0, width - visibleWidth(shown));
   return [
     { text: ' '.repeat(pad), kind },
@@ -396,12 +317,11 @@ const alignEnd = (text, width, kind) => {
 };
 
 const timeParts = (entry, width) => {
-  const when = `${entry.when ?? ''}`.trim();
-  const ago = shortAge(entry.date ?? '');
   if (!width) return [];
+  const { when, ago } = timeFields(entry);
   if (when && ago) return spreadTime(when, ago, width);
   if (ago) return alignEnd(ago, width, 'meta');
-  if (when) return [{ text: truncateVisible(when, width), kind: 'meta' }];
+  if (when) return [{ text: trimVisible(when, width), kind: 'meta' }];
   return [];
 };
 
@@ -419,23 +339,17 @@ const rightRows = (entry, rightW, widths) => {
 };
 
 const panelWidths = (need, leftNeed, inner) => {
-  const indent = visibleWidth(FULL_INDENT);
-  let rightW = need;
-  const room = Math.max(1, inner - indent);
-  if (!rightW || room <= MIN_LEFT) {
-    return { rightW: 0, leftW: room, gapW: 0 };
-  }
+  const room = Math.max(1, inner - MARK_W);
+  if (!need || room <= MIN_LEFT) return { rightW: 0, leftW: room, gapW: 0 };
   const reserve = Math.max(MIN_LEFT, leftNeed);
   const minLeft = Math.min(reserve, room - COL_GAP - 1);
   const maxRight = room - COL_GAP - minLeft;
-  if (rightW > maxRight) rightW = Math.max(1, maxRight);
+  const rightW = need > maxRight ? Math.max(1, maxRight) : need;
   return { rightW, leftW: room - COL_GAP - rightW, gapW: COL_GAP };
 };
 
 const panelLeft = (entry, leftW, edit) => {
-  const parts = edit
-    ? messagePartsFrom(edit.text ?? '', leftW)
-    : messageParts(entry, leftW);
+  const parts = messageParts(edit ? edit.text : messageText(entry), leftW);
   if (!entry.sha) return parts;
   return [{ text: entry.sha, kind: 'hash' }, ...parts];
 };
@@ -443,31 +357,18 @@ const panelLeft = (entry, leftW, edit) => {
 const commitMessageWidth = (entry, screenWidth) => {
   const width = Math.max(20, screenWidth || 80);
   const inner = contentWidth(width);
-  const indent = visibleWidth(FULL_INDENT);
-  if (!entry) return Math.max(1, inner - indent);
-  const hashW = visibleWidth(entry.sha ?? '');
-  const cols = panelWidths(rightNeed(entry), hashW, inner);
+  if (!entry) return Math.max(1, inner - MARK_W);
+  const need = rightNeed(entry, countWidths([entry]));
+  const cols = panelWidths(need, visibleWidth(entry.sha ?? ''), inner);
   return Math.max(1, cols.leftW);
 };
 
-const prefixWidth = (first, selected) => {
-  const mark = first && selected ? FILE_MARK : ' ';
-  const prefix = first ? ` ${mark} ` : FULL_INDENT;
-  return visibleWidth(prefix);
-};
-
-const messageCaret = (text, cursor, width, row, first, selected) => {
-  const pos = cursorInWrap(`${text ?? ''}`, cursor ?? 0, width);
-  if (pos.row !== row) return null;
-  return { x: prefixWidth(first, selected) + pos.col + 1 };
-};
-
 const pieceFg = (kind, tone) => {
   if (kind === 'add') return THEME.addLineFg;
   if (kind === 'del') return THEME.delLineFg;
   if (tone.current) {
     if (kind === 'hash') return THEME.shaDarkFg;
-    if (kind === 'refs') return THEME.warnFg;
+    if (kind === 'refs') return THEME.shaDarkFg;
     if (kind === 'text' || kind === 'body') return THEME.mutedFg;
     return tone.fgRgb;
   }
@@ -480,324 +381,110 @@ const pieceFg = (kind, tone) => {
   return tone.fgRgb;
 };
 
-const clipParts = (parts, width, fallbackKind, tone) => {
-  const shown = [];
-  let used = 0;
-  for (const part of parts) {
-    const room = width - used;
-    if (room <= 0) break;
-    const text = truncateVisible(part.text ?? '', room);
-    if (!text) continue;
-    const kind = part.kind ?? fallbackKind;
-    shown.push({ text, fg: pieceFg(kind, tone) });
-    used += visibleWidth(text);
-  }
-  const pad = Math.max(0, width - used);
-  if (pad) shown.push({ text: ' '.repeat(pad), fg: tone.fgRgb });
+const clipParts = (parts, width, tone) => {
+  const pieces = parts.map((part) => ({
+    text: part.text,
+    fg: pieceFg(part.kind, tone),
+  }));
+  const { shown, pad } = fitPieces(pieces, width);
+  if (pad) shown.push({ text: pad, fg: tone.fgRgb });
   return shown;
 };
 
-const paintPanelLine = (spec) => {
+const paintPanelLine = (left, right, cols, first, spec) => {
   const tone = commitTone(spec.selected, spec.current);
-  const mark = spec.first && spec.selected ? FILE_MARK : ' ';
-  const prefix = spec.first ? ` ${mark} ` : FULL_INDENT;
-  const left = truncateVisible(spec.left, spec.leftW);
-  const leftPad = Math.max(0, spec.leftW - visibleWidth(left));
-  const gap = ' '.repeat(spec.gapW);
-  const right = Array.isArray(spec.right)
-    ? spec.right
-    : [{ text: spec.right ?? '', kind: spec.rightKind }];
-  return paintPieces(
-    [
-      { text: prefix, fg: tone.fgRgb },
-      { text: left, fg: pieceFg(spec.leftKind, tone) },
-      { text: `${' '.repeat(leftPad)}${gap}`, fg: tone.fgRgb },
-      ...clipParts(right, spec.rightW, spec.rightKind, tone),
-    ],
-    spec.width,
-    spec.color,
-    spec.selected,
-    spec.current,
-  );
+  const prefix = first ? markPrefix(spec.selected) : FULL_INDENT;
+  const text = trimVisible(left.text, cols.leftW);
+  const gapW = Math.max(0, cols.leftW - visibleWidth(text)) + cols.gapW;
+  const pieces = [
+    { text: prefix, fg: tone.fgRgb },
+    { text, fg: pieceFg(left.kind, tone) },
+    { text: ' '.repeat(gapW), fg: tone.fgRgb },
+    ...clipParts(right, cols.rightW, tone),
+  ];
+  return paintPieces(pieces, spec.width, spec.color, tone);
 };
 
-const lineRecord = (commit, row, hit, cursor = null) => ({
-  commit,
-  row,
-  hit,
-  cursor,
-});
-
-const commitLines = (
-  entry,
-  index,
-  width,
-  color,
-  selected,
-  edit,
-  current,
-  diffWidths,
-) => {
-  const inner = contentWidth(width);
+const commitLines = (entry, index, spec) => {
+  const { width, edit, diffWidths } = spec;
+  const need = rightNeed(entry, diffWidths);
   const hashW = visibleWidth(entry.sha ?? '');
-  const widths = diffWidths ?? entryCountWidth(entry);
-  const cols = panelWidths(rightNeed(entry, widths), hashW, inner);
-  const rights = rightRows(entry, cols.rightW, widths);
+  const cols = panelWidths(need, hashW, contentWidth(width));
+  const rights = rightRows(entry, cols.rightW, diffWidths);
   const left = panelLeft(entry, cols.leftW, edit);
+  const doc = edit ? wrapDoc(edit.text, cols.leftW) : [];
+  const caret = edit ? cursorInWrap(edit.text, edit.cursor, cols.leftW) : null;
+  const skip = entry.sha ? 1 : 0;
+  const textX = MARK_W + 1;
+  const x1 = textX + cols.leftW;
   const count = Math.max(left.length, rights.length);
   const lines = [];
   for (let row = 0; row < count; row++) {
     const line = left[row] ?? { text: '', kind: 'text' };
-    const painted = paintPanelLine({
-      left: line.text,
-      right: rights[row] ?? [],
-      leftW: cols.leftW,
-      rightW: cols.rightW,
-      gapW: cols.gapW,
-      width,
-      color,
-      selected,
-      current,
-      first: row === 0,
-      leftKind: line.kind,
-      rightKind: 'meta',
-    });
-    const messageRow = entry.sha ? row - 1 : row;
-    const caret = edit
-      ? messageCaret(
-          edit.text,
-          edit.cursor,
-          cols.leftW,
-          messageRow,
-          !entry.sha && row === 0,
-          selected,
-        )
-      : null;
-    lines.push(lineRecord(index, painted, true, caret));
-  }
-  return lines;
-};
-
-const draftLines = (text, cursor, width, color) => {
-  const inner = contentWidth(width);
-  const leftW = Math.max(1, inner - visibleWidth(FULL_INDENT));
-  const parts = messagePartsFrom(text, leftW);
-  const lines = [];
-  for (let row = 0; row < parts.length; row++) {
-    const line = parts[row];
-    const painted = paintPanelLine({
-      left: line.text,
-      right: '',
-      leftW,
-      rightW: 0,
-      gapW: 0,
-      width,
-      color,
-      selected: true,
-      first: row === 0,
-      leftKind: line.kind,
-      rightKind: 'meta',
-    });
-    const caret = messageCaret(text, cursor, leftW, row, row === 0, true);
-    lines.push(lineRecord(-1, painted, false, caret));
+    const right = rights[row] ?? [];
+    const painted = paintPanelLine(line, right, cols, row === 0, spec);
+    const messageRow = row - skip;
+    const atCaret = caret && caret.row === messageRow;
+    const cursor = atCaret ? { x: textX + caret.col } : null;
+    const piece = doc[messageRow];
+    const edits = piece
+      ? [editSpan(1, textX, x1, piece.start, piece.text)]
+      : [];
+    lines.push(listLine(painted, index, cursor, edits));
   }
   return lines;
 };
 
-const composeEditsIndex = (compose, commits, index, cursor) => {
-  if (!compose || compose.kind !== 'commit') return false;
-  if (editsCursor(compose)) return index === cursor;
-  if (!editsPending(compose)) return false;
-  const at = pendingAt(commits);
-  return at >= 0 && index === at;
-};
-
-const composeShowsDraft = (compose, commits) => {
-  if (!compose || compose.kind !== 'commit') return false;
-  if (editsCursor(compose)) return false;
-  if (editsPending(compose)) return pendingAt(commits) < 0;
-  return true;
-};
-
-const gapLine = (width, color) =>
-  lineRecord(-1, paintBodyFill(width, color, 'files'), false);
-
-const flattenCommits = (commits, cursor, width, color, compose, rev, short) => {
+const flattenCommits = (view, commits, target, width, color) => {
+  const cursor = view.commitCursor ?? 0;
+  const { compose } = view;
+  const edit = { text: compose?.text ?? '', cursor: compose?.cursor ?? 0 };
+  const spec = { width, color, diffWidths: countWidths(commits) };
   const lines = [];
-  const diffWidths = listCountWidth(commits);
-  const editing = compose && compose.kind === 'commit';
-  const pushGap = () => {
-    if (lines.length) lines.push(gapLine(width, color));
-  };
-  if (composeShowsDraft(compose, commits)) {
-    const draft = draftLines(
-      compose.text ?? '',
-      compose.cursor ?? 0,
-      width,
-      color,
-    );
-    for (const line of draft) lines.push(line);
+  if (target === -1) {
+    lines.push(...commitLines({}, -1, { ...spec, selected: true, edit }));
   }
+  const gap = listLine(paintBodyFill(width, color, 'files'), -1);
   for (let index = 0; index < commits.length; index++) {
-    pushGap();
-    const inplace = composeEditsIndex(compose, commits, index, cursor);
-    const selected = inplace || (!editing && index === cursor);
-    const edit = inplace
-      ? { text: compose.text ?? '', cursor: compose.cursor ?? 0 }
-      : null;
-    const block = commitLines(
-      commits[index],
-      index,
-      width,
-      color,
-      selected,
-      edit,
-      viewedCommit(commits[index], rev, short),
-      diffWidths,
-    );
-    for (const line of block) lines.push(line);
+    if (lines.length) lines.push(gap);
+    const entry = commits[index];
+    const inplace = index === target;
+    const selected = inplace || (target === null && index === cursor);
+    const current = viewedCommit(entry, view.rev, view.revShort);
+    const entryEdit = inplace ? edit : null;
+    const entrySpec = { ...spec, selected, current, edit: entryEdit };
+    lines.push(...commitLines(entry, index, entrySpec));
   }
   return lines;
 };
 
-const focusLine = (lines, cursor, compose) => {
-  if (compose && compose.kind === 'commit') {
-    for (let i = 0; i < lines.length; i++) {
-      if (lines[i].cursor) return i;
-    }
-  }
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (line.hit && line.commit === cursor) return i;
+const focusLine = (lines, cursor, editing) => {
+  if (editing) {
+    const at = lines.findIndex((line) => line.cursor);
+    if (at >= 0) return at;
   }
-  return 0;
-};
-
-const paintLineWindow = (
-  lines,
-  focus,
-  width,
-  color,
-  bodyH,
-  headerLines,
-  offset,
-) => {
-  const pad = bodyH >= LIST_PAD * 2 + 1 ? LIST_PAD : 0;
-  const listH = bodyH - pad * 2;
-  const start = listWindowStart(focus, offset, listH, lines.length);
-  const blank = paintBodyFill(width, color, 'files');
-  const body = [];
-  const fileHits = [];
-  let textCursor = null;
-  if (pad) body.push(blank);
-  for (let i = 0; i < listH; i++) {
-    const line = lines[start + i];
-    if (!line) break;
-    body.push(line.row);
-    if (line.cursor) {
-      textCursor = { x: line.cursor.x, row: body.length - 1 };
-    }
-    if (!line.hit) continue;
-    const y = headerLines + pad + i + 1;
-    fileHits.push({ y, cursor: line.commit });
-  }
-  if (pad) body.push(blank);
-  return paneResult({
-    body,
-    fileHits,
-    cursor: textCursor,
-    listScroll: start,
-  });
+  const at = lines.findIndex((line) => line.hit && line.index === cursor);
+  return Math.max(0, at);
 };
 
-const paintFullCommits = (view, width, color, bodyH, headerLines) => {
+const paintBodyCommits = (view, width, color, bodyH, headerLines) => {
+  const pane = { width, color, bodyH, headerLines, offset: view.listScroll };
   const commits = view.commits ?? [];
   const cursor = view.commitCursor ?? 0;
-  const compose = view.compose ?? null;
-  const lines = flattenCommits(
-    commits,
-    cursor,
-    width,
-    color,
-    compose,
-    view.rev,
-    view.revShort,
-  );
-  const focus = focusLine(lines, cursor, compose);
-  return paintLineWindow(
-    lines,
-    focus,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    view.listScroll,
-  );
-};
-
-const paintBriefCommits = (
-  commits,
-  cursor,
-  width,
-  color,
-  bodyH,
-  headerLines,
-  extra,
-  offset,
-  cols,
-  rev,
-  revShort,
-) => {
-  const paintRow = (entry, rowWidth, rowColor, selected) =>
-    paintCommitRow(
-      entry,
-      rowWidth,
-      rowColor,
-      selected,
-      cols,
-      viewedCommit(entry, rev, revShort),
-    );
-  return paintCursorList(
-    commits,
-    cursor,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    paintRow,
-    extra,
-    offset,
-  );
-};
-
-const paintBodyCommits = (view, width, color, bodyH, headerLines) => {
+  const { compose } = view;
+  const target = editTarget(compose, commits, cursor);
   if (view.commitView === 'full') {
-    return paintFullCommits(view, width, color, bodyH, headerLines);
+    const lines = flattenCommits(view, commits, target, width, color);
+    const focus = focusLine(lines, cursor, target !== null);
+    return paintListWindow(lines.length, focus, pane, (i) => lines[i]);
   }
-  const commits = view.commits ?? [];
   const cols = measureColumns(commits, commitRowFields, COMMIT_COL_ALIGN);
-  const cursor = view.commitCursor ?? 0;
-  const extra = commitEditRow(
-    view.compose,
-    commits,
-    cursor,
-    width,
-    color,
-    cols,
-  );
-  return paintBriefCommits(
-    commits,
-    cursor,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    extra,
-    view.listScroll,
-    cols,
-    view.rev,
-    view.revShort,
-  );
+  const edit = commitEditRow(compose, commits, target, width, color, cols);
+  const paintRow = (entry, selected) => {
+    const current = viewedCommit(entry, view.rev, view.revShort);
+    return paintCommitRow(entry, width, color, selected, cols, current);
+  };
+  return paintCursorList(commits, cursor, pane, paintRow, edit);
 };
 
 module.exports = {