diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9720c7f8..5191a2c2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: Chris Paul ( https://github.com/bounceme )
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: October 9, 2016
+" Last Change: October 24, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -12,7 +12,7 @@ let b:did_indent = 1
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal nolisp noautoindent nosmartindent
+setlocal autoindent nolisp nosmartindent
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
 
@@ -37,9 +37,6 @@ else
   endfunction
 endif
 
-let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>'
-let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
-
 let s:expr_case = '\<\%(\%(case\>\s*\S.\{-}\)\|default\)\s*:\C'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
@@ -53,7 +50,7 @@ function s:skip_func(lnum)
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\/','nbW',line('.')) || search('[''"\\]','nW',line('.'))) && eval(s:skip_expr)
+  return (strridx(getline('.'),'/',col('.')-1) + 1 || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
 endfunction
 
 if has('reltime')
@@ -61,98 +58,94 @@ if has('reltime')
     return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
   endfunction
 else
-  function s:GetPair(start,end,flags,...)
-    return searchpair(a:start,'',a:end,a:flags,"line('.') < prevnonblank(v:lnum) - 2000 ? dummy : 0")
+  function s:GetPair(start,end,flags,skip,...)
+    return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
   endfunction
 endif
 
-" indent/python.vim
-function s:Trimline(ln)
-  let pline = getline(a:ln)
-  let min = match(pline,'\/[/*]') + 1
-  if min && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? '\%(comment\|doc\)'
-    let max = match(pline,'.*\zs\/[/*]') + 1
-    while min < max
-      let col = (min + max) / 2
-      if synIDattr(synID(a:ln, col, 0), 'name') =~? '\%(comment\|doc\)'
-        let max = col
-      else
-        let min = match(pline,'\/[/*]',col) + 1
-      endif
-    endwhile
-    let pline = strpart(pline, 0, min - 1)
-  endif
-  return substitute(pline,'\s*$','','')
+function s:Trim(ln)
+  let pline = substitute(getline(a:ln),'\s*$','','')
+  let l:max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
+  while l:max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? '\%(comment\|doc\)'
+    let pline = substitute(strpart(pline, 0, l:max),'\s*$','','')
+    let l:max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
+  endwhile
+  return pline
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
-if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,?^%|*&]\|\/[/*]\@!\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
-endif
-if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
-endif
-
-let g:javascript_opfirst = '^' . g:javascript_opfirst
-let g:javascript_continuation .= '$'
+let s:opfirst = '^' . get(g:,'javascript_opfirst',
+      \ '\%([<>,?^%|*&]\|\/[/*]\@!\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)')
+let s:continuation = get(g:,'javascript_continuation',
+      \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)') . '$'
 
 function s:OneScope(lnum,text)
-  return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)$')) > -1 ||
-        \ cursor(a:lnum, match(' ' . a:text, ')$')) > -1 &&
+  return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)$')) + 1 ||
+        \ cursor(a:lnum, match(' ' . a:text, ')$')) + 1 &&
         \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 &&
         \ search('\C\<\%(for\%(\_s\+\%(await\|each\)\)\=\|if\|let\|w\%(hile\|ith\)\)\_s*\%#','bW')
 endfunction
 
 function s:iscontOne(i,num,cont)
   let [l:i, l:cont, l:num] = [a:i, a:cont, a:num + !a:num]
-  let pind = a:num ? indent(l:num) : -s:W
-  let ind = indent(l:i) + (!l:cont * s:W)
+  let pind = a:num ? indent(l:num) + s:W : 0
+  let ind = indent(l:i) + (a:cont ? 0 : s:W)
   let bL = 0
-  while l:i >= l:num && (!l:cont || ind > pind + s:W)
+  while l:i >= l:num && (!l:cont || ind > pind)
     if indent(l:i) < ind " first line always true for !a:cont, false for !!a:cont
-      if s:OneScope(l:i,s:Trimline(l:i))
+      if s:OneScope(l:i,s:Trim(l:i))
         if expand('<cword>') ==# 'while' &&
-              \ s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num + !!a:num) > 0
+              \ s:GetPair('\C\<do\>','\C\<while\>','bW','line2byte(line(".")) + col(".") <'
+              \ . (line2byte(l:num) + b:js_cache[2]) . '||'
+              \ . s:skip_expr . '|| !s:IsBlock()',100,l:num) > 0
           return 0
         endif
-        let bL += 1
+        let bL += s:W
         let [l:cont, l:i] = [0, line('.')]
       elseif !l:cont
         break
       endif
       let ind = indent(l:i)
+    elseif !a:cont
+      break
     endif
     let l:i = s:PrevCodeLine(l:i - 1)
   endwhile
-  return bL * s:W
+  return bL
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
-  if getline(line('.'))[col('.')-1] == '{'
-    if search('\C\<return\s*\%#','nbW')
-      return 0
-    endif
-    if search('\*\/\_s*\%#','bW') && synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment'
-      call searchpair('\/\*','','\*\/','bW')
+  let l:ln = line('.')
+  if search('\S','bW')
+    let char = getline('.')[col('.')-1]
+    let pchar = getline('.')[col('.')-2]
+    let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
+    if pchar . char == '*/' && syn =~? 'comment'
+      if !search('\/\*','bW') || !search('\S','bW')
+        return 1
+      endif
+      let char = getline('.')[col('.')-1]
+      let pchar = getline('.')[col('.')-2]
+      let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
     endif
-    if search('\S','bW')
-      let char = getline(line('.'))[col('.')-1]
-      if char =~# '\l'
-        return expand('<cword>') !~#
-              \ '^\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$'
-      elseif char == '>'
-        return search('=\%#','bW') || synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise'
-      elseif char == ':'
-        return strpart(getline(line('.')),0,col('.')) =~# s:expr_case . '$'
-      elseif char == '{'
-        return s:IsBlock()
-      else
-        return char !~# '[-=~!<*+,./?^%|&\[(]'
+    if syn =~? '\%(xml\|jsx\)'
+      return char != '{'
+    elseif char =~# '\l'
+      if line('.') == l:ln && expand('<cword>') ==# 'return'
+        return 0
       endif
+      return index(split('const let import export yield default delete var void typeof throw new in instanceof')
+            \ , expand('<cword>')) < 0
+    elseif char == '>'
+      return pchar == '=' || syn =~? '^jsflow'
+    elseif char == ':'
+      return strpart(getline('.'),0,col('.')) =~# s:expr_case . '$'
     else
-      return 1
+      return stridx('-=~!<*+,/?^%|&([',char) < 0
     endif
+  else
+    return 1
   endif
 endfunction
 
@@ -160,7 +153,7 @@ endfunction
 function s:PrevCodeLine(lnum)
   let l:lnum = prevnonblank(a:lnum)
   while l:lnum
-    if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
+    if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"`]'),0),'name') !~? s:syng_strcom
       return l:lnum
     endif
     let l:lnum = prevnonblank(l:lnum - 1)
@@ -169,33 +162,30 @@ endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
-  let [open_0,open_2,open_4] = [0,0,0]
+  let l:open = 0
   let l:line = getline(a:lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
     if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
-      let idx = stridx('(){}[]', l:line[pos])
-      if !(idx % 2)
-        let open_{idx} += 1
+      if stridx('[({',l:line[pos]) + 1
+        let l:open += 1
       else
-        let open_{idx - 1} -= 1
-        if open_{idx - 1} < 0
+        let l:open -= 1
+        if l:open < 0
           return 0
         endif
       endif
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)
   endwhile
-  return !(open_4 || open_2 || open_0)
+  return !l:open
 endfunction
 
 function GetJavascriptIndent()
   try
     let save_magic = &magic
     set magic
-  if !exists('b:js_cache')
-    let b:js_cache = [0,0,0]
-  endif
+  let b:js_cache = get(b:,'js_cache',[0,0,0])
   " Get the current line.
   let l:line = getline(v:lnum)
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
@@ -211,76 +201,84 @@ function GetJavascriptIndent()
     return -1
   endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)
-  if l:lnum == 0
+  if !l:lnum
     return 0
   endif
 
   let l:line = substitute(l:line,'^\s*\%(\/\*.\{-}\*\/\s*\)*','','')
 
-  if l:line =~# '^' . s:expr_case
-    let cpo_switch = &cpo
-    set cpo+=%
-    let ind = cindent(v:lnum)
-    let &cpo = cpo_switch
-    return ind
-  endif
-
-  " the containing paren, bracket, curly. Memoize, last lineNr either has the
-  " same scope or starts a new one, unless if it closed a scope.
+  " the containing paren, bracket, curly. Many hacks for performance
   call cursor(v:lnum,1)
-  if getline(l:lnum) !~ '^\S'
+  let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
+  if indent(l:lnum)
     let [s:looksyn,s:free] = [v:lnum - 1,1]
     if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
           \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
-      let num = b:js_cache[1]
-    elseif l:line =~ '^[])}]'
-      let id = stridx('])}',l:line[0])
-      let num = s:GetPair(escape('[({'[id],'['), escape('])}'[id],']'),'bW','s:skip_func(s:looksyn)',2000)
-    elseif syns != '' && getline(v:lnum)[0] =~ '\s'
-      let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
-            \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
-      let num = s:GetPair(pattern[0],pattern[1],'bW','s:skip_func(s:looksyn)',2000)
+      call call('cursor',b:js_cache[1:])
+    elseif idx + 1
+      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000)
+    elseif indent(v:lnum) && syns =~? 'block'
+      call s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
     else
-      let num = s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
+      call s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
     endif
   else
-    let num = s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
+    call s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
   endif
 
-  let num = (num > 0) * num
-  if l:line =~ '^[])}]'
-    return !!num * indent(num)
+  if idx + 1
+    if idx == 2 && search('\S','bW',line('.')) && getline('.')[col('.')-1] == ')'
+      call s:GetPair('(',')','bW',s:skip_expr,200)
+    endif
+    return indent(line('.'))
   endif
-  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
-  call cursor(v:lnum,1)
-  if l:line =~# '^while\>' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,num + 1) > 0
-    return indent(line('.'))
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : [line('.'),col('.')])
+  let num = b:js_cache[1]
+
+  let [s:W, pline, isOp, stmt, bL, switch_offset] = [s:sw(), s:Trim(l:lnum),0,0,0,0]
+  if num 
+    if getline('.')[col('.')-1] == '{'
+      if search(')\_s*\%#','bW')
+        let stmt = 1
+        if s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')
+          let switch_offset = &cino !~ ':' || !has('float') ? s:W :
+                \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
+          if l:line =~# '^' . s:expr_case
+            return indent(num) + switch_offset
+          endif
+          let stmt = pline !~# s:expr_case . '$'
+        endif
+      elseif s:IsBlock()
+        let stmt = 1
+      endif
+    endif
+  else
+    let stmt = 1
   endif
 
