remove es6 semi-less do-while handling (pangloss#698)

bounceme · web-flow · commit 74f6d46f7bfa · 2016-11-07T21:04:14.000-08:00
diff --git a/indent/javascript.vim b/indent/javascript.vim
@@ -112,12 +112,6 @@ function s:iscontOne(i,num,cont)
   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:Trim(l:i))
-        if s:token() ==# 'while' &&
-              \ 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
-        endif
         let bL += s:W
         let [l:cont, l:i] = [0, line('.')]
       elseif !l:cont
@@ -253,10 +247,6 @@ function GetJavascriptIndent()
   endif
 
   if stmt || !num
-    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
