Update javascript.vim

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*\|^\s*break\>'
+let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(\%(template\)\@<!string\|regex\|comment\)\c'
 
@@ -65,10 +65,6 @@ let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 " Regex that defines continuation lines, not including (, {, or [.
 let s:continuation_regex = '\%([\\*/.:]\|+\@<!+\|-\@<!-\|\%(<%\)\@<!=\|\W[|&?]\|||\|&&\|[^=]=[^=>].*,\)' . s:line_term
 
-" Regex that defines continuation lines.
-" TODO: this needs to deal with if ...: and so on
-let s:msl_regex = s:continuation_regex.'\|'.s:expr_case
-
 let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*([^()]*)[^()]*\))[^()]*\))[^()]*\))\)\|=>\)' . s:line_term
 
 " Regex that defines blocks.
@@ -81,8 +77,8 @@ let s:var_stmt = '^\s*\%(const\|let\|var\)'
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
-" " 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)
@@ -142,10 +138,10 @@ function s:GetMSL(lnum, in_one_line_scope)
     " If we have a continuation line, or we're in a string, use line as MSL.
     " Otherwise, terminate search as we have found our MSL already.
     let line = getline(lnum)
-    let col = match(line, s:msl_regex) + 1
+    let col = match(line, s:continuation_regex) + 1
     let line2 = getline(msl)
     let col2 = matchend(line2, ')')
-    if (col > 0 && !s:IsInStringOrComment(lnum, col)) || s:IsInString(lnum, strlen(line))
+    if (col > 0 && !s:IsInStringOrComment(lnum, col) && !s:Match(lnum, s:expr_case)) || s:IsInString(lnum, strlen(line))
       let msl = lnum
 
     " if there are more closing brackets, continue from the line which has the matching opening bracket
@@ -317,7 +313,6 @@ endfunction
 function GetJavascriptIndent()
   " 3.1. Setup {{{2
   " ----------
-
   " Set up variables for restoring position in file.  Could use v:lnum here.
   let vcol = col('.')
 
@@ -331,13 +326,7 @@ function GetJavascriptIndent()
   let prevline = prevnonblank(v:lnum - 1)
 
   if (line =~ s:expr_case)
-    if (getline(prevline) =~ s:expr_case)
-      return cindent(line)
-    else
-      if (getline(prevline) !~ s:block_regex)
-        return cindent(line)
-      endif
-    endif
+    return cindent(v:lnum)
   endif
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
@@ -382,7 +371,7 @@ function GetJavascriptIndent()
     return indent(prevline) - s:sw()
   endif
   if (getline(prevline) =~ s:expr_case)
-    return cindent(line)
+    return cindent(v:lnum)
   endif
 
   " If line starts with an operator...