Update

2 files changed, 114 insertions, 478 deletions

diff --git a/indent/haskell.vim b/indent/haskell.vim
index b2767e1e..7aa94367 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -60,7 +60,7 @@ if !exists('g:haskell_indent_guard')
 endif
 
 setlocal indentexpr=GetHaskellIndent()
-setlocal indentkeys=0{,0},0(,0),0[,0],!^F,o,O,0\=,0=where,0=let,0=deriving,0\,,<space>
+setlocal indentkeys=0{,0},0(,0),0[,0],!^F,o,O,0\=,0=where,0=let,0=deriving,<space>
 
 function! s:isInBlock(hlstack)
   return index(a:hlstack, 'haskellParens') > -1 || index(a:hlstack, 'haskellBrackets') > -1 || index(a:hlstack, 'haskellBlock') > -1
@@ -135,8 +135,34 @@ function! GetHaskellIndent()
   endif
 
   " comment indentation
-  if l:prevline =~ '^\s*--'
-    return match(l:prevline, '\S')
+  if l:line =~ '^\s*--'
+    return match(l:prevline, '-- ')
+  endif
+
+  "   { foo :: Int
+  " >>,
+  "
+  "   |
+  "   ...
+  " >>,
+  if l:line =~ '^\s*,'
+    if s:isInBlock(l:hlstack)
+      normal! 0
+      call search(',', 'cW')
+      let l:n = s:getNesting(s:getHLStack())
+      call search('[([{]', 'bW')
+
+      while l:n != s:getNesting(s:getHLStack())
+        call search('[([{]', 'bW')
+      endwhile
+
+      return col('.') - 1
+    else
+      let l:s = s:indentGuard(match(l:line, ','), l:prevline)
+      if l:s > -1
+        return l:s
+      end
+    endif
   endif
 
   " operator at end of previous line
@@ -362,32 +388,6 @@ function! GetHaskellIndent()
     endif
   endif
 
-  "   { foo :: Int
-  " >>,
-  "
-  "   |
-  "   ...
-  " >>,
-  if l:line =~ '^\s*,'
-    if s:isInBlock(l:hlstack)
-      normal! 0
-      call search(',', 'cW')
-      let l:n = s:getNesting(s:getHLStack())
-      call search('[(\[{]', 'bW')
-
-      while l:n != s:getNesting(s:getHLStack())
-        call search('[(\[{]', 'bW')
-      endwhile
-
-      return col('.') - 1
-    else
-      let l:s = s:indentGuard(match(l:line, ','), l:prevline)
-      if l:s > -1
-        return l:s
-      end
-    endif
-  endif
-
   "   |
   "   ...
   " >>|
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 99ad0d44..add0dfb1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,24 +2,23 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') ==
   
 " Vim indent file
 " Language: Javascript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
 " Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
 
-" 0. Initialization {{{1
-" =================
-
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
 let b:did_indent = 1
 
-setlocal nosmartindent
-
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal formatexpr=Fixedgq(v:lnum,v:count)
-setlocal indentkeys=0{,0},0),0],0\,*<Return>,:,!^F,o,O,e
-setlocal cinoptions+=j1,J1,c1
+setlocal nolisp
+setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
+setlocal cinoptions+=j1,J1
+
+let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<'
 
 " Only define the function once.
 if exists("*GetJavascriptIndent")
@@ -40,96 +39,60 @@ else
   endfunc
 endif
 
-" 1. Variables {{{1
-" ============
-
 let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
-let s:js_keywords = s:line_pre . '\%(break\|import\|export\|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\)\>\C'
 let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:\C'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
 
-" Regex of syntax group names that are strings.
-let s:syng_string = 'regex\c'
-
 " Regex of syntax group names that are strings or documentation.
 let s:syng_comment = '\%(comment\|doc\)\c'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
+let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),'')"
 
-func s:lookForParens(start,end,flags,stop)
-  try 
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,a:stop,300)
+func s:lookForParens(start,end,flags,time)
+  try
+    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time)
   catch /E118/
