From 07c8a7f4c91012e23322f3203acf32fd87c13891 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 7 Nov 2016 20:10:17 -0800
Subject: [PATCH 1/2] remove es6 semi-less do-while handling

---
 indent/javascript.vim | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a5f8cf0f..d3cc594f 100644
--- 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

From 7a1aff004f721df6ffc964c3c4d64196a5f0377e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 7 Nov 2016 20:24:14 -0800
Subject: [PATCH 2/2] part 2nd

---
 indent/javascript.vim | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d3cc594f..83bc204e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -247,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