|
|
|
@ -2,7 +2,7 @@
|
|
|
|
" Language: Javascript
|
|
|
|
" Language: Javascript
|
|
|
|
" Maintainer: Chris Paul ( https://github.com/bounceme )
|
|
|
|
" Maintainer: Chris Paul ( https://github.com/bounceme )
|
|
|
|
" URL: https://github.com/pangloss/vim-javascript
|
|
|
|
" URL: https://github.com/pangloss/vim-javascript
|
|
|
|
" Last Change: August 12, 2017
|
|
|
|
" Last Change: December 4, 2017
|
|
|
|
|
|
|
|
|
|
|
|
" Only load this indent file when no other was loaded.
|
|
|
|
" Only load this indent file when no other was loaded.
|
|
|
|
if exists('b:did_indent')
|
|
|
|
if exists('b:did_indent')
|
|
|
|
@ -10,10 +10,6 @@ if exists('b:did_indent')
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
let b:did_indent = 1
|
|
|
|
let b:did_indent = 1
|
|
|
|
|
|
|
|
|
|
|
|
" indent correctly if inside <script>
|
|
|
|
|
|
|
|
" vim/vim@690afe1 for the switch from cindent
|
|
|
|
|
|
|
|
let b:html_indent_script1 = 'inc'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" Now, set up our indentation expression and keys that trigger it.
|
|
|
|
" Now, set up our indentation expression and keys that trigger it.
|
|
|
|
setlocal indentexpr=GetJavascriptIndent()
|
|
|
|
setlocal indentexpr=GetJavascriptIndent()
|
|
|
|
setlocal autoindent nolisp nosmartindent
|
|
|
|
setlocal autoindent nolisp nosmartindent
|
|
|
|
@ -25,13 +21,6 @@ setlocal indentkeys+=0],0)
|
|
|
|
|
|
|
|
|
|
|
|
let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
|
|
|
|
let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
|
|
|
|
|
|
|
|
|
|
|
|
" Regex of syntax group names that are or delimit string or are comments.
|
|
|
|
|
|
|
|
let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
|
|
|
|
|
|
|
|
let b:syng_str = get(b:,'syng_str','string\|template\|special')
|
|
|
|
|
|
|
|
" template strings may want to be excluded when editing graphql:
|
|
|
|
|
|
|
|
" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
|
|
|
|
|
|
|
|
" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" Only define the function once.
|
|
|
|
" Only define the function once.
|
|
|
|
if exists('*GetJavascriptIndent')
|
|
|
|
if exists('*GetJavascriptIndent')
|
|
|
|
finish
|
|
|
|
finish
|
|
|
|
@ -40,6 +29,23 @@ endif
|
|
|
|
let s:cpo_save = &cpo
|
|
|
|
let s:cpo_save = &cpo
|
|
|
|
set cpo&vim
|
|
|
|
set cpo&vim
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" indent correctly if inside <script>
|
|
|
|
|
|
|
|
" vim/vim@690afe1 for the switch from cindent
|
|
|
|
|
|
|
|
" overridden with b:html_indent_script1
|
|
|
|
|
|
|
|
call extend(g:,{'html_indent_script1': 'inc'},'keep')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" Regex of syntax group names that are or delimit string or are comments.
|
|
|
|
|
|
|
|
let s:bvars = {
|
|
|
|
|
|
|
|
\ 'syng_strcom': 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!',
|
|
|
|
|
|
|
|
\ 'syng_str': 'string\|template\|special' }
|
|
|
|
|
|
|
|
" template strings may want to be excluded when editing graphql:
|
|
|
|
|
|
|
|
" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
|
|
|
|
|
|
|
|
" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function s:GetVars()
|
|
|
|
|
|
|
|
call extend(b:,extend(s:bvars,{'js_cache': [0,0,0]}),'keep')
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" Get shiftwidth value
|
|
|
|
" Get shiftwidth value
|
|
|
|
if exists('*shiftwidth')
|
|
|
|
if exists('*shiftwidth')
|
|
|
|
function s:sw()
|
|
|
|
function s:sw()
|
|
|
|
@ -55,20 +61,19 @@ endif
|
|
|
|
" matches before pos.
|
|
|
|
" matches before pos.
|
|
|
|
let s:z = has('patch-7.4.984') ? 'z' : ''
|
|
|
|
let s:z = has('patch-7.4.984') ? 'z' : ''
|
|
|
|
|
|
|
|
|
|
|
|
let s:syng_com = 'comment\|doc'
|
|
|
|
|
|
|
|
" Expression used to check whether we should skip a match with searchpair().
|
|
|
|
" Expression used to check whether we should skip a match with searchpair().
|
|
|
|
let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
|
|
|
|
let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
|
|
|
|
|
|
|
|
let s:in_comm = s:skip_expr[:-14] . "'comment\\|doc'"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let s:rel = has('reltime')
|
|
|
|
" searchpair() wrapper
|
|
|
|
" searchpair() wrapper
|
|
|
|
if has('reltime')
|
|
|
|
if s:rel
|
|
|
|
function s:GetPair(start,end,flags,skip,time,...)
|
|
|
|
function s:GetPair(start,end,flags,skip)
|
|
|
|
return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
|
|
|
|
return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1,a:skip ==# 's:SkipFunc()' ? 2000 : 200)
|
|
|
|
\ a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
else
|
|
|
|
else
|
|
|
|
function s:GetPair(start,end,flags,skip,...)
|
|
|
|
function s:GetPair(start,end,flags,skip)
|
|
|
|
return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
|
|
|
|
return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1)
|
|
|
|
\ a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,0,get(a:000,1)]))
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
@ -82,60 +87,55 @@ function s:SynAt(l,c)
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:ParseCino(f)
|
|
|
|
function s:ParseCino(f)
|
|
|
|
let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
|
|
|
|
let [divider, n, cstr] = [0] + matchlist(&cino,
|
|
|
|
if cin == -1
|
|
|
|
\ '\%(.*,\)\=\%(\%d'.char2nr(a:f).'\(-\)\=\([.s0-9]*\)\)\=')[1:2]
|
|
|
|
return
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
let [sign, cstr] = &cino[cin+1] == '-' ? [-1, &cino[cin+2:]] : [1, &cino[cin+1:]]
|
|
|
|
|
|
|
|
for c in split(cstr,'\zs')
|
|
|
|
for c in split(cstr,'\zs')
|
|
|
|
if c == '.' && !divider
|
|
|
|
if c == '.' && !divider
|
|
|
|
let divider = 1
|
|
|
|
let divider = 1
|
|
|
|
elseif c ==# 's'
|
|
|
|
elseif c ==# 's'
|
|
|
|
if n is ''
|
|
|
|
if n !~ '\d'
|
|
|
|
let n = s:sw()
|
|
|
|
return n . s:sw() + 0
|
|
|
|
else
|
|
|
|
|
|
|
|
let n = str2nr(n) * s:sw()
|
|
|
|
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
let n = str2nr(n) * s:sw()
|
|
|
|
break
|
|
|
|
break
|
|
|
|
elseif c =~ '\d'
|
|
|
|
|
|
|
|
let [n, divider] .= [c, 0]
|
|
|
|
|
|
|
|
else
|
|
|
|
else
|
|
|
|
break
|
|
|
|
let [n, divider] .= [c, 0]
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endfor
|
|
|
|
endfor
|
|
|
|
return sign * str2nr(n) / max([str2nr(divider),1])
|
|
|
|
return str2nr(n) / max([str2nr(divider),1])
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" Optimized {skip} expr, only callable from the search loop which
|
|
|
|
" Optimized {skip} expr, only callable from the search loop which
|
|
|
|
" GetJavascriptIndent does to find the containing [[{(] (relies on s:vars)
|
|
|
|
" GetJavascriptIndent does to find the containing [[{(] (side-effects)
|
|
|
|
function s:SkipFunc()
|
|
|
|
function s:SkipFunc()
|
|
|
|
if s:top_col == 1
|
|
|
|
if s:top_col == 1
|
|
|
|
throw 'out of bounds'
|
|
|
|
throw 'out of bounds'
|
|
|
|
endif
|
|
|
|
elseif s:check_in
|
|
|
|
let s:top_col = 0
|
|
|
|
|
|
|
|
if s:check_in
|
|
|
|
|
|
|
|
if eval(s:skip_expr)
|
|
|
|
if eval(s:skip_expr)
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
let s:check_in = 0
|
|
|
|
let s:check_in = 0
|
|
|
|
elseif getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
|
|
|
|
elseif getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
|
|
|
|
if eval(s:skip_expr)
|
|
|
|
if eval(s:skip_expr)
|
|
|
|
let s:looksyn = line('.')
|
|
|
|
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn) && eval(s:skip_expr)
|
|
|
|
elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
|
|
|
|
|
|
|
|
if eval(s:skip_expr)
|
|
|
|
let s:check_in = 1
|
|
|
|
let s:check_in = 1
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
let s:synid_cache[:] += [[line2byte('.') + col('.') - 1], ['']]
|
|
|
|
|
|
|
|
endif
|
|
|
|
let [s:looksyn, s:top_col] = getpos('.')[1:2]
|
|
|
|
let [s:looksyn, s:top_col] = getpos('.')[1:2]
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:AlternatePair()
|
|
|
|
function s:AlternatePair()
|
|
|
|
let [pat, l:for] = ['[][(){};]', 2]
|
|
|
|
let [pat, l:for] = ['[][(){};]', 2]
|
|
|
|
while s:SearchLoop('\m'.pat,'bW',s:script_tag,'s:SkipFunc()')
|
|
|
|
while s:SearchLoop(pat,'bW','s:SkipFunc()')
|
|
|
|
if s:LookingAt() == ';'
|
|
|
|
if s:LookingAt() == ';'
|
|
|
|
if !l:for
|
|
|
|
if !l:for
|
|
|
|
if s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
|
|
|
|
if s:GetPair('{','}','bW','s:SkipFunc()')
|
|
|
|
return
|
|
|
|
return
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
break
|
|
|
|
break
|
|
|
|
@ -146,7 +146,7 @@ function s:AlternatePair()
|
|
|
|
let idx = stridx('])}',s:LookingAt())
|
|
|
|
let idx = stridx('])}',s:LookingAt())
|
|
|
|
if idx == -1
|
|
|
|
if idx == -1
|
|
|
|
return
|
|
|
|
return
|
|
|
|
elseif !s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
|
|
|
|
elseif !s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
|
|
|
|
break
|
|
|
|
break
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
@ -166,61 +166,64 @@ function s:Token()
|
|
|
|
return s:LookingAt() =~ '\k' ? expand('<cword>') : s:LookingAt()
|
|
|
|
return s:LookingAt() =~ '\k' ? expand('<cword>') : s:LookingAt()
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:PreviousToken()
|
|
|
|
function s:PreviousToken(...)
|
|
|
|
let l:pos = getpos('.')
|
|
|
|
let [l:pos, tok] = [getpos('.'), '']
|
|
|
|
if search('\m\k\{1,}\|\S','ebW')
|
|
|
|
if search('\m\k\{1,}\|\S','ebW')
|
|
|
|
if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] &&
|
|
|
|
if getline('.')[col('.')-2:col('.')-1] == '*/'
|
|
|
|
\ getline('.')[:col('.')-1] =~ '\/\/') && s:SynAt(line('.'),col('.')) =~? s:syng_com
|
|
|
|
if eval(s:in_comm) && !s:SearchLoop('\S\ze\_s*\/[/*]','bW',s:in_comm)
|
|
|
|
if s:SearchLoop('\m\S\ze\_s*\/[/*]','bW',"s:SynAt(line('.'),col('.')) =~? s:syng_com")
|
|
|
|
call setpos('.',l:pos)
|
|
|
|
return s:Token()
|
|
|
|
else
|
|
|
|
|
|
|
|
let tok = s:Token()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
let two = a:0 || line('.') != l:pos[1] ? strridx(getline('.')[:col('.')],'//') + 1 : 0
|
|
|
|
|
|
|
|
if two && eval(s:in_comm)
|
|
|
|
|
|
|
|
call cursor(0,two)
|
|
|
|
|
|
|
|
let tok = s:PreviousToken(1)
|
|
|
|
|
|
|
|
if tok is ''
|
|
|
|
call setpos('.',l:pos)
|
|
|
|
call setpos('.',l:pos)
|
|
|
|
|
|
|
|
endif
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return s:Token()
|
|
|
|
let tok = s:Token()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
return ''
|
|
|
|
endif
|
|
|
|
|
|
|
|
return tok
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:Pure(f,...)
|
|
|
|
function s:Pure(f,...)
|
|
|
|
let l:pos = getpos('.')
|
|
|
|
return eval("[call(a:f,a:000),cursor(a:firstline,".col('.').")][0]")
|
|
|
|
let ret = call(a:f,a:000)
|
|
|
|
|
|
|
|
call setpos('.',l:pos)
|
|
|
|
|
|
|
|
return ret
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:SearchLoop(...)
|
|
|
|
function s:SearchLoop(pat,flags,expr)
|
|
|
|
let l:pos = getpos('.')
|
|
|
|
return s:GetPair(a:pat,'\_$.',a:flags,a:expr)
|
|
|
|
while call('search',a:000[:-2]) " search flags [^nc]
|
|
|
|
|
|
|
|
if !eval(a:000[-1])
|
|
|
|
|
|
|
|
return line('.')
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
endwhile
|
|
|
|
|
|
|
|
call setpos('.',l:pos)
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:ExprCol()
|
|
|
|
function s:ExprCol()
|
|
|
|
if getline('.')[col('.')-2] == ':'
|
|
|
|
if getline('.')[col('.')-2] == ':'
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
let [bal, l:pos] = [0, getpos('.')]
|
|
|
|
let bal = 0
|
|
|
|
while s:SearchLoop('\m[{}?:]','bW',s:script_tag,s:skip_expr)
|
|
|
|
while s:SearchLoop('[{}?:]','bW',s:skip_expr)
|
|
|
|
if s:LookingAt() == ':'
|
|
|
|
if s:LookingAt() == ':'
|
|
|
|
let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
|
|
|
|
if getline('.')[col('.')-2] == ':'
|
|
|
|
|
|
|
|
call cursor(0,col('.')-1)
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
let bal -= 1
|
|
|
|
elseif s:LookingAt() == '?'
|
|
|
|
elseif s:LookingAt() == '?'
|
|
|
|
let bal += 1
|
|
|
|
if getline('.')[col('.'):col('.')+1] =~ '^\.\d\@!'
|
|
|
|
if bal == 1
|
|
|
|
continue
|
|
|
|
break
|
|
|
|
elseif !bal
|
|
|
|
|
|
|
|
return 1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
let bal += 1
|
|
|
|
elseif s:LookingAt() == '{'
|
|
|
|
elseif s:LookingAt() == '{'
|
|
|
|
let bal = !s:IsBlock()
|
|
|
|
return !s:IsBlock()
|
|
|
|
break
|
|
|
|
elseif !s:GetPair('{','}','bW',s:skip_expr)
|
|
|
|
elseif !s:GetPair('{','}','bW',s:skip_expr,200)
|
|
|
|
|
|
|
|
break
|
|
|
|
break
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endwhile
|
|
|
|
endwhile
|
|
|
|
call setpos('.',l:pos)
|
|
|
|
|
|
|
|
return s:Nat(bal)
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" configurable regexes that define continuation lines, not including (, {, or [.
|
|
|
|
" configurable regexes that define continuation lines, not including (, {, or [.
|
|
|
|
@ -229,167 +232,146 @@ let s:opfirst = '^' . get(g:,'javascript_opfirst',
|
|
|
|
let s:continuation = get(g:,'javascript_continuation',
|
|
|
|
let s:continuation = get(g:,'javascript_continuation',
|
|
|
|
\ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
|
|
|
|
\ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
|
|
|
|
|
|
|
|
|
|
|
|
function s:Continues(ln,con)
|
|
|
|
function s:Continues()
|
|
|
|
let tok = matchstr(a:con[-15:],s:continuation)
|
|
|
|
let tok = matchstr(strpart(getline('.'),col('.')-15,15),s:continuation)
|
|
|
|
if tok =~ '[a-z:]'
|
|
|
|
if tok =~ '[a-z:]'
|
|
|
|
call cursor(a:ln, len(a:con))
|
|
|
|
|
|
|
|
return tok == ':' ? s:ExprCol() : s:PreviousToken() != '.'
|
|
|
|
return tok == ':' ? s:ExprCol() : s:PreviousToken() != '.'
|
|
|
|
elseif tok !~ '[/>]'
|
|
|
|
elseif tok !~ '[/>]'
|
|
|
|
return tok isnot ''
|
|
|
|
return tok isnot ''
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
return s:SynAt(a:ln, len(a:con)) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
|
|
|
|
return s:SynAt(line('.'),col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function s:Trim(ln)
|
|
|
|
|
|
|
|
let divi = split(getline(a:ln),'\s\+$\|\S\zs\ze\s*\/[/*]')
|
|
|
|
|
|
|
|
while len(divi) > 1 && s:SynAt(a:ln, len(join(divi,''))) =~? s:syng_com
|
|
|
|
|
|
|
|
call remove(divi,-1)
|
|
|
|
|
|
|
|
endwhile
|
|
|
|
|
|
|
|
return join(divi,'')
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" Find line above 'lnum' that isn't empty or in a comment
|
|
|
|
|
|
|
|
function s:PrevCodeLine(lnum)
|
|
|
|
|
|
|
|
let [l:multi, l:n, l:pos] = [0, prevnonblank(a:lnum), getpos('.')]
|
|
|
|
|
|
|
|
while l:n
|
|
|
|
|
|
|
|
if getline(l:n) =~ '^\s*\/[/*]' && (getline(l:n) !~ '`' &&
|
|
|
|
|
|
|
|
\ getline(l:n-1)[-1:] != '\' || s:SynAt(l:n,1) !~? b:syng_str)
|
|
|
|
|
|
|
|
let l:n = prevnonblank(l:n-1)
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
elseif l:multi || getline(l:n) =~ '\*\/'
|
|
|
|
|
|
|
|
call cursor(l:n,1)
|
|
|
|
|
|
|
|
if search('\m\/\*\|\(\*\/\)','bWp') == 1 && s:SynAt(l:n,1) =~? s:syng_com
|
|
|
|
|
|
|
|
let [l:multi, l:n] = [1, line('.')]
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
endwhile
|
|
|
|
|
|
|
|
call setpos('.',l:pos)
|
|
|
|
|
|
|
|
return l:n
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" Check if line 'lnum' has a balanced amount of parentheses.
|
|
|
|
" Check if line 'lnum' has a balanced amount of parentheses.
|
|
|
|
function s:Balanced(lnum)
|
|
|
|
function s:Balanced(lnum,line)
|
|
|
|
let [l:open, l:line] = [0, getline(a:lnum)]
|
|
|
|
let l:open = 0
|
|
|
|
let pos = match(l:line, '[][(){}]')
|
|
|
|
let pos = match(a:line, '[][(){}]')
|
|
|
|
while pos != -1
|
|
|
|
while pos != -1
|
|
|
|
if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
|
|
|
|
if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
|
|
|
|
let l:open += match(' ' . l:line[pos],'[[({]')
|
|
|
|
let l:open += matchend(a:line[pos],'[[({]')
|
|
|
|
if l:open < 0
|
|
|
|
if l:open < 0
|
|
|
|
return
|
|
|
|
return
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
let pos = match(l:line, l:open ?
|
|
|
|
let pos = match(a:line, !l:open ? '[][(){}]' : '()' =~ a:line[pos] ?
|
|
|
|
\ matchstr(['[][]','[()]','[{}]'],l:line[pos]) :
|
|
|
|
\ '[()]' : '{}' =~ a:line[pos] ? '[{}]' : '[][]', pos + 1)
|
|
|
|
\ '[][(){}]', pos + 1)
|
|
|
|
|
|
|
|
endwhile
|
|
|
|
endwhile
|
|
|
|
return !l:open
|
|
|
|
return !l:open
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:OneScope(lnum)
|
|
|
|
function s:OneScope()
|
|
|
|
call cursor(a:lnum, len(s:Trim(a:lnum)))
|
|
|
|
if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr)
|
|
|
|
if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
|
|
|
|
|
|
|
|
let tok = s:PreviousToken()
|
|
|
|
let tok = s:PreviousToken()
|
|
|
|
return (tok =~# '^\%(for\|if\|let\|while\|with\)$' ||
|
|
|
|
return (count(split('for if let while with'),tok) ||
|
|
|
|
\ tok =~# '^await$\|^each$' && s:PreviousToken() ==# 'for') &&
|
|
|
|
\ tok =~# '^await$\|^each$' && s:PreviousToken() ==# 'for') &&
|
|
|
|
\ s:Pure('s:PreviousToken') != '.' && !(tok == 'while' && s:DoWhile())
|
|
|
|
\ s:Pure('s:PreviousToken') != '.' && !(tok == 'while' && s:DoWhile())
|
|
|
|
elseif s:Token() =~# '^else$\|^do$'
|
|
|
|
elseif s:Token() =~# '^else$\|^do$'
|
|
|
|
return s:Pure('s:PreviousToken') != '.'
|
|
|
|
return s:Pure('s:PreviousToken') != '.'
|
|
|
|
|
|
|
|
elseif strpart(getline('.'),col('.')-2,2) == '=>'
|
|
|
|
|
|
|
|
call cursor(0,col('.')-1)
|
|
|
|
|
|
|
|
return s:PreviousToken() != ')' || s:GetPair('(', ')', 'bW', s:skip_expr)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
return strpart(getline('.'),col('.')-2,2) == '=>'
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:DoWhile()
|
|
|
|
function s:DoWhile()
|
|
|
|
let cpos = searchpos('\m\<','cbW')
|
|
|
|
let cpos = searchpos('\m\<','cbW')
|
|
|
|
if s:SearchLoop('\m\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
|
|
|
|
while s:SearchLoop('\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
|
|
|
|
if s:{s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) ?
|
|
|
|
if s:LookingAt() =~ '\a'
|
|
|
|
\ 'Previous' : ''}Token() ==# 'do' && s:IsBlock()
|
|
|
|
if s:Pure('s:IsBlock')
|
|
|
|
|
|
|
|
if s:LookingAt() ==# 'd'
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
call call('cursor',cpos)
|
|
|
|
break
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
elseif s:LookingAt() != '}' || !s:GetPair('{','}','bW',s:skip_expr)
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
endwhile
|
|
|
|
|
|
|
|
call call('cursor',cpos)
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" returns braceless levels started by 'i' and above lines * &sw. 'num' is the
|
|
|
|
" returns total offset from braceless contexts. 'num' is the lineNr which
|
|
|
|
" lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
|
|
|
|
" encloses the entire context, 'cont' if whether a:firstline is a continued
|
|
|
|
" a continued expression, which could have started in a braceless context
|
|
|
|
" expression, which could have started in a braceless context
|
|
|
|
function s:IsContOne(i,num,cont)
|
|
|
|
function s:IsContOne(cont)
|
|
|
|
let [l:i, l:num, b_l] = [a:i, a:num + !a:num, 0]
|
|
|
|
let [l:num, pind] = b:js_cache[1] ?
|
|
|
|
let pind = a:num ? indent(a:num) + s:sw() : 0
|
|
|
|
\ [b:js_cache[1], indent(b:js_cache[1]) + s:sw()] : [1,0]
|
|
|
|
let ind = indent(a:i) + (a:cont ? 0 : s:sw())
|
|
|
|
let [ind, b_l] = [indent('.') + !a:cont, 0]
|
|
|
|
while l:i > l:num && ind > pind || l:i == l:num
|
|
|
|
while line('.') > l:num && ind > pind || line('.') == l:num
|
|
|
|
if indent(l:i) < ind && s:OneScope(l:i)
|
|
|
|
if indent('.') < ind && s:OneScope()
|
|
|
|
let b_l += 1
|
|
|
|
let b_l += 1
|
|
|
|
let l:i = line('.')
|
|
|
|
elseif !a:cont || b_l || ind < indent(a:firstline)
|
|
|
|
elseif !a:cont || b_l || ind < indent(a:i)
|
|
|
|
break
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
call cursor(0,1)
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
let ind = min([ind, indent('.')])
|
|
|
|
|
|
|
|
if s:PreviousToken() is ''
|
|
|
|
break
|
|
|
|
break
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
let ind = min([ind, indent(l:i)])
|
|
|
|
|
|
|
|
let l:i = s:PrevCodeLine(l:i - 1)
|
|
|
|
|
|
|
|
endwhile
|
|
|
|
endwhile
|
|
|
|
return b_l
|
|
|
|
return b_l
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function s:IsSwitch()
|
|
|
|
function s:IsSwitch()
|
|
|
|
return s:PreviousToken() !~ '[.*]' &&
|
|
|
|
return search('\m\C\%'.join(b:js_cache[1:],'l\%').
|
|
|
|
\ (!s:GetPair('{','}','cbW',s:skip_expr,100) || s:IsBlock() &&
|
|
|
|
\ 'c{\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>','nW'.s:z)
|
|
|
|
\ (s:Token() !~ '^\K\k*$' || expand('<cword>') !=# 'class' &&
|
|
|
|
|
|
|
|
\ s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.'))
|
|
|
|
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
|
|
|
|
" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
|
|
|
|
function s:IsBlock()
|
|
|
|
function s:IsBlock()
|
|
|
|
let l:n = line('.')
|
|
|
|
|
|
|
|
let tok = s:PreviousToken()
|
|
|
|
let tok = s:PreviousToken()
|
|
|
|
if match(s:stack,'\cxml\|jsx') != -1 && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
|
|
|
|
if join(s:stack) =~? 'xml\|jsx' && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
|
|
|
|
|
|
|
|
let s:in_jsx = 1
|
|
|
|
return tok != '{'
|
|
|
|
return tok != '{'
|
|
|
|
elseif tok =~ '\k'
|
|
|
|
elseif tok =~ '\k'
|
|
|
|
if tok ==# 'type'
|
|
|
|
if tok ==# 'type'
|
|
|
|
return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
|
|
|
|
return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
|
|
|
|
|
|
|
|
elseif tok ==# 'of'
|
|
|
|
|
|
|
|
return s:Pure('eval',"!s:GetPair('[[({]','[])}]','bW',s:skip_expr) || s:LookingAt() != '(' ||"
|
|
|
|
|
|
|
|
\ ."s:{s:PreviousToken() ==# 'await' ? 'Previous' : ''}Token() !=# 'for' || s:PreviousToken() == '.'")
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
|
|
|
|
return index(split('return const let import export extends yield default delete var await void typeof throw case new in instanceof')
|
|
|
|
\ ,tok) < (line('.') != l:n) || s:Pure('s:PreviousToken') == '.'
|
|
|
|
\ ,tok) < (line('.') != a:firstline) || s:Pure('s:PreviousToken') == '.'
|
|
|
|
elseif tok == '>'
|
|
|
|
elseif tok == '>'
|
|
|
|
return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'
|
|
|
|
return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'
|
|
|
|
elseif tok == '*'
|
|
|
|
elseif tok == '*'
|
|
|
|
return s:Pure('s:PreviousToken') == ':'
|
|
|
|
return s:Pure('s:PreviousToken') == ':'
|
|
|
|
elseif tok == ':'
|
|
|
|
elseif tok == ':'
|
|
|
|
return !s:ExprCol()
|
|
|
|
return s:Pure('eval',"s:PreviousToken() =~ '^\\K\\k*$' && !s:ExprCol()")
|
|
|
|
elseif tok == '/'
|
|
|
|
elseif tok == '/'
|
|
|
|
return s:SynAt(line('.'),col('.')) =~? 'regex'
|
|
|
|
return s:SynAt(line('.'),col('.')) =~? 'regex'
|
|
|
|
elseif tok !~ '[=~!<,.?^%|&([]'
|
|
|
|
elseif tok !~ '[=~!<,.?^%|&([]'
|
|
|
|
return tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok
|
|
|
|
return tok !~ '[-+]' || line('.') != a:firstline && getline('.')[col('.')-2] == tok
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
function GetJavascriptIndent()
|
|
|
|
function GetJavascriptIndent()
|
|
|
|
let [b:js_cache, s:synid_cache, l:line, s:stack] = [
|
|
|
|
call s:GetVars()
|
|
|
|
\ get(b:,'js_cache',[0,0,0]),
|
|
|
|
let s:synid_cache = [[],[]]
|
|
|
|
\ [[],[]],
|
|
|
|
let l:line = getline(v:lnum)
|
|
|
|
\ getline(v:lnum),
|
|
|
|
|
|
|
|
\ map(synstack(v:lnum,1),"synIDattr(v:val,'name')"),
|
|
|
|
|
|
|
|
\ ]
|
|
|
|
|
|
|
|
" use synstack as it validates syn state and works in an empty line
|
|
|
|
" use synstack as it validates syn state and works in an empty line
|
|
|
|
let syns = get(s:stack,-1,'')
|
|
|
|
let s:stack = [''] + map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
|
|
|
|
|
|
|
|
|
|
|
|
" start with strings,comments,etc.
|
|
|
|
" start with strings,comments,etc.
|
|
|
|
if syns =~? s:syng_com
|
|
|
|
if s:stack[-1] =~? 'comment\|doc'
|
|
|
|
if l:line =~ '^\s*\*'
|
|
|
|
if l:line !~ '^\s*\/[/*]'
|
|
|
|
return cindent(v:lnum)
|
|
|
|
return l:line =~ '^\s*\*' ? cindent(v:lnum) : -1
|
|
|
|
elseif l:line !~ '^\s*\/[/*]'
|
|
|
|
|
|
|
|
return -1
|
|
|
|
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
elseif syns =~? b:syng_str
|
|
|
|
elseif s:stack[-1] =~? b:syng_str
|
|
|
|
if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
|
|
|
|
if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1,getline(v:lnum-1))
|
|
|
|
let b:js_cache[0] = v:lnum
|
|
|
|
let b:js_cache[0] = v:lnum
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
return -1
|
|
|
|
return -1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
let l:lnum = s:PrevCodeLine(v:lnum - 1)
|
|
|
|
|
|
|
|
if !l:lnum
|
|
|
|
let s:l1 = max([0,prevnonblank(v:lnum) - (s:rel ? 2000 : 1000),
|
|
|
|
|
|
|
|
\ get(get(b:,'hi_indent',{}),'blocklnr')])
|
|
|
|
|
|
|
|
call cursor(v:lnum,1)
|
|
|
|
|
|
|
|
if s:PreviousToken() is ''
|
|
|
|
return
|
|
|
|
return
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
let [l:lnum, lcol, pline] = getpos('.')[1:2] + [getline('.')[:col('.')-1]]
|
|
|
|
|
|
|
|
|
|
|
|
let l:line = substitute(l:line,'^\s*','','')
|
|
|
|
let l:line = substitute(l:line,'^\s*','','')
|
|
|
|
let l:line_raw = l:line
|
|
|
|
let l:line_raw = l:line
|
|
|
|
@ -401,34 +383,34 @@ function GetJavascriptIndent()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
" the containing paren, bracket, or curly. Many hacks for performance
|
|
|
|
" the containing paren, bracket, or curly. Many hacks for performance
|
|
|
|
let [ s:script_tag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'),
|
|
|
|
call cursor(v:lnum,1)
|
|
|
|
\ index([']',')','}'],l:line[0]) ]
|
|
|
|
let idx = index([']',')','}'],l:line[0])
|
|
|
|
if b:js_cache[0] > l:lnum && b:js_cache[0] < v:lnum ||
|
|
|
|
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 && s:Balanced(l:lnum,pline)
|
|
|
|
call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [v:lnum,1])
|
|
|
|
call call('cursor',b:js_cache[1:])
|
|
|
|
else
|
|
|
|
else
|
|
|
|
call cursor(v:lnum,1)
|
|
|
|
let [s:looksyn, s:top_col, s:check_in, s:l1] = [v:lnum - 1,0,0,
|
|
|
|
let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
|
|
|
|
\ max([s:l1, &smc ? search('\m^.\{'.&smc.',}','nbW',s:l1 + 1) + 1 : 0])]
|
|
|
|
try
|
|
|
|
try
|
|
|
|
if idx != -1
|
|
|
|
if idx != -1
|
|
|
|
call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
|
|
|
|
call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
|
|
|
|
elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
|
|
|
|
elseif getline(v:lnum) !~ '^\S' && s:stack[-1] =~? 'block\|^jsobject$'
|
|
|
|
call s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
|
|
|
|
call s:GetPair('{','}','bW','s:SkipFunc()')
|
|
|
|
else
|
|
|
|
else
|
|
|
|
call s:AlternatePair()
|
|
|
|
call s:AlternatePair()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
catch
|
|
|
|
catch /^\Cout of bounds$/
|
|
|
|
call cursor(v:lnum,1)
|
|
|
|
call cursor(v:lnum,1)
|
|
|
|
endtry
|
|
|
|
endtry
|
|
|
|
|
|
|
|
let b:js_cache[1:] = line('.') == v:lnum ? [0,0] : getpos('.')[1:2]
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:script_tag,0] : getpos('.')[1:2])
|
|
|
|
let [b:js_cache[0], num] = [v:lnum, b:js_cache[1]]
|
|
|
|
let num = b:js_cache[1]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
|
|
|
|
let [num_ind, is_op, b_l, l:switch_offset, s:in_jsx] = [s:Nat(indent(num)),0,0,0,0]
|
|
|
|
if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()
|
|
|
|
if !num || s:LookingAt() == '{' && s:IsBlock()
|
|
|
|
let [ilnum, pline] = [line('.'), s:Trim(l:lnum)]
|
|
|
|
let ilnum = line('.')
|
|
|
|
if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr,100)
|
|
|
|
if num && !s:in_jsx && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
|
|
|
|
if ilnum == num
|
|
|
|
if ilnum == num
|
|
|
|
let [num, num_ind] = [line('.'), indent('.')]
|
|
|
|
let [num, num_ind] = [line('.'), indent('.')]
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
@ -442,20 +424,26 @@ function GetJavascriptIndent()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
if idx == -1 && pline[-1:] !~ '[{;]'
|
|
|
|
if idx == -1 && pline[-1:] !~ '[{;]'
|
|
|
|
|
|
|
|
call cursor(l:lnum, lcol)
|
|
|
|
let sol = matchstr(l:line,s:opfirst)
|
|
|
|
let sol = matchstr(l:line,s:opfirst)
|
|
|
|
if sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
|
|
|
|
if sol is '' || sol == '/' && s:SynAt(v:lnum,
|
|
|
|
call cursor(l:lnum, len(pline))
|
|
|
|
\ 1 + len(getline(v:lnum)) - len(l:line)) =~? 'regex'
|
|
|
|
if pline[-1:] == '}' && s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
|
|
|
|
if s:Continues()
|
|
|
|
return num_ind + s:sw()
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
let is_op = s:sw()
|
|
|
|
let is_op = s:sw()
|
|
|
|
elseif sol isnot '' || s:Continues(l:lnum,pline)
|
|
|
|
endif
|
|
|
|
|
|
|
|
elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$' &&
|
|
|
|
|
|
|
|
\ s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) &&
|
|
|
|
|
|
|
|
\ s:PreviousToken() == ')' && s:GetPair('(',')','bW',s:skip_expr) &&
|
|
|
|
|
|
|
|
\ (s:PreviousToken() == ']' || s:LookingAt() =~ '\k' &&
|
|
|
|
|
|
|
|
\ s:{s:PreviousToken() == '*' ? 'Previous' : ''}Token() !=# 'function')
|
|
|
|
|
|
|
|
return num_ind + s:sw()
|
|
|
|
|
|
|
|
else
|
|
|
|
let is_op = s:sw()
|
|
|
|
let is_op = s:sw()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
let b_l = s:Nat(s:IsContOne(l:lnum,b:js_cache[1],is_op) -
|
|
|
|
call cursor(l:lnum, lcol)
|
|
|
|
\ (!is_op && l:line =~ '^{')) * s:sw()
|
|
|
|
let b_l = s:Nat(s:IsContOne(is_op) - (!is_op && l:line =~ '^{')) * s:sw()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '(' &&
|
|
|
|
elseif idx == -1 && s:LookingAt() == '(' && &cino =~ '(' &&
|
|
|
|
\ (search('\m\S','nbW',num) || s:ParseCino('U'))
|
|
|
|
\ (search('\m\S','nbW',num) || s:ParseCino('U'))
|
|
|
|
let pval = s:ParseCino('(')
|
|
|
|
let pval = s:ParseCino('(')
|
|
|
|
if !pval
|
|
|
|
if !pval
|
|
|
|
@ -465,15 +453,15 @@ function GetJavascriptIndent()
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
return Wval ? s:Nat(num_ind + Wval) : vcol
|
|
|
|
return Wval ? s:Nat(num_ind + Wval) : vcol
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
return s:Nat(num_ind + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:sw())
|
|
|
|
return s:Nat(num_ind + pval + searchpair('\m(','','\m)','nbrmW',s:skip_expr,num) * s:sw())
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
" main return
|
|
|
|
" main return
|
|
|
|
if l:line =~ '^[])}]\|^|}'
|
|
|
|
if l:line =~ '^[])}]\|^|}'
|
|
|
|
if l:line_raw[0] == ')' && getline(b:js_cache[1])[b:js_cache[2]-1] == '('
|
|
|
|
if l:line_raw[0] == ')'
|
|
|
|
if s:ParseCino('M')
|
|
|
|
if s:ParseCino('M')
|
|
|
|
return indent(l:lnum)
|
|
|
|
return indent(l:lnum)
|
|
|
|
elseif &cino =~# 'm' && !s:ParseCino('m')
|
|
|
|
elseif num && &cino =~# 'm' && !s:ParseCino('m')
|
|
|
|
return virtcol('.') - 1
|
|
|
|
return virtcol('.') - 1
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
@ -481,6 +469,10 @@ function GetJavascriptIndent()
|
|
|
|
elseif num
|
|
|
|
elseif num
|
|
|
|
return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
|
|
|
|
return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
let nest = get(get(b:,'hi_indent',{}),'blocklnr')
|
|
|
|
|
|
|
|
if nest
|
|
|
|
|
|
|
|
return indent(nest) + s:sw() + b_l + is_op
|
|
|
|
|
|
|
|
endif
|
|
|
|
return b_l + is_op
|
|
|
|
return b_l + is_op
|
|
|
|
endfunction
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
|
|
|
|
|
Buddy Sandidge
7 years ago