Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-22 21:05:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix #209 - Invalid mutation of input on case conversion

Browse Source
This commit is contained in:
Junegunn Choi 2015-04-21 22:10:14 +09:00
parent 917b1759b0
commit 3f0e6a5806
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/algo/algo.go
View File

@ -42,10 +42,8 @@ func FuzzyMatch(caseSensitive bool, runes *[]rune, pattern []rune) (int, int) {
// compiler as of now does not inline non-leaf functions.) // compiler as of now does not inline non-leaf functions.)
if char >= 'A' && char <= 'Z' { if char >= 'A' && char <= 'Z' {
char += 32 char += 32
(*runes)[index] = char
} else if char > unicode.MaxASCII { } else if char > unicode.MaxASCII {
char = unicode.To(unicode.LowerCase, char) char = unicode.To(unicode.LowerCase, char)
(*runes)[index] = char
} }
} }
if char == pattern[pidx] { if char == pattern[pidx] {
@ -63,6 +61,13 @@ func FuzzyMatch(caseSensitive bool, runes *[]rune, pattern []rune) (int, int) {
pidx-- pidx--
for index := eidx - 1; index >= sidx; index-- { for index := eidx - 1; index >= sidx; index-- {
char := (*runes)[index] char := (*runes)[index]
if !caseSensitive {
if char >= 'A' && char <= 'Z' {
char += 32
} else if char > unicode.MaxASCII {
char = unicode.To(unicode.LowerCase, char)
}
}
if char == pattern[pidx] { if char == pattern[pidx] {
if pidx--; pidx < 0 { if pidx--; pidx < 0 {
sidx = index sidx = index

10
test/test_go.rb
View File

@ -525,6 +525,16 @@ class TestGoFZF < TestBase
File.unlink tempname File.unlink tempname
end end
def test_invalid_cache
tmux.send_keys "(echo d; echo D; echo x) | #{fzf '-q d'}", :Enter
tmux.until { |lines| lines[-2].include? '2/3' }
tmux.send_keys :BSpace
tmux.until { |lines| lines[-2].include? '3/3' }
tmux.send_keys :D
tmux.until { |lines| lines[-2].include? '1/3' }
tmux.send_keys :Enter
end
private private
def writelines path, lines, timeout = 10 def writelines path, lines, timeout = 10
File.open(path, 'w') do |f| File.open(path, 'w') do |f|