reslop 0.2.5 → 0.2.6

package/lib/session/dispatch.js

@@ -1,200 +1,192 @@
 'use strict';
 
 const compose = require('./compose.js');
+const { COMPOSE_LEAVE } = compose;
 const commit = require('./commit.js');
 const { hasStagedChanges, listedCommits } = commit;
-const { COMPOSE_LEAVE } = compose;
 const actions = require('./actions.js');
-const {
-  LIST_PANES,
-  CONFIRM_MODE,
-  disabledActions,
-  actionFromKey,
-  applyConfirm,
-} = actions;
+const { LIST_PANES, DASH_BLOCKS, DASH_ALLOWED, CONFIRM_MODE } = actions;
+const { disabledActions, actionFromKey, confirmKey } = actions;
+const changeActions = require('./change-actions.js');
+const { onCommand } = changeActions;
+const filesPane = require('./files-pane.js');
+const pointer = require('./pointer.js');
+const { handlePointer } = pointer;
 
 const currentTarget = (ui) => {
   if (ui.pane === 'files') return ui.fileCursorEntry();
-  if (ui.pane === 'branches') {
-    return ui.branches[ui.branchCursor];
-  }
+  if (ui.pane === 'branches') return ui.branches[ui.branchCursor];
   if (ui.pane === 'commits') {
     const entry = listedCommits(ui.commits.commits)[ui.commitCursor];
-    const staged = hasStagedChanges(ui);
+    const canCommit = hasStagedChanges(ui);
     const unstagedCurrent = !ui.rev && !ui.revShort;
-    return { ...entry, canCommit: staged, unstagedCurrent };
+    return { ...entry, canCommit, unstagedCurrent };
   }
   return ui.current();
 };
 
-const createDispatcher = (ui) => {
-  const handlers = {
-    add: ui.changeActions.onAdd,
-    unstage: ui.changeActions.onUnstage,
-    revert: ui.changeActions.onRevert,
-    ignore: ui.changeActions.onIgnore,
-    next: ui.filesPane.onNext,
-    prev: ui.filesPane.onPrev,
-    layout: ui.filesPane.onLayout,
-    theme: ui.filesPane.onTheme,
-    files: ui.filesPane.onFiles,
-    feedback: ui.composer.onFeedback,
-    tasks: ui.composer.onTasks,
-    code: ui.composer.onCode,
-    reload: ui.lifecycle.onReload,
-    commit: ui.commits.onCommit,
-    amend: ui.commits.onAmend,
-    reword: ui.commits.onReword,
-    apply: ui.commits.onApply,
-    fixup: ui.commits.onFixup,
-    view: () => ui.commits.onView(),
-    branch: ui.gitBranches.onBranch,
-    pull: ui.gitBranches.onPull,
-    push: ui.gitBranches.onPush,
-    newBranch: ui.gitBranches.onNewBranch,
-    rebase: ui.gitBranches.onRebaseBranch,
-    drop: () => {
-      if (ui.pane === 'commits') {
-        return void ui.commits.onDropCommit();
-      }
-      ui.gitBranches.onDropBranch();
-    },
-    open: ui.filesPane.onOpenFile,
-    file: ui.filesPane.onFileScope,
-    diff: ui.filesPane.onDiffScope,
-    npm: ui.npm.open,
-    npmEdit: ui.npm.edit,
-    npmNew: ui.npm.create,
-    npmDrop: () => ui.npm.askDrop(),
-    npmLogs: () => ui.npm.askLogs(),
-    npmStop: () => ui.npm.closeView(),
-    back: () => ui.filesPane.onEscape(),
-    npmVerbose: () => ui.npm.toggleVerbose(),
-    npmRerun: () => ui.npm.rerun(),
-    check: () => ui.composer.toggleFocusedTask(),
-    removeTask: () => {
-      if (ui.pane === 'npm') return void ui.npm.askDrop();
-      ui.composer.removeFocusedTask();
-    },
-    quit: () => ui.onQuit(),
-    scrollUp: () => ui.filesPane.onScroll(-1),
-    scrollDown: () => ui.filesPane.onScroll(1),
-    pageUp: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(-1)),
-    pageDown: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(1)),
-    halfUp: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(-0.5)),
-    halfDown: () => ui.filesPane.onScroll(ui.filesPane.scrollStep(0.5)),
-    home: ui.filesPane.onHome,
-    end: ui.filesPane.onEnd,
-  };
+const scrollBy = (fraction) => (ui) =>
+  filesPane.onScroll(ui, filesPane.scrollStep(ui, fraction));
 
