reslop 0.2.4 → 0.2.5

package/lib/render/commits.js

@@ -5,13 +5,13 @@ const files = require('../files.js');
 const primitives = require('./primitives.js');
 const wrap = require('../wrap.js');
 const { shortAge } = files;
-const { wrapMultiline, cursorInWrap } = wrap;
+const { wrapMultiline, wrapDoc, cursorInWrap } = wrap;
 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 { FILE_MARK, paintCursorList, fieldWindow } = primitives;
+const { paintBodyFill, listLine, paintListWindow } = primitives;
 
 const COMMIT_COL_ALIGN = {
   sha: 'end',
@@ -31,11 +31,11 @@ const COMMIT_COL_FG = {
 
 const COMMIT_CURRENT_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;
@@ -178,46 +178,38 @@ const paintCommitRow = (entry, width, color, selected, cols, current) => {
   return out;
 };
 
-const paintCommitEdit = (compose, width, color, entry, cols) => {
+const lineEdit = (text, textX, span, scroll) => ({
+  x0: 1,
+  textX,
+  x1: textX + span,
+  start: 0,
+  text,
+  limit: text.length,
+  scroll,
+  live: true,
+});
+
+const subjectWindow = (compose, rest) => {
+  const line = splitMessage(compose.text).line;
+  const at = Math.min(compose.cursor ?? 0, line.length);
+  return fieldWindow(line, at, compose.scrollCol, rest);
+};
+
+const paintCommitEdit = (compose, width, color, entry = null, cols = {}) => {
   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 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 = subjectWindow(compose, rest);
+  const shown = { ...entry, body: win.text, subject: win.text };
+  return {
+    row: paintCommitRow(shown, width, color, true, cols),
+    cursor: { x: prefixW + win.col + 1, scroll: win.scroll },
+    at: entry ? 'replace' : 'start',
+    edit: lineEdit(text, prefixW + 1, rest, win.scroll),
+  };
 };
 
 const pendingAt = (commits) => {
@@ -467,7 +459,7 @@ const pieceFg = (kind, tone) => {
   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;
   }
@@ -521,23 +513,24 @@ const paintPanelLine = (spec) => {
   );
 };
 
-const lineRecord = (commit, row, hit, cursor = null) => ({
-  commit,
-  row,
-  hit,
-  cursor,
-});
+const editFromDoc = (doc, row, textX, span) => {
+  if (row < 0 || row >= doc.length) return null;
+  const piece = doc[row];
+  return {
+    x0: 1,
+    textX,
+    x1: textX + span,
+    start: piece.start,
+    text: piece.text,
+    limit: piece.start + piece.text.length,
+    live: true,
+  };
+};
 
-const commitLines = (
-  entry,
-  index,
-  width,
-  color,
-  selected,
-  edit,
-  current,
-  diffWidths,
-) => {
+const editLines = (editHit) => (editHit ? [editHit] : undefined);
+
+const commitLines = (entry, index, spec) => {
+  const { width, color, selected, edit, current, diffWidths } = spec;
   const inner = contentWidth(width);
   const hashW = visibleWidth(entry.sha ?? '');
   const widths = diffWidths ?? entryCountWidth(entry);
@@ -545,6 +538,7 @@ const commitLines = (
   const rights = rightRows(entry, cols.rightW, widths);
   const left = panelLeft(entry, cols.leftW, edit);
   const count = Math.max(left.length, rights.length);
+  const doc = edit ? wrapDoc(`${edit.text ?? ''}`, cols.leftW) : null;
   const lines = [];
   for (let row = 0; row < count; row++) {
     const line = left[row] ?? { text: '', kind: 'text' };
@@ -563,17 +557,22 @@ const commitLines = (
       rightKind: 'meta',
     });
     const messageRow = entry.sha ? row - 1 : row;
+    const first = !entry.sha && row === 0;
     const caret = edit
       ? messageCaret(
           edit.text,
           edit.cursor,
           cols.leftW,
           messageRow,
-          !entry.sha && row === 0,
+          first,
           selected,
         )
       : null;
-    lines.push(lineRecord(index, painted, true, caret));
+    const textX = prefixWidth(first, selected) + 1;
+    const editHit = doc
+      ? editFromDoc(doc, messageRow, textX, cols.leftW)
+      : null;
+    lines.push(listLine(painted, index, caret, editLines(editHit)));
   }
   return lines;
 };
@@ -582,6 +581,7 @@ 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 doc = wrapDoc(`${text ?? ''}`, leftW);
   const lines = [];
   for (let row = 0; row < parts.length; row++) {
     const line = parts[row];
@@ -599,7 +599,9 @@ const draftLines = (text, cursor, width, color) => {
       rightKind: 'meta',
     });
     const caret = messageCaret(text, cursor, leftW, row, row === 0, true);
-    lines.push(lineRecord(-1, painted, false, caret));
+    const textX = prefixWidth(row === 0, true) + 1;
+    const editHit = editFromDoc(doc, row, textX, leftW);
+    lines.push(listLine(painted, -1, caret, editLines(editHit)));
   }
   return lines;
 };
@@ -619,164 +621,58 @@ const composeShowsDraft = (compose, commits) => {
   return true;
 };
 
-const gapLine = (width, color) =>
-  lineRecord(-1, paintBodyFill(width, color, 'files'), false);
-
-const flattenCommits = (commits, cursor, width, color, compose, rev, short) => {
-  const lines = [];
-  const diffWidths = listCountWidth(commits);
+const flattenCommits = (view, commits, width, color) => {
+  const cursor = view.commitCursor ?? 0;
+  const compose = view.compose ?? null;
   const editing = compose && compose.kind === 'commit';
-  const pushGap = () => {
-    if (lines.length) lines.push(gapLine(width, color));
-  };
+  const diffWidths = listCountWidth(commits);
+  const gap = listLine(paintBodyFill(width, color, 'files'), -1);
+  const lines = [];
   if (composeShowsDraft(compose, commits)) {
-    const draft = draftLines(
-      compose.text ?? '',
-      compose.cursor ?? 0,
-      width,
-      color,
-    );
-    for (const line of draft) lines.push(line);
+    const text = compose.text ?? '';
+    lines.push(...draftLines(text, compose.cursor ?? 0, width, color));
   }
   for (let index = 0; index < commits.length; index++) {
-    pushGap();
+    if (lines.length) lines.push(gap);
+    const entry = commits[index];
     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,
+    const text = compose?.text ?? '';
+    const caret = compose?.cursor ?? 0;
+    const edit = inplace ? { text, cursor: caret } : null;
+    const current = viewedCommit(entry, view.rev, view.revShort);
+    const block = commitLines(entry, index, {
       width,
       color,
       selected,
       edit,
-      viewedCommit(commits[index], rev, short),
+      current,
       diffWidths,
-    );
-    for (const line of block) lines.push(line);
+    });
+    lines.push(...block);
   }
   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 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) => {
   if (view.commitView === 'full') {
-    return paintFullCommits(view, width, color, bodyH, headerLines);
+    const lines = flattenCommits(view, commits, width, color);
+    const focus = focusLine(lines, cursor, view.compose);
+    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,
@@ -785,19 +681,11 @@ const paintBodyCommits = (view, width, color, bodyH, headerLines) => {
     color,
     cols,
   );
-  return paintBriefCommits(
-    commits,
-    cursor,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    extra,
-    view.listScroll,
-    cols,
-    view.rev,
-    view.revShort,
-  );
+  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, extra);
 };
 
 module.exports = {

package/lib/render/diff.js

@@ -332,6 +332,32 @@ const codeCursorInRows = (rows, split, width, cursor, scrollCol = 0) => {
   return null;
 };
 
+const codeEditHits = (rows, split, width, scrollCol = 0) => {
+  const { leftW, rightW } = splitWidths(width);
+  const hits = [];
+  for (let i = 0; i < rows.length; i++) {
+    const line = split ? rows[i].right : rows[i];
+    if (!line || line.editStart === undefined) continue;
+    const lineW = split ? rightW : width;
+    const gutterW = Math.min(GUTTER_W, Math.max(0, lineW));
+    const pane = split ? leftW + 1 : 0;
+    const textX = pane + gutterW + 1;
+    const end = split ? pane + rightW : width;
+    hits.push({
+      row: i,
+      x0: pane + 1,
+      textX,
+      x1: end + 1,
+      scroll: scrollCol,
+      start: line.editStart,
+      text: line.text ?? '',
+      limit: line.editEnd,
+      live: true,
+    });
+  }
+  return hits;
+};
+
 const codeInnerWidth = (width, layout = 'unified') => {
   const lineW = layout === 'side' ? splitWidths(width).rightW : width;
   const gutterW = Math.min(GUTTER_W, Math.max(0, lineW));
@@ -376,7 +402,10 @@ const paintBodyDiff = (view, width, color) => {
   }
   const edit = overlay ? overlay.cursor : null;
   const cursor = codeCursorInRows(lines, splitBody, width, edit, scrollCol);
-  return paneResult({ body, cursor, splitBody });
+  const editHits = editing
+    ? codeEditHits(lines, splitBody, width, scrollCol)
+    : [];
+  return paneResult({ body, cursor, splitBody, editHits });
 };
 
 module.exports = {
@@ -386,5 +415,6 @@ module.exports = {
   codeInnerWidth,
   paintBodyDiff,
   codeCursorInRows,
+  codeEditHits,
   expandSoftRows,
 };

package/lib/render/files.js

@@ -5,7 +5,7 @@ const files = require('../files.js');
 const primitives = require('./primitives.js');
 const { measureColumns, padColumns } = primitives;
 
-const { isTodosEntry, shortAge } = files;
+const { isTasksEntry, shortAge } = files;
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
 const { fill, FILE_MARK, paintCursorList } = primitives;
 
@@ -30,7 +30,7 @@ const FILE_DATE_GAP = '   ';
 const signedCount = (sign, n) => `${sign}${n ?? 0}`;
 
 const fileRowFields = (entry) => {
-  if (isTodosEntry(entry)) {
+  if (isTasksEntry(entry)) {
     const n = `${entry.staged ?? 0}`;
     const m = `${entry.remaining ?? 0}`;
     return { add: '', del: '', status: '', n, m, date: '' };
@@ -105,7 +105,7 @@ const paintTodosRow = (entry, width, color, selected, cols) => {
 };
 
 const paintFileRow = (entry, width, color, selected, cols) => {
-  if (isTodosEntry(entry)) {
+  if (isTasksEntry(entry)) {
     return paintTodosRow(entry, width, color, selected, cols);
   }
   const inner = Math.max(1, width - 1);
@@ -132,19 +132,10 @@ const paintBodyFiles = (view, width, color, bodyH, headerLines) => {
   const files = view.files ?? [];
   const cols = measureColumns(files, fileRowFields, FILE_COL_ALIGN);
   const cursor = view.fileCursor ?? 0;
-  const paintRow = (entry, rowWidth, rowColor, selected) =>
-    paintFileRow(entry, rowWidth, rowColor, selected, cols);
-  return paintCursorList(
-    files,
-    cursor,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    paintRow,
-    null,
-    view.listScroll,
-  );
+  const pane = { width, color, bodyH, headerLines, offset: view.listScroll };
+  const paintRow = (entry, selected) =>
+    paintFileRow(entry, width, color, selected, cols);
+  return paintCursorList(files, cursor, pane, paintRow);
 };
 
 module.exports = { paintBodyFiles };