Skip to content

simplify balance func #672

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

Merged
merged 7 commits into from
Oct 17, 2016
Merged

simplify balance func #672

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9e66fb
simplify balance func
bounceme Oct 17, 2016
6d057a7
Update javascript.vim
bounceme Oct 17, 2016
f4487a8
Update javascript.vim
bounceme Oct 17, 2016
28fc03b
Update javascript.vim
bounceme Oct 17, 2016
28dcf6a
Update javascript.vim
bounceme Oct 17, 2016
0b538e2
Update javascript.vim
bounceme Oct 17, 2016
de113d0
Update javascript.vim
bounceme Oct 17, 2016
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
26 changes: 12 additions & 14 deletions indent/javascript.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,24 +174,23 @@ endfunction

" Check if line 'lnum' has a balanced amount of parentheses.
function s:Balanced(lnum)
let [open_0,open_2,open_4] = [0,0,0]
let l:open = 0
let l:line = getline(a:lnum)
let pos = match(l:line, '[][(){}]', 0)
while pos != -1
if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
let idx = stridx('(){}[]', l:line[pos])
if !(idx % 2)
let open_{idx} += 1
if l:line[pos] =~ '[{([]'
let l:open += 1
else
let open_{idx - 1} -= 1
if open_{idx - 1} < 0
let l:open -= 1
if l:open < 0
return 0
endif
endif
endif
let pos = match(l:line, '[][(){}]', pos + 1)
endwhile
return !(open_4 || open_2 || open_0)
return !l:open
endfunction

function GetJavascriptIndent()
Expand Down Expand Up @@ -230,18 +229,17 @@ function GetJavascriptIndent()
return ind
endif

" the containing paren, bracket, curly. Memoize, last lineNr either has the
" same scope or starts a new one, unless if it closed a scope.
" the containing paren, bracket, curly. Many hacks for performance
call cursor(v:lnum,1)
let fclose = l:line =~ '^[])}]'
if indent(l:lnum)
let [s:looksyn,s:free] = [v:lnum - 1,1]
if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
\ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
\ (b:js_cache[0] > l:lnum || !fclose && s:Balanced(l:lnum))
let num = b:js_cache[1]
elseif fclose
let id = stridx('])}',l:line[0])
let num = s:GetPair(escape('[({'[id],'['), escape('])}'[id],']'),'bW','s:skip_func(s:looksyn)',2000)
return indent(s:GetPair(escape('[({'[id],'['), '])}'[id],'bW','s:skip_func(s:looksyn)',2000))
elseif indent(v:lnum) && syns =~? 'block'
let num = s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
else
Expand All @@ -251,10 +249,10 @@ function GetJavascriptIndent()
let num = s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
endif

let num = max([num,0])
if fclose
return !!num * indent(num)
return indent(num)
endif
let num = max([num,0])
let b:js_cache = [v:lnum,num,line('.') == v:lnum && num ? b:js_cache[2] : col('.')]

call cursor(v:lnum,1)
Expand All @@ -281,11 +279,11 @@ function GetJavascriptIndent()
return indent(num) + s:W + switch_offset + bL
endif
return bL

finally
let &magic = save_magic
endtry
endfunction


let &cpo = s:cpo_save
unlet s:cpo_save