reslop 0.2.5 → 0.2.6

package/lib/session/ops.js

@@ -6,17 +6,8 @@ const QUIET_KIND = new Set(['staged', 'unstaged']);
 const pickRepoWrite = (repo, name, uiOpen) => {
   const asyncFn = repo[`${name}Async`];
   const allowAsync = uiOpen === true || ASYNC_WITHOUT_UI.includes(name);
-  if (allowAsync && typeof asyncFn === 'function') {
-    return {
-      async: true,
-      write: (top, ...args) => asyncFn(top, ...args),
-    };
-  }
-  const syncFn = repo[name];
-  return {
-    async: false,
-    write: (top, ...args) => syncFn(top, ...args),
-  };
+  const isAsync = allowAsync && typeof asyncFn === 'function';
+  return { async: isAsync, write: isAsync ? asyncFn : repo[name] };
 };
 
 const showsBusy = (kind) => Boolean(kind) && !QUIET_KIND.has(kind);
@@ -86,7 +77,6 @@ class ChangeQueue {
 
   startReload() {
     const { ui } = this;
-    if (typeof ui.reloadAfterChange !== 'function') return void ui.paint();
     this.reloading = true;
     ui.reloadAfterChange(() => {
       this.reloading = false;
@@ -231,15 +221,17 @@ class OpsRunner {
     this.finishBusy(done, after);
   }
 
-  runWrite(name, args, kind, done, after) {
+  runWrite(name, args, kind, done, after, leave = null) {
     const { ui } = this;
     const picked = pickRepoWrite(ui.repo, name, ui.uiOpen);
     const write = (top) => picked.write(top, ...args);
     if (picked.async) {
+      if (leave) leave();
       const refresh = () => after({ doneStatus: done });
       return void this.runBusy(kind, done, write, refresh);
     }
     if (!this.runRepo(done, write)) return;
+    if (leave) leave();
     after({});
     if (!ui.status) ui.status = done;
   }

package/lib/session/pointer.js

@@ -2,6 +2,7 @@
 
 const select = require('../select.js');
 const editClick = require('./edit-click.js');
+const filesPane = require('./files-pane.js');
 const { extractText, isRange } = select;
 const keys = require('../keys.js');
 const { hitAction } = keys;
@@ -94,16 +95,21 @@ const RELEASE_TARGETS = [
     hits: 'statusHits',
     onHit: (ui, hit) => {
       if (hit.id === 'branch') return void ui.gitBranches.onBranch();
-      ui.input.confirmChoice(hit.id);
+      ui.confirmChoice(hit.id);
     },
   },
+  {
+    match: (ui) => ui.pane === 'dashboard',
+    hits: 'fileHits',
+    onHit: (ui, hit) => ui.dashboard.open(hit.cursor),
+  },
   {
     match: (ui) => ui.pane === 'files',
     hits: 'fileHits',
     onHit: (ui, hit) => {
       const again = armDoubleClick(ui.nav, 'files', hit.cursor);
       ui.nav.fileCursor = hit.cursor;
-      if (again) ui.filesPane.onOpenFile();
+      if (again) filesPane.onOpenFile(ui);
     },
   },
   {
@@ -122,7 +128,7 @@ const RELEASE_TARGETS = [
       if (ui.mode === 'compose') return;
       const again = armDoubleClick(ui.nav, 'commits', hit.cursor);
       ui.nav.commitCursor = hit.cursor;
-      if (again) ui.filesPane.onOpenFile();
+      if (again) filesPane.onOpenFile(ui);
     },
   },
   {
@@ -135,11 +141,11 @@ const RELEASE_TARGETS = [
     },
   },
   {
-    match: (ui) => ui.pane === 'diff',
+    match: (ui) => ui.pane === 'tasks',
     hits: 'taskHits',
     onHit: (ui, hit) => {
-      if (hit.check) return void ui.composer.onTaskCheck(hit.cursor);
-      ui.composer.onTaskHit(hit.cursor);
+      if (hit.check) return void ui.composer.tasks.onTaskCheck(hit.cursor);
+      ui.composer.tasks.onTaskHit(hit.cursor);
     },
   },
   {
@@ -171,14 +177,14 @@ const onRelease = (ui, event) => {
 };
 
 const POINTER_HANDLERS = {
-  wheelUp: (ui) => ui.filesPane.onScroll(-1),
-  wheelDown: (ui) => ui.filesPane.onScroll(1),
+  wheelUp: (ui) => filesPane.onScroll(ui, -1),
+  wheelDown: (ui) => filesPane.onScroll(ui, 1),
   press: onPress,
   drag: onDrag,
   release: onRelease,
 };
 
-const handle = (ui, event) => {
+const handlePointer = (ui, event) => {
   const kind = event.kind;
   const handler = POINTER_HANDLERS[kind];
   if (!handler) return;
@@ -187,8 +193,4 @@ const handle = (ui, event) => {
   handler(ui, event);
 };
 
-const createPointer = (ui) => ({
-  handle: (event) => handle(ui, event),
-});
-
-module.exports = { createPointer };
+module.exports = { handlePointer };

package/lib/session/progress.js

@@ -1,32 +1,41 @@
 'use strict';
 
-const createProgress = (term, onTick, intervalMs) => {
-  const active = new Set();
-
-  const tick = () => {
-    if (!active.size) return;
-    onTick();
-    term.later('progress', tick, intervalMs);
-  };
-
-  const start = (id) => {
-    active.add(id);
-    term.later('progress', tick, intervalMs);
-  };
-
-  const stop = (id) => {
-    active.delete(id);
-    if (active.size === 0) term.cancel('progress');
-  };
-
-  const clear = () => {
-    active.clear();
-    term.cancel('progress');
-  };
-
-  const size = () => active.size;
-
-  return { start, stop, clear, size };
-};
-
-module.exports = { createProgress };
+class Progress {
+  constructor(term, onTick, intervalMs) {
+    this.term = term;
+    this.onTick = onTick;
+    this.intervalMs = intervalMs;
+    this.active = new Set();
+  }
+
+  tick() {
+    if (!this.active.size) return;
+    this.onTick();
+    this.schedule();
+  }
+
+  schedule() {
+    this.term.later('progress', () => this.tick(), this.intervalMs);
+  }
+
+  start(id) {
+    this.active.add(id);
+    this.schedule();
+  }
+
+  stop(id) {
+    this.active.delete(id);
+    if (!this.active.size) this.term.cancel('progress');
+  }
+
+  clear() {
+    this.active.clear();
+    this.term.cancel('progress');
+  }
+
+  size() {
+    return this.active.size;
+  }
+}
+
+module.exports = { Progress };

package/lib/session/review.js

@@ -7,9 +7,7 @@ const { loadReview, flushReview } = review;
 
 class ReviewController {
   constructor() {
-    this.store = null;
-    this.didResume = false;
-    this.importedRemote = false;
+    this.reset();
   }
 
   reset() {