Skip to content

fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.7-pr-18108 [CONFLICTS] #18230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skeshive merged 2 commits into from
Feb 3, 2026
Merged

fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.7-pr-18108 [CONFLICTS] #18230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84dfaf4
Fix up/down arrow regression and add test. (#18108)
jacob314 Feb 2, 2026
9239a7b
Resolve conflict and fix test as part of merge.
jacob314 Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions packages/cli/src/ui/components/shared/text-buffer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,57 @@ describe('useTextBuffer', () => {
expect(state.visualCursor).toEqual([0, 1]);
});

it('move: up/down should work on wrapped lines (regression test)', () => {
// Line that wraps into two visual lines
// Viewport width 10. "0123456789ABCDE" (15 chars)
// Visual Line 0: "0123456789"
// Visual Line 1: "ABCDE"
const { result } = renderHook(() =>
useTextBuffer({
viewport: { width: 10, height: 5 },
isValidPath: () => false,
}),
);

act(() => {
result.current.setText('0123456789ABCDE');
});

// Cursor should be at the end: logical [0, 15], visual [1, 5]
expect(getBufferState(result).cursor).toEqual([0, 15]);
expect(getBufferState(result).visualCursor).toEqual([1, 5]);

// Press Up arrow - should move to first visual line
// This currently fails because handleInput returns false if cursorRow === 0
act(() => {
result.current.handleInput({
name: 'up',
shift: false,
alt: false,
ctrl: false,
cmd: false,
insertable: false,
sequence: '\x1b[A',
});
});
expect(getBufferState(result).visualCursor[0]).toBe(0);

// Press Down arrow - should move back to second visual line
// This would also fail if cursorRow is the last logical row
act(() => {
result.current.handleInput({
name: 'down',
shift: false,
alt: false,
ctrl: false,
cmd: false,
insertable: false,
sequence: '\x1b[B',
});
});
expect(getBufferState(result).visualCursor[0]).toBe(1);
});

it('moveToVisualPosition: should correctly handle wide characters (Chinese)', () => {
const { result } = renderHook(() =>
useTextBuffer({
Expand Down
6 changes: 4 additions & 2 deletions packages/cli/src/ui/components/shared/text-buffer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2905,12 +2905,12 @@ export function useTextBuffer({
return true;
}
if (keyMatchers[Command.MOVE_UP](key)) {
if (cursorRow === 0) return false;
if (visualCursor[0] === 0) return false;
move('up');
return true;
}
if (keyMatchers[Command.MOVE_DOWN](key)) {
if (cursorRow === lines.length - 1) return false;
if (visualCursor[0] === visualLines.length - 1) return false;
move('down');
return true;
}
Expand Down Expand Up @@ -2974,6 +2974,8 @@ export function useTextBuffer({
cursorCol,
lines,
singleLine,
visualCursor,
visualLines,
],
);

Expand Down
Loading