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

Make visualmode parameter required for motion functions

Browse Source
This commit is contained in:
Kim Silkebækken 2011-03-28 22:08:49 +02:00
parent becf71b5ad
commit ebb93269cf
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
plugin/EasyMotion.vim
View File

@ -55,22 +55,26 @@
" }}} " }}}
" Default key mapping {{{ " Default key mapping {{{
if g:EasyMotion_do_mapping if g:EasyMotion_do_mapping
nnoremap <silent> <Leader>f :call EasyMotionF(0)<CR> nnoremap <silent> <Leader>f :call EasyMotionF(0, 0)<CR>
vnoremap <silent> <Leader>f :<C-U>call EasyMotionF(0, visualmode())<CR> vnoremap <silent> <Leader>f :<C-U>call EasyMotionF(0, 1)<CR>
nnoremap <silent> <Leader>F :call EasyMotionF(1)<CR>
vnoremap <silent> <Leader>F :<C-U>call EasyMotionF(1, visualmode())<CR>
nnoremap <silent> <Leader>t :call EasyMotionT(0)<CR> nnoremap <silent> <Leader>F :call EasyMotionF(1, 0)<CR>
vnoremap <silent> <Leader>t :<C-U>call EasyMotionT(0, visualmode())<CR> vnoremap <silent> <Leader>F :<C-U>call EasyMotionF(1, 1)<CR>
nnoremap <silent> <Leader>T :call EasyMotionT(1)<CR>
vnoremap <silent> <Leader>T :<C-U>call EasyMotionT(1, visualmode())<CR>
nnoremap <silent> <Leader>w :call EasyMotionW()<CR> nnoremap <silent> <Leader>t :call EasyMotionT(0, 0)<CR>
vnoremap <silent> <Leader>w :<C-U>call EasyMotionW(visualmode())<CR> vnoremap <silent> <Leader>t :<C-U>call EasyMotionT(0, 1)<CR>
nnoremap <silent> <Leader>e :call EasyMotionE()<CR>
vnoremap <silent> <Leader>e :<C-U>call EasyMotionE(visualmode())<CR> nnoremap <silent> <Leader>T :call EasyMotionT(1, 0)<CR>
nnoremap <silent> <Leader>b :call EasyMotionB()<CR> vnoremap <silent> <Leader>T :<C-U>call EasyMotionT(1, 1)<CR>
vnoremap <silent> <Leader>b :<C-U>call EasyMotionB(visualmode())<CR>
nnoremap <silent> <Leader>w :call EasyMotionW(0)<CR>
vnoremap <silent> <Leader>w :<C-U>call EasyMotionW(1)<CR>
nnoremap <silent> <Leader>e :call EasyMotionE(0)<CR>
vnoremap <silent> <Leader>e :<C-U>call EasyMotionE(1)<CR>
nnoremap <silent> <Leader>b :call EasyMotionB(0)<CR>
vnoremap <silent> <Leader>b :<C-U>call EasyMotionB(1)<CR>
endif endif
" }}} " }}}
" Initialize variables {{{ " Initialize variables {{{
@ -88,19 +92,19 @@
" Motion functions {{{ " Motion functions {{{
" F key motions {{{ " F key motions {{{
" Go to {char} to the right or the left " Go to {char} to the right or the left
function! EasyMotionF(direction, ...) function! EasyMotionF(direction, visualmode)
call <SID>Prompt('Search for character') call <SID>Prompt('Search for character')
let char = getchar() let char = getchar()
let re = '\C' . escape(nr2char(char), '.$^~') let re = '\C' . escape(nr2char(char), '.$^~')
call <SID>EasyMotion(re, a:direction, a:0 > 0 ? a:1 : '') call <SID>EasyMotion(re, a:direction, a:visualmode ? visualmode() : '')
endfunction endfunction
" }}} " }}}
" T key motions {{{ " T key motions {{{
" Go to {char} to the right (before) or the left (after) " Go to {char} to the right (before) or the left (after)
function! EasyMotionT(direction, ...) function! EasyMotionT(direction, visualmode)
call <SID>Prompt('Search for character') call <SID>Prompt('Search for character')
let char = getchar() let char = getchar()
@ -111,25 +115,25 @@
let re = '\C.' . escape(nr2char(char), '.$^~') let re = '\C.' . escape(nr2char(char), '.$^~')
endif endif
call <SID>EasyMotion(re, a:direction, a:0 > 0 ? a:1 : '') call <SID>EasyMotion(re, a:direction, a:visualmode ? visualmode() : '')
endfunction endfunction
" }}} " }}}
" W key motions {{{ " W key motions {{{
" Beginning of word forward " Beginning of word forward
function! EasyMotionW(...) function! EasyMotionW(visualmode)
call <SID>EasyMotion('\<.', 0, a:0 > 0 ? a:1 : '') call <SID>EasyMotion('\<.', 0, a:visualmode ? visualmode() : '')
endfunction endfunction
" }}} " }}}
" E key motions {{{ " E key motions {{{
" End of word forward " End of word forward
function! EasyMotionE(...) function! EasyMotionE(visualmode)
call <SID>EasyMotion('.\>', 0, a:0 > 0 ? a:1 : '') call <SID>EasyMotion('.\>', 0, a:visualmode ? visualmode() : '')
endfunction endfunction
" }}} " }}}
" B key motions {{{ " B key motions {{{
" Beginning of word backward " Beginning of word backward
function! EasyMotionB(...) function! EasyMotionB(visualmode)
call <SID>EasyMotion('\<.', 1, a:0 > 0 ? a:1 : '') call <SID>EasyMotion('\<.', 1, a:visualmode ? visualmode() : '')
endfunction endfunction
" }}} " }}}
" }}} " }}}
@ -255,10 +259,9 @@
endif endif
endtry endtry
endfunction "}}} endfunction "}}}
function! s:EasyMotion(regexp, direction, ...) " {{{ function! s:EasyMotion(regexp, direction, visualmode) " {{{
let orig_pos = [line('.'), col('.')] let orig_pos = [line('.'), col('.')]
let targets = [] let targets = []
let visualmode = a:0 > 0 ? a:1 : ''
try try
" Reset properties " Reset properties
@ -341,7 +344,7 @@
if len(coords) != 2 if len(coords) != 2
throw 'Cancelled' throw 'Cancelled'
else else
if ! empty(visualmode) if ! empty(a:visualmode)
" Store original marks " Store original marks
let m_a = getpos("'a") let m_a = getpos("'a")
let m_b = getpos("'b") let m_b = getpos("'b")
@ -351,7 +354,7 @@
call setpos("'b", [0, coords[0], coords[1]]) call setpos("'b", [0, coords[0], coords[1]])
" Update selection " Update selection
silent exec 'normal! `a' . visualmode . '`b' silent exec 'normal! `a' . a:visualmode . '`b'
" Restore original marks " Restore original marks
call setpos("'a", m_a) call setpos("'a", m_a)
@ -370,8 +373,8 @@
call <SID>Message(v:exception) call <SID>Message(v:exception)
" Restore cursor position/selection " Restore cursor position/selection
if ! empty(visualmode) if ! empty(a:visualmode)
silent exec 'normal! `<' . visualmode . '`>' silent exec 'normal! `<' . a:visualmode . '`>'
else else
call setpos('.', [0, orig_pos[0], orig_pos[1]]) call setpos('.', [0, orig_pos[0], orig_pos[1]])
endif endif