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

Ignore more ANSI escape sequences

Browse Source 
Fix #2420
This commit is contained in:
Junegunn Choi
2021-04-06 00:51:39 +09:00
parent 391237f7df
commit be36de2482
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ansi.go
View File

@@ -103,11 +103,11 @@ func matchOperatingSystemCommand(s string) int {
} }
func matchControlSequence(s string) int { func matchControlSequence(s string) int {
// `\x1b[\\[()][0-9;]*[a-zA-Z@]` // `\x1b[\\[()][0-9;?]*[a-zA-Z@]`
// ^ match starting here // ^ match starting here
// //
i := 2 // prefix matched in nextAnsiEscapeSequence() i := 2 // prefix matched in nextAnsiEscapeSequence()
for ; i < len(s) && (isNumeric(s[i]) || s[i] == ';'); i++ { for ; i < len(s) && (isNumeric(s[i]) || s[i] == ';' || s[i] == '?'); i++ {
} }
if i < len(s) { if i < len(s) {
c := s[i] c := s[i]
@@ -125,7 +125,7 @@ func isCtrlSeqStart(c uint8) bool {
// nextAnsiEscapeSequence returns the ANSI escape sequence and is equivalent to // nextAnsiEscapeSequence returns the ANSI escape sequence and is equivalent to
// calling FindStringIndex() on the below regex (which was originally used): // calling FindStringIndex() on the below regex (which was originally used):
// //
// "(?:\x1b[\\[()][0-9;]*[a-zA-Z@]|\x1b][0-9];[[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)" // "(?:\x1b[\\[()][0-9;?]*[a-zA-Z@]|\x1b][0-9];[[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)"
// //
func nextAnsiEscapeSequence(s string) (int, int) { func nextAnsiEscapeSequence(s string) (int, int) {
// fast check for ANSI escape sequences // fast check for ANSI escape sequences
@@ -154,7 +154,7 @@ Loop:
return i - n, i + 1 return i - n, i + 1
} }
case '\x1b': case '\x1b':
// match: `\x1b[\\[()][0-9;]*[a-zA-Z@]` // match: `\x1b[\\[()][0-9;?]*[a-zA-Z@]`
if i+2 < len(s) && isCtrlSeqStart(s[i+1]) { if i+2 < len(s) && isCtrlSeqStart(s[i+1]) {
if j := matchControlSequence(s[i:]); j != -1 { if j := matchControlSequence(s[i:]); j != -1 {
return i, i + j return i, i + j