reslop 0.1.1 → 0.1.3

package/lib/render.js

@@ -2,20 +2,19 @@
 
 const ansi = require('./ansi.js');
 const { displayLines } = require('./diff.js');
-const { tokenize, overlayTokens } = require('./highlight.js');
+const highlight = require('./highlight.js');
 const { detectLang } = require('./detect.js');
 const keys = require('./keys.js');
-const { ACTIONS, actionHot, actionLetter, buttonWord } = keys;
-const { FILES_DISABLED } = keys;
 const { overlayRows } = require('./select.js');
 const { itemPath } = require('./files.js');
-const { isDoneMark } = require('./review.js');
 const wrap = require('./wrap.js');
-const { wrapPlain, wrapDoc, wrapMultiline, cursorInWrap, wrapMove } = wrap;
 
-const { THEME, CODE_FG, codeFg, paint, visibleWidth, truncateVisible, fg } =
-  ansi;
-const { RESET, ESC, EL, seq } = ansi;
+const { tokenize, overlayTokens } = highlight;
+const { ACTIONS, ACTION_IDS, actionLetter, buttonWord } = keys;
+const { FILES_DISABLED } = keys;
+const { wrapPlain, wrapMultiline, cursorInWrap } = wrap;
+const { THEME, CODE_FG, codeFg, paint, visibleWidth } = ansi;
+const { truncateVisible, fg, RESET, ESC, EL, seq } = ansi;
 
 const STYLES = {
   del: {
@@ -32,6 +31,27 @@ const STYLES = {
     chBg: THEME.addCharBg,
     mark: '+',
   },
+  warn: {
+    baseFg: THEME.delLineFg,
+    baseBg: THEME.delLineBg,
+    chFg: THEME.delCharFg,
+    chBg: THEME.delCharBg,
+    mark: ' ',
+  },
+  note: {
+    baseFg: THEME.chromeFg,
+    baseBg: THEME.noteBg,
+    chFg: THEME.chromeFg,
+    chBg: THEME.noteBg,
+    mark: ' ',
+  },
+  noteSep: {
+    baseFg: THEME.mutedFg,
+    baseBg: THEME.chromeBg,
+    chFg: THEME.mutedFg,
+    chBg: THEME.chromeBg,
+    mark: ' ',
+  },
   ctx: {
     baseFg: THEME.ctxFg,
     baseBg: THEME.ctxBg,
@@ -56,6 +76,15 @@ const STAGED_STYLES = {
     chBg: THEME.stagedAddCharBg,
     mark: '+',
   },
+  warn: {
+    baseFg: THEME.stagedDelLineFg,
+    baseBg: THEME.stagedDelLineBg,
+    chFg: THEME.stagedDelCharFg,
+    chBg: THEME.stagedDelCharBg,
+    mark: ' ',
+  },
+  note: STYLES.note,
+  noteSep: STYLES.noteSep,
   ctx: STYLES.ctx,
 };
 
@@ -74,9 +103,18 @@ const FILE_STATUS_FG = {
   partial: THEME.warnFg,
 };
 
+const FILE_COL_KEYS = ['add', 'del', 'status', 'n', 'm'];
+
+const FILE_COL_ALIGN = {
+  add: 'start',
+  del: 'start',
+  status: 'start',
+  n: 'start',
+  m: 'end',
+};
+
 const INFO_STATUS = [
   'copied',
-  'skipped',
   'staged',
   'unstaged',
   'not staged',
@@ -85,7 +123,6 @@ const INFO_STATUS = [
   'read only',
   'last block',
   'first block',
-  'all skipped',
   'first file',
   'last file',
   'nothing to review',
@@ -107,10 +144,14 @@ const BUTTON_GAP = '  ';
 const LOGO = '👁️';
 const FILE_MARK = '▶';
 const FILE_LIST_PAD = 1;
+const CHECK_DONE = 'xX';
 const TODO_CAPTION = 'TODO:';
 const INPUT_MAX = 4;
 const NOTE_MAX = 4;
 const NOTE_PAD = 1;
+const SOFT_WRAP = ['warn', 'note'];
+const DEL_CHAR_BG = ansi.bg(THEME.delCharBg);
+const ADD_CHAR_BG = ansi.bg(THEME.addCharBg);
 
 const lineStyles = (origin) => (origin === 'staged' ? STAGED_STYLES : STYLES);
 
@@ -137,7 +178,32 @@ const paintSpans = (pieces, lineStyle, budget, color) => {
   return { text: out, used };
 };
 
+const paintAuditNote = (line, width, color) => {
+  const style = STYLES.note;
+  const gutterW = Math.min(GUTTER_W, Math.max(0, width));
+  const label = `${style.mark} `.slice(0, gutterW);
+  const gutter = paint(label, style.baseFg, style.baseBg, color);
+  const budget = Math.max(0, width - gutterW);
+  const text = truncateVisible(line.text ?? '', budget);
+  const used = visibleWidth(text);
+  let out = gutter;
+  if (text) out += paint(text, style.baseFg, style.baseBg, color);
+  if (used < budget) {
+    out += fill(budget - used, style.baseFg, style.baseBg, color);
+  }
+  return out;
+};
+
+const paintAuditRule = (width, color) => {
+  const style = STYLES.noteSep;
+  const n = Math.max(0, width);
+  const bar = '─'.repeat(n);
+  return paint(bar, style.baseFg, style.baseBg, color);
+};
+
 const paintDiffLine = (line, width, color, origin, lang) => {
+  if (line.type === 'noteSep') return paintAuditRule(width, color);
+  if (line.type === 'note') return paintAuditNote(line, width, color);
   const styles = lineStyles(origin);
   const style = styles[line.type] ?? styles.ctx;
   const diffSpans = line.spans ?? [{ text: line.text, changed: false }];
@@ -183,19 +249,14 @@ const paintSplitBlank = (width, color) => {
   );
 };
 
-const FILL_KIND = {
-  files: (width, color) => {
+const paintBodyFill = (width, color, kind) => {
+  if (kind === 'files') {
     const inner = Math.max(1, width - 1);
     const main = fill(inner, THEME.ctxFg, THEME.ctxBg, color);
     const edge = fill(1, THEME.ctxFg, THEME.ctxBg, color);
     return main + edge;
-  },
-  split: (width, color) => paintSplitBlank(width, color),
-};
-
-const paintBodyFill = (width, color, kind) => {
-  const paint = FILL_KIND[kind];
-  if (paint) return paint(width, color);
+  }
+  if (kind === 'split') return paintSplitBlank(width, color);
   return fill(width, THEME.ctxFg, THEME.ctxBg, color);
 };
 
@@ -215,22 +276,18 @@ const splitCheck = (text) => {
   if (!match) return null;
   const start = match.index;
   const token = match[0];
-  return {
-    before: text.slice(0, start),
-    mark: match[1],
-    token,
-    after: text.slice(start + token.length),
-  };
+  const before = text.slice(0, start);
+  const mark = match[1];
+  const after = text.slice(start + token.length);
+  return { before, mark, token, after };
 };
 
 const paintCheckBar = (text, width, fgRgb, bgRgb, color) => {
   const clipped = truncateVisible(text, width);
+  const parts = color ? splitCheck(clipped) : null;
+  if (!parts) return paintBar(text, width, fgRgb, bgRgb, color);
   const pad = Math.max(0, width - visibleWidth(clipped));
-  const filled = clipped + ' '.repeat(pad);
-  if (!color) return filled;
-  const parts = splitCheck(clipped);
-  if (!parts) return `${seq(fgRgb, bgRgb)}${EL}${filled}${RESET}`;
-  const done = isDoneMark(parts.mark);
+  const done = CHECK_DONE.includes(parts.mark);
   const chipFg = done ? THEME.checkDoneFg : THEME.checkFg;
   const chipBg = done ? THEME.checkDoneBg : THEME.checkBg;
   const after = `${parts.after}${' '.repeat(pad)}`;
@@ -241,10 +298,15 @@ const paintCheckBar = (text, width, fgRgb, bgRgb, color) => {
   return out;
 };
 
-const originLabel = (origin, revShort, sourceLabel) => {
-  if (origin === 'commit') return revShort || 'commit';
-  if (origin === 'pr') return sourceLabel || 'pr';
-  if (origin === 'todo') return 'todo';
+const ORIGIN_LABEL = {
+  commit: (view) => view.revShort || 'commit',
+  pr: (view) => view.sourceLabel || 'pr',
+  todo: () => 'todo',
+};
+
+const originLabel = (origin, view) => {
+  const named = ORIGIN_LABEL[origin];
+  if (named) return named(view);
   return origin ?? 'unknown';
 };
 
@@ -281,7 +343,7 @@ const headerTarget = (view) => {
   if (!view.item) return { path: '', origin: '', n: 0, total: view.total ?? 0 };
   return {
     path: itemPath(view.item),
-    origin: originLabel(view.item.origin, view.revShort, view.sourceLabel),
+    origin: originLabel(view.item.origin, view),
     n: view.index + 1,
     total: view.total,
   };
@@ -295,17 +357,20 @@ const headerPrefix = (view) => {
   return ` ${LOGO}  reslop: `;
 };
 
+const headerSuffix = ({ origin, n, total }) =>
+  origin ? ` ${origin} ${n}/${total}` : ` ${n}/${total}`;
+
 const headerText = (view) => {
   const prefix = headerPrefix(view);
-  const { path, origin, n, total } = headerTarget(view);
-  const suffix = origin ? ` ${origin} ${n}/${total}` : ` ${n}/${total}`;
-  return `${prefix}${path}${suffix}`;
+  const target = headerTarget(view);
+  return `${prefix}${target.path}${headerSuffix(target)}`;
 };
 
 const headerPieces = (view, width) => {
   const repo = view.repoName || '';
-  const { path, origin, n, total } = headerTarget(view);
-  const suffix = origin ? ` ${origin} ${n}/${total}` : ` ${n}/${total}`;
+  const target = headerTarget(view);
+  const path = target.path;
+  const suffix = headerSuffix(target);
   const right = ' ';
   const chrome = ` ${LOGO}  reslop: `;
   const prefixW = visibleWidth(headerPrefix(view));
@@ -336,7 +401,7 @@ const headerPieces = (view, width) => {
 const paintHeader = (view, width, color) => {
   const pieces = headerPieces(view, width);
   if (!color) {
-    return pieces.map((p) => p.text).join('');
+    return pieces.map((piece) => piece.text).join('');
   }
   const bgRgb = THEME.headerBg;
   let out = `${seq(THEME.headerChromeFg, bgRgb)}${EL}`;
@@ -355,7 +420,8 @@ const bodyLines = (item, layout) => {
     return [{ type: 'ctx', text, spans: [{ text, changed: false }] }];
   }
   if (!item.hunk) return [];
-  return displayLines(item.hunk, item.blockId, layout);
+  const radius = item.dep ? Number.MAX_SAFE_INTEGER : undefined;
+  return displayLines(item.hunk, item.blockId, layout, radius);
 };
 
 const sourceEmpty = (line) => !line || !(line.text ?? '').trim();
@@ -373,26 +439,6 @@ const dropLeadingEmpty = (lines, split) => {
   return i ? lines.slice(i) : lines;
 };
 
-const helpLines = () => {
-  const lines = [' keys and buttons', ''];
-  for (const action of ACTIONS) {
-    const keys = actionHot(action);
-    let label = action.label;
-    if (action.id === 'layout') {
-      label = 'Mode (unified / mixed / side)';
-    }
-    lines.push(` ${keys.padEnd(16)} ${label}`);
-  }
-  lines.push(' enter            open file / save note');
-  lines.push(' esc              files, then quit');
-  lines.push(' del, backspace   remove todo');
-  lines.push(' j, k, wheel      scroll / move');
-  lines.push(' drag              copy');
-  lines.push(' ctrl-z, ctrl-y   undo / redo');
-  lines.push(' ?, h              help');
-  return lines;
-};
-
 const BUTTON_MARK = {
   bgRgb: THEME.buttonBg,
   fgRgb: THEME.buttonFg,
@@ -429,15 +475,16 @@ const layoutButtons = (width, compact = false, disabled = []) => {
     const hits = [];
     const parts = [];
     let x = 0;
-    for (const action of ACTIONS) {
+    for (const id of ACTION_IDS) {
+      const action = { id, ...ACTIONS[id] };
       const letter = actionLetter(action);
       const word = buttonWord(action);
       const label = short ? letter : word;
       const piece = `${BUTTON_GAP}${label}`;
       const w = visibleWidth(piece);
       if (x + w > width && parts.length) break;
-      const isDisabled = disabled.includes(action.id);
-      if (!isDisabled) hits.push({ id: action.id, x0: x, x1: x + w });
+      const isDisabled = disabled.includes(id);
+      if (!isDisabled) hits.push({ id, x0: x, x1: x + w });
       parts.push({ action, piece, letter, label, disabled: isDisabled });
       x += w;
     }
@@ -445,7 +492,7 @@ const layoutButtons = (width, compact = false, disabled = []) => {
   };
   if (compact) return build(true);
   const words = build(false);
-  if (words.parts.length === ACTIONS.length) return words;
+  if (words.parts.length === ACTION_IDS.length) return words;
   return build(true);
 };
 
@@ -467,26 +514,38 @@ const paintButtons = (layout, width, color) => {
   return out;
 };
 
+const COUNTS_KIND = {
+  pr: ({ counts, notes, sourceLabel }) => {
+    const n = counts.pr ?? 0;
+    const label = sourceLabel || 'pr';
+    return ` pr ${label}  ${n}  ${notes}`;
+  },
+  commit: ({ counts, notes, revShort }) => {
+    const n = counts.commit ?? 0;
+    return ` commit ${revShort}  ${n}  ${notes}`;
+  },
+  worktree: ({ counts, notes }) => {
+    const staged = counts.staged ?? 0;
+    const unstaged = counts.unstaged ?? 0;
+    const untracked = counts.untracked ?? 0;
+    const gitCounts = `unstaged ${unstaged}  untracked ${untracked}`;
+    const git = `staged ${staged}  ${gitCounts}`;
+    return ` ${git}  ${notes}`;
+  },
+};
+
+const countsKind = (sourceKind, revShort) => {
+  if (sourceKind === 'pr') return 'pr';
+  if (revShort) return 'commit';
+  return 'worktree';
+};
+
 const countsLine = (counts, revShort, sourceKind, sourceLabel) => {
-  const skipped = counts.skipped ?? 0;
   const feedback = counts.feedback ?? 0;
   const todo = counts.todo ?? 0;
   const notes = `feedback ${feedback}  todo ${todo}`;
-  const extra = skipped ? `  skipped ${skipped}` : '';
-  if (sourceKind === 'pr') {
-    const n = counts.pr ?? 0;
-    const label = sourceLabel || 'pr';
-    return ` pr ${label}  ${n}  ${notes}${extra}`;
-  }
-  if (revShort) {
-    const n = counts.commit ?? 0;
-    return ` commit ${revShort}  ${n}  ${notes}${extra}`;
-  }
-  const staged = counts.staged ?? 0;
-  const unstaged = counts.unstaged ?? 0;
-  const untracked = counts.untracked ?? 0;
-  const git = `staged ${staged}  unstaged ${unstaged}  untracked ${untracked}`;
-  return ` ${git}  ${notes}${extra}`;
+  const kind = countsKind(sourceKind, revShort);
+  return COUNTS_KIND[kind]({ counts, notes, sourceLabel, revShort });
 };
 
 const paintQuitPrompt = (width, color) => {
@@ -526,23 +585,36 @@ const paintStatusLine = (view, status, width, color) => {
   );
 };
 
+const signedCount = (sign, n) => `${sign}${n ?? 0}`;
+
+const fileRowFields = (entry) => {
+  const { added, removed, staged, remaining } = entry;
+  const add = signedCount('+', added);
+  const del = signedCount('-', removed);
+  const status = entry.status ?? '';
+  const n = `${staged ?? 0}`;
+  const m = `${remaining ?? 0}`;
+  return { add, del, status, n, m };
+};
+
 const fileColumns = (files) => {
-  let statusW = 0;
-  let countW = 0;
+  const widths = {};
+  for (const key of FILE_COL_KEYS) widths[key] = 0;
   for (const entry of files) {
-    const status = entry.status ?? '';
-    const count = `${entry.remaining ?? 0}`;
-    const sw = visibleWidth(status);
-    const cw = visibleWidth(count);
-    if (sw > statusW) statusW = sw;
-    if (cw > countW) countW = cw;
+    const fields = fileRowFields(entry);
+    for (const key of FILE_COL_KEYS) {
+      const w = visibleWidth(fields[key]);
+      if (w > widths[key]) widths[key] = w;
+    }
   }
-  return { statusW, countW };
+  return widths;
 };
 
-const padStartVisible = (text, width) => {
+const padVisible = (text, width, align) => {
   const n = Math.max(0, width - visibleWidth(text));
-  return `${' '.repeat(n)}${text}`;
+  const gap = ' '.repeat(n);
+  if (align === 'end') return `${text}${gap}`;
+  return `${gap}${text}`;
 };
 
 const fileRowFg = (status, selected) => {
@@ -552,25 +624,55 @@ const fileRowFg = (status, selected) => {
   return THEME.mutedFg;
 };
 
+const fileRowParts = (entry, cols) => {
+  const fields = fileRowFields(entry);
+  const parts = {};
+  for (const key of FILE_COL_KEYS) {
+    const width = cols?.[key] ?? visibleWidth(fields[key]);
+    const align = FILE_COL_ALIGN[key];
+    parts[key] = padVisible(fields[key], width, align);
+  }
+  return parts;
+};
+
+const joinFileSuffix = (parts) => {
+  const { add, del, status, n, m } = parts;
+  return `  ${add}  ${del}  ${status}  ${n}/${m}`;
+};
+
+const paintFileSuffix = (parts, fgRgb, bgRgb, color) => {
+  const { add, del, status, n, m } = parts;
+  const gap = paint('  ', fgRgb, bgRgb, color);
+  const addText = paint(add, THEME.addLineFg, bgRgb, color);
+  const delText = paint(del, THEME.delLineFg, bgRgb, color);
+  const statusText = paint(status, fgRgb, bgRgb, color);
+  const nText = paint(n, fgRgb, bgRgb, color);
+  const slash = paint('/', fgRgb, bgRgb, color);
+  const mText = paint(m, fgRgb, bgRgb, color);
+  const counts = addText + gap + delText;
+  const meta = statusText + gap + nText + slash + mText;
+  return gap + counts + gap + meta;
+};
+
 const paintFileRow = (entry, width, color, selected, cols) => {
   const inner = Math.max(1, width - 1);
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
-  const status = entry.status ?? '';
-  const count = `${entry.remaining ?? 0}`;
-  const statusW = cols?.statusW ?? visibleWidth(status);
-  const countW = cols?.countW ?? visibleWidth(count);
-  const statusCol = padStartVisible(status, statusW);
-  const countCol = padStartVisible(count, countW);
-  const suffix = `  ${statusCol}  ${countCol}`;
+  const parts = fileRowParts(entry, cols);
+  const suffix = joinFileSuffix(parts);
   const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
-  const clipped = truncateVisible(entry.path, pathW);
+  const { path, status } = entry;
+  const clipped = truncateVisible(path, pathW);
   const pad = Math.max(0, pathW - visibleWidth(clipped));
-  const line = `${prefix}${clipped}${' '.repeat(pad)}${suffix}`;
+  const left = `${prefix}${clipped}${' '.repeat(pad)}`;
   const fgRgb = fileRowFg(status, selected);
   const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
-  const row = paintBar(line, inner, fgRgb, bgRgb, color);
-  return row + fill(1, fgRgb, bgRgb, color);
+  const edge = fill(1, fgRgb, bgRgb, color);
+  if (!color) return `${left}${suffix}${edge}`;
+  let out = `${seq(fgRgb, bgRgb)}${EL}`;
+  out += paint(left, fgRgb, bgRgb, color);
+  out += paintFileSuffix(parts, fgRgb, bgRgb, color);
+  return out + edge;
 };
 
 const todoInnerWidth = (width) => Math.max(1, width - 2);
@@ -669,8 +771,7 @@ const paintIdleNote = (view, width, color) => {
   const text = view.noteText;
   if (!text) return empty;
   const inner = noteInnerWidth(width);
-  const prefix = view.noteKind ? `${view.noteKind}: ` : '';
-  const wrapped = wrapMultiline(`${prefix}${text}`, inner);
+  const wrapped = wrapMultiline(`feedback: ${text}`, inner);
   const rows = [];
   for (const line of wrapped.slice(0, NOTE_MAX)) {
     const painted = paintNoteLine(
@@ -688,7 +789,7 @@ const paintIdleNote = (view, width, color) => {
 
 const paintNotePanel = (view, width, color, cap) => {
   const empty = { rows: [], cursor: null, templateHits: [] };
-  if (view.help || (view.pane ?? 'diff') === 'files') return empty;
+  if ((view.pane ?? 'diff') === 'files') return empty;
   const compose = view.compose;
   if (compose && compose.kind === 'feedback') {
     return paintComposeNote(view, width, color, cap);
@@ -696,16 +797,6 @@ const paintNotePanel = (view, width, color, cap) => {
   return paintIdleNote(view, width, color);
 };
 
-const paintBodyHelp = (width, color) => {
-  const body = [];
-  for (const line of helpLines()) {
-    for (const row of wrapPlain(line, width)) {
-      body.push(paintBar(row, width, THEME.chromeFg, THEME.ctxBg, color));
-    }
-  }
-  return body;
-};
-
 const paintBodyFiles = (view, width, color, bodyH, headerLines) => {
   const files = view.files ?? [];
   const cols = fileColumns(files);
@@ -753,10 +844,39 @@ const paintBodyTodo = (view, width, color) => {
   return { body, todoOwners, cursor };
 };
 
+const wrapSoftLine = (line, width) => {
+  const gutterW = Math.min(GUTTER_W, Math.max(0, width));
+  const budget = Math.max(1, width - gutterW);
+  const rows = wrapPlain(line.text ?? '', budget);
+  return rows.map((text) => {
+    const spans = [{ text, changed: false }];
+    return { ...line, text, spans };
+  });
+};
+
+const expandSoftRows = (lines, width, split) => {
+  const wrapWidth = split ? splitWidths(width).leftW : width;
+  const out = [];
+  for (const row of lines) {
+    const line = split ? row.left || row.right : row;
+    if (!line || !SOFT_WRAP.includes(line.type)) {
+      out.push(row);
+      continue;
+    }
+    const parts = wrapSoftLine(line, wrapWidth);
+    for (const part of parts) {
+      if (split) out.push({ left: part, right: part });
+      else out.push(part);
+    }
+  }
+  return out;
+};
+
 const paintBodyDiff = (item, layout, width, color) => {
   const lang = detectLang(itemPath(item));
   const splitBody = layout === 'side' && !item.file.isBinary;
-  const lines = dropLeadingEmpty(bodyLines(item, layout), splitBody);
+  const raw = dropLeadingEmpty(bodyLines(item, layout), splitBody);
+  const lines = expandSoftRows(raw, width, splitBody);
   const body = [];
   if (splitBody) {
     for (const row of lines) {
@@ -771,7 +891,6 @@ const paintBodyDiff = (item, layout, width, color) => {
 };
 
 const bodyKind = (view) => {
-  if (view.help) return 'help';
   if ((view.pane ?? 'diff') === 'files') return 'files';
   if (!view.item) return 'empty';
   if (view.item.origin === 'todo') return 'todo';
@@ -779,11 +898,6 @@ const bodyKind = (view) => {
 };
 
 const BODY_PAINT = {
-  help: (view, width, color) => ({
-    body: paintBodyHelp(width, color),
-    fileHits: [],
-    todoOwners: [],
-  }),
   files: (view, width, color, bodyH, headerLines) => ({
     ...paintBodyFiles(view, width, color, bodyH, headerLines),
     todoOwners: [],
@@ -837,10 +951,10 @@ const windowBody = (view, width, color, bodyH, headerLines, paintedBody) => {
   const todoOwners = paintedBody.todoOwners;
   const splitBody = paintedBody.splitBody === true;
   const pane = view.pane ?? 'diff';
-  const listPane = pane === 'files' && !view.help;
+  const listPane = pane === 'files';
   const fillKind = bodyFillKind(listPane, splitBody);
   let shift = 0;
-  if (!listPane && !view.help && body.length > 0) {
+  if (!listPane && body.length > 0) {
     body.unshift(paintBodyFill(width, color, fillKind));
     if (todoOwners.length) todoOwners.unshift(null);
     shift = 1;
@@ -889,7 +1003,7 @@ const stackFrame = (view, width, color, rows, layout, windowed, notes) => {
   return overlayRows(rows, view.selection);
 };
 
-const frameResult = (text, painted, layout, windowed, hits) => {
+const frameResult = (text, painted, layout, windowed, hits, bodyH) => {
   const fileHits = windowed.fileHits;
   const todoHits = windowed.todoHits;
   const templateHits = hits.templateHits;
@@ -907,6 +1021,7 @@ const frameResult = (text, painted, layout, windowed, hits) => {
     height: painted.length,
     scroll,
     cursor,
+    bodyH,
   };
 };
 
@@ -938,7 +1053,7 @@ const renderFrame = (view, options = {}) => {
     notes.noteCursor,
     bodyH,
   );
-  return frameResult(text, painted, layout, windowed, hits);
+  return frameResult(text, painted, layout, windowed, hits, bodyH);
 };
 
 const presentCursor = (cursor) => {
@@ -961,36 +1076,18 @@ const presentRows = (rows, options = {}) => {
   return parts.join('');
 };
 
-const DEL_CHAR_BG = ansi.bg(THEME.delCharBg);
-const ADD_CHAR_BG = ansi.bg(THEME.addCharBg);
-const DEL_LINE_FG = ansi.fg(THEME.delLineFg);
-const ADD_LINE_FG = ansi.fg(THEME.addLineFg);
-
 module.exports = {
-  LOGO,
-  FILE_MARK,
   QUIT_FINISH,
   QUIT_CONTINUE,
   QUIT_PROMPT,
-  STYLES,
-  STAGED_STYLES,
-  renderFrame,
-  presentCursor,
-  presentRows,
-  layoutButtons,
+  DEL_CHAR_BG,
+  ADD_CHAR_BG,
   paintDiffLine,
-  paintSplitRow,
-  bodyLines,
   headerText,
-  wrapPlain,
-  wrapDoc,
-  wrapMultiline,
-  cursorInWrap,
-  wrapMove,
-  noteInnerWidth,
+  layoutButtons,
   todoInnerWidth,
-  DEL_CHAR_BG,
-  ADD_CHAR_BG,
-  DEL_LINE_FG,
-  ADD_LINE_FG,
+  noteInnerWidth,
+  renderFrame,
+  presentCursor,
+  presentRows,
 };