reslop 0.1.9 → 0.2.0

package/lib/render/diff.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const ansi = require('../ansi.js');
-const { displayLines } = require('../diff.js');
+const { displayLines } = require('../diff/diff.js');
 const highlight = require('../highlight.js');
 const { detectLang } = require('../detect.js');
 const files = require('../files.js');
@@ -81,8 +81,6 @@ 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);
-
 const paintSpans = (pieces, lineStyle, budget, color) => {
   let out = '';
   let used = 0;
@@ -129,13 +127,13 @@ const paintAuditRule = (width, 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 styles = origin === 'staged' ? STAGED_STYLES : STYLES;
   const style = styles[line.type] ?? styles.ctx;
   const diffSpans = line.spans ?? [{ text: line.text, changed: false }];
   const tokens = tokenize(lang, line.text ?? '');
   const pieces = overlayTokens(tokens, diffSpans);
   const gutterW = Math.min(GUTTER_W, Math.max(0, width));
-  const label = `${style.mark} `.slice(0, gutterW);
+  const label = `${line.mark ?? style.mark} `.slice(0, gutterW);
   const gutter = paint(label, CODE_FG.punct, style.baseBg, color);
   const budget = Math.max(0, width - gutterW);
   const rest = paintSpans(pieces, style, budget, color);
@@ -190,11 +188,12 @@ const wrapSoftLine = (line, width) => {
   const budget = Math.max(1, width - gutterW);
   const rows = wrapPlain(line.text ?? '', budget);
   const changed = line.wrap === true;
-  const pieces = [];
+  const { length } = rows;
+  const pieces = new Array(length);
   let used = 0;
-  for (let i = 0; i < rows.length; i++) {
+  for (let i = 0; i < length; i++) {
     const text = rows[i];
-    const last = i === rows.length - 1;
+    const last = i === length - 1;
     const spans = [{ text, changed }];
     const next = { ...line, text, spans, editLast: last };
     if (line.editStart !== undefined) {
@@ -203,7 +202,7 @@ const wrapSoftLine = (line, width) => {
       else next.editEnd = next.editStart + text.length;
     }
     used += text.length;
-    pieces.push(next);
+    pieces[i] = next;
   }
   return pieces;
 };
@@ -249,8 +248,7 @@ const expandSoftRows = (lines, width, split) => {
 const onCodePiece = (line, cursor) => {
   if (!line || line.editStart === undefined) return false;
   if (cursor < line.editStart) return false;
-  if (line.editLast) return cursor <= line.editEnd;
-  return cursor < line.editEnd;
+  return cursor <= line.editEnd;
 };
 
 const codeCursorInRows = (rows, split, width, cursor) => {
@@ -283,14 +281,15 @@ const paintBodyDiff = (view, width, color) => {
   const splitBody = layout === 'side' && !item.file.isBinary;
   const raw = dropLeadingEmpty(bodyLines(item, layout, overlay), splitBody);
   const lines = expandSoftRows(raw, width, splitBody);
-  const body = [];
+  const { length } = lines;
+  const body = new Array(length);
   if (splitBody) {
-    for (const row of lines) {
-      body.push(paintSplitRow(row, width, color, item.origin, lang));
+    for (let i = 0; i < length; i++) {
+      body[i] = paintSplitRow(lines[i], width, color, item.origin, lang);
     }
   } else {
-    for (const line of lines) {
-      body.push(paintDiffLine(line, width, color, item.origin, lang));
+    for (let i = 0; i < length; i++) {
+      body[i] = paintDiffLine(lines[i], width, color, item.origin, lang);
     }
   }
   const edit = overlay ? overlay.cursor : null;
@@ -304,4 +303,5 @@ module.exports = {
   paintDiffLine,
   codeInnerWidth,
   paintBodyDiff,
+  codeCursorInRows,
 };

package/lib/render/files.js

@@ -3,10 +3,11 @@
 const ansi = require('../ansi.js');
 const files = require('../files.js');
 const primitives = require('./primitives.js');
+const { measureColumns, padColumns } = primitives;
 
 const { isTodosEntry } = files;
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
-const { fill, padVisible, FILE_MARK, paneResult, paintCursorList } = primitives;
+const { fill, FILE_MARK, paneResult, paintCursorList } = primitives;
 
 const FILE_STATUS_FG = {
   unstaged: THEME.delLineFg,
@@ -15,8 +16,6 @@ const FILE_STATUS_FG = {
   partial: THEME.warnFg,
 };
 
-const FILE_COL_KEYS = ['add', 'del', 'status', 'n', 'm', 'date'];
-
 const FILE_COL_ALIGN = {
   add: 'start',
   del: 'start',
@@ -46,19 +45,6 @@ const fileRowFields = (entry) => {
   return { add, del, status, n, m, date };
 };
 
-const fileColumns = (files) => {
-  const widths = {};
-  for (const key of FILE_COL_KEYS) widths[key] = 0;
-  for (const entry of files) {
-    const fields = fileRowFields(entry);
-    for (const key of FILE_COL_KEYS) {
-      const w = visibleWidth(fields[key]);
-      if (w > widths[key]) widths[key] = w;
-    }
-  }
-  return widths;
-};
-
 const fileRowFg = (status, selected) => {
   const statusFg = FILE_STATUS_FG[status];
   if (statusFg) return statusFg;
@@ -66,17 +52,6 @@ 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 joinFileDate = (parts, cols) => {
   if (!cols?.date) return '';
   return `${FILE_DATE_GAP}${parts.date}`;
@@ -87,9 +62,6 @@ const joinFileMeta = (parts) => {
   return `  ${add}  ${del}  ${status}  ${n}/${m}`;
 };
 
-const joinFileSuffix = (parts, cols) =>
-  `${joinFileMeta(parts)}${joinFileDate(parts, cols)}`;
-
 const paintFileSuffix = (parts, cols, fgRgb, bgRgb, color) => {
   const { add, del, status, n, m } = parts;
   const gap = paint('  ', fgRgb, bgRgb, color);
@@ -111,7 +83,7 @@ const paintTodosRow = (entry, width, color, selected, cols) => {
   const inner = Math.max(1, width - 1);
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
-  const parts = fileRowParts(entry, cols);
+  const parts = padColumns(fileRowFields(entry), cols, FILE_COL_ALIGN);
   const meta = joinFileMeta(parts);
   const dated = joinFileDate(parts, cols);
   const suffix = `${meta}${dated}`;
@@ -139,8 +111,8 @@ const paintFileRow = (entry, width, color, selected, cols) => {
   const inner = Math.max(1, width - 1);
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
-  const parts = fileRowParts(entry, cols);
-  const suffix = joinFileSuffix(parts, cols);
+  const parts = padColumns(fileRowFields(entry), cols, FILE_COL_ALIGN);
+  const suffix = `${joinFileMeta(parts)}${joinFileDate(parts, cols)}`;
   const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
   const { path, status } = entry;
   const clipped = truncateVisible(path, pathW);
@@ -158,7 +130,7 @@ const paintFileRow = (entry, width, color, selected, cols) => {
 
 const paintBodyFiles = (view, width, color, bodyH, headerLines) => {
   const files = view.files ?? [];
-  const cols = fileColumns(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);

package/lib/render/frame.js

@@ -9,6 +9,7 @@ const branches = require('./branches.js');
 const commits = require('./commits.js');
 const notes = require('./notes.js');
 const diff = require('./diff.js');
+const unit = require('./unit.js');
 
 const { RESET } = ansi;
 const { LIST_PANES, paintBodyFill, paneResult } = primitives;
@@ -20,12 +21,14 @@ const { paintBodyFiles } = files;
 const { paintBodyBranches } = branches;
 const { paintBodyCommits } = commits;
 const { paintBodyDiff } = diff;
+const { paintBodyUnit } = unit;
 
 const bodyKind = (view) => {
   const pane = view.pane ?? 'diff';
   if (pane === 'files' || pane === 'branches' || pane === 'commits') {
     return pane;
   }
+  if (pane === 'unit') return 'unit';
   if (!view.item) return 'empty';
   if (view.item.origin === 'todo') return 'todo';
   return 'diff';
@@ -47,6 +50,7 @@ const BODY_PAINT = {
   empty: paintBodyEmpty,
   todo: paintBodyTodo,
   diff: paintBodyDiff,
+  unit: paintBodyUnit,
 };
 
 const paintFrameBody = (view, width, color, bodyH, headerLines) => {
@@ -89,24 +93,31 @@ const windowBody = (view, width, color, bodyH, headerLines, paintedBody) => {
   const listPane = LIST_PANES.includes(pane);
   const fillKind = bodyFillKind(listPane, splitBody);
   const filler = paintBodyFill(width, color, fillKind);
-  const body = [];
-  const todoOwners = [];
+  const lead = !listPane && sourceBody.length > 0;
+  const body = new Array(sourceBody.length + (lead ? 1 : 0));
+  let bodyAt = 0;
   let shift = 0;
-  if (!listPane && sourceBody.length > 0) {
-    body.push(filler);
-    if (sourceOwners.length) todoOwners.push(null);
+  if (lead) {
+    body[bodyAt++] = filler;
     shift = 1;
   }
-  for (const row of sourceBody) body.push(row);
-  for (const owner of sourceOwners) todoOwners.push(owner);
+  for (let i = 0; i < sourceBody.length; i++) body[bodyAt++] = sourceBody[i];
+  const ownerLead = lead && sourceOwners.length;
+  const todoOwners = new Array(sourceOwners.length + (ownerLead ? 1 : 0));
+  let ownerAt = 0;
+  if (ownerLead) todoOwners[ownerAt++] = null;
+  for (let i = 0; i < sourceOwners.length; i++) {
+    todoOwners[ownerAt++] = sourceOwners[i];
+  }
   const scrollRaw = view.scroll ?? 0;
   const scrollMax = Math.max(0, body.length - bodyH);
   const scroll = listPane ? 0 : Math.min(scrollRaw, scrollMax);
-  const slice = [];
   const end = Math.min(body.length, scroll + bodyH);
-  for (let i = scroll; i < end; i++) slice.push(body[i]);
+  const copied = Math.max(0, end - scroll);
+  const slice = new Array(bodyH);
+  for (let i = 0; i < copied; i++) slice[i] = body[scroll + i];
   const todoHits = [];
-  for (let i = 0; i < slice.length; i++) {
+  for (let i = 0; i < copied; i++) {
     const owner = todoOwners[scroll + i];
     if (owner === undefined || owner === null) continue;
     todoHits.push({ y: headerLines + i + 1, cursor: owner });
@@ -116,9 +127,9 @@ const windowBody = (view, width, color, bodyH, headerLines, paintedBody) => {
     shift,
     scroll,
     headerLines,
-    slice.length,
+    copied,
   );
-  while (slice.length < bodyH) slice.push(filler);
+  for (let i = copied; i < bodyH; i++) slice[i] = filler;
   const listScroll = paintedBody.listScroll ?? 0;
   const fileHits = paintedBody.fileHits;
   return { slice, scroll, scrollMax, listScroll, todoHits, fileHits, cursor };

package/lib/render/notes.js

@@ -36,10 +36,11 @@ const wrapTodoItem = (text, inner) => {
   const bodyWidth = Math.max(1, inner - lead);
   const hang = ' '.repeat(lead);
   const wrapped = wrapMultiline(body, bodyWidth);
-  const lines = [];
-  for (let i = 0; i < wrapped.length; i++) {
+  const { length } = wrapped;
+  const lines = new Array(length);
+  for (let i = 0; i < length; i++) {
     const prefix = i === 0 ? mark : hang;
-    lines.push(`${prefix}${wrapped[i]}`);
+    lines[i] = `${prefix}${wrapped[i]}`;
   }
   return lines;
 };

package/lib/render/primitives.js

@@ -180,7 +180,52 @@ const paneResult = (fields) => ({
   listScroll: fields.listScroll ?? 0,
 });
 
+const measureColumns = (entries, rowFields, align) => {
+  const keys = Object.keys(align);
+  const widths = Object.fromEntries(keys.map((key) => [key, 0]));
+  for (const entry of entries) {
+    const fields = rowFields(entry);
+    for (const key of keys) {
+      widths[key] = Math.max(widths[key], visibleWidth(fields[key]));
+    }
+  }
+  return widths;
+};
+
+const padColumns = (fields, widths, align) => {
+  const parts = {};
+  for (const key of Object.keys(align)) {
+    const width = widths?.[key] ?? visibleWidth(fields[key]);
+    parts[key] = padVisible(fields[key], width, align[key]);
+  }
+  return parts;
+};
+
+const columnGap = (key) => (key === 'date' ? '   ' : '  ');
+
+const joinColumns = (parts, widths) => {
+  let text = '';
+  for (const key of Object.keys(parts)) {
+    if (widths[key]) text += columnGap(key) + parts[key];
+  }
+  return text;
+};
+
+const paintColumns = (parts, widths, fgRgb, bgRgb, color, tones) => {
+  let text = '';
+  for (const key of Object.keys(parts)) {
+    if (!widths[key]) continue;
+    text += paint(columnGap(key), fgRgb, bgRgb, color);
+    text += paint(parts[key], tones[key] ?? fgRgb, bgRgb, color);
+  }
+  return text;
+};
+
 module.exports = {
+  measureColumns,
+  padColumns,
+  joinColumns,
+  paintColumns,
   GUTTER_W,
   FILE_MARK,
   LIST_PANES,

package/lib/{render.js → render/render.js}

@@ -1,10 +1,10 @@
 'use strict';
 
-const chrome = require('./render/chrome.js');
-const notes = require('./render/notes.js');
-const diff = require('./render/diff.js');
-const present = require('./render/present.js');
-const { renderFrame } = require('./render/frame.js');
+const chrome = require('./chrome.js');
+const notes = require('./notes.js');
+const diff = require('./diff.js');
+const present = require('./present.js');
+const { renderFrame } = require('./frame.js');
 
 const { QUIT_PROMPT, PUSH_PROMPT } = chrome;
 const { updatePrompt, dropPrompt } = chrome;

package/lib/render/unit.js

@@ -0,0 +1,41 @@
+'use strict';
+
+const { detectLang } = require('../detect.js');
+const primitives = require('./primitives.js');
+const diff = require('./diff.js');
+
+const { paneResult } = primitives;
+const { paintDiffLine, codeCursorInRows } = diff;
+const { sameHunk } = require('../diff/diff.js');
+
+const paintBodyUnit = (view, width, color) => {
+  const lines = view.unitLines ?? [];
+  const item = view.item;
+  const lang = detectLang(view.reviewPath ?? '');
+  const overlay = view.codeOverlay;
+  const editing = view.mode === 'compose' && overlay;
+  const { length } = lines;
+  const body = new Array(length);
+  for (let i = 0; i < length; i++) {
+    const line = lines[i];
+    const isBlock = item && sameHunk(line.item, item);
+    const row = { ...line };
+    if (editing) {
+      row.mark = ' ';
+    } else if ((row.type === 'add' || row.type === 'del') && !isBlock) {
+      row.mark = ' ';
+    }
+    body[i] = paintDiffLine(row, width, color, row.origin, lang);
+  }
+  const edit = overlay ? overlay.cursor : null;
+  const cursor = codeCursorInRows(lines, false, width, edit);
+  return paneResult({
+    body,
+    fileHits: [],
+    todoOwners: [],
+    cursor,
+    splitBody: false,
+  });
+};
+
+module.exports = { paintBodyUnit };