@@ -74,9 +74,9 @@ function s:Trimline(ln)
74
74
endfunction
75
75
76
76
" configurable regexes that define continuation lines, not including (, {, or [.
77
- let s: javascript_opfirst = ' ^' . get (g: ,' javascript_opfirst' ,
77
+ let s: opfirst = ' ^' . get (g: ,' javascript_opfirst' ,
78
78
\ ' \%([<>,?^%|*&]\|\/[/*]\@!\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)' )
79
- let s: javascript_continuation = get (g: ,' javascript_continuation' ,
79
+ let s: continuation = get (g: ,' javascript_continuation' ,
80
80
\ ' \%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)' ) . ' $'
81
81
82
82
function s: OneScope (lnum,text)
@@ -254,7 +254,7 @@ function GetJavascriptIndent()
254
254
\ float2nr (str2float (matchstr (&cino ,' .*:\zs[-0-9.]*' )) * (&cino = ~# ' .*:[^,]*s' ? s: W : 1 ))
255
255
256
256
" most significant, find the indent amount
257
- let isOp = l: line = ~# s: javascript_opfirst || pline !~# s: expr_case . ' $' && pline = ~# s: javascript_continuation
257
+ let isOp = l: line = ~# s: opfirst || pline !~# s: expr_case . ' $' && pline = ~# s: continuation
258
258
let bL = s: iscontOne (l: lnum ,num,isOp)
259
259
let bL -= (bL && l: line = ~ ' ^{' ) * s: W
260
260
if isOp && (! num || bchar && cursor (b: js_cache [1 ],b: js_cache [2 ])+ 1 && s: IsBlock ())
0 commit comments