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

Support 3-parameter modifyOtherKeys sequences (#13342)

Browse Source
This commit is contained in:
Tommaso Sciortino
2025-11-18 16:40:40 -08:00
committed by GitHub
parent 10003a6490
commit 90c764ce13
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/cli/src/ui/contexts/KeypressContext.test.tsx
View File

@@ -405,12 +405,21 @@ describe('KeypressContext', () => {
describe('Parameterized functional keys', () => { describe('Parameterized functional keys', () => {
it.each([ it.each([
// Parameterized // ModifyOtherKeys
{ sequence: `\x1b[27;2;13~`, expected: { name: 'return', shift: true } },
{ sequence: `\x1b[27;5;13~`, expected: { name: 'return', ctrl: true } },
{ sequence: `\x1b[27;5;9~`, expected: { name: 'tab', ctrl: true } },
{
sequence: `\x1b[27;6;9~`,
expected: { name: 'tab', ctrl: true, shift: true },
},
// XTerm Function Key
{ sequence: `\x1b[1;129A`, expected: { name: 'up' } }, { sequence: `\x1b[1;129A`, expected: { name: 'up' } },
{ sequence: `\x1b[1;2H`, expected: { name: 'home', shift: true } }, { sequence: `\x1b[1;2H`, expected: { name: 'home', shift: true } },
{ sequence: `\x1b[1;5F`, expected: { name: 'end', ctrl: true } }, { sequence: `\x1b[1;5F`, expected: { name: 'end', ctrl: true } },
{ sequence: `\x1b[1;1P`, expected: { name: 'f1' } }, { sequence: `\x1b[1;1P`, expected: { name: 'f1' } },
{ sequence: `\x1b[1;3Q`, expected: { name: 'f2', meta: true } }, { sequence: `\x1b[1;3Q`, expected: { name: 'f2', meta: true } },
// Tilde Function Keys
{ sequence: `\x1b[3~`, expected: { name: 'delete' } }, { sequence: `\x1b[3~`, expected: { name: 'delete' } },
{ sequence: `\x1b[5~`, expected: { name: 'pageup' } }, { sequence: `\x1b[5~`, expected: { name: 'pageup' } },
{ sequence: `\x1b[6~`, expected: { name: 'pagedown' } }, { sequence: `\x1b[6~`, expected: { name: 'pagedown' } },
@@ -441,6 +450,7 @@ describe('KeypressContext', () => {
sequence: `\x1b[D`, sequence: `\x1b[D`,
expected: { name: 'left', ctrl: false, meta: false, shift: false }, expected: { name: 'left', ctrl: false, meta: false, shift: false },
}, },
// Legacy Home/End // Legacy Home/End
{ {
sequence: `\x1b[H`, sequence: `\x1b[H`,

27
packages/cli/src/ui/contexts/KeypressContext.tsx
View File

@@ -366,13 +366,15 @@ function* emitKeys(
// skip modifier // skip modifier
if (ch === ';') { if (ch === ';') {
ch = yield; while (ch === ';') {
sequence += ch;
// collect as many digits as possible
while (ch >= '0' && ch <= '9') {
ch = yield; ch = yield;
sequence += ch; sequence += ch;
// collect as many digits as possible
while (ch >= '0' && ch <= '9') {
ch = yield;
sequence += ch;
}
} }
} else if (ch === '<') { } else if (ch === '<') {
// SGR mouse mode // SGR mouse mode
@@ -401,10 +403,17 @@ function* emitKeys(
const cmd = sequence.slice(cmdStart); const cmd = sequence.slice(cmdStart);
let match; let match;
if ((match = /^(\d+)(?:;(\d+))?([~^$u])$/.exec(cmd))) { if ((match = /^(\d+)(?:;(\d+))?(?:;(\d+))?([~^$u])$/.exec(cmd))) {
code += match[1] + match[3]; if (match[1] === '27' && match[3] && match[4] === '~') {
// Defaults to '1' if no modifier exists, resulting in a 0 modifier value // modifyOtherKeys format: CSI 27 ; modifier ; key ~
modifier = parseInt(match[2] ?? '1', 10) - 1; // Treat as CSI u: key + 'u'
code += match[3] + 'u';
modifier = parseInt(match[2] ?? '1', 10) - 1;
} else {
code += match[1] + match[4];
// Defaults to '1' if no modifier exists, resulting in a 0 modifier value
modifier = parseInt(match[2] ?? '1', 10) - 1;
}
} else if ((match = /^(\d+)?(?:;(\d+))?([A-Za-z])$/.exec(cmd))) { } else if ((match = /^(\d+)?(?:;(\d+))?([A-Za-z])$/.exec(cmd))) {
code += match[3]; code += match[3];
modifier = parseInt(match[2] ?? match[1] ?? '1', 10) - 1; modifier = parseInt(match[2] ?? match[1] ?? '1', 10) - 1;