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

Remove s:max function

Browse Source 
Sadly function calls are rather slow in Vimscript.
Test shows that this commit reduces the response time by 10%.
This commit is contained in:
Junegunn Choi
2013-10-13 12:15:57 +09:00
parent 256e5b83ab
commit 37fa908d04
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

@@ -151,11 +151,11 @@ function! s:exit(msg)
endfunction endfunction
function! s:ltrim(str) function! s:ltrim(str)
return substitute(a:str, '^\s*', '', '') return substitute(a:str, '^\s\+', '', '')
endfunction endfunction
function! s:rtrim(str) function! s:rtrim(str)
return substitute(a:str, '\s*$', '', '') return substitute(a:str, '\s\+$', '', '')
endfunction endfunction
function! s:trim(str) function! s:trim(str)
@@ -323,14 +323,6 @@ function! s:split_line(line, nth, modes, cycle, fc, lc, pattern, stick_to_left,
return [tokens, delims] return [tokens, delims]
endfunction endfunction
function! s:max(old, new)
for k in keys(a:new)
if a:new[k] > a:old[k]
let a:old[k] = a:new[k] " max() doesn't work with Floats
endif
endfor
endfunction
function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, pattern, nth, function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, pattern, nth,
\ ml, mr, da, indentation, stick_to_left, ignore_unmatched, ignore_groups, recur) \ ml, mr, da, indentation, stick_to_left, ignore_unmatched, ignore_groups, recur)
let mode = a:modes[0] let mode = a:modes[0]
@@ -362,7 +354,7 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, patter
endif endif
" Calculate the maximum number of tokens for a line within the range " Calculate the maximum number of tokens for a line within the range
call s:max(max, { 'tokens': len(tokens) }) let max.tokens = max([max.tokens, len(tokens)])
if a:nth > 0 " Positive N-th if a:nth > 0 " Positive N-th
if len(tokens) < a:nth if len(tokens) < a:nth
@@ -398,11 +390,16 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, patter
endif endif
if mode ==? 'c' | let token .= matchstr(token, '^\s*') | endif if mode ==? 'c' | let token .= matchstr(token, '^\s*') | endif
let [pw, tw] = [s:strwidth(prefix), s:strwidth(token)] let [pw, tw] = [s:strwidth(prefix), s:strwidth(token)]
call s:max(max, { 'indent': indent, 'token_len': tw, 'just_len': pw + tw, let max.indent = max([max.indent, indent])
\ 'delim_len': s:strwidth(delim) }) let max.token_len = max([max.token_len, tw])
let max.just_len = max([max.just_len, pw + tw])
let max.delim_len = max([max.delim_len, s:strwidth(delim)])
if mode ==? 'c' if mode ==? 'c'
call s:max(max, { 'pivot_len': pw + tw / 2.0, if max.pivot_len < pw + tw / 2.0
\ 'strip_len': s:strwidth(s:trim(token)) }) let max.pivot_len = pw + tw / 2.0
endif
let max.strip_len = max([max.strip_len, s:strwidth(s:trim(token))])
endif endif
let lines[line] = [nth, prefix, token, delim] let lines[line] = [nth, prefix, token, delim]
endfor endfor
@@ -432,9 +429,12 @@ function! s:do_align(todo, modes, all_tokens, all_delims, fl, ll, fc, lc, patter
let token = substitute(token, '\s*$', indent, '') let token = substitute(token, '\s*$', indent, '')
endif endif
let [pw, tw] = [s:strwidth(prefix), s:strwidth(token)] let [pw, tw] = [s:strwidth(prefix), s:strwidth(token)]
call s:max(max, { 'token_len': tw, 'just_len': pw + tw }) let max.token_len = max([max.token_len, tw])
let max.just_len = max([max.just_len, pw + tw])
if mode ==? 'c' if mode ==? 'c'
call s:max(max, { 'pivot_len': pw + tw / 2.0 }) if max.pivot_len < pw + tw / 2.0
let max.pivot_len = pw + tw / 2.0
endif
endif endif
let lines[line][2] = token let lines[line][2] = token