Update javascript.vim

Author: bounceme

indent/javascript.vim

@@ -76,7 +76,7 @@ let s:var_stmt = '^\s*(const\|let\|var)'
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
-let s:operator_first = '^\s*\%([*+.:?]\|||\|&&\)'
+let s:operator_first = '^\s*\%([-*/+.:?]\|||\|&&\)'
 
 let s:case_indent = s:sw()
 let s:case_indent_after = s:sw()
@@ -377,9 +377,8 @@ function GetJavascriptIndent()
     return indent(prevline) + s:case_indent_after
   endif
 
-  " If line starts with operator...
-  if (line =~ s:operator_first)
-    if (getline(prevline) =~ s:operator_first)
+  if (s:Match(v:lnum, s:operator_first))
+    if (s:Match(prevline, s:operator_first))
       " and so does previous line, don't indent
       return indent(prevline)
     end
@@ -388,20 +387,20 @@ function GetJavascriptIndent()
       call cursor(prevline, 1)
       " Search for the opening tag
       let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
-      if mnum > 0
-        if getline(mnum) =~ s:operator_first
-          return indent(mnum)
-        end
+      if mnum > 0 && s:Match(mnum, s:operator_first)
+        return indent(mnum)
       end
     else
       " otherwise, indent 1 level
-      return indent(prevline) + &sw
+      return indent(prevline) + s:sw()
+    end
+    " If previous line starts with a operator...
+  elseif (s:Match(prevline, s:operator_first))
+    let counts = s:LineHasOpeningBrackets(prevline)
+    if counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
+      " dedent 1 level
+      return indent(prevline) - s:sw()
     end
-  end
-  " If previous line starts with a dot...
-  if (getline(prevline) =~ s:operator_first)
-    " dedent 1 level
-    return indent(prevline) - &sw
   endif
 
   " If we are in a multi-line comment, cindent does the right thing.