-    return searchpair(a:start,'',a:end,a:flags,0,a:stop)
+    return searchpair(a:start,'',a:end,a:flags,0,0)
   endtry
 endfunc
 
-let s:line_term = '\s*\%(\%(\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
-
-" Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([*.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
+let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
-let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
+" configurable regexes that define continuation lines, not including (, {, or [.
+if !exists('g:javascript_opfirst')
+  let g:javascript_opfirst = '\%([,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)\C'
+endif
+let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 
-function s:Onescope(lnum)
-  if getline(a:lnum) =~ s:one_line_scope_regex
-    return 1
-  end
-  let mypos = col('.')
-  call cursor(a:lnum, 1)
-  if search('.*\zs\<\%(while\|for\|if\)\>\s*(\C', 'ce', a:lnum) > 0 &&
-        \ s:lookForParens('(', ')', 'W', a:lnum) > 0 &&
-        \ col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
-    call cursor(a:lnum, mypos)
-    return 1
-  else
-    call cursor(a:lnum, mypos)
-    return 0
-  end
+if !exists('g:javascript_continuation')
+  let g:javascript_continuation = '\%([*,.?:^%]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)\C'
+endif
+let g:javascript_continuation .= s:line_term
+
+function s:Onescope(lnum,text,add)
+  return a:text =~ '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)\C' . s:line_term ||
+        \ (a:add && a:text =~ s:line_pre . s:line_term && getline(s:PrevCodeLine(a:lnum - 1)) =~ ')' . s:line_term) ||
+        \ (cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1 &&
+        \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
+        \ search((a:add ? '\%(function\*\|[A-Za-z_$][0-9A-Za-z_$]*\)\C' :
+        \ '\<\%(for\%(\s+each\)\=\|if\|let\|switch\|while\|with\)\C') . '\_s*\%#','bW')) &&
+        \ (a:add || (expand("<cword>") == 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
-" Regex that defines blocks.
-let s:block_regex = '[{([]' . s:line_term
-
-let s:operator_first = s:line_pre . '\%([,:?]\|\([-/.+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
-
-let s:var_stmt = s:line_pre . '\%(const\|let\|var\)\s\+\C'
-
-let s:comma_last = ',' . s:line_term
-
-" 2. Auxiliary Functions {{{1
-" ======================
+" Auxiliary Functions {{{2
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
-function s:IsInStringOrComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_strcom
-endfunction
-
-" Check if the character at lnum:col is inside a string.
-function s:IsInString(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_string
-endfunction
-
-" Check if the character at lnum:col is inside a multi-line comment.
-function s:IsInComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_comment
+function s:IsSyn(lnum, col, reg)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~? (a:reg != '' ? a:reg : s:syng_strcom)
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
-function s:PrevNonBlankNonString(lnum)
+function s:PrevCodeLine(lnum)
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
-    let line = getline(lnum)
-    let com = match(line, '\%(\/\*.*\)\@<!\*\/') + 1
-    if s:IsInComment(lnum, com)
-      call cursor(lnum, com)
-      let parlnum = search('\%(\/\/.*\)\@<!\/\*', 'nbW')
-      if parlnum > 0
-        let lnum = parlnum
-      end
-    elseif line !~ '^' . s:line_term && !s:IsInStringOrComment(lnum,1)
+    if !s:IsSyn(lnum, matchend(getline(lnum), '^\s*[^''"]'),'')
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -137,94 +100,6 @@ function s:PrevNonBlankNonString(lnum)
   return lnum
 endfunction
 
-" Find line above 'lnum' that started the continuation 'lnum' may be part of.
-function s:GetMSL(lnum, in_one_line_scope)
-  " Start on the line we're at and use its indent.
-  let msl = a:lnum
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-  while lnum > 0 && !s:Match(msl,s:line_pre . '[])}]')
-    " 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 line2 = getline(msl)
-    if ((s:Match(lnum,s:continuation_regex) || s:Match(lnum, s:comma_last)) &&
-          \ !s:Match(lnum, s:expr_case)) || s:IsInString(lnum, strlen(line))
-      let msl = lnum
-      if s:Match(lnum, s:line_pre . '[]})]') && !a:in_one_line_scope
-        call cursor(lnum,1)
-        let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-        if parlnum > 0
-          let lnum = parlnum
-          continue
-        end
-      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 msl_one_line = s:Onescope(lnum)
-      if msl_one_line == 0
-        break
-      endif
-    end
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
-  endwhile
-  return msl
-endfunction
-
-function s:RemoveTrailingComments(content)
-  let single = '\/\/\%(.*\)\s*$'
-  let multi = '\/\*\%(.*\)\*\/\s*$'
-  return substitute(substitute(substitute(a:content, single, '', ''), multi, '', ''), '\s\+$', '', '')
-endfunction
-
-" Find if the string is inside var statement (but not the first string)
-function s:InMultiVarStatement(lnum, cont, prev)
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-  let cont = a:cont
-  let prev = a:prev
-
-  "  let type = synIDattr(synID(lnum, indent(lnum) + 1, 0), 'name')
-
-  " loop through previous expressions to find a var statement
-  while lnum > 0 && (s:Match(lnum, s:comma_last) ||(cont && getline(lnum) =~ s:line_pre . '[]})]') ||
-        \ s:Match(lnum,s:continuation_regex)) || (prev && (s:Match(prev, s:comma_last) ||
-        \ s:Match(prev,s:continuation_regex)))
-    " if the line is a js keyword
-    if cont
-      let cont = 0
-      call cursor(lnum,1)
-      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if parlnum > 0
-        let lnum = parlnum
-      end
-    end
-    if s:Match(lnum, s:js_keywords)
-      " check if the line is a var stmt
-      " if the line has a comma first or comma last then we can assume that we
-      " are in a multiple var statement
-      if s:Match(lnum, s:var_stmt) && (s:Match(lnum, s:comma_last)||s:Match(lnum,s:continuation_regex))
-        return lnum
-      endif
-
-      " other js keywords, not a var
-      if !s:Match(lnum, s:comma_last)||!s:Match(lnum,s:continuation_regex)
-        return 0
-      end
-    endif
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
-    let prev = prev && lnum > 0 ? prev : 0
-  endwhile
-
-  " beginning of program, not a var
-  return 0
-endfunction
-
 " Check if line 'lnum' has more opening brackets than closing ones.
 function s:LineHasOpeningBrackets(lnum)
   let open_0 = 0
@@ -232,335 +107,96 @@ function s:LineHasOpeningBrackets(lnum)
   let open_4 = 0
   let line = getline(a:lnum)
   let pos = match(line, '[][(){}]', 0)
+  let last = 0
   while pos != -1
-    if !s:IsInStringOrComment(a:lnum, pos + 1)
+    if !s:IsSyn(a:lnum, pos + 1, '')
       let idx = stridx('(){}[]', line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1
+        let last = pos
       else
         let open_{idx - 1} = open_{idx - 1} - 1
       endif
     endif
     let pos = match(line, '[][(){}]', pos + 1)
   endwhile
-  return (open_0 > 0 ? 1 : (open_0 == 0 ? 0 : 2)) . (open_2 > 0 ? 1 : (open_2 == 0 ? 0 : 2)) . (open_4 > 0 ? 1 : (open_4 == 0 ? 0 : 2))
-endfunction
-
-function s:Match(lnum, regex)
-  let col = match(getline(a:lnum), a:regex) + 1
-  return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
-endfunction
-
-function s:IndentWithContinuation(lnum, ind, width)
-  " Set up variables to use and search for MSL to the previous line.
-  let p_lnum = a:lnum
-  let lnum = s:GetMSL(a:lnum, 1)
-  let line = getline(lnum)
-
-  " If the previous line wasn't a MSL and is continuation return its indent.
-  " TODO: the || s:IsInString() thing worries me a bit.
-  if p_lnum != lnum
-    if s:Match(p_lnum,s:continuation_regex)||s:IsInString(p_lnum,strlen(line))
-      return a:ind
-    endif
-  endif
-
-  " Set up more variables now that we know we aren't continuation bound.
-  let msl_ind = indent(lnum)
-
-  " If the previous line ended with [*+/.-=], start a continuation that
-  " indents an extra level.
-  if s:Match(lnum, s:continuation_regex)
-    if lnum == p_lnum
-      return msl_ind + a:width
-    else
-      return msl_ind
-    end
-  elseif s:InMultiVarStatement(p_lnum, 0, s:PrevNonBlankNonString(p_lnum - 1))
-    return indent(p_lnum) - s:sw()
-  endif
-
-  return a:ind
-endfunction
-
-function s:InOneLineScope(lnum)
-  let msl = s:GetMSL(a:lnum, 1)
-  if msl > 0 && s:Onescope(msl)
-    return msl
-  endif
-  return 0
-endfunction
-
-function s:ExitingOneLineScope(lnum)
-  let msl = s:GetMSL(a:lnum, 1)
-  if msl > 0
-    " if the current line is in a one line scope ..
-    if s:Onescope(msl)
-      return 0
-    else
-      let prev_msl = s:GetMSL(msl - 1, 1)
-      if s:Onescope(prev_msl)
-        return prev_msl
-      endif
-    endif
-  endif
-  return 0
+  return [(open_0 > 0 ? 1 : (open_0 == 0 ? 0 : 2)) . (open_2 > 0 ? 1 : (open_2 == 0 ? 0 : 2)) .
+        \ (open_4 > 0 ? 1 : (open_4 == 0 ? 0 : 2)), last]
 endfunction
-
-" 3. GetJavascriptIndent Function {{{1
-" =========================
+" }}}
 
 function GetJavascriptIndent()
-  " 3.1. Setup {{{1
-  " ----------
-  " Set up variables for restoring position in file.  Could use v:lnum here.
-  " Avoid use of line('.')/col('.') type functions as the curpos can change
-  let vcol = col('.')
-
-  " 3.2. Work on the current line {{{1
-  " -----------------------------
-
-  let ind = -1
+  if !exists('b:js_cache')
+    let b:js_cache = [0,0,0]
+  end
   " Get the current line.
   let line = getline(v:lnum)
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
   " previous line of code
-  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
-
-  " to not change multiline string values 
-  if line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template'
-    return -1
+  let lnum = s:PrevCodeLine(v:lnum - 1)
+  if lnum == 0
+    return 0
   endif
 
-  " If we are in a multi-line comment, cindent does the right thing.
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
-    return cindent(v:lnum)
+  " start with strings,comments,etc.{{{2
+  if (line !~ '^[''"`]' && s:IsSyn(v:lnum,1,'string\|template')) ||
+        \ (line !~ '^\s*[/*]' && s:IsSyn(v:lnum,1,s:syng_comment))
+    return -1
   endif
-
-  " single opening bracket will assume you want a c style of indenting
-  if line =~ s:line_pre . '{' && !s:Match(lnum,s:block_regex) &&
-        \ !s:Match(lnum,s:comma_last)
+  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsSyn(v:lnum,1,s:syng_comment)
     return cindent(v:lnum)
   endif
 
-  " cindent each line which has a switch label
   if (line =~ s:expr_case)
-    let s:cpo_switch = &cpo
+    let cpo_switch = &cpo
     set cpo+=%
     let ind = cindent(v:lnum)
-    let &cpo = s:cpo_switch
-    return ind
-  endif
-
-  " If we got a closing bracket on an empty line, find its match and indent
-  " according to it.
-  let col = line =~ s:line_pre . '[]})]'
-  if col > 0
-    let parlnum = v:lnum
-    while col
-      call cursor(parlnum, 1)
-      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      let col = s:Match(parlnum,  s:line_pre . '[]})]')
-      if col
-        continue
-      end
-      if parlnum > 0
-        let ind = s:InMultiVarStatement(parlnum, 0, 0)|| s:LineHasOpeningBrackets(parlnum) !~ '2' ?
-              \ indent(parlnum) : indent(s:GetMSL(parlnum, 0))
-      endif
-    endwhile
+    let &cpo = cpo_switch
     return ind
   endif
+  "}}}
 
-
-  " If line starts with an operator...
-  if (line =~ s:operator_first)
-    if (s:Match(lnum, s:operator_first) || (s:Match(lnum, s:line_pre . '[])}]') &&
-          \ !(s:Match(v:lnum,s:line_pre . '\.') && s:Match(lnum, ')' . s:line_term))))
-      " and so does previous line, don't indent
-      return indent(lnum)
+  " the containing paren, bracket, curly
+  let pcounts = [0]
+  if b:js_cache[0] >= lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
+        \ (b:js_cache[0] > lnum || map(pcounts,'s:LineHasOpeningBrackets(lnum)')[0][0] !~ '2')
+    let num = pcounts[0][0] =~ '1' ? lnum : b:js_cache[1]
+    if pcounts[0][0] =~'1'
+      call cursor(lnum,pcounts[0][1])
     end
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts =~ '2'
-      call cursor(lnum, 1)
-      " Search for the opening tag
-      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if parlnum > 0
-        return !s:Match(parlnum, s:operator_first) &&
-              \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsbracket\|jsparen\|jsobject' ?
-              \ indent(lnum) + s:sw() : indent(parlnum)
-      end
-    elseif synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsbracket\|jsparen\|jsobject'
-      " otherwise, if not in an key/val;array item;param, indent 1 level
-      return indent(lnum) + s:sw()
-    end
-
-    " If previous line starts with an operator...
-  elseif (s:Match(lnum, s:operator_first) && !s:Match(lnum,s:continuation_regex)) ||
-        \ getline(lnum) =~ '[]})];\=' . s:line_term
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts =~ '2' && !s:Match(lnum, s:operator_first)
-      call cursor(lnum, 1)
-      " Search for the opening tag
-      let mnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if mnum > 0 && (s:Match(mnum, s:operator_first) ||
-            \ (s:Onescope(s:PrevNonBlankNonString(mnum - 1))) && !s:Match(mnum, s:line_pre . '{'))
-        return indent(mnum) - s:sw()
-      end
-    elseif s:Match(lnum, s:operator_first)
-      if counts !~ '1'
-        return indent(lnum) - s:sw()
-      end
+  else
+    call cursor(v:lnum,1)
+    let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
+    if line[0] =~ '\s' && syns != ''
+      let pattern = syns =~? 'funcblock' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : syns =~? 'jsbracket'? ['\[','\]'] :
+            \ ['(\|{\|\[',')\|}\|\]']
+      let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
+    else
+      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000)
     end
   end
+  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
-  " 3.3. Work on the previous line. {{{1
-  " -------------------------------
-
-  " If the line is empty and the previous nonblank line was a multi-line
-  " comment, use that comment's indent. Deduct one char to account for the
-  " space in ' */'.
-  if line =~ '^\s*$' && getline(prevline) =~ '\%(\%(^\s*\/\/\|\/\*\).*\)\@<!\*\/' &&
-        \ s:IsInComment(prevline, 1)
-    return indent(prevline) - 1
-  endif
-
-  " Find a non-blank, non-multi-line string line above the current line.
-
-  " If the line is empty and inside a string, use the previous line.
-  if line =~ '^\s*$' && lnum != prevline
-    return indent(prevnonblank(v:lnum))
-  endif
-
-  " At the start of the file use zero indent.
-  if lnum == 0
-    return 0
-  endif
-
-  " If the previous line ended with a block opening, add a level of indent.
-  if s:Match(lnum, s:block_regex)
-    return s:InMultiVarStatement(lnum, 0, 0) || s:LineHasOpeningBrackets(lnum) !~ '2' ?
-          \ indent(lnum) + s:sw() : indent(s:GetMSL(lnum, 0)) + s:sw()
-  endif
-
-  " Set up variables for current line.
-  let line = getline(lnum)
-  let ind = indent(lnum)
-  " If the previous line contained an opening bracket, and we are still in it,
-  " add indent depending on the bracket type.
-  if s:Match(lnum, '[[({})\]]')
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts =~ '2'
-      call cursor(lnum,matchend(s:RemoveTrailingComments(line), '.*\zs[])}]'))
-      while s:lookForParens('(\|{\|\[', ')\|}\|\]', 'bW', 0) == lnum
-        call cursor(lnum, matchend(s:RemoveTrailingComments(strpart(line,0,col('.'))), '.*\zs[])}]'))
-      endwhile
-      let cur = line('.')
-      if cur < lnum && !s:InMultiVarStatement(cur,0,0)
-        return indent(s:GetMSL(cur, 0))
-      end
-    elseif counts =~ '1' || s:Onescope(lnum)
-      return ind + s:sw()
-    end
+  " most significant part
+  if line =~ s:line_pre . '[])}]'
+    return indent(num)
   end
-
-  " 3.4. Work on the MSL line. {{{1
-  " --------------------------
-  if s:Match(lnum, s:comma_last) && !s:Match(lnum,  s:continuation_regex)
-    return s:Match(lnum, s:var_stmt) ? indent(lnum) + s:sw() : indent(lnum)
-
-  elseif s:Match(s:PrevNonBlankNonString(lnum - 1), s:comma_last)
-    if !s:Match(lnum, s:comma_last) && s:InMultiVarStatement(lnum,1,0)
-      return indent(lnum) - s:sw()
-    end
+  let inb = num == 0 ? 1 : s:Onescope(num, strpart(getline(num),0,b:js_cache[2] - 1),1)
+  let switch_offset = (!inb || num == 0) || expand("<cword>") != 'switch' ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
+        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))
+  if ((line =~ g:javascript_opfirst ||
+        \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case)) &&
+        \ inb) || (s:Onescope(lnum,getline(lnum),0) && line !~ s:line_pre . '{')
+    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+  elseif num > 0
+    return indent(num) + s:sw() + switch_offset
   end
