Switch mechanics, indent

also now that I know about cindent i'm curious if there are other places like this to remove code and increase performance

Author: bounceme

indent/javascript.vim

@@ -17,7 +17,7 @@ setlocal nosmartindent
 setlocal indentexpr=GetJavascriptIndent()
 setlocal formatexpr=Fixedgq(v:lnum,v:count)
 setlocal indentkeys=0{,0},0),0],0\,:,!^F,o,O,e
-
+setl cino+=b0
 " Only define the function once.
 if exists("*GetJavascriptIndent")
   finish
@@ -41,7 +41,7 @@ endif
 " ============
 
 let s:js_keywords = '^\s*\(break\|catch\|const\|continue\|debugger\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|let\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
-let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
+let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*\|^\s*break\>'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(\%(template\)\@<!string\|regex\|comment\)\c'
 
@@ -81,18 +81,8 @@ let s:var_stmt = '^\s*\%(const\|let\|var\)'
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
-let s:case_indent = s:sw()
-let s:case_indent_after = s:sw()
-let s:m = matchlist(&cinoptions, ':\(.\)')
-if (len(s:m) > 2)
-    let s:case_indent = s:m[1]
-endif
-let s:m = matchlist(&cinoptions, '=\(.\)')
-if (len(s:m) > 2)
-    let s:case_indent_after = s:m[1]
-endif
-" 2. Auxiliary Functions {{{1
-" ======================
+" " 2. Auxiliary Functions {{{1
+" " ======================
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
 function s:IsInStringOrComment(lnum, col)
@@ -342,12 +332,10 @@ function GetJavascriptIndent()
 
   if (line =~ s:expr_case)
     if (getline(prevline) =~ s:expr_case)
-      return indent(prevline)
+      return cindent(line)
     else
-      if (getline(prevline) =~ s:block_regex)
-        return indent(prevline) + s:case_indent
-      else
-        return indent(prevline) - s:case_indent_after
+      if (getline(prevline) !~ s:block_regex)
+        return cindent(line)
       endif
     endif
   endif
@@ -394,7 +382,7 @@ function GetJavascriptIndent()
     return indent(prevline) - s:sw()
   endif
   if (getline(prevline) =~ s:expr_case)
-    return indent(prevline) + s:case_indent_after
+    return cindent(line)
   endif
 
   " If line starts with an operator...
@@ -475,11 +463,7 @@ function GetJavascriptIndent()
 
   " If the previous line ended with a block opening, add a level of indent.
   if s:Match(lnum, s:block_regex)
-    if (line =~ s:expr_case)
-      return indent(s:GetMSL(lnum, 0)) + s:sw()/2
-    else
       return indent(s:GetMSL(lnum, 0)) + s:sw()
-    endif
   endif
 
   " Set up variables for current line.