MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-18 01:51:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): Correct mouse click cursor positioning for wide characters (#13537)

Browse Source
This commit is contained in:
Sandy Tao
2025-11-21 07:56:31 +08:00
committed by GitHub
parent 78b10dccf1
commit 5982abeffb
2 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/cli/src/ui/components/shared/text-buffer.ts
View File

@@ -853,7 +853,7 @@ export interface TextBufferState {
lines: string[];
cursorRow: number;
cursorCol: number;
preferredCol: number | null; // This is visual preferred col
preferredCol: number | null; // This is the logical character offset in the visual line
undoStack: UndoHistoryEntry[];
redoStack: UndoHistoryEntry[];
clipboard: string | null;
@@ -2022,20 +2022,40 @@ export function useTextBuffer({
Math.min(visRow, visualLines.length - 1),
);
const visualLine = visualLines[clampedVisRow] || '';
// Clamp visCol to the length of the visual line
const clampedVisCol = Math.max(0, Math.min(visCol, cpLen(visualLine)));
if (visualToLogicalMap[clampedVisRow]) {
const [logRow, logStartCol] = visualToLogicalMap[clampedVisRow];
const codePoints = toCodePoints(visualLine);
let currentVisX = 0;
let charOffset = 0;
for (const char of codePoints) {
const charWidth = getCachedStringWidth(char);
// If the click is within this character
if (visCol < currentVisX + charWidth) {
// Check if we clicked the second half of a wide character
if (charWidth > 1 && visCol >= currentVisX + charWidth / 2) {
charOffset++;
}
break;
}
currentVisX += charWidth;
charOffset++;
}
// Clamp charOffset to length
charOffset = Math.min(charOffset, codePoints.length);
const newCursorRow = logRow;
const newCursorCol = logStartCol + clampedVisCol;
const newCursorCol = logStartCol + charOffset;
dispatch({
type: 'set_cursor',
payload: {
cursorRow: newCursorRow,
cursorCol: newCursorCol,
preferredCol: clampedVisCol,
preferredCol: charOffset,
},
});
}