github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-17 17:32:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't increase the width for variation selector 15.

Browse Source 
See discussion in #5668 and #5583
This commit is contained in:
Aaron Gyes 2019-02-19 04:21:29 -08:00
parent 8a93c7d0ea
commit 6aa2f29901
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fallback.cpp
View File

@ -282,8 +282,10 @@ int fish_wcswidth(const wchar_t *str, size_t n) { return wcswidth(str, n); }
int fish_wcwidth(wchar_t wc) {
// Check for VS16 which selects emoji presentation. This "promotes" a character like U+2764
// (width 1) to an emoji (probably width 2). So treat it as width 1 so the sums work. See #2652.
const int variation_selector_16 = 0xFE0F;
// VS15 selects text presentation.
const wchar_t variation_selector_16 = L'\uFE0F', variation_selector_15 = L'\uFE0E';
if (wc == variation_selector_16) return 1;
else if (wc == variation_selector_15) return 0;
int width = widechar_wcwidth(wc);
switch (width) {