Skip to content

move functions to autoload/ #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhysd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

move functions to autoload/ #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 145 additions & 0 deletions autoload/textobj/wiw.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
" NOTE: Disable 'ignorecase' to avoid textobj-user's bug that defines key
" mappings incorrectly when 'ignorecase' is enabled.

let s:save_ic = &ignorecase
set noignorecase

let s:WIW_HEAD = '\%(\(\<.\)\|\(\u\l\|\l\@<=\u\)\|\(\A\@<=\a\)\)'
let s:WIW_TAIL = '\%(\(.\>\)\|\(\l\u\@=\|\u\%(\u\l\)\@=\)\|\(\a\A\@=\)\)'

" Sub-match types
let s:NOT_FOUND = 0

let s:WORD_BOUND = 2
" Example: <this> <is> <a> <wiw>

let s:CASE_BOUND = 3
" Example: <This><Is><A><Wiw>

let s:CTYPE_BOUND = 4
" Example: <this>_<is>_<a>_<wiw>
" Example: <this>#<is>#<a>#<wiw>

" NOTE: Sub-match number starts from 2 because 1 means that none of the
" sub-matches matched but the whole pattern did match. See :help
" search()-sub-match.


" Override move function to share s:move() with s:select().
function! g:__textobj_wiw.move(obj_name, flags, previous_mode)
if a:previous_mode ==# 'v'
normal! gv
endif
let pattern = (a:flags =~# 'e' ? s:WIW_TAIL : s:WIW_HEAD)
let flags = (a:flags =~# 'b' ? 'b' : '')
call s:move(pattern, flags, v:count1, 0)
endfunction

function! s:move(pattern, flags, count, within_word)
let flags = a:flags
let submatch = s:NOT_FOUND
for i in range(a:count)
let result = search(a:pattern, 'p' . flags)
if result == s:NOT_FOUND
if i == 0
return result
else
break
endif
elseif result == s:WORD_BOUND && a:within_word
let submatch = result
break
endif
if i == 0
let flags = substitute(flags, 'c', '', 'g')
endif
let submatch = result
endfor
return submatch
endfunction

function! textobj#wiw#select_a()
return s:select(0)
endfunction

function! textobj#wiw#select_i()
return s:select(1)
endfunction

function! s:select(inner)
let save_ww = &whichwrap
set whichwrap-=h,l

try
if !s:cursor_is_in_word()
call s:move(s:WIW_HEAD, '', 1, 0)
endif

let delim_included = 0
let pos = getpos('.')

" Get the column position where the selection ends.
let submatch = s:move(s:WIW_TAIL, 'cW', v:count1, 1)
if submatch == s:NOT_FOUND
return 0
endif
if !a:inner
if submatch == s:CTYPE_BOUND
" Include a trailing delimiter.
" NOTE: Only ctype bounds have delimiters.
normal! l
let delim_included = 1
endif
endif
let end = getpos('.')

call setpos('.', pos)

" Get the column position where the selection starts.
let submatch = s:move(s:WIW_HEAD, 'cbW', 1, 1)
if submatch == s:NOT_FOUND
return 0
endif
if !a:inner && !delim_included
if submatch == s:CTYPE_BOUND
" Include a leading delimiter.
normal! h
endif
endif
let start = getpos('.')

return ['v', start, end]

finally
let &whichwrap = save_ww
endtry
endfunction

function! s:cursor_is_in_word()
" The cursor is in a word when:
" cursor < tail < head or EOF
let tail_pos = searchpos('.\>', 'cnW')
if tail_pos[0] > 0
let head_pos = searchpos('\<.', 'nW')
if head_pos[0] > 0
" return (tail_pos < head_pos)
return (s:compare_pos(tail_pos, head_pos) <= 0)
else
" The cursor is in the last word.
return 1
endif
endif
return 0
endfunction

" NOTE: This function is compatible with sort().
function! s:compare_pos(pos1, pos2)
if a:pos1[0] == a:pos2[0]
return (a:pos1[1] == a:pos2[1] ? 0 : (a:pos1[1] > a:pos2[1] ? 1 : -1))
else
return (a:pos1[0] > a:pos2[0] ? 1 : -1)
endif
endfunction

let &ignorecase = s:save_ic
unlet s:save_ic
148 changes: 2 additions & 146 deletions plugin/textobj/wiw.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ endif
let g:loaded_textobj_wiw = 1

let s:save_cpo = &cpo
let s:save_ic = &ignorecase
set cpo&vim
set noignorecase
" NOTE: Disable 'ignorecase' to avoid textobj-user's bug that defines key
" mappings incorrectly when 'ignorecase' is enabled.

let s:prefix = get(g:, 'textobj_wiw_default_key_mappings_prefix', ',')

Expand All @@ -52,151 +48,11 @@ call textobj#user#plugin('wiw', {
\ 'move-P' : s:prefix . 'ge',
\
\ '*sfile*' : expand('<sfile>:p'),
\ 'select-a' : 'a' . s:prefix . 'w', '*select-a-function*': 's:select_a',
\ 'select-i' : 'i' . s:prefix . 'w', '*select-i-function*': 's:select_i',
\ 'select-a' : 'a' . s:prefix . 'w', '*select-a-function*': 'textobj#wiw#select_a',
\ 'select-i' : 'i' . s:prefix . 'w', '*select-i-function*': 'textobj#wiw#select_i',
\ }
\})
unlet s:prefix

