final

Author: bounceme

indent/javascript.vim

@@ -148,34 +148,24 @@ function s:GetMSL(lnum, in_one_line_scope)
     " Otherwise, terminate search as we have found our MSL already.
     let line = getline(lnum)
     let col = match(line, s:msl_regex) + 1
-    let colprev = s:Match(msl, s:operator_first)
-    if ((col > 0 && !s:IsInStringOrComment(lnum, col)) || s:IsInString(lnum, strlen(line)) || colprev)
+    if (col > 0 && !s:IsInStringOrComment(lnum, col)) || s:IsInString(lnum, strlen(line))
       let msl = lnum
-      else
-        " Don't use lines that are part of a one line scope as msl unless the
-        " flag in_one_line_scope is set to 1
-        "
-        if a:in_one_line_scope
-          break
-        end
-        let msl_one_line = s:Match(lnum, s:one_line_scope_regex)
-        if msl_one_line == 0
-          break
-        endif
-      endif
-      let coli = matchend(line, '^\s*[]})]')
-      if coli
-        let bs = strpart('(){}[]', stridx(')}]', line[coli - 1]) * 2, 2)
-        let mnum = searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
-        if mnum
-          let lnum = mnum
-        end
+    else
+      " Don't use lines that are part of a one line scope as msl unless the
+      " flag in_one_line_scope is set to 1
+      "
+      if a:in_one_line_scope
+        break
       end
-
-      let lnum = s:PrevNonBlankNonString(lnum - 1)
-    endwhile
-    return msl
-  endfunction
+      let msl_one_line = s:Match(lnum, s:one_line_scope_regex)
+      if msl_one_line == 0
+        break
+      endif
+    endif
+    let lnum = s:PrevNonBlankNonString(lnum - 1)
+  endwhile
+  return msl
+endfunction
 
 function s:RemoveTrailingComments(content)
   let single = '\/\/\(.*\)\s*$'
@@ -411,13 +401,12 @@ function GetJavascriptIndent()
       return indent(prevline) + s:sw()
     end
     " If previous line starts with a operator...
-  elseif (s:Match(prevline, s:operator_first) || s:Match(v:lnum, '^\s*[)}]'))
-    let counts = s:LineHasOpeningBrackets(prevline)
-    if counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
-      " dedent 1 level
+  elseif s:Match(prevline, s:operator_first) && !s:Match(prevline, s:comma_last)
+    let countscur = s:LineHasOpeningBrackets(v:lnum)
+    if countscur[0] != '2'
       return indent(prevline) - s:sw()
     end
-  endif
+  end
 
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)