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

Merge pull request #86 from LFDM/bd_fl

Browse Source 
Adds bd-f plugs for consistency in plug naming
This commit is contained in:
haya14busa 2014-02-06 18:55:01 +09:00
commit 46f7c2066f
3 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/easymotion.txt
View File

@ -139,7 +139,7 @@ EasyMotion <Plug> table *easymotion-plug-table*
More <Plug> Mapping Table | (No assignment by default)
----------------------------------|---------------------------------
(<Plug>(easymotion-bd-f)) | See |<Plug>(easymotion-s)|
<Plug>(easymotion-bd-f) | See |<Plug>(easymotion-s)|
<Plug>(easymotion-bd-t) | See |<Plug>(easymotion-bd-t)|
<Plug>(easymotion-bd-w) | See |<Plug>(easymotion-bd-w)|
<Plug>(easymotion-bd-W) | See |<Plug>(easymotion-bd-W)|
@ -159,6 +159,7 @@ EasyMotion <Plug> table *easymotion-plug-table*
<Plug>(easymotion-sl) | See |<Plug>(easymotion-sl)|
<Plug>(easymotion-fl) | See |<Plug>(easymotion-fl)|
<Plug>(easymotion-Fl) | See |<Plug>(easymotion-Fl)|
<Plug>(easymotion-bd-fl) | See |<Plug>(easymotion-sl)|
<Plug>(easymotion-tl) | See |<Plug>(easymotion-tl)|
<Plug>(easymotion-Tl) | See |<Plug>(easymotion-Tl)|
<Plug>(easymotion-bd-tl) | See |<Plug>(easymotion-bd-tl)|
@ -177,6 +178,7 @@ EasyMotion <Plug> table *easymotion-plug-table*
<Plug>(easymotion-s2) | See |<Plug>(easymotion-s2)|
<Plug>(easymotion-f2) | See |<Plug>(easymotion-f2)|
<Plug>(easymotion-F2) | See |<Plug>(easymotion-F2)|
<Plug>(easymotion-bd-f2) | See |<Plug>(easymotion-s2)|
<Plug>(easymotion-t2) | See |<Plug>(easymotion-t2)|
<Plug>(easymotion-T2) | See |<Plug>(easymotion-T2)|
<Plug>(easymotion-bd-t2) | See |<Plug>(easymotion-bd-t2)|
@ -190,6 +192,7 @@ EasyMotion <Plug> table *easymotion-plug-table*
<Plug>(easymotion-sn) | See |<Plug>(easymotion-sn)|
<Plug>(easymotion-fn) | See |<Plug>(easymotion-fn)|
<Plug>(easymotion-Fn) | See |<Plug>(easymotion-Fn)|
<Plug>(easymotion-bd-fn) | See |<Plug>(easymotion-sn)|
<Plug>(easymotion-tn) | See |<Plug>(easymotion-tn)|
<Plug>(easymotion-Tn) | See |<Plug>(easymotion-Tn)|
<Plug>(easymotion-bd-tn) | See |<Plug>(easymotion-bd-tn)|
@ -197,8 +200,10 @@ EasyMotion <Plug> table *easymotion-plug-table*
<Plug>(easymotion-sln) | See |<Plug>(easymotion-sln)|
<Plug>(easymotion-fln) | See |<Plug>(easymotion-fln)|
<Plug>(easymotion-Fln) | See |<Plug>(easymotion-Fln)|
<Plug>(easymotion-bd-fln) | See |<Plug>(easymotion-sln)|
<Plug>(easymotion-tln) | See |<Plug>(easymotion-tln)|
<Plug>(easymotion-Tln) | See |<Plug>(easymotion-Tln)|
<Plug>(easymotion-bd-tln) | See |<Plug>(easymotion-bd-tln)|
------------------------------------------------------------------------------
@ -211,7 +216,7 @@ Bidirection ~
Note: bd is short for bidirectional
<Plug>(easymotion-s) *<Plug>(easymotion-s)*
*<Plug>(easymotion-bd-f)* (doesn't exist)
*<Plug>(easymotion-bd-f)*
Find {char} to bidirection(forward and backward at the same
time.) See |f| & |F|.
@ -359,6 +364,7 @@ Within line motion ~
*easymotion-within-line*
<Plug>(easymotion-sl) *<Plug>(easymotion-sl)*
*<Plug>(easymotion-bd-fl)*
This function is same as |<Plug>(easymotion-s)|, except range
is within current cursor line.

6
plugin/EasyMotion.vim
View File

@ -70,12 +70,14 @@ call s:find_motion_map_helper({
\ 'f' : {'fnc': 'S' , 'cnt': 1, 'direction': 0},
\ 'F' : {'fnc': 'S' , 'cnt': 1, 'direction': 1},
\ 's' : {'fnc': 'S' , 'cnt': 1, 'direction': 2},
\ 'bd-f' : {'fnc': 'S' , 'cnt': 1, 'direction': 2},
\ 't' : {'fnc': 'T' , 'cnt': 1, 'direction': 0},
\ 'T' : {'fnc': 'T' , 'cnt': 1, 'direction': 1},
\ 'bd-t' : {'fnc': 'T', 'cnt': 1, 'direction': 2},
\ 'fl' : {'fnc': 'SL', 'cnt': 1, 'direction': 0},
\ 'Fl' : {'fnc': 'SL', 'cnt': 1, 'direction': 1},
\ 'sl' : {'fnc': 'SL', 'cnt': 1, 'direction': 2},
\ 'bd-fl' : {'fnc': 'SL', 'cnt': 1, 'direction': 2},
\ 'tl' : {'fnc': 'TL', 'cnt': 1, 'direction': 0},
\ 'Tl' : {'fnc': 'TL', 'cnt': 1, 'direction': 1},
\ 'bd-tl' : {'fnc': 'TL', 'cnt': 1, 'direction': 2},
@ -83,12 +85,14 @@ call s:find_motion_map_helper({
\ 'f2' : {'fnc': 'S' , 'cnt': 2, 'direction': 0},
\ 'F2' : {'fnc': 'S' , 'cnt': 2, 'direction': 1},
\ 's2' : {'fnc': 'S' , 'cnt': 2, 'direction': 2},
\ 'bd-f2' : {'fnc': 'S' , 'cnt': 2, 'direction': 2},
\ 't2' : {'fnc': 'T' , 'cnt': 2, 'direction': 0},
\ 'T2' : {'fnc': 'T' , 'cnt': 2, 'direction': 1},
\ 'bd-t2' : {'fnc': 'T', 'cnt': 2, 'direction': 2},
\ 'fl2' : {'fnc': 'SL', 'cnt': 2, 'direction': 0},
\ 'Fl2' : {'fnc': 'SL', 'cnt': 2, 'direction': 1},
\ 'sl2' : {'fnc': 'SL', 'cnt': 2, 'direction': 2},
\ 'bd-fl2' : {'fnc': 'SL', 'cnt': 2, 'direction': 2},
\ 'tl2' : {'fnc': 'TL', 'cnt': 2, 'direction': 0},
\ 'Tl2' : {'fnc': 'TL', 'cnt': 2, 'direction': 1},
\ 'bd-tl2' : {'fnc': 'TL', 'cnt': 2, 'direction': 2},
@ -96,12 +100,14 @@ call s:find_motion_map_helper({
\ 'fn' : {'fnc': 'S' , 'cnt': -1, 'direction': 0},
\ 'Fn' : {'fnc': 'S' , 'cnt': -1, 'direction': 1},
\ 'sn' : {'fnc': 'S' , 'cnt': -1, 'direction': 2},
\ 'bd-fn' : {'fnc': 'S' , 'cnt': -1, 'direction': 2},
\ 'tn' : {'fnc': 'T' , 'cnt': -1, 'direction': 0},
\ 'Tn' : {'fnc': 'T' , 'cnt': -1, 'direction': 1},
\ 'bd-tn' : {'fnc': 'T', 'cnt': -1, 'direction': 2},
\ 'fln' : {'fnc': 'SL', 'cnt': -1, 'direction': 0},
\ 'Fln' : {'fnc': 'SL', 'cnt': -1, 'direction': 1},
\ 'sln' : {'fnc': 'SL', 'cnt': -1, 'direction': 2},
\ 'bd-fln' : {'fnc': 'SL', 'cnt': -1, 'direction': 2},
\ 'tln' : {'fnc': 'TL', 'cnt': -1, 'direction': 0},
\ 'Tln' : {'fnc': 'TL', 'cnt': -1, 'direction': 1},
\ 'bd-tln' : {'fnc': 'TL', 'cnt': -1, 'direction': 2},

24
t/easymotion_spec.vim
View File

@ -47,6 +47,10 @@ describe 'Default settings'
Expect maparg('<Plug>(easymotion-F)', 'n') ==# ':<C-U>call EasyMotion#S(1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-F)', 'o') ==# ':<C-U>call EasyMotion#S(1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-F)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(1,1,1)<CR>'
" bd-f
Expect maparg('<Plug>(easymotion-bd-f)', 'n') ==# maparg('<Plug>(easymotion-s)', 'n')
Expect maparg('<Plug>(easymotion-bd-f)', 'o') ==# maparg('<Plug>(easymotion-s)', 'o')
Expect maparg('<Plug>(easymotion-bd-f)', 'v') ==# maparg('<Plug>(easymotion-s)', 'v')
" t
Expect maparg('<Plug>(easymotion-t)', 'n') ==# ':<C-U>call EasyMotion#T(1,0,0)<CR>'
Expect maparg('<Plug>(easymotion-t)', 'o') ==# ':<C-U>call EasyMotion#T(1,0,0)<CR>'
@ -71,6 +75,10 @@ describe 'Default settings'
Expect maparg('<Plug>(easymotion-Fl)', 'n') ==# ':<C-U>call EasyMotion#SL(1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fl)', 'o') ==# ':<C-U>call EasyMotion#SL(1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(1,1,1)<CR>'
" bd-fl
Expect maparg('<Plug>(easymotion-bd-fl)', 'n') ==# maparg('<Plug>(easymotion-sl)', 'n')
Expect maparg('<Plug>(easymotion-bd-fl)', 'o') ==# maparg('<Plug>(easymotion-sl)', 'o')
Expect maparg('<Plug>(easymotion-bd-fl)', 'v') ==# maparg('<Plug>(easymotion-sl)', 'v')
" tl
Expect maparg('<Plug>(easymotion-tl)', 'n') ==# ':<C-U>call EasyMotion#TL(1,0,0)<CR>'
Expect maparg('<Plug>(easymotion-tl)', 'o') ==# ':<C-U>call EasyMotion#TL(1,0,0)<CR>'
@ -98,6 +106,10 @@ describe 'Default settings'
Expect maparg('<Plug>(easymotion-F2)', 'n') ==# ':<C-U>call EasyMotion#S(2,0,1)<CR>'
Expect maparg('<Plug>(easymotion-F2)', 'o') ==# ':<C-U>call EasyMotion#S(2,0,1)<CR>'
Expect maparg('<Plug>(easymotion-F2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(2,1,1)<CR>'
" bd-f2
Expect maparg('<Plug>(easymotion-bd-f2)', 'n') ==# maparg('<Plug>(easymotion-s2)', 'n')
Expect maparg('<Plug>(easymotion-bd-f2)', 'o') ==# maparg('<Plug>(easymotion-s2)', 'o')
Expect maparg('<Plug>(easymotion-bd-f2)', 'v') ==# maparg('<Plug>(easymotion-s2)', 'v')
" t2
Expect maparg('<Plug>(easymotion-t2)', 'n') ==# ':<C-U>call EasyMotion#T(2,0,0)<CR>'
Expect maparg('<Plug>(easymotion-t2)', 'o') ==# ':<C-U>call EasyMotion#T(2,0,0)<CR>'
@ -122,6 +134,10 @@ describe 'Default settings'
Expect maparg('<Plug>(easymotion-Fl2)', 'n') ==# ':<C-U>call EasyMotion#SL(2,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fl2)', 'o') ==# ':<C-U>call EasyMotion#SL(2,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(2,1,1)<CR>'
" bd-fl2
Expect maparg('<Plug>(easymotion-bd-fl2)', 'n') ==# maparg('<Plug>(easymotion-sl2)', 'n')
Expect maparg('<Plug>(easymotion-bd-fl2)', 'o') ==# maparg('<Plug>(easymotion-sl2)', 'o')
Expect maparg('<Plug>(easymotion-bd-fl2)', 'v') ==# maparg('<Plug>(easymotion-sl2)', 'v')
" tl2
Expect maparg('<Plug>(easymotion-tl2)', 'n') ==# ':<C-U>call EasyMotion#TL(2,0,0)<CR>'
Expect maparg('<Plug>(easymotion-tl2)', 'o') ==# ':<C-U>call EasyMotion#TL(2,0,0)<CR>'
@ -149,6 +165,10 @@ describe 'Default settings'
Expect maparg('<Plug>(easymotion-Fn)', 'n') ==# ':<C-U>call EasyMotion#S(-1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fn)', 'o') ==# ':<C-U>call EasyMotion#S(-1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(-1,1,1)<CR>'
" bd-fn
Expect maparg('<Plug>(easymotion-bd-fn)', 'n') ==# maparg('<Plug>(easymotion-sn)', 'n')
Expect maparg('<Plug>(easymotion-bd-fn)', 'o') ==# maparg('<Plug>(easymotion-sn)', 'o')
Expect maparg('<Plug>(easymotion-bd-fn)', 'v') ==# maparg('<Plug>(easymotion-sn)', 'v')
" tn
Expect maparg('<Plug>(easymotion-tn)', 'n') ==# ':<C-U>call EasyMotion#T(-1,0,0)<CR>'
Expect maparg('<Plug>(easymotion-tn)', 'o') ==# ':<C-U>call EasyMotion#T(-1,0,0)<CR>'
@ -173,6 +193,10 @@ describe 'Default settings'
Expect maparg('<Plug>(easymotion-Fln)', 'n') ==# ':<C-U>call EasyMotion#SL(-1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fln)', 'o') ==# ':<C-U>call EasyMotion#SL(-1,0,1)<CR>'
Expect maparg('<Plug>(easymotion-Fln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(-1,1,1)<CR>'
" bd-fln
Expect maparg('<Plug>(easymotion-bd-fln)', 'n') ==# maparg('<Plug>(easymotion-sln)', 'n')
Expect maparg('<Plug>(easymotion-bd-fln)', 'o') ==# maparg('<Plug>(easymotion-sln)', 'o')
Expect maparg('<Plug>(easymotion-bd-fln)', 'v') ==# maparg('<Plug>(easymotion-sln)', 'v')
" tln
Expect maparg('<Plug>(easymotion-tln)', 'n') ==# ':<C-U>call EasyMotion#TL(-1,0,0)<CR>'
Expect maparg('<Plug>(easymotion-tln)', 'o') ==# ':<C-U>call EasyMotion#TL(-1,0,0)<CR>'