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

Improve t/T find motions to match beginning & end of line targets

Browse Source 
Including minor refactoring

close #109
This commit is contained in:
haya14busa 2014-02-18 13:56:21 +09:00
parent 6f31bc5443
commit 2b27e74c2f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
autoload/EasyMotion.vim
View File

@ -141,9 +141,9 @@ function! EasyMotion#T(num_strokes, visualmode, direction) " {{{
if a:direction == 2 if a:direction == 2
let s:flag.bd_t = 1 let s:flag.bd_t = 1
elseif a:direction == 1 elseif a:direction == 1
let re = '\('.re.'\)\zs.' let re = s:convert_t_regexp(re, 1) " backward
else else
let re = '.\ze\('.re.'\)' let re = s:convert_t_regexp(re, 0) " forward
endif endif
call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive) call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive)
return s:EasyMotion_is_cancelled return s:EasyMotion_is_cancelled
@ -544,6 +544,13 @@ function! s:should_use_smartsign(char) "{{{
return 0 return 0
endif endif
endfunction "}}} endfunction "}}}
function! s:convert_t_regexp(re, direction)
if a:direction == 0 "forward
return '\_.\ze\('.a:re.'\)'
elseif a:direction == 1 "backward
return '\('.a:re.'\)\@<=\_.'
endif
endfunction
function! s:handleEmpty(input, visualmode) "{{{ function! s:handleEmpty(input, visualmode) "{{{
" if empty, reselect and return 1 " if empty, reselect and return 1
@ -1112,7 +1119,7 @@ function! s:EasyMotion(regexp, direction, visualmode, is_inclusive) " {{{
" Handle bi-directional t motion {{{ " Handle bi-directional t motion {{{
if s:flag.bd_t == 1 if s:flag.bd_t == 1
let regexp = '\('.a:regexp.'\)\zs.' let regexp = s:convert_t_regexp(a:regexp, 1) "backward
else else
let regexp = a:regexp let regexp = a:regexp
endif endif
@ -1148,7 +1155,7 @@ function! s:EasyMotion(regexp, direction, visualmode, is_inclusive) " {{{
" Handle bidirection "{{{ " Handle bidirection "{{{
" For bi-directional t motion {{{ " For bi-directional t motion {{{
if s:flag.bd_t == 1 if s:flag.bd_t == 1
let regexp = '.\ze\('.a:regexp.'\)' let regexp = s:convert_t_regexp(a:regexp, 0) "forward
endif endif
"}}} "}}}
" Reconstruct match dict " Reconstruct match dict