m-vim_plugins/vim-easy-align
1
0
Fork 0
mirror of https://github.com/junegunn/vim-easy-align.git synced 2025-11-10 10:53:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove option value after every cycle

Browse Source
This commit is contained in:
Junegunn Choi
2013-10-05 15:20:15 +09:00
parent a4a1e27395
commit fa26fd7b42
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
autoload/easy_align.vim
View File

@@ -49,10 +49,10 @@ let s:known_options = {
\ } \ }
let s:option_values = { let s:option_values = {
\ 'indentation': ['shallow', 'deep', 'none', 'keep'], \ 'indentation': ['shallow', 'deep', 'none', 'keep', -1],
\ 'delimiter_align': ['left', 'center', 'right'], \ 'delimiter_align': ['left', 'center', 'right', -1],
\ 'ignore_unmatched': [0, 1], \ 'ignore_unmatched': [0, 1, -1],
\ 'ignore_groups': [[], ['String'], ['Comment'], ['String', 'Comment']] \ 'ignore_groups': [[], ['String'], ['Comment'], ['String', 'Comment'], -1]
\ } \ }
let s:shorthand = { let s:shorthand = {
@@ -561,6 +561,15 @@ function! s:atoi(str)
return (a:str =~ '^[0-9]\+$') ? str2nr(a:str) : a:str return (a:str =~ '^[0-9]\+$') ? str2nr(a:str) : a:str
endfunction endfunction
function! s:shift_opts(opts, key, vals)
let val = s:shift(a:vals, 1)
if type(val) == 0 && val == -1
call remove(a:opts, a:key)
else
let a:opts[a:key] = val
endif
endfunction
function! s:interactive(modes, vis, opts, delims) function! s:interactive(modes, vis, opts, delims)
let mode = s:shift(a:modes, 1) let mode = s:shift(a:modes, 1)
let n = '' let n = ''
@@ -604,9 +613,9 @@ function! s:interactive(modes, vis, opts, delims)
else | let n = n . ch else | let n = n . ch
end end
elseif ch == "\<C-D>" elseif ch == "\<C-D>"
let opts['da'] = s:shift(vals['delimiter_align'], 1) call s:shift_opts(opts, 'da', vals['delimiter_align'])
elseif ch == "\<C-I>" elseif ch == "\<C-I>"
let opts['idt'] = s:shift(vals['indentation'], 1) call s:shift_opts(opts, 'idt', vals['indentation'])
elseif ch == "\<C-L>" elseif ch == "\<C-L>"
let lm = s:input("Left margin: ", get(opts, 'lm', ''), a:vis) let lm = s:input("Left margin: ", get(opts, 'lm', ''), a:vis)
if empty(lm) if empty(lm)
@@ -624,9 +633,9 @@ function! s:interactive(modes, vis, opts, delims)
let opts['rm'] = s:atoi(rm) let opts['rm'] = s:atoi(rm)
endif endif
elseif ch == "\<C-U>" elseif ch == "\<C-U>"
let opts['iu'] = s:shift(vals['ignore_unmatched'], 1) call s:shift_opts(opts, 'iu', vals['ignore_unmatched'])
elseif ch == "\<C-G>" elseif ch == "\<C-G>"
let opts['ig'] = s:shift(vals['ignore_groups'], 1) call s:shift_opts(opts, 'ig', vals['ignore_groups'])
elseif c == "\<Left>" elseif c == "\<Left>"
let opts['stl'] = 1 let opts['stl'] = 1
let opts['lm'] = 0 let opts['lm'] = 0

2
test/basic.script
View File

@@ -1 +1 @@
4Gvipjyvip 4Gvipjyvip