-  const dispatch = (action) => {
-    if (CONFIRM_MODE.includes(ui.mode)) return;
-    if (ui.mode === 'compose') {
-      if (!COMPOSE_LEAVE.includes(action)) return;
-      const result = ui.composer.saveCompose();
-      if (result && result.kind === 'error') return;
-    }
-    const pane = ui.pane;
-    if (LIST_PANES.includes(pane) && (action === 'next' || action === 'prev')) {
-      ui.filesPane.onScroll(action === 'next' ? 1 : -1);
-      return;
-    }
-    const hidden = disabledActions(pane, currentTarget(ui));
-    if (hidden.includes(action)) return;
-    const handler = handlers[action];
-    if (!handler) return;
-    handler();
-  };
+const DASH_HANDLERS = Object.fromEntries(
+  Object.entries(DASH_BLOCKS).map(([id, block]) => [
+    id,
+    (ui) => ui.dashboard.open(block),
+  ]),
+);
 
-  return { dispatch, handlers };
+const HANDLERS = {
+  add: (ui) => onCommand(ui, 'add'),
+  unstage: (ui) => onCommand(ui, 'unstage'),
+  revert: (ui) => onCommand(ui, 'revert'),
+  ignore: (ui) => onCommand(ui, 'ignore'),
+  next: filesPane.onNext,
+  prev: filesPane.onPrev,
+  layout: filesPane.onLayout,
+  theme: filesPane.onTheme,
+  files: filesPane.onFiles,
+  open: filesPane.onOpenFile,
+  file: filesPane.onFileScope,
+  diff: filesPane.onDiffScope,
+  back: filesPane.onEscape,
+  home: filesPane.onHome,
+  end: filesPane.onEnd,
+  scrollUp: (ui) => filesPane.onScroll(ui, -1),
+  scrollDown: (ui) => filesPane.onScroll(ui, 1),
+  pageUp: scrollBy(-1),
+  pageDown: scrollBy(1),
+  halfUp: scrollBy(-0.5),
+  halfDown: scrollBy(0.5),
+  feedback: (ui) => ui.composer.onFeedback(),
+  code: (ui) => ui.composer.onCode(),
+  tasks: (ui) => ui.composer.tasks.onTasks(),
+  check: (ui) => ui.composer.tasks.toggleFocusedTask(),
+  removeTask: (ui) => {
+    if (ui.pane === 'npm') return void ui.npm.askDrop();
+    ui.composer.tasks.removeFocusedTask();
+  },
+  reload: (ui) => ui.lifecycle.onReload(),
+  commit: (ui) => ui.commits.onCommit(),
+  amend: (ui) => ui.commits.onAmend(),
+  reword: (ui) => ui.commits.onReword(),
+  apply: (ui) => ui.commits.onApply(),
+  fixup: (ui) => ui.commits.onFixup(),
+  view: (ui) => ui.commits.onView(),
+  branch: (ui) => ui.gitBranches.onBranch(),
+  pull: (ui) => ui.gitBranches.onPull(),
+  push: (ui) => ui.gitBranches.onPush(),
+  newBranch: (ui) => ui.gitBranches.onNewBranch(),
+  rebase: (ui) => ui.gitBranches.onRebaseBranch(),
+  drop: (ui) => {
+    if (ui.pane === 'commits') return void ui.commits.onDropCommit();
+    if (ui.pane === 'tasks') return void ui.composer.tasks.removeFocusedTask();
+    ui.gitBranches.onDropBranch();
+  },
+  npm: (ui) => ui.npm.open(),
+  npmEdit: (ui) => ui.npm.edit(),
+  npmNew: (ui) => ui.npm.create(),
+  npmDrop: (ui) => ui.npm.askDrop(),
+  npmLogs: (ui) => ui.npm.askLogs(),
+  npmStop: (ui) => ui.npm.closeView(),
+  npmVerbose: (ui) => ui.npm.toggleVerbose(),
+  npmRerun: (ui) => ui.npm.rerun(),
+  quit: (ui) => ui.onQuit(),
+  ...DASH_HANDLERS,
 };
 
