From 24c75c022328e7cbff658144a14ca97ab8e26b5f Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Thu, 20 Oct 2016 23:09:42 -0700 Subject: [PATCH 1/2] other small touches --- indent/javascript.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 560653ac..04dd214a 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -199,7 +199,7 @@ function GetJavascriptIndent() return -1 endif let l:lnum = s:PrevCodeLine(v:lnum - 1) - if l:lnum == 0 + if !l:lnum return 0 endif From 701fee9a9bc42a46af53049956ef62459093c38c Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Fri, 21 Oct 2016 00:50:30 -0700 Subject: [PATCH 2/2] Update javascript.vim --- indent/javascript.vim | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 04dd214a..6717e79e 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -215,15 +215,14 @@ function GetJavascriptIndent() " the containing paren, bracket, curly. Many hacks for performance call cursor(v:lnum,1) - let fclose = l:line =~ '^[])}]' + let idx = stridx('])}',l:line[0]) 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 || !fclose && s:Balanced(l:lnum)) + \ (b:js_cache[0] > l:lnum || idx < 0 && s:Balanced(l:lnum)) let num = b:js_cache[1] - elseif fclose - let id = stridx('])}',l:line[0]) - return indent(s:GetPair(escape('[({'[id],'['), '])}'[id],'bW','s:skip_func(s:looksyn)',2000)) + elseif idx + 1 + return indent(s:GetPair(escape('[({'[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 @@ -233,7 +232,7 @@ function GetJavascriptIndent() let num = s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum) endif - if fclose + if idx + 1 return indent(num) endif let num = max([num,0])