From b6df967489e8c7b5136453cfe2523cb7512eb73d Mon Sep 17 00:00:00 2001 From: Keith Guerin Date: Fri, 27 Feb 2026 13:04:26 -0800 Subject: [PATCH] fix(cli): resolve merge conflicts and fix failing tests after merging main --- .../HistoryItemDisplay.test.tsx.snap | 2 +- packages/cli/src/ui/utils/textUtils.test.ts | 4 +-- packages/vscode-ide-companion/NOTICES.txt | 25 ++----------------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap index 51cae26b01..134741facf 100644 --- a/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap +++ b/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap @@ -389,7 +389,7 @@ exports[` > renders InfoMessage for "info" type with multi `; exports[` > thinking items > renders thinking item when enabled 1`] = ` -" │ +" │ │ Thinking │ test " diff --git a/packages/cli/src/ui/utils/textUtils.test.ts b/packages/cli/src/ui/utils/textUtils.test.ts index fb0c9786ae..4927486d43 100644 --- a/packages/cli/src/ui/utils/textUtils.test.ts +++ b/packages/cli/src/ui/utils/textUtils.test.ts @@ -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); }); }); diff --git a/packages/vscode-ide-companion/NOTICES.txt b/packages/vscode-ide-companion/NOTICES.txt index 83e1d959cc..5337fb3ef6 100644 --- a/packages/vscode-ide-companion/NOTICES.txt +++ b/packages/vscode-ide-companion/NOTICES.txt @@ -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