twin/fzf
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.git synced 2025-08-15 20:23:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Do not print non-displayable characters

Browse Source 
fzf used to print non-displayable characters (ascii code < 32) as '?',
but we will simply ignore those characters with this patch, just like
our terminals do.

\n and \r are exceptions. They will be printed as a space character.

TODO: \H should delete the preceding character, but this is not implemented.

Related: #1253
This commit is contained in:
Junegunn Choi
2018-04-12 17:49:52 +09:00
parent 7dbbbef51a
commit f57920ad90
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tui/light.go
View File

@@ -48,11 +48,13 @@ func (r *LightRenderer) stderrInternal(str string, allowNLCR bool) {
runes := []rune{} runes := []rune{}
for len(bytes) > 0 { for len(bytes) > 0 {
r, sz := utf8.DecodeRune(bytes) r, sz := utf8.DecodeRune(bytes)
if r == utf8.RuneError || r < 32 && nlcr := r == '\n' || r == '\r'
r != '\x1b' && (!allowNLCR || r != '\n' && r != '\r') { if r >= 32 || r == '\x1b' || nlcr {
runes = append(runes, '?') if r == utf8.RuneError || nlcr && !allowNLCR {
} else { runes = append(runes, ' ')
runes = append(runes, r) } else {
runes = append(runes, r)
}
} }
bytes = bytes[sz:] bytes = bytes[sz:]
} }
@@ -807,7 +809,7 @@ func (w *LightWindow) Print(text string) {
} }
func cleanse(str string) string { func cleanse(str string) string {
return strings.Replace(str, "\x1b", "?", -1) return strings.Replace(str, "\x1b", "", -1)
} }
func (w *LightWindow) CPrint(pair ColorPair, attr Attr, text string) { func (w *LightWindow) CPrint(pair ColorPair, attr Attr, text string) {

9
src/util/util.go
View File

@@ -17,11 +17,12 @@ func RuneWidth(r rune, prefixWidth int, tabstop int) int {
return tabstop - prefixWidth%tabstop return tabstop - prefixWidth%tabstop
} else if w, found := _runeWidths[r]; found { } else if w, found := _runeWidths[r]; found {
return w return w
} else { } else if r == '\n' || r == '\r' {
w := Max(runewidth.RuneWidth(r), 1) return 1
_runeWidths[r] = w
return w
} }
w := runewidth.RuneWidth(r)
_runeWidths[r] = w
return w
} }
// Max returns the largest integer // Max returns the largest integer