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

fix(cli): resolve merge conflicts and fix failing tests after merging main

Browse Source
This commit is contained in:
Keith Guerin
2026-02-27 13:04:26 -08:00
parent 4443e1028a
commit b6df967489
3 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap
View File

@@ -389,7 +389,7 @@ exports[`<HistoryItemDisplay /> > renders InfoMessage for "info" type with multi
`;
exports[`<HistoryItemDisplay /> > thinking items > renders thinking item when enabled 1`] = `
" │
" │
│ Thinking
│ test
"

4
packages/cli/src/ui/utils/textUtils.test.ts
View File

@@ -48,12 +48,12 @@ describe('textUtils', () => {
it('should handle unicode characters that crash string-width', () => {
// U+0602 caused string-width to crash (see #16418)
const char = '؂';
expect(getCachedStringWidth(char)).toBe(0);
expect(getCachedStringWidth(char)).toBe(1);
});
it('should handle unicode characters that crash string-width with ANSI codes', () => {
const charWithAnsi = '\u001b[31m' + '؂' + '\u001b[0m';
expect(getCachedStringWidth(charWithAnsi)).toBe(0);
expect(getCachedStringWidth(charWithAnsi)).toBe(1);
});
});

25
packages/vscode-ide-companion/NOTICES.txt
View File

@@ -2131,30 +2131,9 @@ THE SOFTWARE.
============================================================
path-to-regexp@6.3.0
(https://github.com/pillarjs/path-to-regexp.git)
The MIT License (MIT)
Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
(No repository found)
License text not found.
============================================================
send@1.2.1