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

Make the motions work in visual mode

Browse Source
This commit is contained in:
Kim Silkebækken 2011-03-28 10:14:51 +02:00
parent a4689e85ec
commit 99dfdfb732
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
plugin/EasyMotion.vim
View File

@ -9,8 +9,8 @@
" http://www.vim.org/scripts/script.php?script_id=3437 " http://www.vim.org/scripts/script.php?script_id=3437
" "
" This script addresses some issues with the original PreciseJump " This script addresses some issues with the original PreciseJump
" script. It only works in normal mode (for now), and it works correctly " script. It works correctly with the following motions in both normal
" with the following motions: f F t T w e b " and visual mode: f F t T w e b
" "
" Default key mapping: " Default key mapping:
" - <Leader> f {char} " - <Leader> f {char}
@ -60,14 +60,21 @@
" 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)<CR>
vnoremap <silent> <Leader>f :<C-U>call EasyMotionF(0, visualmode())<CR>
nnoremap <silent> <Leader>F :call EasyMotionF(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>t :call EasyMotionT(0)<CR>
vnoremap <silent> <Leader>t :<C-U>call EasyMotionT(0, visualmode())<CR>
nnoremap <silent> <Leader>T :call EasyMotionT(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>w :call EasyMotionW()<CR>
vnoremap <silent> <Leader>w :<C-U>call EasyMotionW(visualmode())<CR>
nnoremap <silent> <Leader>e :call EasyMotionE()<CR> nnoremap <silent> <Leader>e :call EasyMotionE()<CR>
vnoremap <silent> <Leader>e :<C-U>call EasyMotionE(visualmode())<CR>
nnoremap <silent> <Leader>b :call EasyMotionB()<CR> nnoremap <silent> <Leader>b :call EasyMotionB()<CR>
vnoremap <silent> <Leader>b :<C-U>call EasyMotionB(visualmode())<CR>
endif endif
" }}} " }}}
" Initialize variables {{{ " Initialize variables {{{
@ -83,19 +90,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, ...)
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) call <SID>EasyMotion(re, a:direction, a:0 > 0 ? a:1 : '')
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, ...)
call <SID>Prompt('Search for character') call <SID>Prompt('Search for character')
let char = getchar() let char = getchar()
@ -106,25 +113,25 @@
let re = '\C.' . escape(nr2char(char), '.$^~') let re = '\C.' . escape(nr2char(char), '.$^~')
endif endif
call <SID>EasyMotion(re, a:direction) call <SID>EasyMotion(re, a:direction, a:0 > 0 ? a:1 : '')
endfunction endfunction
" }}} " }}}
" W key motions {{{ " W key motions {{{
" Beginning of word forward " Beginning of word forward
function! EasyMotionW() function! EasyMotionW(...)
call <SID>EasyMotion('\<.', 0) call <SID>EasyMotion('\<.', 0, a:0 > 0 ? a:1 : '')
endfunction endfunction
" }}} " }}}
" E key motions {{{ " E key motions {{{
" End of word forward " End of word forward
function! EasyMotionE() function! EasyMotionE(...)
call <SID>EasyMotion('.\>', 0) call <SID>EasyMotion('.\>', 0, a:0 > 0 ? a:1 : '')
endfunction endfunction
" }}} " }}}
" B key motions {{{ " B key motions {{{
" Beginning of word backward " Beginning of word backward
function! EasyMotionB() function! EasyMotionB(...)
call <SID>EasyMotion('\<.', 1) call <SID>EasyMotion('\<.', 1, a:0 > 0 ? a:1 : '')
endfunction endfunction
" }}} " }}}
" }}} " }}}
@ -268,9 +275,10 @@
endif endif
endtry endtry
endfunction "}}} endfunction "}}}
function! s:EasyMotion(regexp, direction) " {{{ function! s:EasyMotion(regexp, direction, ...) " {{{
let orig_pos = [line('.'), col('.')] let orig_pos = [line('.'), col('.')]
let targets = [] let targets = []
let visualmode = a:0 > 0 ? a:1 : ''
" Find motion targets " Find motion targets
while 1 while 1
@ -300,6 +308,9 @@
call <SID>Message('No matches') call <SID>Message('No matches')
" Restore cursor position
call setpos('.', [0, orig_pos[0], orig_pos[1]])
return return
endif endif
@ -351,10 +362,34 @@
" Cancelled by user " Cancelled by user
call <SID>Message('Operation cancelled') call <SID>Message('Operation cancelled')
" Restore cursor position/selection
if ! empty(visualmode)
silent exec 'normal! `<' . visualmode . '`>'
else
call setpos('.', [0, orig_pos[0], orig_pos[1]])
endif
return return
else else
" Jump to coords if ! empty(visualmode)
call setpos('.', [0, coords[0], coords[1]]) " Store original marks
let m_a = getpos("'a")
let m_b = getpos("'b")
" Store start/end positions
call setpos("'a", [0, orig_pos[0], orig_pos[1]])
call setpos("'b", [0, coords[0], coords[1]])
" Update selection
silent exec 'normal! `a' . visualmode . '`b'
" Restore original marks
call setpos("'a", m_a)
call setpos("'b", m_b)
else
" Update cursor position
call setpos('.', [0, coords[0], coords[1]])
endif
call <SID>Message('Jumping to [' . coords[0] . ', ' . coords[1] . ']') call <SID>Message('Jumping to [' . coords[0] . ', ' . coords[1] . ']')
endif endif