let [] =[], minor formatting (pangloss#990)

bounceme · web-flow · commit 43097941ad86 · 2017-06-27T11:35:37.000-07:00
diff --git a/indent/javascript.vim b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: Chris Paul ( https://github.com/bounceme )
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: June 15, 2017
+" Last Change: June 27, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -204,9 +204,10 @@ function s:ExprCol()
       endif
     elseif tok == '?'
       let bal += 1
-    elseif tok == '{' && !s:IsBlock()
-      let bal = 1
-    elseif tok != '}' || !s:GetPair('{','}','bW',s:skip_expr,200)
+    elseif tok == '{'
+      let bal = !s:IsBlock()
+      break
+    elseif !s:GetPair('{','}','bW',s:skip_expr,200)
       break
     endif
   endwhile
@@ -271,9 +272,8 @@ endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
-  let l:open = 0
-  let l:line = getline(a:lnum)
-  let pos = match(l:line, '[][(){}]', 0)
+  let [l:open, l:line] = [0, getline(a:lnum)]
+  let pos = match(l:line, '[][(){}]')
   while pos != -1
     if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
       let l:open += match(' ' . l:line[pos],'[[({]')
@@ -289,9 +289,8 @@ function s:Balanced(lnum)
 endfunction
 
 function s:OneScope(lnum)
-  let pline = s:Trim(a:lnum)
+  let [pline, kw] = [s:Trim(a:lnum), 'else do']
   call cursor(a:lnum,strlen(pline))
-  let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
     if s:PreviousToken() =~# '^\%(await\|each\)$'
       call s:PreviousToken()
@@ -325,8 +324,8 @@ endfunction
 " a continued expression, which could have started in a braceless context
 function s:IsContOne(i,num,cont)
   let [l:i, l:num, b_l] = [a:i, a:num + !a:num, 0]
-  let pind = a:num ? indent(l:num) + s:sw() : 0
-  let ind = indent(l:i) + (a:cont ? 0 : s:sw())
+  let pind = a:num ? indent(a:num) + s:sw() : 0
+  let ind = indent(a:i) + (a:cont ? 0 : s:sw())
   while l:i >= l:num && (ind > pind || l:i == l:num)
     if indent(l:i) < ind && s:OneScope(l:i)
       let b_l += 1
@@ -387,12 +386,13 @@ function s:IsBlock()
 endfunction
 
 function GetJavascriptIndent()
-  let b:js_cache = get(b:,'js_cache',[0,0,0])
-  let s:synid_cache = {}
-  " Get the current line.
-  let l:line = getline(v:lnum)
+  let [b:js_cache, s:synid_cache, l:line, s:stack] = [
+        \ get(b:,'js_cache',[0,0,0]),
+        \ {},
+        \ 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
-  let s:stack = map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
   let syns = get(s:stack,-1,'')
 
   " start with strings,comments,etc.
