reslop 0.2.5 → 0.2.7

package/lib/session/find.js

@@ -0,0 +1,94 @@
+'use strict';
+
+const files = require('../files.js');
+const { isTasksEntry, TASKS_FILE } = files;
+const find = require('../find.js');
+const { fileMatches } = find;
+
+const FIND_PANES = ['files', 'diff'];
+
+const isTypeKey = (key) =>
+  Boolean(key) && key.length === 1 && key.charCodeAt(0) >= 32;
+
+const startFind = (ui) => {
+  if (ui.mode !== 'review') return;
+  if (!FIND_PANES.includes(ui.pane)) return;
+  ui.mode = 'find';
+  ui.nav.find = { query: '', at: 0 };
+  ui.status = '';
+};
+
+const stopFind = (ui) => {
+  ui.mode = 'review';
+  ui.nav.find = null;
+  ui.status = '';
+};
+
+const focusMatch = (ui, hit, jump) => {
+  const entry = ui.fileList()[hit.index];
+  if (!entry) return;
+  const moved = ui.nav.fileCursor !== hit.index;
+  ui.nav.fileCursor = hit.index;
+  if (isTasksEntry(entry)) {
+    ui.nav.reviewPath = TASKS_FILE;
+    return;
+  }
+  ui.nav.reviewPath = entry.path;
+  if (ui.nav.pane !== 'diff') {
+    ui.nav.index = entry.firstIndex;
+    return;
+  }
+  if (!moved && !jump) return;
+  ui.nav.index = entry.openIndex ?? entry.firstIndex;
+  ui.nav.scroll = 0;
+  ui.nav.clearSelection();
+};
+
+const showHit = (ui, jump) => {
+  const state = ui.nav.find;
+  if (!state) return;
+  const hits = fileMatches(ui.fileList(), state.query);
+  if (!hits.length) return;
+  const count = hits.length;
+  let at = state.at % count;
+  if (at < 0) at += count;
+  state.at = at;
+  focusMatch(ui, hits[at], jump);
+};
+
+const typeFind = (ui, key) => {
+  const state = ui.nav.find;
+  state.query += key;
+  state.at = 0;
+  showHit(ui, true);
+};
+
+const eraseFind = (ui) => {
+  const state = ui.nav.find;
+  if (!state.query) return void stopFind(ui);
+  state.query = state.query.slice(0, -1);
+  state.at = 0;
+  showHit(ui, true);
+};
+
+const moveFind = (ui, delta) => {
+  const state = ui.nav.find;
+  if (!state.query) return;
+  state.at += delta;
+  showHit(ui, false);
+};
+
+const onFindKey = (ui, key) => {
+  if (!ui.nav.find) {
+    ui.mode = 'review';
+    return;
+  }
+  if (key === 'ctrl-c') return void ui.onQuit();
+  if (key === 'escape' || key === 'enter') return void stopFind(ui);
+  if (key === 'backspace') return void eraseFind(ui);
+  if (key === 'up' || key === 'left') return void moveFind(ui, -1);
+  if (key === 'down' || key === 'right') return void moveFind(ui, 1);
+  if (isTypeKey(key)) typeFind(ui, key);
+};
+
+module.exports = { FIND_PANES, startFind, stopFind, onFindKey };

package/lib/session/items.js

@@ -29,13 +29,9 @@ const blockKey = (item) => {
   if (isTaskItem(item)) return `todo:${TASKS_FILE}`;
   const depId = depChangeKey(item);
   if (depId) return `${rel}:dep:${depId}`;
-  if (!item.hunk) {
-    const block = item.blockId ?? '-';
-    return `${rel}:file:${block}`;
-  }
-  const oldStart = item.hunk.oldStart;
-  const newStart = item.hunk.newStart;
   const block = item.blockId ?? '-';
+  if (!item.hunk) return `${rel}:file:${block}`;
+  const { oldStart, newStart } = item.hunk;
   return `${rel}:${oldStart}:${newStart}:${block}`;
 };
 
@@ -119,12 +115,10 @@ const alignLoadedItems = (prev, next) => {
   const ordered = [];
   for (const [rel, list] of groupByPath(prev)) {
     seen.add(rel);
-    const aligned = alignGroup(list, nextGroups.get(rel) ?? []);
-    for (const item of aligned) ordered.push(item);
+    ordered.push(...alignGroup(list, nextGroups.get(rel) ?? []));
   }
   for (const [rel, list] of nextGroups) {
-    if (seen.has(rel)) continue;
-    for (const item of list) ordered.push(item);
+    if (!seen.has(rel)) ordered.push(...list);
   }
   return ordered;
 };
@@ -195,8 +189,7 @@ const sameBlock = (left, right) => {
 const canEditCode = (item) => {
   if (!item || isTaskItem(item)) return false;
   if (!item.hunk || !item.file) return false;
-  if (item.file.isBinary) return false;
-  return true;
+  return !item.file.isBinary;
 };
 
 class ItemCollection {
@@ -237,11 +230,7 @@ class ItemCollection {
     const replaced = this.items.map((entry) =>
       sameBlock(entry, item) ? next : entry,
     );
-    if (next.dep) {
-      this.items = replaced;
-      return;
-    }
-    this.items = refreshIndexPatches(replaced, next);
+    this.items = next.dep ? replaced : refreshIndexPatches(replaced, next);
   }
 }