Skip to content

small fixes #678

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
bounceme merged 3 commits into from
Oct 22, 2016
Merged

small fixes #678

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a086e9e
small fixes
bounceme Oct 22, 2016
2100397
Update javascript.vim
bounceme Oct 22, 2016
d0f6fdc
Update javascript.vim
bounceme Oct 22, 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
8 changes: 4 additions & 4 deletions indent/javascript.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function s:Balanced(lnum)
let pos = match(l:line, '[][(){}]', 0)
while pos != -1
if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
if l:line[pos] =~ '[{([]'
if stridx('[({',l:line[pos]) + 1
let l:open += 1
else
let l:open -= 1
Expand Down Expand Up @@ -215,14 +215,14 @@ function GetJavascriptIndent()

" the containing paren, bracket, curly. Many hacks for performance
call cursor(v:lnum,1)
let idx = stridx('])}',l:line[0])
let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
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 || idx < 0 && s:Balanced(l:lnum))
let num = b:js_cache[1]
elseif idx + 1
return indent(s:GetPair(escape('[({'[idx],'['), '])}'[idx],'bW','s:skip_func(s:looksyn)',2000))
return indent(s:GetPair(['\[','(','{'][idx], '])}'[idx],'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 Down Expand Up @@ -255,7 +255,7 @@ function GetJavascriptIndent()
" most significant, find the indent amount
let isOp = l:line =~# s:opfirst || pline !~# s:expr_case . '$' && pline =~# s:continuation
let bL = s:iscontOne(l:lnum,num,isOp)
let bL -= (bL && l:line =~ '^{') * s:W
let bL -= (bL && strridx(l:line,'{',0) + 1) * s:W
if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())
return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
elseif num
Expand Down