more code cleaning

Author: bounceme

indent/javascript.vim

@@ -241,23 +241,19 @@ function GetJavascriptIndent()
   let num = 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 s:current_char() == '{' && s:IsBlock()
-      let stmt = 1
-      if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
-        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 . '$'
+  if num && s:current_char() == '{' && s:IsBlock()
+    let stmt = 1
+    if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
+      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
-  else
-    let stmt = 1
   endif
 
-  if stmt
+  if stmt || !num
     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('.'))