[cliptext] squeeze in single-width char when truncating double-width …

…char #1918
saulpw · Oct 19, 2023 · 4ceeb8d · 4ceeb8d
1 parent ebd84d9
commit 4ceeb8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/visidata/cliptext.py b/visidata/cliptext.py
@@ -162,8 +162,12 @@ def _clipstr(s, dispw, trunch='', oddspacech='', combch='', modch=''):
 
         if dispw and w+chlen > dispw:
             if trunchlen and dispw > trunchlen:
-                ret = ret[:-1] + trunch  # replace final char with ellipsis
-                w += trunchlen-1
+                lastchlen = _dispch(ret[-1])[1]
+                if w+trunchlen > dispw:
+                    ret = ret[:-1]
+                    w -= lastchlen
+                ret += trunch  # replace final char with ellipsis
+                w += trunchlen
             break
 
         w += chlen

diff --git a/visidata/tests/test_cliptext.py b/visidata/tests/test_cliptext.py
@@ -17,7 +17,8 @@ def test_dispwidth(self, s, dispw):
         ('b to', 4, 'b to', 4),
         ('abcde', 8, 'abcde', 5),
         (' jsonl', 5, ' jso…', 5),
-        ('    で', 6, '    で', 6),
+        ('abcdで', 6, 'abcdで', 6),
+        ('abcdで', 5, 'abcd…', 5),
     ])
     def test_clipstr(self, s, w, clippeds, clippedw):
         clips, clipw = visidata.clipstr(s, w)