vim/vim-easymotion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/asterisc' into master

Browse Source
This commit is contained in:
haya14busa 2014-05-06 10:42:18 +09:00
commit 180cc531e4
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/EasyMotion.vim
View File

@ -509,7 +509,7 @@ function! s:escape_regexp_char(char) "{{{
" Get escaped char from given dictionary
" return '' if char is not find
" Used inside `[]`
return escape(a:char, '.$^~\[]')
return escape(a:char, '.$^~\[]*')
endfunction "}}}
function! s:convertSmartcase(re, char) "{{{
let re = a:re

81
t/smartsign_spec.vim
View File

@ -386,6 +386,87 @@ describe 'Basic Smartsign feature with 1-key findmotions with US layout'
end
"}}}
" Smartsign with 2-key find motions with US layout {{{
describe 'Smartsign with 2-key find motions with US layout'
before
new
let g:EasyMotion_keys = '123456789'
let g:EasyMotion_use_smartsign_us = 1
map s <Plug>(easymotion-s2)
call EasyMotion#init()
call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
call AddLine(' ,< .> /?')
call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
call AddLine(' ,< .> /?')
" 123456789012345678901234567890
" 1 2 3
end
after
close!
end
it 'works well'
" Default position
normal! 0
let l = line('.')
Expect CursorPos() == [l,1,' ']
" ,<
normal s,,1
Expect CursorPos() == [l,2,',']
normal! 0
Expect CursorPos() == [l,1,' ']
normal s,,3
Expect CursorPos() == [l,1,' ']
normal! 0
normal s, 1
Expect CursorPos() == [l,3,'<']
normal! 0
normal s<<1
Expect CursorPos() == [l,1,' ']
normal! 0
normal s,<1
Expect CursorPos() == [l,2,',']
normal! 0
normal s<,1
Expect CursorPos() == [l,1,' ']
normal! 0
end
it ': s,,3'
normal! 0
let l = line('.')
Expect CursorPos() == [l,1,' ']
normal s,,3
Expect CursorPos() == [l,1,' ']
normal! 0
end
it 'escape * asterisc #151'
normal! 0
let l = line('.')
Expect CursorPos() == [l,1,' ']
normal s1*22
Expect CursorPos() == [l,1,' ']
normal! 0
normal s8*1
Expect CursorPos() == [l+1,23,'8']
normal! 0
normal s881
Expect CursorPos() == [l+1,23,'8']
normal! 0
normal s**1
Expect CursorPos() == [l+1,1,' ']
normal! 0
normal s*81
Expect CursorPos() == [l+1,1,' ']
normal! 0
end
end
"}}}
" Smartsign with 2-key find motions with JP layout {{{
describe 'Smartsign with 2-key find motions with JP layout'
before