-const createInput = (ui) => {
-  const confirmations = {
-    confirmQuit: {
-      ready: () => ui.finishQuit('ready'),
-      editing: () => ui.finishQuit('editing'),
-      cancel: () => ui.cancelQuit(),
-    },
-    confirmUpdate: {
-      accept: () => ui.updater.accept(),
-      decline: () => ui.updater.decline(),
-    },
-    confirmDrop: {
-      confirm: () => {
-        if (ui.npm.dropName) return void ui.npm.confirmDrop();
-        if (ui.commits.dropName) {
-          return void ui.commits.confirmDropCommit();
-        }
-        ui.gitBranches.confirmDropBranch();
-      },
-      cancel: () => {
-        if (ui.npm.dropName) return void ui.npm.cancelDrop();
-        if (ui.commits.dropName) {
-          return void ui.commits.cancelDropCommit();
-        }
-        ui.gitBranches.cancelDropBranch();
-      },
+const dispatchAction = (ui, action) => {
+  if (CONFIRM_MODE.includes(ui.mode)) return;
+  if (ui.mode === 'compose') {
+    if (!COMPOSE_LEAVE.includes(action)) return;
+    const result = ui.composer.saveCompose();
+    if (result && result.kind === 'error') return;
+  }
+  const pane = ui.pane;
+  if (pane === 'dashboard' && !DASH_ALLOWED.includes(action)) return;
+  if (LIST_PANES.includes(pane) && (action === 'next' || action === 'prev')) {
+    return void filesPane.onScroll(ui, action === 'next' ? 1 : -1);
+  }
+  if (disabledActions(pane, currentTarget(ui)).includes(action)) return;
+  const handler = HANDLERS[action];
+  if (handler) handler(ui);
+};
+
+const CONFIRMATIONS = {
+  confirmQuit: {
+    ready: (ui) => ui.finishQuit('ready'),
+    editing: (ui) => ui.finishQuit('editing'),
+    cancel: (ui) => ui.cancelQuit(),
+  },
+  confirmUpdate: {
+    accept: (ui) => ui.updater.accept(),
+    decline: (ui) => ui.updater.decline(),
+  },
+  confirmDrop: {
+    confirm: (ui) => {
+      if (ui.npm.dropName) return void ui.npm.confirmDrop();
+      if (ui.commits.dropName) return void ui.commits.confirmDropCommit();
+      ui.gitBranches.confirmDropBranch();
     },
-    confirmPush: {
-      force: ui.gitBranches.onForcePush,
-      cancel: ui.gitBranches.cancelPush,
+    cancel: (ui) => {
+      if (ui.npm.dropName) return void ui.npm.cancelDrop();
+      if (ui.commits.dropName) return void ui.commits.cancelDropCommit();
+      ui.gitBranches.cancelDropBranch();
     },
-  };
-
-  const confirmChoice = (key) => {
-    const mode = ui.mode;
-    if (!CONFIRM_MODE.includes(mode)) return;
-    applyConfirm(mode, key, confirmations[mode]);
-  };
+  },
+  confirmPush: {
+    force: (ui) => ui.gitBranches.onForcePush(),
+    cancel: (ui) => ui.gitBranches.cancelPush(),
+  },
+};
 
-  const npmViewKeys = {
-    escape: () => ui.npm.closeView(),
-    r: () => ui.npm.rerun(),
-    v: () => ui.npm.toggleVerbose(),
-    e: () => {},
-    n: () => {},
-  };
+const confirmChoice = (ui, key) => {
+  const handlers = CONFIRMATIONS[ui.mode];
+  const action = handlers ? confirmKey(ui.mode, key) : null;
+  if (action && handlers[action]) handlers[action](ui);
+};
 
-  const npmListKeys = {
-    'ctrl-up': () => ui.npm.reorder(-1),
-    'ctrl-down': () => ui.npm.reorder(1),
-    up: () => ui.npm.move(-1),
-    down: () => ui.npm.move(1),
-  };
+const NPM_VIEW_KEYS = {
+  escape: (ui) => ui.npm.closeView(),
+  r: (ui) => ui.npm.rerun(),
+  v: (ui) => ui.npm.toggleVerbose(),
+  e: () => {},
+  i: () => {},
+};
 
-  const npmKey = (key) => {
-    if (ui.pane !== 'npm') return null;
-    if (ui.npm.viewing && Object.hasOwn(npmViewKeys, key)) {
-      return npmViewKeys[key];
-    }
-    return Object.hasOwn(npmListKeys, key) ? npmListKeys[key] : null;
-  };
+const NPM_LIST_KEYS = {
+  'ctrl-up': (ui) => ui.npm.reorder(-1),
+  'ctrl-down': (ui) => ui.npm.reorder(1),
+  up: (ui) => ui.npm.move(-1),
+  down: (ui) => ui.npm.move(1),
+};
 
-  const handleKey = (key) => {
-    const mode = ui.mode;
-    if (CONFIRM_MODE.includes(mode)) return void confirmChoice(key);
-    if (mode === 'compose') {
-      const command = ui.composer.handleKey(key);
-      return void ui.runComposeCommand(command);
-    }
-    const onNpmKey = npmKey(key);
-    if (onNpmKey) return void onNpmKey();
-    if (key === 'escape') return void ui.filesPane.onEscape();
-    const toggle = key === 'x' || key === ' ';
-    if (toggle && ui.composer.toggleFocusedTask()) return;
-    if (ui.composer.typeIntoTask(key)) return;
-    const action = actionFromKey(key, ui.pane, ui.fileScope);
-    if (action) ui.dispatch(action);
-  };
+const npmKey = (ui, key) => {
+  if (ui.pane !== 'npm') return null;
+  if (ui.npm.viewing && Object.hasOwn(NPM_VIEW_KEYS, key)) {
+    return NPM_VIEW_KEYS[key];
+  }
+  return Object.hasOwn(NPM_LIST_KEYS, key) ? NPM_LIST_KEYS[key] : null;
+};
 
-  const handleEvent = (event) => {
-    if (event.type === 'key') return void handleKey(event.key);
-    if (event.type !== 'mouse') return;
-    ui.pointer.handle(event);
-  };
+const handleKey = (ui, key) => {
+  if (CONFIRM_MODE.includes(ui.mode)) return void confirmChoice(ui, key);
+  if (ui.mode === 'compose') {
+    return void ui.runComposeCommand(ui.composer.handleKey(key));
+  }
+  const onNpmKey = npmKey(ui, key);
+  if (onNpmKey) return void onNpmKey(ui);
+  if (key === 'escape') return void filesPane.onEscape(ui);
+  const tasks = ui.composer.tasks;
+  const toggle = key === 'x' || key === ' ';
+  if (toggle && tasks.toggleFocusedTask()) return;
+  if (tasks.typeIntoTask(key)) return;
+  const action = actionFromKey(key, ui.pane, ui.fileScope);
+  if (action) ui.dispatch(action);
+};
 
-  return { handleEvent, confirmChoice };
+const handleEvent = (ui, event) => {
+  if (event.type === 'key') return void handleKey(ui, event.key);
+  if (event.type === 'mouse') handlePointer(ui, event);
 };
 
-module.exports = { createDispatcher, createInput };
+module.exports = { dispatchAction, confirmChoice, handleEvent };

package/lib/session/files-pane.js

@@ -13,16 +13,16 @@ const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
 
-const current = (ui) => ui.nav.current(ui.items, ui.tasksItem);
+const fileCursorEntry = (ui) => ui.fileList()[ui.nav.fileCursor] ?? null;
 
 const clampIndex = (ui) => ui.nav.clampIndex(ui.items.length);
 
-const syncReviewPath = (ui) => ui.nav.syncReviewPath(current(ui));
+const syncReviewPath = (ui) => ui.nav.syncReviewPath(ui.current());
 
 const clampFileCursor = (ui) => ui.nav.clampFileCursor(ui.fileList().length);
 
 const followReviewPath = (ui) =>
-  ui.nav.followReviewPath(ui.fileList(), current(ui));
+  ui.nav.followReviewPath(ui.fileList(), ui.current());
 
 const syncFileCursor = (ui) => {
   if (ui.nav.pane === 'files') return void clampFileCursor(ui);
@@ -44,7 +44,42 @@ const showFiles = (ui) => {
   if (held) ui.lifecycle.catchUpWatch();
 };
 
+const viewingCommit = (ui) => !ui.change && Boolean(ui.rev || ui.revShort);
+
+const releaseCommit = (ui) => {
+  if (!viewingCommit(ui)) return;
+  ui.rev = '';
+  ui.revShort = '';
+  ui.refreshFromRepo({ keepEmpty: true });
+};
+
+const showDashboard = (ui) => {
+  const nav = ui.nav;
+  const held = nav.pane !== 'dashboard';
+  nav.pane = 'dashboard';
+  nav.tasksOpen = false;
+  nav.scroll = 0;
+  nav.clearSelection();
+  ui.status = '';
+  releaseCommit(ui);
+  if (held) ui.lifecycle.catchUpWatch();
+  ui.dashboard.enter();
+};
+
+const HOME_CHILDREN = ['files', 'branches', 'commits', 'npm'];
+
+const returnsHome = (ui) => {
+  if (!ui.dashboardHome) return false;
+  const { pane, tasksOpen } = ui.nav;
+  return HOME_CHILDREN.includes(pane) || tasksOpen === true;
+};
+
 const onEscape = (ui) => {
+  if (ui.nav.pane === 'dashboard') return void ui.onQuit();
+  const commitDiff = ui.nav.pane === 'diff' && viewingCommit(ui);
+  if (returnsHome(ui) || (ui.dashboardHome && commitDiff)) {
+    return void showDashboard(ui);
+  }
   if (ui.nav.pane === 'files') return void ui.onQuit();
   showFiles(ui);
 };
@@ -60,7 +95,6 @@ const onFiles = (ui) => {
     }
     ui.nav.pane = 'diff';
     ui.nav.clearSelection();
-    if (ui.nav.reviewPath === TASKS_FILE) ui.composer.openTasksPage();
     return;
   }
   showFiles(ui);
@@ -73,14 +107,14 @@ const onOpenFile = (ui) => {
   if (ui.nav.pane === 'commits') return void ui.commits.onShowDiff();
   if (ui.nav.pane === 'npm') return void ui.npm.run();
   if (ui.nav.pane !== 'files') {
-    if (ui.nav.tasksOpen) ui.composer.editFocusedTask();
+    if (ui.nav.tasksOpen) ui.composer.tasks.editFocusedTask();
     return;
   }
   const list = ui.fileList();
   const entry = list[ui.nav.fileCursor];
   if (!entry) return;
   if (isTasksEntry(entry)) {
-    ui.composer.openTasksPage();
+    ui.composer.tasks.openTasksPage();
     ui.status = '';
     return;
   }
@@ -134,21 +168,13 @@ const moveRemaining = (ui, step) => {
 
 const onNext = (ui) => {
   if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, 1);
-  if (ui.nav.tasksOpen) {
-    ui.composer.closeTasksPage();
-    if (ui.items.length) ui.nav.index = 0;
-    ui.nav.scroll = 0;
-    syncReviewPath(ui);
-    syncFileCursor(ui);
-    return;
-  }
+  if (ui.nav.pane === 'tasks') return void ui.composer.tasks.moveTaskFocus(1);
   moveRemaining(ui, 1);
 };
 
 const onPrev = (ui) => {
   if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, -1);
-  if (ui.nav.tasksOpen) return;
-  if (ui.nav.index <= 0) return void ui.composer.openTasksPage();
+  if (ui.nav.pane === 'tasks') return void ui.composer.tasks.moveTaskFocus(-1);
   moveRemaining(ui, -1);
 };
 
@@ -158,7 +184,7 @@ const scrollStep = (ui, fraction) => {
   const rows = size.height ?? 24;
   const fallback = Math.max(1, rows - 4);
   const bodyH = frame?.bodyH ?? fallback;
-  const viewing = ui.nav.pane === 'npm' && ui.npm && ui.npm.viewing;
+  const viewing = ui.nav.pane === 'npm' && ui.npm.viewing;
   const viewRows = viewing ? logViewRows(bodyH) : bodyH;
   const height = Math.max(1, viewRows);
   const span = Math.floor(height * Math.abs(fraction));
@@ -168,6 +194,7 @@ const scrollStep = (ui, fraction) => {
 };
 
 const onScroll = (ui, delta) => {
+  if (ui.nav.pane === 'dashboard') return;
   if (ui.nav.pane === 'files') return void onFileMove(ui, delta);
   if (ui.nav.pane === 'branches') {
     return void ui.gitBranches.onBranchMove(delta);
@@ -176,8 +203,8 @@ const onScroll = (ui, delta) => {
     return void ui.commits.onCommitMove(delta);
   }
   if (ui.nav.pane === 'npm') return void ui.npm.move(delta);
-  if (ui.nav.tasksOpen && ui.composer.taskRowCount() > 1) {
-    return void ui.composer.moveTaskFocus(delta);
+  if (ui.nav.tasksOpen && ui.composer.tasks.taskRowCount() > 1) {
+    return void ui.composer.tasks.moveTaskFocus(delta);
   }
   const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : null;
@@ -190,15 +217,16 @@ const onScroll = (ui, delta) => {
 };
 
 const onJump = (ui, toEnd) => {
+  if (ui.nav.pane === 'dashboard') return;
   if (LIST_PANES.includes(ui.nav.pane)) {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
     return void onScroll(ui, delta);
   }
-  if (ui.nav.tasksOpen && ui.composer.taskRowCount() > 0) {
-    const last = ui.composer.taskRowCount() - 1;
+  if (ui.nav.tasksOpen && ui.composer.tasks.taskRowCount() > 0) {
+    const last = ui.composer.tasks.taskRowCount() - 1;
     const target = toEnd ? last : 0;
-    const at = ui.composer.clampedTaskFocus();
-    return void ui.composer.moveTaskFocus(target - at);
+    const at = ui.composer.tasks.clampedTaskFocus();
+    return void ui.composer.tasks.moveTaskFocus(target - at);
   }
   const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : 0;
@@ -223,24 +251,28 @@ const onTheme = (ui) => {
   ui.status = next;
 };
 
-const createFilesPane = (ui) => ({
-  clampIndex: () => clampIndex(ui),
-  syncReviewPath: () => syncReviewPath(ui),
-  syncFileCursor: () => syncFileCursor(ui),
-  showFiles: () => showFiles(ui),
-  onEscape: () => onEscape(ui),
-  onFiles: () => onFiles(ui),
-  onOpenFile: () => onOpenFile(ui),
-  onNext: () => onNext(ui),
-  onPrev: () => onPrev(ui),
-  scrollStep: (fraction) => scrollStep(ui, fraction),
-  onScroll: (delta) => onScroll(ui, delta),
-  onHome: () => onJump(ui, false),
-  onEnd: () => onJump(ui, true),
-  onLayout: () => onLayout(ui),
-  onTheme: () => onTheme(ui),
-  onFileScope: () => setFileScope(ui, 'file'),
-  onDiffScope: () => setFileScope(ui, 'diff'),
-});
-
-module.exports = { createFilesPane };
+const onHome = (ui) => onJump(ui, false);
+const onEnd = (ui) => onJump(ui, true);
+const onFileScope = (ui) => setFileScope(ui, 'file');
+const onDiffScope = (ui) => setFileScope(ui, 'diff');
+
+module.exports = {
+  fileCursorEntry,
+  clampIndex,
+  syncReviewPath,
+  syncFileCursor,
+  showFiles,
+  onEscape,
+  onFiles,
+  onOpenFile,
+  onNext,
+  onPrev,
+  scrollStep,
+  onScroll,
+  onHome,
+  onEnd,
+  onLayout,
+  onTheme,
+  onFileScope,
+  onDiffScope,
+};

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);
   }
 }