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

Co-authored-by: Jacob Richman <jacob314@gmail.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
This commit is contained in:
gemini-cli-robot
2026-02-03 13:41:47 -08:00
committed by GitHub
parent 93c2f0cabb
commit 57c7f6faeb
2 changed files with 55 additions and 2 deletions

View File

@@ -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({

View File

@@ -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;
}
@@ -2974,6 +2974,8 @@ export function useTextBuffer({
cursorCol,
lines,
singleLine,
visualCursor,
visualLines,
],
);