Prevent giant loop, refactor

Author: bounceme

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: October 19, 2016
+" Last Change: October 24, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -63,7 +63,7 @@ else
   endfunction
 endif
 
-function s:Trimline(ln)
+function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
   let l:max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
   while l:max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? '\%(comment\|doc\)'
@@ -88,12 +88,12 @@ endfunction
 
 function s:iscontOne(i,num,cont)
   let [l:i, l:cont, l:num] = [a:i, a:cont, a:num + !a:num]
-  let pind = a:num ? indent(l:num) : -s:W
-  let ind = indent(l:i) + (!l:cont * s:W)
+  let pind = a:num ? indent(l:num) + s:W : 0
+  let ind = indent(l:i) + (a:cont ? 0 : s:W)
   let bL = 0
-  while l:i >= l:num && (!l:cont || ind > pind + s:W)
+  while l:i >= l:num && (!l:cont || ind > pind)
     if indent(l:i) < ind " first line always true for !a:cont, false for !!a:cont
-      if s:OneScope(l:i,s:Trimline(l:i))
+      if s:OneScope(l:i,s:Trim(l:i))
         if expand('<cword>') ==# 'while' &&
               \ s:GetPair('\C\<do\>','\C\<while\>','bW','line2byte(line(".")) + col(".") <'
               \ . (line2byte(l:num) + b:js_cache[2]) . '||'
@@ -106,6 +106,8 @@ function s:iscontOne(i,num,cont)
         break
       endif
       let ind = indent(l:i)
+    elseif !a:cont
+      break
     endif
     let l:i = s:PrevCodeLine(l:i - 1)
   endwhile
@@ -234,32 +236,40 @@ function GetJavascriptIndent()
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : [line('.'),col('.')])
   let num = b:js_cache[1]
 
-  call cursor(v:lnum,1)
-  if l:line =~# '^while\>' && s:GetPair('\C\<do\>','\C\<while\>','bW',s:skip_expr . '|| !s:IsBlock()',100,num + 1) > 0
-    return indent(line('.'))
+  call call('cursor',b:js_cache[1:])
+  let [s:W, pline, isOp, stmt, bL, switch_offset] = [s:sw(), s:Trim(l:lnum),0,0,0,0]
+  if num 
+    if getline('.')[col('.')-1] == '{'
+      if search(')\_s*\%#','bW')
+        let stmt = 1
+        if s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')
+          let switch_offset = &cino !~ ':' || !has('float') ? s:W :
+                \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
+          if l:line =~# '^' . s:expr_case
+            return indent(num) + switch_offset
+          endif
+          let stmt = pline !~# s:expr_case . '$'
+        endif
+      elseif s:IsBlock()
+        let stmt = 1
+      endif
+    endif
+  else
+    let stmt = 1
   endif
 
-  call call('cursor',b:js_cache[1:])
-  let s:W = s:sw()
-  let pline = s:Trimline(l:lnum)
-  let bchar = getline('.')[col('.')-1] == '{'
-  let switch_offset = 0
-  let in_switch = 0
-  if num && bchar && search(')\_s*\%#','bW') &&
-        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')
-    let in_switch = 1
-    let switch_offset = &cino !~ ':' || !has('float') ? s:W :
-          \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
-    if l:line =~# '^' . s:expr_case
-      return indent(num) + switch_offset
+  if stmt
+    call cursor(v:lnum,1)
+    if l:line =~# '^while\>' && s:GetPair('\C\<do\>','\C\<while\>','bW',s:skip_expr . '|| !s:IsBlock()',100,num + 1) > 0
+      return indent(line('.'))
     endif
+    let isOp = l:line =~# s:opfirst || pline =~# s:continuation
+    let bL = s:iscontOne(l:lnum,num,isOp)
+    let bL -= (bL && l:line[0] == '{') * s:W
   endif
 
   " most significant, find the indent amount
-  let isOp = l:line =~# s:opfirst || (in_switch && pline =~# s:expr_case . '$' ? 0 : pline =~# s:continuation)
-  let bL = s:iscontOne(l:lnum,num,isOp)
-  let bL -= (bL && l:line[0] == '{') * s:W
-  if isOp && (!num || in_switch || bchar && call('cursor',b:js_cache[1:])+1 && s:IsBlock())
+  if isOp
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL