Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-11 02:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Junegunn Choi 2020-06-21 22:43:03 +09:00
commit 199bc3f0ad
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/fzf.vim
View File

@ -297,7 +297,7 @@ function! fzf#wrap(...)
let expects = map(copy(args), 'type(v:val)') let expects = map(copy(args), 'type(v:val)')
let tidx = 0 let tidx = 0
for arg in copy(a:000) for arg in copy(a:000)
let tidx = index(expects, type(arg), tidx) let tidx = index(expects, type(arg) == 6 ? type(0) : type(arg), tidx)
if tidx < 0 if tidx < 0
throw 'Invalid arguments (expected: [name string] [opts dict] [fullscreen boolean])' throw 'Invalid arguments (expected: [name string] [opts dict] [fullscreen boolean])'
endif endif
@ -652,8 +652,8 @@ function! s:split(dict)
try try
if s:present(a:dict, 'window') if s:present(a:dict, 'window')
if type(a:dict.window) == type({}) if type(a:dict.window) == type({})
if !has('nvim') && !has('patch-8.2.191') if !(has('nvim') ? has('nvim-0.4') : has('popupwin') && has('patch-8.2.191'))
throw 'Vim 8.2.191 or later is required for pop-up window' throw 'Nvim 0.4+ or Vim 8.2.191+ with popupwin feature is required for pop-up window'
end end
call s:popup(a:dict.window) call s:popup(a:dict.window)
let is_popup = 1 let is_popup = 1

68
src/algo/normalize.go
View File

@ -405,6 +405,74 @@ var normalized map[rune]rune = map[rune]rune{
0x024E: 'Y', // WITH STROKE, LATIN CAPITAL LETTER 0x024E: 'Y', // WITH STROKE, LATIN CAPITAL LETTER
0x028F: 'Y', // , LATIN LETTER SMALL CAPITAL 0x028F: 'Y', // , LATIN LETTER SMALL CAPITAL
0x1D22: 'Z', // , LATIN LETTER SMALL CAPITAL 0x1D22: 'Z', // , LATIN LETTER SMALL CAPITAL
'Ắ': 'A',
'Ấ': 'A',
'Ằ': 'A',
'Ầ': 'A',
'Ẳ': 'A',
'Ẩ': 'A',
'Ẵ': 'A',
'Ẫ': 'A',
'Ặ': 'A',
'Ậ': 'A',
'ắ': 'a',
'ấ': 'a',
'ằ': 'a',
'ầ': 'a',
'ẳ': 'a',
'ẩ': 'a',
'ẵ': 'a',
'ẫ': 'a',
'ặ': 'a',
'ậ': 'a',
'Ế': 'E',
'Ề': 'E',
'Ể': 'E',
'Ễ': 'E',
'Ệ': 'E',
'ế': 'e',
'ề': 'e',
'ể': 'e',
'ễ': 'e',
'ệ': 'e',
'Ố': 'O',
'Ớ': 'O',
'Ồ': 'O',
'Ờ': 'O',
'Ổ': 'O',
'Ở': 'O',
'Ỗ': 'O',
'Ỡ': 'O',
'Ộ': 'O',
'Ợ': 'O',
'ố': 'o',
'ớ': 'o',
'ồ': 'o',
'ờ': 'o',
'ổ': 'o',
'ở': 'o',
'ỗ': 'o',
'ỡ': 'o',
'ộ': 'o',
'ợ': 'o',
'Ứ': 'U',
'Ừ': 'U',
'Ử': 'U',
'Ữ': 'U',
'Ự': 'U',
'ứ': 'u',
'ừ': 'u',
'ử': 'u',
'ữ': 'u',
'ự': 'u',
} }
// NormalizeRunes normalizes latin script letters // NormalizeRunes normalizes latin script letters