-  let ind_con = ind
-  let ind = s:IndentWithContinuation(lnum, ind_con, s:sw())
-
-  " }}}2
-  "
-  "
-  let ols = s:InOneLineScope(lnum)
-  if ols > 0
-    let ind = ind + s:sw()
-  else
-    let ols = s:ExitingOneLineScope(lnum)
-    while ols > 0 && ind > 0
-      let ind = ind - s:sw()
-      let ols = s:InOneLineScope(ols - 1)
-    endwhile
-  endif
 
-  return ind
 endfunction
 
-" }}}1
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" gq{{{2
-function! Fixedgq(lnum, count)
-  let l:tw = &tw ? &tw : 80;
-
-  let l:count = a:count
-  let l:first_char = indent(a:lnum) + 1
-
-  if mode() == 'i' " gq was not pressed, but tw was set
-    return 1
-  endif
-
-  " This gq is only meant to do code with strings, not comments
-  if s:IsInComment(a:lnum, l:first_char)
-    return 1
-  endif
-
-  if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
-    return 1
-  endif
-
-  " Put all the lines on one line and do normal spliting after that
-  if l:count > 1
-    while l:count > 1
-      let l:count -= 1
-      normal J
-    endwhile
-  endif
-
-  let l:winview = winsaveview()
-
-  call cursor(a:lnum, l:tw + 1)
-  let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
-  call cursor(a:lnum, l:tw + 1)
-  let breakpoint = searchpairpos(' ', '', '\.', 'bcW', s:skip_expr, a:lnum)
-
-  " No need for special treatment, normal gq handles edgecases better
-  if breakpoint[1] == orig_breakpoint[1]
-    call winrestview(l:winview)
-    return 1
-  endif
-
-  " Try breaking after string
-  if breakpoint[1] <= indent(a:lnum)
-    call cursor(a:lnum, l:tw + 1)
-    let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
-  endif
-
-
-  if breakpoint[1] != 0
-    call feedkeys("r\<CR>")
-  else
-    let l:count = l:count - 1
-  endif
-
-  " run gq on new lines
-  if l:count == 1
-    call feedkeys("gqq")
-  endif
-
-  return 0
-endfunction
-"}}}
-" vim: foldmethod=marker:foldlevel=1
 
 endif