-  let s:W = s:sw()
-  let pline = s:Trimline(l:lnum)
-  call cursor(b:js_cache[1],b:js_cache[2])
-  let switch_offset = !num || !(search(')\_s*\%#','bW') &&
-        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')) ? 0 :
-        \ &cino !~ ':' || !has('float') ? s:W :
-        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
+  if stmt
+    call cursor(v:lnum,1)
+    if l:line =~# '^while\>' && s:GetPair('\C\<do\>','\C\<while\>','bW',s:skip_expr . '|| !s:IsBlock()',100,num + 1) > 0
+      return indent(line('.'))
+    endif
+    let isOp = l:line =~# s:opfirst || pline =~# s:continuation
+    let bL = s:iscontOne(l:lnum,num,isOp)
+    let bL -= (bL && l:line[0] == '{') * s:W
+  endif
 
-  " most significant, find the indent amount
-  let isOp = l:line =~# g:javascript_opfirst || pline !~# s:expr_case . '$' && pline =~# g:javascript_continuation
-  let bL = s:iscontOne(l:lnum,num,isOp)
-  let bL -= (bL && l:line =~ '^{') * s:W
-  if isOp && (!num || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
+  " main return
+  if isOp
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL
   endif
   return bL
+  
   finally
     let &magic = save_magic
   endtry
 endfunction
 
-
 let &cpo = s:cpo_save
 unlet s:cpo_save