m/fzf
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.git synced 2025-11-18 08:13:40 -05:00
Code Packages Releases Wiki Activity

Fix missing NFD conversion in extended-search mode

Browse Source
This commit is contained in:
Junegunn Choi
2013-11-17 11:20:06 +09:00
parent 90adda73b0
commit 6a5e1de6f3
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fzf
View File

@@ -214,7 +214,7 @@ class FZF
end end
class Matcher class Matcher
def convert_query q def query_chars q
UConv.nfd(q).split(//) UConv.nfd(q).split(//)
end end
end end
@@ -224,7 +224,7 @@ class FZF
end end
class Matcher class Matcher
def convert_query q def query_chars q
q.split(//) q.split(//)
end end
end end
@@ -747,7 +747,7 @@ class FZF
def fuzzy_regex q def fuzzy_regex q
@regexp[q] ||= begin @regexp[q] ||= begin
q = q.downcase if @rxflag != 0 q = q.downcase if @rxflag != 0
Regexp.new(convert_query(q).inject('') { |sum, e| Regexp.new(query_chars(q).inject('') { |sum, e|
e = Regexp.escape e e = Regexp.escape e
sum << "#{e}[^#{e}]*?" sum << "#{e}[^#{e}]*?"
}, @rxflag) }, @rxflag)
@@ -804,13 +804,13 @@ class FZF
nil nil
when /^'/ when /^'/
w.length > 1 ? w.length > 1 ?
Regexp.new(Regexp.escape(w[1..-1]), rxflag) : nil Regexp.new(UConv.nfd(Regexp.escape(w[1..-1])), rxflag) : nil
when /^\^/ when /^\^/
w.length > 1 ? w.length > 1 ?
Regexp.new('^' << Regexp.escape(w[1..-1]), rxflag) : nil Regexp.new('^' << UConv.nfd(Regexp.escape(w[1..-1])), rxflag) : nil
when /\$$/ when /\$$/
w.length > 1 ? w.length > 1 ?
Regexp.new(Regexp.escape(w[0..-2]) << '$', rxflag) : nil Regexp.new(UConv.nfd(Regexp.escape(w[0..-2])) << '$', rxflag) : nil
else else
fuzzy_regex w fuzzy_regex w
end, invert ] end, invert ]

2
fzf.gemspec
View File

@@ -1,7 +1,7 @@
# coding: utf-8 # coding: utf-8
Gem::Specification.new do |spec| Gem::Specification.new do |spec|
spec.name = 'fzf' spec.name = 'fzf'
spec.version = '0.4.0' spec.version = '0.4.1'
spec.authors = ['Junegunn Choi'] spec.authors = ['Junegunn Choi']
spec.email = ['junegunn.c@gmail.com'] spec.email = ['junegunn.c@gmail.com']
spec.description = %q{Fuzzy finder for your shell} spec.description = %q{Fuzzy finder for your shell}

15
test/test_fzf.rb
View File

@@ -296,6 +296,21 @@ class TestFZF < MiniTest::Unit::TestCase
assert_equal 6, nfd.length assert_equal 6, nfd.length
assert_equal NFD, nfd assert_equal NFD, nfd
end end
def test_nfd_fuzzy_matcher
matcher = FZF::FuzzyMatcher.new 0
match = matcher.match([NFD], '할', '', '')
assert_equal [[NFD, [[0, 6]]]], match
assert_equal ['한글', [[0, 2]]], FZF::UConv.nfc(*match.first)
end
def test_nfd_extended_fuzzy_matcher
matcher = FZF::ExtendedFuzzyMatcher.new 0
assert_equal [], matcher.match([NFD], "'할", '', '')
match = matcher.match([NFD], "'한글", '', '')
assert_equal [[NFD, [[0, 6]]]], match
assert_equal ['한글', [[0, 2]]], FZF::UConv.nfc(*match.first)
end
end end
def test_split def test_split