reslop 0.2.3 → 0.2.5

package/lib/session/compose.js

@@ -4,22 +4,29 @@ const wrap = require('../wrap.js');
 const { cursorInWrap, wrapDoc } = wrap;
 const render = require('../render/render.js');
 const { noteInnerWidth, codeInnerWidth, todoBodyWidth } = render;
-const { commitMessageWidth } = require('../render/commits.js');
-const { listedCommits } = require('./commit.js');
-const { Editor } = require('../editor.js');
+const commits = require('../render/commits.js');
+const { commitMessageWidth } = commits;
+const commit = require('./commit.js');
+const { listedCommits } = commit;
+const editor = require('../editor.js');
+const { Editor } = editor;
 const files = require('../files.js');
-const { itemPath, isTodoItem, listPath, isReadOnlyOrigin } = files;
-const { blockAddText } = require('../diff/diff.js');
+const { itemPath, isTaskItem, listPath, isReadOnlyOrigin } = files;
+const diff = require('../diff/diff.js');
+const { blockAddText } = diff;
 const items = require('./items.js');
 const { itemFeedKey, canEditCode } = items;
 const review = require('../review.js');
 const { setFeedback, setCode, checkLabel, rememberTemplate } = review;
-const { createTemplatePick } = require('./templates.js');
-const { createTodoCompose } = require('./todos.js');
+const templates = require('./templates.js');
+const { createTemplatePick } = templates;
+const todos = require('./tasks.js');
+const { createTasksCompose } = todos;
 const unit = require('./unit.js');
+const clipboard = require('../clipboard.js');
 
 const COMPOSE_EDITS = ['backspace', 'delete', 'ctrl-z', 'ctrl-y'];
