diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2020-03-03 20:55:29 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2020-03-03 21:19:23 +0900 |
| commit | dd49e41c424ad0cbef6ca0a0f52d918053f329ea (patch) | |
| tree | 6b6f27e5fee02ebe012910580d1d0988721ea16f | |
| parent | 6db15e86937029b4a4565b2ae73a3c6bae5ef4ba (diff) | |
Ignore xterm OSC control sequences
- OSC Ps ; Pt BEL
- OSC Ps ; Pt ST
Fix #1415
| -rw-r--r-- | src/ansi.go | 3 | ||||
| -rwxr-xr-x | test/test_go.rb | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/ansi.go b/src/ansi.go index b5b3a203..b15bd91c 100644 --- a/src/ansi.go +++ b/src/ansi.go @@ -90,10 +90,11 @@ func init() { - http://ascii-table.com/ansi-escape-sequences.php - http://ascii-table.com/ansi-escape-sequences-vt-100.php - http://tldp.org/HOWTO/Bash-Prompt-HOWTO/x405.html + - https://invisible-island.net/xterm/ctlseqs/ctlseqs.html */ // The following regular expression will include not all but most of the // frequently used ANSI sequences - ansiRegex = regexp.MustCompile("(?:\x1b[\\[()][0-9;]*[a-zA-Z@]|\x1b.|[\x0e\x0f]|.\x08)") + ansiRegex = regexp.MustCompile("(?:\x1b[\\[()][0-9;]*[a-zA-Z@]|\x1b][0-9];[[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)") } func findAnsiStart(str string) int { diff --git a/test/test_go.rb b/test/test_go.rb index 7c448fe1..fac25dcc 100755 --- a/test/test_go.rb +++ b/test/test_go.rb @@ -1716,6 +1716,18 @@ class TestGoFZF < TestBase tmux.prepare end + def test_strip_xterm_osc_sequence + %W[\x07 \x1b\\].each do |esc| + writelines tempname, [%(printf $1"\e]4;3;rgb:aa/bb/cc#{esc} "$2)] + File.chmod(0o755, tempname) + tmux.prepare + tmux.send_keys( + %(echo foo bar | #{FZF} --preview '#{tempname} {2} {1}'), :Enter + ) + tmux.until { |lines| lines.any_include?('bar foo') } + tmux.send_keys :Enter + end + end end module TestShell |