Fix bug where `--read0` not properly displaying long lines

Fix #2508
This commit is contained in:
Junegunn Choi 2021-06-01 16:55:51 +09:00
parent a4bc08f5a3
commit 8255aa23f4
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 4 additions and 1 deletions

View File

@ -8,6 +8,7 @@ CHANGELOG
fzf --color fg:3,fg+:11 fzf --color fg:3,fg+:11
fzf --color fg:yellow,fg+:bright-yellow fzf --color fg:yellow,fg+:bright-yellow
``` ```
- Fix bug where `--read0` not properly displaying long lines
0.27.1 0.27.1
------ ------

View File

@ -3,6 +3,7 @@ package util
import ( import (
"math" "math"
"os" "os"
"strings"
"time" "time"
"github.com/mattn/go-isatty" "github.com/mattn/go-isatty"
@ -21,7 +22,8 @@ func RunesWidth(runes []rune, prefixWidth int, tabstop int, limit int) (int, int
if len(rs) == 1 && rs[0] == '\t' { if len(rs) == 1 && rs[0] == '\t' {
w = tabstop - (prefixWidth+width)%tabstop w = tabstop - (prefixWidth+width)%tabstop
} else { } else {
w = runewidth.StringWidth(string(rs)) s := string(rs)
w = runewidth.StringWidth(s) + strings.Count(s, "\n")
} }
width += w width += w
if limit > 0 && width > limit { if limit > 0 && width > limit {