-const COMPOSE_LEAVE = ['next', 'prev', 'todo'];
+const COMPOSE_LEAVE = ['next', 'prev', 'tasks'];
 
 const KIND = {
   feedback: {
@@ -46,13 +53,13 @@ const KIND = {
     command: null,
     view: 'code',
   },
-  todo: {
+  tasks: {
     enter: 'edit-next',
     tab: 'template',
     escape: 'save',
-    move: 'todo',
+    move: 'tasks',
     command: null,
-    view: 'todo',
+    view: 'tasks',
   },
   commit: {
     enter: 'save',
@@ -85,11 +92,10 @@ const initialState = () => ({
   composeKind: null,
   commitKind: null,
   commitBody: '',
-  composeTodoId: null,
+  composeTaskId: null,
   composeBaseline: '',
   templateIndex: -1,
   templateFocus: false,
-  blinkOn: true,
   fileDirty: false,
   fileEditRows: null,
   fileOpened: '',
@@ -99,19 +105,18 @@ const reset = (state) => {
   Object.assign(state, initialState());
 };
 
-const resetBlink = (api) => {
-  api.state.blinkOn = true;
-  api.restartBlink();
-};
+const viewSize = (api) => api.ui.lastSize ?? api.ui.getSize();
 
-const tickBlink = (api) => {
-  if (!api.state.composeKind) return;
-  api.state.blinkOn = !api.state.blinkOn;
-  api.ui.draw();
+const syncCodeScroll = (api) => {
+  const kind = api.state.composeKind;
+  if (kind !== 'code' && kind !== 'file') return;
+  const ed = api.state.editor;
+  if (!ed) return;
+  const size = viewSize(api);
+  const inner = codeInnerWidth(size.width, api.ui.layout);
+  ed.reveal(inner);
 };
 
-const viewSize = (api) => api.ui.lastSize ?? api.ui.getSize();
-
 const followFileEdit = (api) => {
   if (api.state.composeKind !== 'file') return;
   const text = api.state.editor ? api.state.editor.text : null;
@@ -134,7 +139,7 @@ const openCompose = (api, kind, text, todoId) => {
   const { state, ui, nav } = api;
   ui.mode = 'compose';
   state.composeKind = kind;
-  state.composeTodoId = todoId ?? null;
+  state.composeTaskId = todoId ?? null;
   state.composeBaseline = text;
   state.fileOpened = kind === 'file' ? text : '';
   state.editor = new Editor(text);
@@ -142,7 +147,6 @@ const openCompose = (api, kind, text, todoId) => {
   state.templateFocus = false;
   ui.status = '';
   nav.clearSelection();
-  resetBlink(api);
 };
 
 const closeCompose = (api) => {
@@ -152,7 +156,7 @@ const closeCompose = (api) => {
   state.composeKind = null;
   state.commitKind = null;
   state.commitBody = '';
-  state.composeTodoId = null;
+  state.composeTaskId = null;
   state.composeBaseline = '';
   state.fileOpened = '';
   state.templateIndex = -1;
@@ -185,7 +189,7 @@ const writesCodeFile = (api, item) => {
 
 const commitFeedback = (api, text) => {
   const item = api.ui.current();
-  if (!item || isTodoItem(item)) return;
+  if (!item || isTaskItem(item)) return;
   const notes = api.review.store;
   setFeedback(notes, itemFeedKey(item), itemNote(item, text));
 };
@@ -249,7 +253,7 @@ const saveUnitFile = (api, text) => {
     api.ui.status = error.message;
     return false;
   }
-  if (typeof api.ui.ignoreWatch === 'function') api.ui.ignoreWatch();
+  api.ui.ignoreWatch();
   api.state.composeBaseline = text;
   api.state.fileDirty = true;
   return true;
@@ -268,12 +272,12 @@ const stageEditedFile = (api, rel) => {
       api.ui.status = error.message;
       return false;
     }
-    if (typeof api.ui.ignoreWatch === 'function') api.ui.ignoreWatch();
+    api.ui.ignoreWatch();
     return true;
   }
   if (typeof repo.add !== 'function') return false;
   let staged = 0;
-  for (const item of api.ui.items ?? []) {
+  for (const item of api.ui.items) {
     if (listPath(item) !== rel) continue;
     if (isReadOnlyOrigin(item.origin)) continue;
     if (item.origin === 'staged') continue;
@@ -283,14 +287,10 @@ const stageEditedFile = (api, rel) => {
       api.ui.status = error.message;
       return staged > 0;
     }
-    if (api.ui.collection && api.ui.collection.keepOrigin) {
-      api.ui.collection.keepOrigin(item, 'staged');
-    }
+    api.ui.collection.keepOrigin(item, 'staged');
     staged += 1;
   }
-  if (staged && typeof api.ui.ignoreWatch === 'function') {
-    api.ui.ignoreWatch();
-  }
+  if (staged) api.ui.ignoreWatch();
   return staged > 0;
 };
 
@@ -309,7 +309,7 @@ const saveFileCompose = (api) => {
   api.ui.flushReview();
   closeCompose(api);
   const doneStatus = changed ? 'staged' : 'saved';
-  if (!reload || typeof api.ui.reloadAfterChange !== 'function') {
+  if (!reload) {
     if (!api.ui.status) api.ui.status = doneStatus;
     return { kind: 'saved' };
   }
@@ -327,8 +327,8 @@ const commitCompose = (api) => {
     if (api.review.store) commitFeedback(api, text);
     return true;
   }
-  if (state.composeKind === 'todo') {
-    api.todos.commitTodo(text);
+  if (state.composeKind === 'tasks') {
+    api.tasks.commitTask(text);
     return true;
   }
   if (state.composeKind === 'code') return commitCode(api, text);
@@ -342,7 +342,7 @@ const saveCompose = (api, extra) => {
   if (spec && spec.command) return { kind: spec.command };
   const kind = api.state.composeKind;
   if (kind === 'file') return saveFileCompose(api);
-  const item = api.ui.current ? api.ui.current() : null;
+  const item = api.ui.current();
   const shouldStage =
     kind === 'code' &&
     writesCodeFile(api, item) &&
@@ -363,14 +363,14 @@ const saveCompose = (api, extra) => {
   api.ui.flushReview();
   closeCompose(api);
   const doneStatus = shouldStage && reload ? 'staged' : 'saved';
-  if (reload && typeof api.ui.reloadAfterChange === 'function') {
+  if (reload) {
     api.ui.reloadAfterChange(() => {
       if (!api.ui.status) api.ui.status = doneStatus;
     });
   } else {
     api.ui.status = doneStatus;
   }
-  if (opts.editNext === true) api.todos.editNextTodo();
+  if (opts.editNext === true) api.tasks.editNextTask();
   return { kind: 'saved' };
 };
 
@@ -402,7 +402,16 @@ const composeView = (api) => {
   const kind = state.composeKind;
   const text = state.editor.text;
   const cursor = state.editor.cursor;
-  return { kind, text, cursor, commitKind: state.commitKind };
+  const scrollCol = state.editor.scrollCol;
+  const anchor = state.editor.anchor;
+  return {
+    kind,
+    text,
+    cursor,
+    scrollCol,
+    anchor,
+    commitKind: state.commitKind,
+  };
 };
 
 const liveCodeText = (api) => {
@@ -426,7 +435,10 @@ const codeOverlayView = (api) => {
     api.state.composeKind === 'code' || api.state.composeKind === 'file';
   const editor = api.state.editor;
   const cursor = editing && editor ? editor.cursor : null;
-  return { text, keepEmpty: editing, cursor };
+  const picked = editing && editor ? editor.scrollCol : 0;
+  const scrollCol = picked ?? 0;
+  const anchor = editing && editor ? editor.anchor : null;
+  return { text, keepEmpty: editing, cursor, scrollCol, anchor };
 };
 
 const idleNoteText = (api) => {
@@ -434,7 +446,7 @@ const idleNoteText = (api) => {
   if (!notes) return '';
   if (api.state.composeKind) return '';
   const item = api.ui.current();
-  if (!item || isTodoItem(item)) return '';
+  if (!item || isTaskItem(item)) return '';
   const note = notes.feedback.get(itemFeedKey(item));
   if (!note || !note.text.trim()) return '';
   return checkLabel(note.text, note.done);
@@ -475,15 +487,15 @@ const moveTemplateLine = (api, delta, shown, width) => {
   return false;
 };
 
-const moveNoteLine = (api, delta) => {
+const moveNoteLine = (api, delta, extend) => {
   const size = viewSize(api);
   const width = noteInnerWidth(size.width);
   const shown = api.templates.shownTemplates();
   const feedback = api.state.composeKind === 'feedback';
-  if (shown.length && feedback) {
+  if (shown.length && feedback && !extend) {
     if (moveTemplateLine(api, delta, shown, width)) return;
   }
-  api.state.editor.moveLine(delta, width);
+  api.state.editor.moveLine(delta, width, extend);
 };
 
 const fullCommitEdit = (api) =>
@@ -496,27 +508,26 @@ const editedCommitEntry = (api) => {
   return list[api.nav.commitCursor] ?? null;
 };
 
-const moveCommitLine = (api, delta) => {
+const moveCommitLine = (api, delta, extend) => {
   const size = viewSize(api);
   const width = commitMessageWidth(editedCommitEntry(api), size.width);
-  api.state.editor.moveLine(delta, width);
+  api.state.editor.moveLine(delta, width, extend);
 };
 
-const moveComposeLine = (api, delta) => {
+const moveComposeLine = (api, delta, extend) => {
   const spec = KIND[api.state.composeKind];
   const move = spec ? spec.move : 'note';
-  if (move === 'todo') {
+  if (move === 'tasks') {
     const size = viewSize(api);
     const inner = todoBodyWidth(size.width);
-    return void api.todos.moveTodoCompose(delta, inner);
+    return void api.tasks.moveTaskCompose(delta, inner, extend);
   }
   if (move === 'code') {
-    const size = viewSize(api);
-    const inner = codeInnerWidth(size.width, api.ui.layout);
-    return void api.state.editor.moveLine(delta, inner);
+    api.state.editor.moveLine(delta, undefined, extend);
+    return void syncCodeScroll(api);
   }
-  if (fullCommitEdit(api)) return void moveCommitLine(api, delta);
-  moveNoteLine(api, delta);
+  if (fullCommitEdit(api)) return void moveCommitLine(api, delta, extend);
+  moveNoteLine(api, delta, extend);
 };
 
 const composePageStep = (api) => {
@@ -535,14 +546,14 @@ const jumpComposeTemplates = (api, toEnd) => {
   return true;
 };
 
-const composeHome = (api) => {
-  if (jumpComposeTemplates(api, false)) return;
-  api.state.editor.home();
+const composeHome = (api, extend) => {
+  if (!extend && jumpComposeTemplates(api, false)) return;
+  api.state.editor.home(extend);
 };
 
-const composeEnd = (api) => {
-  if (jumpComposeTemplates(api, true)) return;
-  api.state.editor.end();
+const composeEnd = (api, extend) => {
+  if (!extend && jumpComposeTemplates(api, true)) return;
+  api.state.editor.end(extend);
 };
 
 const moveComposePage = (api, dir) => {
@@ -556,7 +567,7 @@ const onFeedback = (api) => {
     return;
   }
   const item = api.ui.current();
-  if (!item || isTodoItem(item)) {
+  if (!item || isTaskItem(item)) {
     api.ui.status = 'not a diff block';
     return;
   }
@@ -581,6 +592,7 @@ const onUnitEdit = (api) => {
   openCompose(api, 'file', at.text);
   api.state.fileEditRows = at.rows ?? null;
   api.state.editor.cursor = Math.min(at.cursor, at.text.length);
+  syncCodeScroll(api);
   followFileEdit(api);
 };
 
@@ -602,11 +614,11 @@ const onCode = (api) => {
     : notes.code.get(itemFeedKey(item));
   const text = prev ? prev.text : original;
   openCompose(api, 'code', text);
+  syncCodeScroll(api);
 };
 
 const insertNewline = (api) => {
   api.state.editor.insert('\n');
-  resetBlink(api);
   followFileEdit(api);
   return null;
 };
@@ -619,6 +631,32 @@ const onEmptyLastLine = (editor) => {
   return text.slice(lastBreak + 1).trim() === '';
 };
 
+const filledLines = (text) => {
+  let count = 0;
+  for (const line of `${text ?? ''}`.split('\n')) {
+    if (line.trim() !== '') count += 1;
+  }
+  return count;
+};
+
+const blankTail = (text) => {
+  const lines = `${text ?? ''}`.split('\n');
+  let count = 0;
+  for (let i = lines.length - 1; i >= 0; i -= 1) {
+    if (lines[i].trim() !== '') break;
+    count += 1;
+  }
+  return count;
+};
+
+const enterFullCommit = (api) => {
+  const editor = api.state.editor;
+  const text = editor ? editor.text : '';
+  const shaped = filledLines(text) >= 2 || blankTail(text) >= 2;
+  if (onEmptyLastLine(editor) && shaped) return saveCompose(api);
+  return insertNewline(api);
+};
+
 const enterCompose = (api) => {
   const { state } = api;
   if (state.templateFocus && state.composeKind === 'feedback') {
@@ -626,10 +664,7 @@ const enterCompose = (api) => {
   }
   const spec = KIND[state.composeKind];
   if (spec && spec.enter === 'newline') return insertNewline(api);
-  if (fullCommitEdit(api)) {
-    if (onEmptyLastLine(state.editor)) return saveCompose(api);
-    return insertNewline(api);
-  }
+  if (fullCommitEdit(api)) return enterFullCommit(api);
   if (spec && spec.enter === 'edit-next') {
     return saveCompose(api, { editNext: true });
   }
@@ -646,35 +681,72 @@ const leaveCompose = (api, key) => {
   return saveCompose(api);
 };
 
+const copyCompose = (api) => {
+  const text = api.state.editor.selectedText();
+  if (!text) return;
+  const ok = clipboard.copyText(text, api.ui.stdout);
+  api.ui.status = ok ? 'copied' : 'copy failed';
+};
+
+const cutCompose = (api) => {
+  if (!api.state.editor.hasSelect()) return;
+  copyCompose(api);
+  api.state.editor.removeSpan();
+};
+
+const pasteCompose = (api) => {
+  const text = clipboard.pasteText();
+  if (!text) return;
+  api.state.editor.insert(text);
+};
+
+const COMPOSE_CLIP = ['ctrl-x', 'ctrl-v'];
+
 const COMPOSE_SPECIAL = {
   backspace: (api) => api.state.editor.backspace(),
   delete: (api) => api.state.editor.delete(),
   left: (api) => api.state.editor.move(-1),
   right: (api) => api.state.editor.move(1),
+  'shift-left': (api) => api.state.editor.move(-1, true),
+  'shift-right': (api) => api.state.editor.move(1, true),
   'ctrl-left': (api) => api.state.editor.moveWord(-1),
   'ctrl-right': (api) => api.state.editor.moveWord(1),
+  'ctrl-shift-left': (api) => api.state.editor.moveWord(-1, true),
+  'ctrl-shift-right': (api) => api.state.editor.moveWord(1, true),
   up: (api) => moveComposeLine(api, -1),
   down: (api) => moveComposeLine(api, 1),
+  'shift-up': (api) => moveComposeLine(api, -1, true),
+  'shift-down': (api) => moveComposeLine(api, 1, true),
   home: (api) => composeHome(api),
   end: (api) => composeEnd(api),
+  'shift-home': (api) => composeHome(api, true),
+  'shift-end': (api) => composeEnd(api, true),
   pageUp: (api) => moveComposePage(api, -1),
   pageDown: (api) => moveComposePage(api, 1),
   'ctrl-a': (api) => api.state.editor.home(),
   'ctrl-e': (api) => api.state.editor.end(),
+  'ctrl-c': (api) => copyCompose(api),
+  'ctrl-x': (api) => cutCompose(api),
+  'ctrl-v': (api) => pasteCompose(api),
   'ctrl-z': (api) => api.state.editor.undoEdit(),
   'ctrl-y': (api) => api.state.editor.redoEdit(),
   tab: (api) => composeTab(api),
 };
 
 const handleKey = (api, key) => {
-  if (key === 'enter') return enterCompose(api);
+  if (key === 'enter') {
+    const result = enterCompose(api);
+    syncCodeScroll(api);
+    return result;
+  }
   if (key === 'escape' || key === 'ctrl-s') return leaveCompose(api, key);
   const special = COMPOSE_SPECIAL[key];
   if (special) {
     const result = special(api);
-    if (COMPOSE_EDITS.includes(key)) api.templates.clearTemplatePick();
-    resetBlink(api);
+    const edits = COMPOSE_EDITS.includes(key) || COMPOSE_CLIP.includes(key);
+    if (edits) api.templates.clearTemplatePick();
     followFileEdit(api);
+    syncCodeScroll(api);
     return result ?? null;
   }
   if (!key.length) return null;
@@ -682,8 +754,8 @@ const handleKey = (api, key) => {
   if (key.charCodeAt(0) >= 32) {
     api.templates.clearTemplatePick();
     api.state.editor.insert(key);
-    resetBlink(api);
     followFileEdit(api);
+    syncCodeScroll(api);
   }
   return null;
 };
@@ -694,8 +766,10 @@ const applyDiskText = (api, text) => {
   const cursor = api.state.editor.cursor;
   api.state.editor.text = text;
   api.state.editor.cursor = Math.min(cursor, text.length);
+  api.state.editor.anchor = null;
   api.state.composeBaseline = text;
   api.state.fileEditRows = unit.linesFor(api.ui, api.nav.reviewPath, null);
+  syncCodeScroll(api);
   followFileEdit(api);
 };
 
@@ -709,8 +783,6 @@ const composerMethods = (api) => ({
   composeView: () => composeView(api),
   codeOverlayView: () => codeOverlayView(api),
   idleNoteText: () => idleNoteText(api),
-  resetBlink: () => resetBlink(api),
-  tickBlink: () => tickBlink(api),
   onFeedback: () => onFeedback(api),
   onCode: () => onCode(api),
   handleKey: (key) => handleKey(api, key),
@@ -722,28 +794,25 @@ const composerMethods = (api) => ({
   applyDiskText: (text) => applyDiskText(api, text),
 });
 
-const createComposer = ({ nav, review, ui, restartBlink }) => {
+const createComposer = ({ nav, review, ui }) => {
   const state = initialState();
-  const api = { nav, review, ui, restartBlink, state };
+  const api = { nav, review, ui, state };
   api.open = (kind, text, todoId) => openCompose(api, kind, text, todoId);
   api.close = () => closeCompose(api);
   api.commit = () => commitCompose(api);
   api.save = (opts) => saveCompose(api, opts);
-  api.resetBlink = () => resetBlink(api);
   api.templates = createTemplatePick(api);
-  api.todos = createTodoCompose(api);
+  api.tasks = createTasksCompose(api);
   const composer = {
     state,
     ...composerMethods(api),
-    ...api.todos,
+    ...api.tasks,
     ...api.templates,
   };
   return composer;
 };
 
 module.exports = {
-  COMPOSE_EDITS,
   COMPOSE_LEAVE,
-  KIND,
   createComposer,
 };