let s:WIW_HEAD = '\%(\(\<.\)\|\(\u\l\|\l\@<=\u\)\|\(\A\@<=\a\)\)'
let s:WIW_TAIL = '\%(\(.\>\)\|\(\l\u\@=\|\u\%(\u\l\)\@=\)\|\(\a\A\@=\)\)'

" Sub-match types
let s:NOT_FOUND = 0

let s:WORD_BOUND = 2
" Example: <this> <is> <a> <wiw>

let s:CASE_BOUND = 3
" Example: <This><Is><A><Wiw>

let s:CTYPE_BOUND = 4
" Example: <this>_<is>_<a>_<wiw>
" Example: <this>#<is>#<a>#<wiw>

" NOTE: Sub-match number starts from 2 because 1 means that none of the
" sub-matches matched but the whole pattern did match. See :help
" search()-sub-match.


" Override move function to share s:move() with s:select().
function! g:__textobj_wiw.move(obj_name, flags, previous_mode)
if a:previous_mode ==# 'v'
normal! gv
endif
let pattern = (a:flags =~# 'e' ? s:WIW_TAIL : s:WIW_HEAD)
let flags = (a:flags =~# 'b' ? 'b' : '')
call s:move(pattern, flags, v:count1, 0)
endfunction

function! s:move(pattern, flags, count, within_word)
let flags = a:flags
let submatch = s:NOT_FOUND
for i in range(a:count)
let result = search(a:pattern, 'p' . flags)
if result == s:NOT_FOUND
if i == 0
return result
else
break
endif
elseif result == s:WORD_BOUND && a:within_word
let submatch = result
break
endif
if i == 0
let flags = substitute(flags, 'c', '', 'g')
endif
let submatch = result
endfor
return submatch
endfunction

function! s:select_a()
return s:select(0)
endfunction

function! s:select_i()
return s:select(1)
endfunction

function! s:select(inner)
let save_ww = &whichwrap
set whichwrap-=h,l

try
if !s:cursor_is_in_word()
call s:move(s:WIW_HEAD, '', 1, 0)
endif

let delim_included = 0
let pos = getpos('.')

" Get the column position where the selection ends.
let submatch = s:move(s:WIW_TAIL, 'cW', v:count1, 1)
if submatch == s:NOT_FOUND
return 0
endif
if !a:inner
if submatch == s:CTYPE_BOUND
" Include a trailing delimiter.
" NOTE: Only ctype bounds have delimiters.
normal! l
let delim_included = 1
endif
endif
let end = getpos('.')

call setpos('.', pos)

" Get the column position where the selection starts.
let submatch = s:move(s:WIW_HEAD, 'cbW', 1, 1)
if submatch == s:NOT_FOUND
return 0
endif
if !a:inner && !delim_included
if submatch == s:CTYPE_BOUND
" Include a leading delimiter.
normal! h
endif
endif
let start = getpos('.')

return ['v', start, end]

finally
let &whichwrap = save_ww
endtry
endfunction

function! s:cursor_is_in_word()
" The cursor is in a word when:
" cursor < tail < head or EOF
let tail_pos = searchpos('.\>', 'cnW')
if tail_pos[0] > 0
let head_pos = searchpos('\<.', 'nW')
if head_pos[0] > 0
" return (tail_pos < head_pos)
return (s:compare_pos(tail_pos, head_pos) <= 0)
else
" The cursor is in the last word.
return 1
endif
endif
return 0
endfunction

" NOTE: This function is compatible with sort().
function! s:compare_pos(pos1, pos2)
if a:pos1[0] == a:pos2[0]
return (a:pos1[1] == a:pos2[1] ? 0 : (a:pos1[1] > a:pos2[1] ? 1 : -1))
else
return (a:pos1[0] > a:pos2[0] ? 1 : -1)
endif
endfunction

let &ignorecase = s:save_ic
unlet s:save_ic

let &cpo = s:save_cpo
unlet s:save_cpo