m-vim_plugins/vim-wordy
1
0
Fork 0
mirror of https://github.com/preservim/vim-wordy.git synced 2025-11-12 03:43:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add an 'off' position to the ring of wordy dictionaries #4

Browse Source
This commit is contained in:
Reed Esau
2014-06-24 02:39:07 -06:00
parent 0752ff3548
commit 6437ef8220
1 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
autoload/wordy.vim
View File

@@ -24,7 +24,6 @@ function! wordy#init(...) abort
" switch to usage dictionaries, building if needed
let l:d = get(l:args, 'd', []) " may be string or list
let l:dicts = (type(l:d) == type([])) ? l:d : [l:d]
if len(l:dicts)
let l:dst_paths = []
" TODO &spelllang)
let l:lang = get(l:args, 'lang', 'en')
@@ -48,19 +47,21 @@ function! wordy#init(...) abort
if filereadable(l:dst_path)
call add(l:dst_paths, l:dst_path)
else
echohl WarningMsg | echo 'Unable to read target: ' . l:dst_path | echohl NONE
let l:msg = 'Unable to read target: ' . l:dst_path
endif
else
echohl WarningMsg | echo 'Unable to read source: ' . l:src_path | echohl NONE
let l:msg = 'Unable to read source: ' . l:src_path
endif
endfor
if len(l:dst_paths) > 0
let b:original_spl = &spelllang
exe 'setlocal spelllang=' . l:lang . ',' . join(l:dst_paths, ',')
setlocal spell
let l:msg = join(l:dicts, ', ')
else
let l:msg = 'off'
endif
echohl ModeMsg | echo 'wordy: ' . join(l:dicts, ', ') | echohl NONE
endif
echohl ModeMsg | echo 'wordy: ' . l:msg | echohl NONE
endfunction
function! wordy#jump(mode)
@@ -68,16 +69,24 @@ function! wordy#jump(mode)
" mode=-1 prev in ring
let l:avail_count = len(g:wordy#ring)
if l:avail_count == 0 | return | endif
if g:wordy_ring_index < 0
" ring navigation not initialized; start at begin or end
" if -1, ring navigation not initialized; start at begin or end
" Example with avail_count=3
" ((-1 + 3 + 1 + 2) % 4) - 1 => 0
" (( 0 + 3 + 1 + 2) % 4) - 1 => 1
" (( 1 + 3 + 1 + 2) % 4) - 1 => 2
" (( 2 + 3 + 1 + 2) % 4) - 1 => -1 NoWordy
" ((-1 + 3 - 1 + 2) % 4) - 1 => 2
" (( 0 + 3 - 1 + 2) % 4) - 1 => -1 NoWordy
" (( 1 + 3 - 1 + 2) % 4) - 1 => 0
" (( 2 + 3 - 1 + 2) % 4) - 1 => 1
let g:wordy_ring_index =
\ a:mode == 1
\ ? 0
\ : (l:avail_count - 1)
\ ((g:wordy_ring_index + l:avail_count + a:mode + 2)
\ % (l:avail_count + 1)) - 1
if g:wordy_ring_index == -1
call wordy#init({}) " NoWordy
else
let g:wordy_ring_index = (g:wordy_ring_index + l:avail_count + a:mode) % l:avail_count
endif
call wordy#init({ 'd': g:wordy#ring[ g:wordy_ring_index ]})
endif
endfunction
" vim:ts=2:sw=2:sts=2