cursedbelt 5.79.3 → 5.80.0

package/src/react/line-keys/lineKeys.spec.tsx

@@ -89,9 +89,10 @@ describe('lineCommandOf', () => {
     expect(key('Enter', { metaKey: true, altKey: true })).toBeNull();
   });
 
-  test('⌘↑ / ⌘↓ (the owner\'s chord) and ⌥↑ / ⌥↓ (VS Code\'s) move a line; ⇧ stays a selection key', () => {
-    expect(key('ArrowUp', { metaKey: true })).toBe('up');
-    expect(key('ArrowDown', { ctrlKey: true })).toBe('down');
+  test('⌥↑ / ⌥↓ move a line; ⌘↑ / ⌘↓ stay the jump to the top or bottom (VS Code, forge task 3182); ⇧ stays a selection key', () => {
+    expect(key('ArrowUp', { metaKey: true })).toBeNull();
+    expect(key('ArrowDown', { metaKey: true })).toBeNull();
+    expect(key('ArrowDown', { ctrlKey: true })).toBeNull();
     expect(key('ArrowUp', { altKey: true })).toBe('up');
     expect(key('ArrowDown', { altKey: true })).toBe('down');
     expect(key('ArrowUp')).toBeNull();
@@ -136,23 +137,34 @@ describe('installLineKeys — on a React-controlled textarea', () => {
     expect(box.value).toBe('first\nsecond');
   });
 
-  test('⌘↓ moves a line through React state, the caret riding with it; past the last line it does nothing', () => {
+  test('⌥↓ moves a line through React state, the caret riding with it; past the last line it does nothing', () => {
     off = installLineKeys();
     const view = render(<Box initial={'one\ntwo\nthree'} />);
     const box = view.getByLabelText('box') as HTMLTextAreaElement;
     box.focus();
     box.setSelectionRange(1, 1);
-    fireEvent.keyDown(box, { key: 'ArrowDown', metaKey: true });
+    fireEvent.keyDown(box, { key: 'ArrowDown', altKey: true });
     expect(box.value).toBe('two\none\nthree');
     expect(box.selectionStart).toBe(5);
     fireEvent.keyDown(box, { key: 'ArrowDown', altKey: true });
     expect(box.value).toBe('two\nthree\none');
-    const blocked = fireEvent.keyDown(box, { key: 'ArrowDown', metaKey: true });
+    const blocked = fireEvent.keyDown(box, { key: 'ArrowDown', altKey: true });
     expect(box.value).toBe('two\nthree\none');
-    // Swallowed, so ⌘↓ at the last line does not also jump the caret to the end.
+    // Swallowed, so ⌥↓ at the last line does not also move the caret.
     expect(blocked).toBe(false);
   });
 
+  test('⌘↑ / ⌘↓ leave the line where it is and the key to the browser — its jump to the top or bottom', () => {
+    off = installLineKeys();
+    const view = render(<Box initial={'one\ntwo\nthree'} />);
+    const box = view.getByLabelText('box') as HTMLTextAreaElement;
+    box.focus();
+    box.setSelectionRange(5, 5);
+    expect(fireEvent.keyDown(box, { key: 'ArrowUp', metaKey: true })).toBe(true);
+    expect(fireEvent.keyDown(box, { key: 'ArrowDown', metaKey: true })).toBe(true);
+    expect(box.value).toBe('one\ntwo\nthree');
+  });
+
   test('a box that already answers ⌘↵ keeps it', () => {
     off = installLineKeys();
     const view = render(<Box claims initial="send me" />);

package/src/react/line-keys/lineKeys.ts

@@ -4,14 +4,14 @@
  *   ⌘↵  (Ctrl↵)         a new line BELOW the caret's line, from anywhere on it
  *   ⇧⌘↵ (Ctrl⇧↵)        a new line ABOVE it
  *   ⇧⌘K (Ctrl⇧K)        delete the line (every line the selection touches)
- *   ⌘↑ ⌘↓ (Ctrl↑ Ctrl↓)  move the line (every line the selection touches) up or down one
- *   ⌥↑ ⌥↓ (Alt↑ Alt↓)    the same — VS Code's own binding for it
+ *   ⌥↑ ⌥↓ (Alt↑ Alt↓)    move the line (every line the selection touches) up or down one
  *
  * The owner asked for these by name (2026-10-05, desk's context components first, "in apps with
- * multi line text boxes"; ⌘↑ / ⌘↓ the same day, in his words "like vscode does it"). ⌘↑ / ⌘↓ is
- * the owner's chord, and it costs the box the Mac's jump-to-top/bottom (⌘↑ is still that in a
- * single-line `<input>`, which this never touches); ⌥↑ / ⌥↓ is what VS Code itself binds, so
- * hands trained there find it too. They are one document listener rather than an `onKeyDown` on each
+ * multi line text boxes"). ⌘↑ / ⌘↓ is NOT a line key: it is VS Code's — and the Mac's — jump to the
+ * top or bottom, the line staying where it is (the owner, 2026-10-14, forge task 3182: "holding
+ * command and pushing up should jump to the top of the file … make all commands and keystrokes
+ * work like it does in VS code"). It moved the line from 2026-10-05 to then; the browser has it
+ * back. They are one document listener rather than an `onKeyDown` on each
  * `<textarea>` because desk alone draws a dozen of them by hand: a prop is a thing the next box
  * forgets, an install at boot is not.
  *
@@ -28,7 +28,7 @@
  *
  * CodeMirror boxes (cb's `CodeEditor`) are `contenteditable`, not `<textarea>`, and are left to
  * CodeMirror's own keymap: `Mod-Enter` and `Shift-Mod-k` are already in its `defaultKeymap`, and
- * `CodeEditor` adds the line above and ⌘↑ / ⌘↓ (⌥↑ / ⌥↓ is `defaultKeymap`'s `moveLineUp`/`Down`).
+ * `CodeEditor` adds the line above (⌥↑ / ⌥↓ is `defaultKeymap`'s `moveLineUp`/`Down`).
  */
 
 export type LineCommand = 'below' | 'above' | 'delete' | 'up' | 'down';
@@ -114,11 +114,15 @@ function moveLines(value: string, start: number, end: number, from: number, to:
   return { from, to: nextEnd, text: `${next}\n${block}`, caret: start + shift, end: end + shift };
 }
 
-/** Which command a key event asks for, or null. ⌘ on a Mac, Ctrl elsewhere — either is taken. */
+/**
+ * Which command a key event asks for, or null. ⌘ on a Mac, Ctrl elsewhere — either is taken —
+ * except on an arrow, which moves a line on ⌥ alone: ⌘↑ / ⌘↓ stays the browser's jump to the top
+ * or bottom, as in VS Code.
+ */
 export function lineCommandOf(event: Pick<KeyboardEvent, 'key' | 'metaKey' | 'ctrlKey' | 'shiftKey' | 'altKey'>): LineCommand | null {
   const arrow = event.key === 'ArrowUp' ? 'up' : event.key === 'ArrowDown' ? 'down' : null;
   // ⇧ with an arrow extends a selection, in every one of these chords; that stays the browser's.
-  if (arrow) return event.shiftKey || (event.metaKey || event.ctrlKey) === event.altKey ? null : arrow;
+  if (arrow) return event.altKey && !event.shiftKey && !event.metaKey && !event.ctrlKey ? arrow : null;
   if (!(event.metaKey || event.ctrlKey) || event.altKey) return null;
   if (event.key === 'Enter') return event.shiftKey ? 'above' : 'below';
   if (event.shiftKey && (event.key === 'k' || event.key === 'K')) return 'delete';
@@ -154,7 +158,7 @@ function onKeyDown(event: KeyboardEvent): void {
   if (command === 'delete' && field.value === '') return;
   event.preventDefault();
   // A move past the first or last line does nothing — and still swallows the key, as VS Code
-  // does, rather than letting ⌘↑ jump the caret to the top of the box.
+  // does, rather than letting ⌥↑ jump the caret to the start of the paragraph.
   const edit = lineEdit(field.value, field.selectionStart, field.selectionEnd, command);
   if (edit) applyLineEdit(field, edit);
 }