@google/gemini-cli 0.15.0-preview.5 → 0.15.0-preview.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/google-gemini-cli-0.15.0-preview.6.tgz +0 -0
- package/dist/package.json +3 -3
- package/dist/src/config/keyBindings.d.ts +6 -0
- package/dist/src/config/keyBindings.js +14 -0
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +10 -1
- package/dist/src/config/settingsSchema.js +10 -1
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/gemini.js +14 -22
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +4 -0
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/test-utils/render.js +5 -1
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/AppContainer.js +9 -2
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js +1 -4
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js.map +1 -1
- package/dist/src/ui/components/StickyHeader.d.ts +3 -0
- package/dist/src/ui/components/StickyHeader.js +2 -2
- package/dist/src/ui/components/StickyHeader.js.map +1 -1
- package/dist/src/ui/components/StickyHeader.test.js +2 -2
- package/dist/src/ui/components/StickyHeader.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +5 -7
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +18 -12
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +56 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.d.ts +3 -0
- package/dist/src/ui/components/messages/ToolMessage.js +6 -10
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.test.js +3 -0
- package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js +3 -0
- package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.js +99 -9
- package/dist/src/ui/components/shared/ScrollableList.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.test.js +66 -0
- package/dist/src/ui/components/shared/ScrollableList.test.js.map +1 -1
- package/dist/src/ui/contexts/ScrollProvider.d.ts +1 -0
- package/dist/src/ui/contexts/ScrollProvider.drag.test.d.ts +6 -0
- package/dist/src/ui/contexts/ScrollProvider.drag.test.js +307 -0
- package/dist/src/ui/contexts/ScrollProvider.drag.test.js.map +1 -0
- package/dist/src/ui/contexts/ScrollProvider.js +112 -2
- package/dist/src/ui/contexts/ScrollProvider.js.map +1 -1
- package/dist/src/ui/contexts/ScrollProvider.test.js +138 -0
- package/dist/src/ui/contexts/ScrollProvider.test.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.d.ts +2 -0
- package/dist/src/ui/hooks/useAlternateBuffer.js +2 -1
- package/dist/src/ui/hooks/useAlternateBuffer.js.map +1 -1
- package/dist/src/ui/keyMatchers.test.js +37 -0
- package/dist/src/ui/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.js +5 -5
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.test.d.ts +6 -0
- package/dist/src/ui/utils/CodeColorizer.test.js +38 -0
- package/dist/src/ui/utils/CodeColorizer.test.js.map +1 -0
- package/dist/src/ui/utils/ui-sizing.js +2 -1
- package/dist/src/ui/utils/ui-sizing.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/dist/google-gemini-cli-0.15.0-preview.4.tgz +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScrollProvider.test.js","sourceRoot":"","sources":["../../../../src/ui/contexts/ScrollProvider.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EACL,cAAc,EACd,aAAa,GAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAkB,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,GAAG,EAAmB,MAAM,KAAK,CAAC;AAG3C,qBAAqB;AACrB,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;AACrE,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;IACzC,yFAAyF;IACzF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,CAAC,QAAqC,EAAE,EAAE;YAClD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;gBACnB,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACpC,OAAO,GAAG,EAAE;oBACV,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACzC,CAAC,CAAC;YACJ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACtC,MAAM,MAAM,GAAG,MAAM,cAAc,EAAwB,CAAC;IAC5D,OAAO;QACL,GAAG,MAAM;QACT,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;KACrE,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,UAAU,CAC/B,CACE,
|
|
1
|
+
{"version":3,"file":"ScrollProvider.test.js","sourceRoot":"","sources":["../../../../src/ui/contexts/ScrollProvider.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,6 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import type { LoadedSettings } from '../../config/settings.js';
|
|
7
|
+
export declare const isAlternateBufferEnabled: (settings: LoadedSettings) => boolean;
|
|
6
8
|
export declare const useAlternateBuffer: () => boolean;
|
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useSettings } from '../contexts/SettingsContext.js';
|
|
7
|
+
export const isAlternateBufferEnabled = (settings) => settings.merged.ui?.useAlternateBuffer !== false;
|
|
7
8
|
export const useAlternateBuffer = () => {
|
|
8
9
|
const settings = useSettings();
|
|
9
|
-
return settings
|
|
10
|
+
return isAlternateBufferEnabled(settings);
|
|
10
11
|
};
|
|
11
12
|
//# sourceMappingURL=useAlternateBuffer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAlternateBuffer.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAlternateBuffer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"useAlternateBuffer.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAlternateBuffer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAG7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,QAAwB,EAAW,EAAE,CAC5E,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,kBAAkB,KAAK,KAAK,CAAC;AAEnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAY,EAAE;IAC9C,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,OAAO,wBAAwB,CAAC,QAAQ,CAAC,CAAC;AAC5C,CAAC,CAAC"}
|
|
@@ -27,6 +27,12 @@ describe('keyMatchers', () => {
|
|
|
27
27
|
[Command.CLEAR_INPUT]: (key) => key.ctrl && key.name === 'c',
|
|
28
28
|
[Command.DELETE_WORD_BACKWARD]: (key) => (key.ctrl || key.meta) && key.name === 'backspace',
|
|
29
29
|
[Command.CLEAR_SCREEN]: (key) => key.ctrl && key.name === 'l',
|
|
30
|
+
[Command.SCROLL_UP]: (key) => key.name === 'up' && !!key.shift,
|
|
31
|
+
[Command.SCROLL_DOWN]: (key) => key.name === 'down' && !!key.shift,
|
|
32
|
+
[Command.SCROLL_HOME]: (key) => key.name === 'home',
|
|
33
|
+
[Command.SCROLL_END]: (key) => key.name === 'end',
|
|
34
|
+
[Command.PAGE_UP]: (key) => key.name === 'pageup',
|
|
35
|
+
[Command.PAGE_DOWN]: (key) => key.name === 'pagedown',
|
|
30
36
|
[Command.HISTORY_UP]: (key) => key.ctrl && key.name === 'p',
|
|
31
37
|
[Command.HISTORY_DOWN]: (key) => key.ctrl && key.name === 'n',
|
|
32
38
|
[Command.NAVIGATION_UP]: (key) => key.name === 'up',
|
|
@@ -118,6 +124,37 @@ describe('keyMatchers', () => {
|
|
|
118
124
|
positive: [createKey('l', { ctrl: true })],
|
|
119
125
|
negative: [createKey('l'), createKey('k', { ctrl: true })],
|
|
120
126
|
},
|
|
127
|
+
// Scrolling
|
|
128
|
+
{
|
|
129
|
+
command: Command.SCROLL_UP,
|
|
130
|
+
positive: [createKey('up', { shift: true })],
|
|
131
|
+
negative: [createKey('up'), createKey('up', { ctrl: true })],
|
|
132
|
+
},
|
|
133
|
+
{
|
|
134
|
+
command: Command.SCROLL_DOWN,
|
|
135
|
+
positive: [createKey('down', { shift: true })],
|
|
136
|
+
negative: [createKey('down'), createKey('down', { ctrl: true })],
|
|
137
|
+
},
|
|
138
|
+
{
|
|
139
|
+
command: Command.SCROLL_HOME,
|
|
140
|
+
positive: [createKey('home')],
|
|
141
|
+
negative: [createKey('end')],
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
command: Command.SCROLL_END,
|
|
145
|
+
positive: [createKey('end')],
|
|
146
|
+
negative: [createKey('home')],
|
|
147
|
+
},
|
|
148
|
+
{
|
|
149
|
+
command: Command.PAGE_UP,
|
|
150
|
+
positive: [createKey('pageup'), createKey('pageup', { shift: true })],
|
|
151
|
+
negative: [createKey('pagedown'), createKey('up')],
|
|
152
|
+
},
|
|
153
|
+
{
|
|
154
|
+
command: Command.PAGE_DOWN,
|
|
155
|
+
positive: [createKey('pagedown'), createKey('pagedown', { ctrl: true })],
|
|
156
|
+
negative: [createKey('pageup'), createKey('down')],
|
|
157
|
+
},
|
|
121
158
|
// History navigation
|
|
122
159
|
{
|
|
123
160
|
command: Command.HISTORY_UP,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyMatchers.test.js","sourceRoot":"","sources":["../../../src/ui/keyMatchers.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"keyMatchers.test.js","sourceRoot":"","sources":["../../../src/ui/keyMatchers.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG9D,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,OAAqB,EAAE,EAAO,EAAE,CAAC,CAAC;QACjE,IAAI;QACJ,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,KAAK;QACjB,QAAQ,EAAE,IAAI;QACd,GAAG,IAAI;KACR,CAAC,CAAC;IAEH,6CAA6C;IAC7C,MAAM,gBAAgB,GAA2C;QAC/D,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ;QACrD,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAC1D,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACzD,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACrE,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACpE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACjE,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC3C,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW;QACpD,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAClE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK;QACnE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK;QACvE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM;QACxD,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK;QACtD,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ;QACtD,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,UAAU;QAC1D,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAChE,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAClE,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI;QACxD,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM;QAC5D,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC3C,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;QACvD,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC7C,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;QACzD,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CACxC,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAC5D,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CACpC,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;QACrD,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CACtC,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;QACvD,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ;QACrD,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC7B,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK;QAC/D,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC9B,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC;QAC9D,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC3C,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC;QAC3D,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAC3E,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK;QAC9D,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACrE,CAAC,OAAO,CAAC,yBAAyB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAChD,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAC9B,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACrE,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACtE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAC1D,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAC1D,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACrE,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QACpE,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC5C,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI;QACpC,CAAC,OAAO,CAAC,gCAAgC,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CACvD,GAAG,CAAC,IAAI,KAAK,KAAK;QACpB,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAC/C,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG;QAC9B,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO;QAC/D,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM;KACjE,CAAC;IAEF,mEAAmE;IACnE,MAAM,SAAS,GAAG;QAChB,iBAAiB;QACjB;YACE,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC/B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SAC3B;QACD;YACE,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACpE,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;SAC7C;QAED,kBAAkB;QAClB;YACE,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE;gBACR,SAAS,CAAC,GAAG,CAAC;gBACd,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC/B,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aAC/B;SACF;QACD;YACE,OAAO,EAAE,OAAO,CAAC,GAAG;YACpB,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE;gBACR,SAAS,CAAC,GAAG,CAAC;gBACd,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC/B,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aAC/B;SACF;QAED,gBAAgB;QAChB;YACE,OAAO,EAAE,OAAO,CAAC,eAAe;YAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,cAAc;YAC/B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,oBAAoB;YACrC,QAAQ,EAAE;gBACR,SAAS,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBACtC,SAAS,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACvC;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SACxE;QAED,iBAAiB;QACjB;YACE,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QAED,YAAY;QACZ;YACE,OAAO,EAAE,OAAO,CAAC,SAAS;YAC1B,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC7D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9C,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SACjE;QACD;YACE,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC7B,QAAQ,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC7B;QACD;YACE,OAAO,EAAE,OAAO,CAAC,UAAU;YAC3B,QAAQ,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC5B,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAC9B;QACD;YACE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACrE,QAAQ,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;SACnD;QACD;YACE,OAAO,EAAE,OAAO,CAAC,SAAS;YAC1B,QAAQ,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACxE,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;SACnD;QAED,qBAAqB;QACrB;YACE,OAAO,EAAE,OAAO,CAAC,UAAU;YAC3B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;SAC5C;QACD;YACE,OAAO,EAAE,OAAO,CAAC,YAAY;YAC7B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;SAC9C;QACD;YACE,OAAO,EAAE,OAAO,CAAC,aAAa;YAC9B,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;SAC3C;QACD;YACE,OAAO,EAAE,OAAO,CAAC,eAAe;YAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAChE,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;SAC3C;QAED,oBAAoB;QACpB;YACE,OAAO,EAAE,OAAO,CAAC,oBAAoB;YACrC,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;YAC3C,QAAQ,EAAE;gBACR,SAAS,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAChC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC/B,SAAS,CAAC,GAAG,CAAC;aACf;SACF;QACD;YACE,OAAO,EAAE,OAAO,CAAC,sBAAsB;YACvC,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;YAC7C,QAAQ,EAAE;gBACR,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAClC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC/B,SAAS,CAAC,GAAG,CAAC;aACf;SACF;QAED,kBAAkB;QAClB;YACE,OAAO,EAAE,OAAO,CAAC,iBAAiB;YAClC,QAAQ,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;YACjD,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;SACpE;QACD;YACE,OAAO,EAAE,OAAO,CAAC,aAAa;YAC9B,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;SAC9C;QACD;YACE,OAAO,EAAE,OAAO,CAAC,eAAe;YAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7D,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;SAC5C;QAED,aAAa;QACb;YACE,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC/B,QAAQ,EAAE;gBACR,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBACnC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBACnC,SAAS,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aACrC;SACF;QACD;YACE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE;gBACR,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBACnC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBACnC,SAAS,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aACrC;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;SAChD;QAED,iBAAiB;QACjB;YACE,OAAO,EAAE,OAAO,CAAC,oBAAoB;YACrC,QAAQ,EAAE;gBACR,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBAC9B,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;aACvD;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,qBAAqB;YACtC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QAED,qBAAqB;QACrB;YACE,OAAO,EAAE,OAAO,CAAC,kBAAkB;YACnC,QAAQ,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC5B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;SAC7D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,eAAe;YAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,yBAAyB;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,eAAe;YAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC5D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,gBAAgB;YACjC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,eAAe;YAChC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QAED,iBAAiB;QACjB;YACE,OAAO,EAAE,OAAO,CAAC,cAAc;YAC/B,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QACD;YACE,OAAO,EAAE,OAAO,CAAC,qBAAqB;YACtC,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC/B,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;SAClE;QACD;YACE,OAAO,EAAE,OAAO,CAAC,gCAAgC;YACjD,QAAQ,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9D,QAAQ,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;SACpD;QACD;YACE,OAAO,EAAE,OAAO,CAAC,wBAAwB;YACzC,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SAC3B;KACF,CAAC;IAEF,QAAQ,CAAC,gDAAgD,EAAE,GAAG,EAAE;QAC9D,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;YACpD,EAAE,CAAC,gBAAgB,OAAO,YAAY,EAAE,GAAG,EAAE;gBAC3C,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACvB,MAAM,CACJ,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EACzB,YAAY,OAAO,aAAa,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CACtD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACb,MAAM,CACJ,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAC9B,sCAAsC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC5D,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACf,CAAC,CAAC,CAAC;gBAEH,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACvB,MAAM,CACJ,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EACzB,YAAY,OAAO,iBAAiB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC1D,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACd,MAAM,CACJ,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAC9B,0CAA0C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAChE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;YACvE,MAAM,CACJ,WAAW,CAAC,OAAO,CAAC,gCAAgC,CAAC,CACnD,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CACpC,CACF,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB;YACpC,MAAM,CACJ,WAAW,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CACxE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,MAAM,CACJ,WAAW,CAAC,OAAO,CAAC,gCAAgC,CAAC,CACnD,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CACjC,CACF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,YAAY,GAAqB;gBACrC,GAAG,kBAAkB;gBACrB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aACzD,CAAC;YAEF,MAAM,cAAc,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAEvD,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CACvE,IAAI,CACL,CAAC;YACF,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChE,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CACvE,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,MAAM,GAAqB;gBAC/B,GAAG,kBAAkB;gBACrB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBACd,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE;oBACxB,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;iBAC5B;aACF,CAAC;YAEF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC3C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1E,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,MAAM,GAAqB;gBAC/B,GAAG,kBAAkB;gBACrB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;aACnB,CAAC;YAEF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC3C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CACjE,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -10,6 +10,7 @@ import { common, createLowlight } from 'lowlight';
|
|
|
10
10
|
import { themeManager } from '../themes/theme-manager.js';
|
|
11
11
|
import { MaxSizedBox, MINIMUM_MAX_HEIGHT, } from '../components/shared/MaxSizedBox.js';
|
|
12
12
|
import { debugLogger } from '@google/gemini-cli-core';
|
|
13
|
+
import { isAlternateBufferEnabled } from '../hooks/useAlternateBuffer.js';
|
|
13
14
|
// Configure theming and parsing utilities.
|
|
14
15
|
const lowlight = createLowlight(common);
|
|
15
16
|
function renderHastNode(node, theme, inheritedColor) {
|
|
@@ -81,7 +82,7 @@ export function colorizeCode({ code, language = null, availableHeight, maxWidth,
|
|
|
81
82
|
const showLineNumbers = hideLineNumbers
|
|
82
83
|
? false
|
|
83
84
|
: (settings?.merged.ui?.showLineNumbers ?? true);
|
|
84
|
-
const useMaxSizedBox = settings
|
|
85
|
+
const useMaxSizedBox = !isAlternateBufferEnabled(settings);
|
|
85
86
|
try {
|
|
86
87
|
// Render the HAST tree using the adapted theme
|
|
87
88
|
// Apply the theme's default foreground color to the top-level Text element
|
|
@@ -89,8 +90,7 @@ export function colorizeCode({ code, language = null, availableHeight, maxWidth,
|
|
|
89
90
|
const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
|
|
90
91
|
let hiddenLinesCount = 0;
|
|
91
92
|
// Optimization to avoid highlighting lines that cannot possibly be displayed.
|
|
92
|
-
if (availableHeight !== undefined &&
|
|
93
|
-
settings?.merged.ui?.useAlternateBuffer === false) {
|
|
93
|
+
if (availableHeight !== undefined && useMaxSizedBox) {
|
|
94
94
|
availableHeight = Math.max(availableHeight, MINIMUM_MAX_HEIGHT);
|
|
95
95
|
if (lines.length > availableHeight) {
|
|
96
96
|
const sliceIndex = lines.length - availableHeight;
|
|
@@ -100,7 +100,7 @@ export function colorizeCode({ code, language = null, availableHeight, maxWidth,
|
|
|
100
100
|
}
|
|
101
101
|
const renderedLines = lines.map((line, index) => {
|
|
102
102
|
const contentToRender = highlightAndRenderLine(line, language, activeTheme);
|
|
103
|
-
return (_jsxs(Box, { children: [showLineNumbers && useMaxSizedBox && (_jsx(Text, { color: activeTheme.colors.Gray, children: `${String(index + 1 + hiddenLinesCount).padStart(padWidth, ' ')} ` })), showLineNumbers && !useMaxSizedBox && (_jsx(Box, { minWidth: padWidth + 1, flexShrink: 0, paddingRight: 1, alignItems: "flex-start", justifyContent: "flex-end", children: _jsx(Text, { color: activeTheme.colors.Gray, children: `${index + 1 + hiddenLinesCount}` }) })), _jsx(Text, { color: activeTheme.defaultColor, wrap: "wrap", children: contentToRender })] }, index));
|
|
103
|
+
return (_jsxs(Box, { minHeight: useMaxSizedBox ? undefined : 1, children: [showLineNumbers && useMaxSizedBox && (_jsx(Text, { color: activeTheme.colors.Gray, children: `${String(index + 1 + hiddenLinesCount).padStart(padWidth, ' ')} ` })), showLineNumbers && !useMaxSizedBox && (_jsx(Box, { minWidth: padWidth + 1, flexShrink: 0, paddingRight: 1, alignItems: "flex-start", justifyContent: "flex-end", children: _jsx(Text, { color: activeTheme.colors.Gray, children: `${index + 1 + hiddenLinesCount}` }) })), _jsx(Text, { color: activeTheme.defaultColor, wrap: "wrap", children: contentToRender })] }, index));
|
|
104
104
|
});
|
|
105
105
|
if (useMaxSizedBox) {
|
|
106
106
|
return (_jsx(MaxSizedBox, { maxHeight: availableHeight, maxWidth: maxWidth, additionalHiddenLinesCount: hiddenLinesCount, overflowDirection: "top", children: renderedLines }));
|
|
@@ -113,7 +113,7 @@ export function colorizeCode({ code, language = null, availableHeight, maxWidth,
|
|
|
113
113
|
// Also display line numbers in fallback
|
|
114
114
|
const lines = codeToHighlight.split('\n');
|
|
115
115
|
const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
|
|
116
|
-
const fallbackLines = lines.map((line, index) => (_jsxs(Box, { children: [showLineNumbers && useMaxSizedBox && (_jsx(Text, { color: activeTheme.defaultColor, children: `${String(index + 1).padStart(padWidth, ' ')} ` })), showLineNumbers && !useMaxSizedBox && (_jsx(Box, { minWidth: padWidth + 1, flexShrink: 0, paddingRight: 1, alignItems: "flex-start", justifyContent: "flex-end", children: _jsx(Text, { color: activeTheme.defaultColor, children: `${index + 1}` }) })), _jsx(Text, { color: activeTheme.colors.Gray, children: line })] }, index)));
|
|
116
|
+
const fallbackLines = lines.map((line, index) => (_jsxs(Box, { minHeight: useMaxSizedBox ? undefined : 1, children: [showLineNumbers && useMaxSizedBox && (_jsx(Text, { color: activeTheme.defaultColor, children: `${String(index + 1).padStart(padWidth, ' ')} ` })), showLineNumbers && !useMaxSizedBox && (_jsx(Box, { minWidth: padWidth + 1, flexShrink: 0, paddingRight: 1, alignItems: "flex-start", justifyContent: "flex-end", children: _jsx(Text, { color: activeTheme.defaultColor, children: `${index + 1}` }) })), _jsx(Text, { color: activeTheme.colors.Gray, children: line })] }, index)));
|
|
117
117
|
if (useMaxSizedBox) {
|
|
118
118
|
return (_jsx(MaxSizedBox, { maxHeight: availableHeight, maxWidth: maxWidth, overflowDirection: "top", children: fallbackLines }));
|
|
119
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeColorizer.js","sourceRoot":"","sources":["../../../../src/ui/utils/CodeColorizer.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAQlD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EACL,WAAW,EACX,kBAAkB,GACnB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"CodeColorizer.js","sourceRoot":"","sources":["../../../../src/ui/utils/CodeColorizer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { describe, it, expect } from 'vitest';
|
|
8
|
+
import { colorizeCode } from './CodeColorizer.js';
|
|
9
|
+
import { renderWithProviders } from '../../test-utils/render.js';
|
|
10
|
+
import { LoadedSettings } from '../../config/settings.js';
|
|
11
|
+
describe('colorizeCode', () => {
|
|
12
|
+
it('renders empty lines correctly when useAlternateBuffer is true', () => {
|
|
13
|
+
const code = 'line 1\n\nline 3';
|
|
14
|
+
const settings = new LoadedSettings({ path: '', settings: {}, originalSettings: {} }, { path: '', settings: {}, originalSettings: {} }, {
|
|
15
|
+
path: '',
|
|
16
|
+
settings: { ui: { useAlternateBuffer: true, showLineNumbers: false } },
|
|
17
|
+
originalSettings: {
|
|
18
|
+
ui: { useAlternateBuffer: true, showLineNumbers: false },
|
|
19
|
+
},
|
|
20
|
+
}, { path: '', settings: {}, originalSettings: {} }, true, new Set());
|
|
21
|
+
const result = colorizeCode({
|
|
22
|
+
code,
|
|
23
|
+
language: 'javascript',
|
|
24
|
+
maxWidth: 80,
|
|
25
|
+
settings,
|
|
26
|
+
hideLineNumbers: true,
|
|
27
|
+
});
|
|
28
|
+
const { lastFrame } = renderWithProviders(_jsx(_Fragment, { children: result }));
|
|
29
|
+
// We expect the output to preserve the empty line.
|
|
30
|
+
// If the bug exists, it might look like "line 1\nline 3"
|
|
31
|
+
// If fixed, it should look like "line 1\n \nline 3" (if we use space) or just have the newline.
|
|
32
|
+
// We can check if the output matches the code (ignoring color codes if any, but lastFrame returns plain text usually unless configured otherwise)
|
|
33
|
+
// Actually lastFrame() returns string with ANSI codes stripped by default in some setups, or not.
|
|
34
|
+
// But ink-testing-library usually returns the visual representation.
|
|
35
|
+
expect(lastFrame()).toMatch(/line 1\s*\n\s*\n\s*line 3/);
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
//# sourceMappingURL=CodeColorizer.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CodeColorizer.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/CodeColorizer.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,IAAI,GAAG,kBAAkB,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAI,cAAc,CACjC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAChD,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAChD;YACE,IAAI,EAAE,EAAE;YACR,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE;YACtE,gBAAgB,EAAE;gBAChB,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE;aACzD;SACF,EACD,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAChD,IAAI,EACJ,IAAI,GAAG,EAAE,CACV,CAAC;QAEF,MAAM,MAAM,GAAG,YAAY,CAAC;YAC1B,IAAI;YACJ,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,EAAE;YACZ,QAAQ;YACR,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QAEH,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,4BAAG,MAAM,GAAI,CAAC,CAAC;QACzD,mDAAmD;QACnD,yDAAyD;QACzD,gGAAgG;QAEhG,kJAAkJ;QAClJ,kGAAkG;QAClG,qEAAqE;QAErE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { lerp } from '../../utils/math.js';
|
|
7
7
|
import {} from '../../config/settings.js';
|
|
8
|
+
import { isAlternateBufferEnabled } from '../hooks/useAlternateBuffer.js';
|
|
8
9
|
const getMainAreaWidthInternal = (terminalWidth) => {
|
|
9
10
|
if (terminalWidth <= 80) {
|
|
10
11
|
return Math.round(0.98 * terminalWidth);
|
|
@@ -19,7 +20,7 @@ const getMainAreaWidthInternal = (terminalWidth) => {
|
|
|
19
20
|
};
|
|
20
21
|
export const calculateMainAreaWidth = (terminalWidth, settings) => {
|
|
21
22
|
if (settings.merged.ui?.useFullWidth !== false) {
|
|
22
|
-
if (settings
|
|
23
|
+
if (isAlternateBufferEnabled(settings)) {
|
|
23
24
|
return terminalWidth - 1;
|
|
24
25
|
}
|
|
25
26
|
return terminalWidth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-sizing.js","sourceRoot":"","sources":["../../../../src/ui/utils/ui-sizing.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAuB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ui-sizing.js","sourceRoot":"","sources":["../../../../src/ui/utils/ui-sizing.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAuB,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,MAAM,wBAAwB,GAAG,CAAC,aAAqB,EAAU,EAAE;IACjE,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,aAAa,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,aAAa,IAAI,GAAG,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,aAAa,CAAC,CAAC;IACzC,CAAC;IAED,uEAAuE;IACvE,MAAM,CAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAEnC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,aAAqB,EACrB,QAAwB,EAChB,EAAE;IACV,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,KAAK,KAAK,EAAE,CAAC;QAC/C,IAAI,wBAAwB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,OAAO,aAAa,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,wBAAwB,CAAC,aAAa,CAAC,CAAC;AACjD,CAAC,CAAC"}
|