From e314f4e56766447392eb8487f7b558045d142648 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Sep 2016 00:46:17 -0700
Subject: [PATCH 1/6] small script function changes

---
 indent/javascript.vim | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4dbf5d88..37da82e0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -72,11 +72,10 @@ let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 let g:javascript_continuation .= s:line_term
 
 function s:OneScope(lnum,text,add)
-  return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
-        \ ((a:add && a:text =~ s:line_pre . '$' && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
-        \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
-        \ s:GetPair('(', ')', 'cbW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
-        \ (a:add || ((expand('<cword>') !=# 'while' || !s:GetPair('\C\<do\>', '\C\<while\>','nbW',100)) &&
+  return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' : search(
+        \ '\%' . (a:add && a:text =~ s:line_pre . '$' ? s:PrevCodeLine(a:lnum - 1) : a:lnum) . 'l)' . s:line_term) &&
+        \ s:GetPair('(', ')', 'bW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
+        \ (a:add || ((expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',100) <= 0) &&
         \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')))) ? expand('<cword>') : ''
 endfunction
 
@@ -84,7 +83,7 @@ endfunction
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
         \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
-        \ (!search('\%({\|:\zs\)\_s*\%#','bW') || search(s:expr_case . '\%#' ,'nbW') || s:IsBlock())
+        \ (search(s:expr_case . '\_s*\%#','nbW') || search('{\_s*\%#','bW') && s:IsBlock())
 endfunction
 
 " Auxiliary Functions {{{2

From 0f52afa5a98e0a2b4f69452a317904544e6dc0ee Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Sep 2016 01:49:23 -0700
Subject: [PATCH 2/6] Update javascript.vim

---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 37da82e0..9780c4cc 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
         \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
-        \ (search(s:expr_case . '\_s*\%#','nbW') || search('{\_s*\%#','bW') && s:IsBlock())
+        \ (search(s:expr_case . '\_s*\%#','nbW') || !search('{\_s*\%#','bW') || s:IsBlock())
 endfunction
 
 " Auxiliary Functions {{{2

From 1935a3c27919da3b5aba3ad94e34d243021a406a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Sep 2016 14:09:47 -0700
Subject: [PATCH 3/6] Update javascript.vim

---
 indent/javascript.vim | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9780c4cc..888f9da9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,12 +71,12 @@ endif
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 let g:javascript_continuation .= s:line_term
 
-function s:OneScope(lnum,text,add)
-  return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' : search(
-        \ '\%' . (a:add && a:text =~ s:line_pre . '$' ? s:PrevCodeLine(a:lnum - 1) : a:lnum) . 'l)' . s:line_term) &&
+function s:OneScope(lnum,text)
+  return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
+        \ search('\%' . a:lnum . 'l)' . s:line_term,'bW') &&
         \ s:GetPair('(', ')', 'bW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
-        \ (a:add || ((expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',100) <= 0) &&
-        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')))) ? expand('<cword>') : ''
+        \ ((expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',100) <= 0) &&
+        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW'))) ? expand('<cword>') : ''
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -173,14 +173,16 @@ function GetJavascriptIndent()
   endif
 
   let pline = substitute(substitute(getline(l:lnum),s:expr_case,'\=repeat(" ",strlen(submatch(0)))',''), '\%(:\@<!\/\/.*\)$', '','')
-  let switch_offset = num <= 0 || s:OneScope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) !=# 'switch' ? 0 :
-        \ &cino !~ ':' || !has('float') ?  s:sw() :
+  call cursor(b:js_cache[1],b:js_cache[2])
+  let switch_offset = num <= 0 || !(search(')\_s*\%#','bW') &&
+        \ s:GetPair('(', ')', 'bW', 100) > 0 && search('\C\<switch\_s*\%#','bW')) ? 0 :
+        \ &cino !~ ':' || !has('float') ? s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
   let isOp = l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation
   if isOp && (num <= 0 || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock()) ||
-        \ s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
+        \ s:OneScope(l:lnum,pline) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
         \ l:line !~ s:line_pre . '{'
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0

From 665f3bb90f285e72cc8f9d633b1c17e238e19282 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Sep 2016 14:12:33 -0700
Subject: [PATCH 4/6] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 888f9da9..8223c669 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -75,8 +75,8 @@ function s:OneScope(lnum,text)
   return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
         \ search('\%' . a:lnum . 'l)' . s:line_term,'bW') &&
         \ s:GetPair('(', ')', 'bW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
-        \ ((expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',100) <= 0) &&
-        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW'))) ? expand('<cword>') : ''
+        \ (expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',100) <= 0) &&
+        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')) ? expand('<cword>') : ''
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader

From 17e8ae9dbb3e0c14717c3544cbf1fae038eff877 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Sep 2016 16:15:40 -0700
Subject: [PATCH 5/6] Update javascript.vim

---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8223c669..d4ddf346 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
         \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
-        \ (search(s:expr_case . '\_s*\%#','nbW') || !search('{\_s*\%#','bW') || s:IsBlock())
+        \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock())
 endfunction
 
 " Auxiliary Functions {{{2

From 89383eb3d30248751875752c98b80cacd468b7ea Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Sep 2016 21:03:35 -0700
Subject: [PATCH 6/6] Update javascript.vim

---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d4ddf346..faf592b3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,7 +73,7 @@ let g:javascript_continuation .= s:line_term
 
 function s:OneScope(lnum,text)
   return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
-        \ search('\%' . a:lnum . 'l)' . s:line_term,'bW') &&
+        \ cursor(a:lnum, match(' ' . a:text, ')' . s:line_term)) > -1 &&
         \ s:GetPair('(', ')', 'bW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
         \ (expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',100) <= 0) &&
         \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')) ? expand('<cword>') : ''