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

finish implementing negative field number

Browse Source
This commit is contained in:
Junegunn Choi
2013-05-13 12:38:58 +09:00
parent 5c870f60d9
commit 27b95b4ce0
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
autoload/easy_align.vim
View File

@@ -5,7 +5,7 @@ let g:easy_align_loaded = 1
let s:easy_align_delimiters_default = { let s:easy_align_delimiters_default = {
\ ' ': { 'pattern': ' ', 'margin_left': '', 'margin_right': '', 'stick_to_left': 0 }, \ ' ': { 'pattern': ' ', 'margin_left': '', 'margin_right': '', 'stick_to_left': 0 },
\ '=': { 'pattern': '===\|<=>\|\(&&\|||\|<<\|>>\)=\|=\~\|=>\|[:+/*!%^=><&|-]\?=', \ '=': { 'pattern': '===\|<=>\|\(&&\|||\|<<\|>>\)=\|=\~\|=>\|[:+/*!%^=><&|-]\?=[#?]\?',
\ 'margin_left': ' ', 'margin_right': ' ', 'stick_to_left': 0 }, \ 'margin_left': ' ', 'margin_right': ' ', 'stick_to_left': 0 },
\ ':': { 'pattern': ':', 'margin_left': '', 'margin_right': ' ', 'stick_to_left': 1 }, \ ':': { 'pattern': ':', 'margin_left': '', 'margin_right': ' ', 'stick_to_left': 1 },
\ ',': { 'pattern': ',', 'margin_left': '', 'margin_right': ' ', 'stick_to_left': 1 }, \ ',': { 'pattern': ',', 'margin_left': '', 'margin_right': ' ', 'stick_to_left': 1 },
@@ -21,7 +21,7 @@ function! s:do_align(just, fl, ll, fc, lc, pattern, nth, ml, mr, stick_to_left,
let max_just_len = 0 let max_just_len = 0
let max_delim_len = 0 let max_delim_len = 0
let max_tokens = 0 let max_tokens = 0
let pattern = '\s*\(' .a:pattern. '\)\s*' let pattern = '\s*\(' .a:pattern. '\)\s\{-}'
for line in range(a:fl, a:ll) for line in range(a:fl, a:ll)
let tokens = split(a:lc ? let tokens = split(a:lc ?
\ strpart(getline(line), a:fc - 1, a:lc - a:fc + 1) : \ strpart(getline(line), a:fc - 1, a:lc - a:fc + 1) :
@@ -56,7 +56,7 @@ function! s:do_align(just, fl, ll, fc, lc, pattern, nth, ml, mr, stick_to_left,
let last = tokens[nth] let last = tokens[nth]
let prefix = (nth > 0 ? join(tokens[0 : nth - 1], '') : '') let prefix = (nth > 0 ? join(tokens[0 : nth - 1], '') : '')
let token = substitute(last, pattern.'$', '', '') let token = substitute(last, pattern.'$', '', '')
let suffix = join(tokens[nth + 1: -1], '') let suffix = substitute(join(tokens[nth + 1: -1], ''), '^\s*', '', '')
if match(last, pattern.'$') == -1 if match(last, pattern.'$') == -1
if a:just == 0 && (!exists("g:easy_align_ignore_unmatched") || g:easy_align_ignore_unmatched) if a:just == 0 && (!exists("g:easy_align_ignore_unmatched") || g:easy_align_ignore_unmatched)
@@ -130,30 +130,30 @@ function! easy_align#align(just, ...) range
endif endif
elseif c == 13 elseif c == 13
let just = (just + 1) % len(s:just) let just = (just + 1) % len(s:just)
elseif c == 45 elseif index(['-', '*'], ch) != -1
if !empty(n) if empty(n)
break let n = ch
else else
let n = '-' break
endif endif
elseif c >= 48 && c <= 57 elseif c == 48
if n == '*' if n == '-'
break let n = '-0'
else else
break
endif
elseif c > 48 && c <= 57
if n != '*'
let n = n . nr2char(c) let n = n . nr2char(c)
endif
elseif ch == '*'
if !empty(n)
break
else else
let n = '*' break
endif endif
else else
break break
endif endif
endwhile endwhile
elseif a:0 == 1 elseif a:0 == 1
let tokens = matchlist(a:1, '^\(-\?[1-9][0-9]*\|-\|\*\)\?\(.\)$') let tokens = matchlist(a:1, '^\([1-9][0-9]*\|-[0-9]*\|\*\)\?\(.\)$')
if empty(tokens) if empty(tokens)
echo "Invalid arguments: ". a:1 echo "Invalid arguments: ". a:1
return return
@@ -174,7 +174,7 @@ function! easy_align#align(just, ...) range
let n = -1 let n = -1
elseif empty(n) elseif empty(n)
let n = 1 let n = 1
elseif n != string(str2nr(n)) elseif n != '-0' && n != string(str2nr(n))
echon "\rInvalid field number: ". n echon "\rInvalid field number: ". n
return return
endif endif