From 2f3935516d1aea7dc3fbd9a45efec4ba9f0b6d50 Mon Sep 17 00:00:00 2001
From: DrSlump <drslump@pollinimini.net>
Date: Mon, 19 Sep 2011 22:55:46 +0200
Subject: [PATCH 0001/1043] Modified syntax groups regular expressions

Instead of targetting the regular expressions to very specific syntax
groups (ie: javaScriptDocComment), which make the indent script not
compatible with other syntaxes (ie: jsComment), more generic versions
are used which should still match the same groups by using case
insensitive search and shorter patterns (string, regex and comment).
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b34deee4..dfe2d076 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -33,13 +33,13 @@ set cpo&vim
 " ============
 
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'javaScript\%(String\|RegexpString\|CommentTodo\|LineComment\|Comment\|DocComment\)'
+let s:syng_strcom = 'string\|regex\|comment\c'
 
 " Regex of syntax group names that are strings.
-let s:syng_string = 'javaScript\%(RegexpString\)'
+let s:syng_string = 'regex\c'
 
 " Regex of syntax group names that are strings or documentation.
-let s:syng_stringdoc = 'javaScriptDocComment\|javaScriptComment'
+let s:syng_stringdoc = 'comment\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."'"

From 395f8901b34cc871c9576886938a6efda0eb7268 Mon Sep 17 00:00:00 2001
From: Darrick Wiebe <dw@xnlogic.com>
Date: Fri, 10 Aug 2012 15:19:42 -0400
Subject: [PATCH 0002/1043] Fix bug in a method that is apparently not called
 very often (if ever)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 173c51b3..09200b28 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -159,7 +159,7 @@ 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(line)
+  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.

From 5da54c4095b973cddb80b4114e4570b52599dba3 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Tue, 19 Feb 2013 11:20:06 -0800
Subject: [PATCH 0003/1043] Adds syntax for Identifiers in labeled statements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    { $: 'now this label has syntax highlighting' }

Using this RegExp `[a-zA-Z_$][0-9a-zA-Z_$\-]`
instead of just checking for `\w`.

Although it doesn't cover the full range of characters an Identifier
can be it does work for the 98%.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 126c3211..e3ee90c5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -78,7 +78,7 @@ syntax region  javaScriptRegexpCharClass start=+\[+ end=+\]+ contained
 syntax region  javaScriptRegexpString   start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=javaScriptSpecial,javaScriptRegexpCharClass,@htmlPreproc oneline
 syntax match   javaScriptNumber         /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax match   javaScriptFloat          /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   javaScriptLabel          /\<\w\+\(\s*:\)\@=/
+syntax match   javaScriptLabel          /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
 
 "" JavaScript Prototype
 syntax keyword javaScriptPrototype      prototype

From 08c5b1f572d5671432ca0894b0459596c0bfedc9 Mon Sep 17 00:00:00 2001
From: Darrick Wiebe <dw@xnlogic.com>
Date: Tue, 19 Feb 2013 17:43:34 -0500
Subject: [PATCH 0004/1043] Update README.md

---
 README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 280af92d..be63dbdd 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,21 @@ JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
 > Indentation of javascript in vim is terrible, and this is the very end of it.
 
-## Feature
+## Maintainer(s) wanted
+
+This project does not get too much love because, frankly I don't use JS all that
+much anymore. This project's maintenance isn't much work, but it would be helpful to
+everyone if one or two people would evaluate pull requests and merge them if they're
+good.  There are also a couple of valid issues that have been filed that would make
+lots of people happy if they were addressed.  Plus it might be good if someone updated
+the script on vim.org occasionally.  By the way, I'd be happy to put more effort into
+helping a new maintainer get going than what I put in actually maintaining the project
+myself. If you're interested, please comment on issue #65.
+
+Cheers!
+Darrick
+
+## Features
 
 1. very correct indentation for javascript
 2. support javascript indentation in html (provided by [lepture](https://github.com/lepture))

From ba4f29212bca38ce38bc393c6bec33483b7b2df7 Mon Sep 17 00:00:00 2001
From: Darrick Wiebe <dw@xnlogic.com>
Date: Tue, 19 Feb 2013 17:44:06 -0500
Subject: [PATCH 0005/1043] linkify

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index be63dbdd..157c5142 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ good.  There are also a couple of valid issues that have been filed that would m
 lots of people happy if they were addressed.  Plus it might be good if someone updated
 the script on vim.org occasionally.  By the way, I'd be happy to put more effort into
 helping a new maintainer get going than what I put in actually maintaining the project
-myself. If you're interested, please comment on issue #65.
+myself. If you're interested, please comment on issue [#65](https://github.com/pangloss/vim-javascript/issues/65).
 
 Cheers!
 Darrick

From d28b72d6cc0f1de34d4eab08ca7e5cef8e36750a Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Tue, 19 Feb 2013 20:50:02 -0800
Subject: [PATCH 0006/1043] Adds new maintainer info. Removes trailing
 whitespace

---
 README.md             | 14 --------------
 indent/javascript.vim |  2 +-
 syntax/javascript.vim | 10 ++++------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 157c5142..efc1ec60 100644
--- a/README.md
+++ b/README.md
@@ -4,20 +4,6 @@ JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
 > Indentation of javascript in vim is terrible, and this is the very end of it.
 
-## Maintainer(s) wanted
-
-This project does not get too much love because, frankly I don't use JS all that
-much anymore. This project's maintenance isn't much work, but it would be helpful to
-everyone if one or two people would evaluate pull requests and merge them if they're
-good.  There are also a couple of valid issues that have been filed that would make
-lots of people happy if they were addressed.  Plus it might be good if someone updated
-the script on vim.org occasionally.  By the way, I'd be happy to put more effort into
-helping a new maintainer get going than what I put in actually maintaining the project
-myself. If you're interested, please comment on issue [#65](https://github.com/pangloss/vim-javascript/issues/65).
-
-Cheers!
-Darrick
-
 ## Features
 
 1. very correct indentation for javascript
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 09200b28..77b8b112 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -116,7 +116,7 @@ function s:GetMSL(lnum, in_one_line_scope)
       " 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 
+      if a:in_one_line_scope
 	break
       end
       let msl_one_line = s:Match(lnum, s:one_line_scope_regex)
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e3ee90c5..16119cd7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,10 +1,8 @@
 " Vim syntax file
 " Language:     JavaScript
-" Maintainer:   Yi Zhao (ZHAOYI) <zzlinux AT hotmail DOT com>
-" Last Change By: Marc Harter
-" Last Change:  February 18, 2011
+" Maintainer:   Josh Perez <josh at goatslacker.com>
 " Version:      0.7.9
-" Changes:      Updates JSDoc syntax
+" URL:          https://github.com/pangloss/vim-javascript
 "
 " TODO:
 "  - Add the HTML syntax inside the JSDoc
@@ -85,7 +83,7 @@ syntax keyword javaScriptPrototype      prototype
 
 "" Program Keywords
 syntax keyword javaScriptSource         import export
-syntax keyword javaScriptType           const undefined var void yield 
+syntax keyword javaScriptType           const undefined var void yield
 syntax keyword javaScriptOperator       delete new in instanceof let typeof
 syntax keyword javaScriptBoolean        true false
 syntax keyword javaScriptNull           null
@@ -158,7 +156,7 @@ syntax cluster javaScriptExpression2 contains=javaScriptComment,javaScriptLineCo
 syntax cluster javaScriptAll       contains=@javaScriptExpression2,javaScriptLabel,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptTernaryIf
 syntax region  javaScriptBracket   matchgroup=javaScriptBracket transparent start="\[" end="\]" contains=@javaScriptAll,javaScriptParensErrB,javaScriptParensErrC,javaScriptBracket,javaScriptParen,javaScriptBlock,@htmlPreproc
 syntax region  javaScriptParen     matchgroup=javaScriptParen   transparent start="("  end=")"  contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrC,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc
-syntax region  javaScriptBlock     matchgroup=javaScriptBlock   transparent start="{"  end="}"  contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc 
+syntax region  javaScriptBlock     matchgroup=javaScriptBlock   transparent start="{"  end="}"  contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc
 syntax region  javaScriptTernaryIf matchgroup=javaScriptTernaryIfOperator start=+?+  end=+:+  contains=@javaScriptExpression2
 
 "" catch errors caused by wrong parenthesis

From 7fab32d952dc41ee0b066fd7dba4880f98f93da5 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Thu, 21 Feb 2013 00:29:38 -0800
Subject: [PATCH 0007/1043] Adds CommonJS keywords to syntax highlighting

---
 syntax/javascript.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 16119cd7..4ad91221 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -83,6 +83,7 @@ syntax keyword javaScriptPrototype      prototype
 
 "" Program Keywords
 syntax keyword javaScriptSource         import export
+syntax keyword javaScriptCommonJS       require module exports
 syntax keyword javaScriptType           const undefined var void yield
 syntax keyword javaScriptOperator       delete new in instanceof let typeof
 syntax keyword javaScriptBoolean        true false
@@ -229,6 +230,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink javaScriptLabel                Label
   HiLink javaScriptSpecial              Special
   HiLink javaScriptSource               Special
+  HiLink javaScriptCommonJS             Define
   HiLink javaScriptGlobalObjects        Special
   HiLink javaScriptExceptions           Special
 

From 8c82cf076321048ef6cd1e68bcb7ecb61466da22 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Thu, 21 Feb 2013 11:10:24 -0800
Subject: [PATCH 0008/1043] Moves CommonJS from Define to Include

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4ad91221..c03e6dfc 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -230,7 +230,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink javaScriptLabel                Label
   HiLink javaScriptSpecial              Special
   HiLink javaScriptSource               Special
-  HiLink javaScriptCommonJS             Define
+  HiLink javaScriptCommonJS             Include
   HiLink javaScriptGlobalObjects        Special
   HiLink javaScriptExceptions           Special
 

From 4ff3b73b8067fdd65f9512ad3ec11d7f7d659fa7 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 25 Feb 2013 12:29:33 -0800
Subject: [PATCH 0009/1043] Allows CommonJS syntax inside function blocks

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c03e6dfc..2a8d08a1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -153,7 +153,7 @@ endif "DOM/HTML/CSS
 
 "" Code blocks
 " there is a name collision with javaScriptExpression in html.vim, hence the use of the '2' here
-syntax cluster javaScriptExpression2 contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptStringD,javaScriptStringS,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptSource,javaScriptThis,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFunction,javaScriptGlobalObjects,javaScriptExceptions,javaScriptFutureKeys,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation,javaScriptBracket,javaScriptParen,javaScriptBlock,javaScriptParenError
+syntax cluster javaScriptExpression2 contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptStringD,javaScriptStringS,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptSource,javaScriptCommonJS,javaScriptThis,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFunction,javaScriptGlobalObjects,javaScriptExceptions,javaScriptFutureKeys,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation,javaScriptBracket,javaScriptParen,javaScriptBlock,javaScriptParenError
 syntax cluster javaScriptAll       contains=@javaScriptExpression2,javaScriptLabel,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptTernaryIf
 syntax region  javaScriptBracket   matchgroup=javaScriptBracket transparent start="\[" end="\]" contains=@javaScriptAll,javaScriptParensErrB,javaScriptParensErrC,javaScriptBracket,javaScriptParen,javaScriptBlock,@htmlPreproc
 syntax region  javaScriptParen     matchgroup=javaScriptParen   transparent start="("  end=")"  contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrC,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc

From f62100276e9518e7dd11aff12c6717e4003ffec6 Mon Sep 17 00:00:00 2001
From: Mathieu Quinette <hickop@gmail.com>
Date: Tue, 5 Mar 2013 17:33:38 +0100
Subject: [PATCH 0010/1043] Do not treat line comments with cindent.

---
 indent/javascript.vim | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 83e06901..481be853 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -41,6 +41,9 @@ let s:syng_string = 'regex\c'
 " Regex of syntax group names that are strings or documentation.
 let s:syng_multiline = 'comment\c'
 
+" Regex of syntax group names that are line comment.
+let s:syng_linecom = 'linecomment'
+
 " 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."'"
 
@@ -76,6 +79,11 @@ function s:IsInMultilineComment(lnum, col)
   return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
 endfunction
 
+" Check if the character at lnum:col is a line comment.
+function s:IsLineComment(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_linecom
+endfunction
+
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevNonBlankNonString(lnum)
   let in_block = 0
@@ -244,7 +252,7 @@ function GetJavascriptIndent()
   endif
 
   " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1)
+  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
 

From 4fe01683794105f5eddfbd3ae113d87aa800f7ce Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Tue, 5 Mar 2013 19:00:19 -0800
Subject: [PATCH 0011/1043] Renames javaScript to js

This is to avoid name collisions
and also for brevity

This diff also does some style formatting
---
 syntax/javascript.vim | 275 +++++++++++++++++++++---------------------
 1 file changed, 136 insertions(+), 139 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 2a8d08a1..a9a6266f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -28,12 +28,12 @@ setlocal iskeyword+=$
 syntax sync fromstart
 
 "" JavaScript comments
-syntax keyword javaScriptCommentTodo    TODO FIXME XXX TBD contained
-syntax region  javaScriptLineComment    start=+\/\/+ end=+$+ keepend contains=javaScriptCommentTodo,@Spell
-syntax region  javaScriptEnvComment     start="\%^#!" end="$" display
-syntax region  javaScriptLineComment    start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=javaScriptCommentTodo,@Spell fold
-syntax region  javaScriptCvsTag         start="\$\cid:" end="\$" oneline contained
-syntax region  javaScriptComment        start="/\*"  end="\*/" contains=javaScriptCommentTodo,javaScriptCvsTag,@Spell fold
+syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
+syntax region  jsLineComment    start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell
+syntax region  jsEnvComment     start="\%^#!" end="$" display
+syntax region  jsLineComment    start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell fold
+syntax region  jsCvsTag         start="\$\cid:" end="\$" oneline contained
+syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold
 
 "" JSDoc / JSDoc Toolkit
 if !exists("javascript_ignore_javaScriptdoc")
@@ -43,25 +43,25 @@ if !exists("javascript_ignore_javaScriptdoc")
   "syntax include @javaHtml <sfile>:p:h/html.vim
   "unlet b:current_syntax
 
-  syntax region javaScriptDocComment      matchgroup=javaScriptComment start="/\*\*\s*"  end="\*/" contains=javaScriptDocTags,javaScriptCommentTodo,javaScriptCvsTag,@javaScriptHtml,@Spell fold
+  syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  javaScriptDocTags         contained "@\(augments\|base\|borrows\|class\|constructs\|default\|exception\|exports\|extends\|file\|member\|memberOf\|methodOf\|module\|name\|namespace\|optional\|requires\|title\|throws\|version\)\>" nextgroup=javaScriptDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(augments\|base\|borrows\|class\|constructs\|default\|exception\|exports\|extends\|file\|member\|memberOf\|methodOf\|module\|name\|namespace\|optional\|requires\|title\|throws\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
-  syntax match  javaScriptDocTags         contained "@\(argument\|param\|property\)\>" nextgroup=javaScriptDocType skipwhite
+  syntax match  jsDocTags         contained "@\(argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
-  syntax match  javaScriptDocTags         contained "@\(type\|return\|returns\|api\)\>" nextgroup=javaScriptDocTypeNoParam skipwhite
+  syntax match  jsDocTags         contained "@\(type\|return\|returns\|api\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references
-  syntax match  javaScriptDocTags         contained "@\(lends\|link\|see\)\>" nextgroup=javaScriptDocSeeTag skipwhite
+  syntax match  jsDocTags         contained "@\(lends\|link\|see\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  javaScriptDocTags         contained "@\(access\|addon\|alias\|author\|beta\|constant\|const\|constructor\|copyright\|deprecated\|description\|event\|example\|exec\|field\|fileOverview\|fileoverview\|function\|global\|ignore\|inner\|license\|overview\|private\|protected\|project\|public\|readonly\|since\|static\)\>"
+  syntax match  jsDocTags         contained "@\(access\|addon\|alias\|author\|beta\|constant\|const\|constructor\|copyright\|deprecated\|description\|event\|example\|exec\|field\|fileOverview\|fileoverview\|function\|global\|ignore\|inner\|license\|overview\|private\|protected\|project\|public\|readonly\|since\|static\)\>"
 
-  syntax region javaScriptDocType         start="{" end="}" oneline contained nextgroup=javaScriptDocParam skipwhite
-  syntax match  javaScriptDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=javaScriptDocParam skipwhite
-  syntax region javaScriptDocTypeNoParam  start="{" end="}" oneline contained
-  syntax match  javaScriptDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  javaScriptDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\)\+"
-  syntax region javaScriptDocSeeTag       contained matchgroup=javaScriptDocSeeTag start="{" end="}" contains=javaScriptDocTags
+  syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
+  syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+  syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
+  syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+  syntax match  jsDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\)\+"
+  syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
   syntax case match
 endif   "" JSDoc end
@@ -69,52 +69,52 @@ endif   "" JSDoc end
 syntax case match
 
 "" Syntax in the JavaScript code
-syntax match   javaScriptSpecial        "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\."
-syntax region  javaScriptStringD        start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=javaScriptSpecial,@htmlPreproc
-syntax region  javaScriptStringS        start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=javaScriptSpecial,@htmlPreproc
-syntax region  javaScriptRegexpCharClass start=+\[+ end=+\]+ contained
-syntax region  javaScriptRegexpString   start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=javaScriptSpecial,javaScriptRegexpCharClass,@htmlPreproc oneline
-syntax match   javaScriptNumber         /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
-syntax match   javaScriptFloat          /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   javaScriptLabel          /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
+syntax match   jsSpecial         "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\."
+syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc
+syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc
+syntax region  jsRegexpCharClass start=+\[+ end=+\]+ contained
+syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,@htmlPreproc oneline
+syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
+syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
 
 "" JavaScript Prototype
-syntax keyword javaScriptPrototype      prototype
+syntax keyword jsPrototype      prototype
 
 "" Program Keywords
-syntax keyword javaScriptSource         import export
-syntax keyword javaScriptCommonJS       require module exports
-syntax keyword javaScriptType           const undefined var void yield
-syntax keyword javaScriptOperator       delete new in instanceof let typeof
-syntax keyword javaScriptBoolean        true false
-syntax keyword javaScriptNull           null
-syntax keyword javaScriptThis           this
+syntax keyword jsSource         import export
+syntax keyword jsCommonJS       require module exports
+syntax keyword jsType           const undefined var void yield
+syntax keyword jsOperator       delete new in instanceof let typeof
+syntax keyword jsBoolean        true false
+syntax keyword jsNull           null
+syntax keyword jsThis           this
 
 "" Statement Keywords
-syntax keyword javaScriptConditional    if else
-syntax keyword javaScriptRepeat         do while for
-syntax keyword javaScriptBranch         break continue switch case default return
-syntax keyword javaScriptStatement      try catch throw with finally
+syntax keyword jsConditional    if else
+syntax keyword jsRepeat         do while for
+syntax keyword jsBranch         break continue switch case default return
+syntax keyword jsStatement      try catch throw with finally
 
-syntax keyword javaScriptGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number NaN Object Packages RegExp String Undefined java netscape sun
+syntax keyword jsGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number NaN Object Packages RegExp String Undefined java netscape sun
 
-syntax keyword javaScriptExceptions     Error EvalError RangeError ReferenceError SyntaxError TypeError URIError
+syntax keyword jsExceptions     Error EvalError RangeError ReferenceError SyntaxError TypeError URIError
 
-syntax keyword javaScriptFutureKeys     abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws goto private transient debugger implements protected volatile double import public
+syntax keyword jsFutureKeys     abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws goto private transient debugger implements protected volatile double import public
 
 "" DOM/HTML/CSS specified things
 
   " DOM2 Objects
-  syntax keyword javaScriptGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
-  syntax keyword javaScriptExceptions     DOMException
+  syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
+  syntax keyword jsExceptions     DOMException
 
   " DOM2 CONSTANT
-  syntax keyword javaScriptDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
-  syntax keyword javaScriptDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
+  syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
+  syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
 
   " HTML events and internal variables
   syntax case ignore
-  syntax keyword javaScriptHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
+  syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
   syntax case match
 
 " Follow stuff should be highligh within a special context
@@ -123,28 +123,28 @@ syntax keyword javaScriptFutureKeys     abstract enum int short boolean export i
 if exists("javascript_enable_domhtmlcss")
 
     " DOM2 things
-    syntax match javaScriptDomElemAttrs     contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/
-    syntax match javaScriptDomElemFuncs     contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=javaScriptParen skipwhite
+    syntax match jsDomElemAttrs     contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/
+    syntax match jsDomElemFuncs     contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=jsParen skipwhite
     " HTML things
-    syntax match javaScriptHtmlElemAttrs    contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/
-    syntax match javaScriptHtmlElemFuncs    contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=javaScriptParen skipwhite
+    syntax match jsHtmlElemAttrs    contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/
+    syntax match jsHtmlElemFuncs    contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=jsParen skipwhite
 
     " CSS Styles in JavaScript
-    syntax keyword javaScriptCssStyles      contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition
-    syntax keyword javaScriptCssStyles      contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition
-    syntax keyword javaScriptCssStyles      contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode
-    syntax keyword javaScriptCssStyles      contained bottom height left position right top width zIndex
-    syntax keyword javaScriptCssStyles      contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout
-    syntax keyword javaScriptCssStyles      contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop
-    syntax keyword javaScriptCssStyles      contained listStyle listStyleImage listStylePosition listStyleType
-    syntax keyword javaScriptCssStyles      contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat
-    syntax keyword javaScriptCssStyles      contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType
-    syntax keyword javaScriptCssStyles      contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText
-    syntax keyword javaScriptCssStyles      contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor
+    syntax keyword jsCssStyles      contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition
+    syntax keyword jsCssStyles      contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition
+    syntax keyword jsCssStyles      contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode
+    syntax keyword jsCssStyles      contained bottom height left position right top width zIndex
+    syntax keyword jsCssStyles      contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout
+    syntax keyword jsCssStyles      contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop
+    syntax keyword jsCssStyles      contained listStyle listStyleImage listStylePosition listStyleType
+    syntax keyword jsCssStyles      contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat
+    syntax keyword jsCssStyles      contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType
+    syntax keyword jsCssStyles      contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText
+    syntax keyword jsCssStyles      contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor
 
     " Highlight ways
-    syntax match javaScriptDotNotation      "\." nextgroup=javaScriptPrototype,javaScriptDomElemAttrs,javaScriptDomElemFuncs,javaScriptHtmlElemAttrs,javaScriptHtmlElemFuncs
-    syntax match javaScriptDotNotation      "\.style\." nextgroup=javaScriptCssStyles
+    syntax match jsDotNotation      "\." nextgroup=jsPrototype,jsDomElemAttrs,jsDomElemFuncs,jsHtmlElemAttrs,jsHtmlElemFuncs
+    syntax match jsDotNotation      "\.style\." nextgroup=jsCssStyles
 
 endif "DOM/HTML/CSS
 
@@ -152,34 +152,33 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-" there is a name collision with javaScriptExpression in html.vim, hence the use of the '2' here
-syntax cluster javaScriptExpression2 contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptStringD,javaScriptStringS,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptSource,javaScriptCommonJS,javaScriptThis,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFunction,javaScriptGlobalObjects,javaScriptExceptions,javaScriptFutureKeys,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation,javaScriptBracket,javaScriptParen,javaScriptBlock,javaScriptParenError
-syntax cluster javaScriptAll       contains=@javaScriptExpression2,javaScriptLabel,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptTernaryIf
-syntax region  javaScriptBracket   matchgroup=javaScriptBracket transparent start="\[" end="\]" contains=@javaScriptAll,javaScriptParensErrB,javaScriptParensErrC,javaScriptBracket,javaScriptParen,javaScriptBlock,@htmlPreproc
-syntax region  javaScriptParen     matchgroup=javaScriptParen   transparent start="("  end=")"  contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrC,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc
-syntax region  javaScriptBlock     matchgroup=javaScriptBlock   transparent start="{"  end="}"  contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc
-syntax region  javaScriptTernaryIf matchgroup=javaScriptTernaryIfOperator start=+?+  end=+:+  contains=@javaScriptExpression2
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsSource,jsCommonJS,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError
+syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsStatement,jsTernaryIf
+syntax region  jsBracket    matchgroup=jsBracket transparent start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
+syntax region  jsParen      matchgroup=jsParen   transparent start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBlock      matchgroup=jsBlock   transparent start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 
 "" catch errors caused by wrong parenthesis
-syntax match   javaScriptParensError    ")\|}\|\]"
-syntax match   javaScriptParensErrA     contained "\]"
-syntax match   javaScriptParensErrB     contained ")"
-syntax match   javaScriptParensErrC     contained "}"
+syntax match   jsParensError    ")\|}\|\]"
+syntax match   jsParensErrA     contained "\]"
+syntax match   jsParensErrB     contained ")"
+syntax match   jsParensErrC     contained "}"
 
 if main_syntax == "javascript"
   syntax sync clear
-  syntax sync ccomment javaScriptComment minlines=200
-  syntax sync match javaScriptHighlight grouphere javaScriptBlock /{/
+  syntax sync ccomment jsComment minlines=200
+  syntax sync match jsHighlight grouphere jsBlock /{/
 endif
 
 "" Fold control
 if exists("b:javascript_fold")
-    syntax match   javaScriptFunction       /\<function\>/ nextgroup=javaScriptFuncName skipwhite
-    syntax match   javaScriptOpAssign       /=\@<!=/ nextgroup=javaScriptFuncBlock skipwhite skipempty
-    syntax region  javaScriptFuncName       contained matchgroup=javaScriptFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=javaScriptLineComment,javaScriptComment nextgroup=javaScriptFuncBlock skipwhite skipempty
-    syntax region  javaScriptFuncBlock      contained matchgroup=javaScriptFuncBlock start="{" end="}" contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock fold
+    syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite
+    syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
+    syntax region  jsFuncName       contained matchgroup=jsFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=jsLineComment,jsComment nextgroup=jsFuncBlock skipwhite skipempty
+    syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
 else
-    syntax keyword javaScriptFunction       function
+    syntax keyword jsFunction       function
 endif
 
 " Define the default highlighting.
@@ -192,73 +191,71 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   else
     command -nargs=+ HiLink hi def link <args>
   endif
-  HiLink javaScriptComment              Comment
-  HiLink javaScriptLineComment          Comment
-  HiLink javaScriptEnvComment           PreProc
-  HiLink javaScriptDocComment           Comment
-  HiLink javaScriptCommentTodo          Todo
-  HiLink javaScriptCvsTag               Function
-  HiLink javaScriptDocTags              Special
-  HiLink javaScriptDocSeeTag            Function
-  HiLink javaScriptDocType              Type
-  HiLink javaScriptDocTypeNoParam       Type
-  HiLink javaScriptDocParam             Label
-  HiLink javaScriptStringS              String
-  HiLink javaScriptStringD              String
-  HiLink javaScriptTernaryIfOperator    Conditional
-  HiLink javaScriptRegexpString         String
-  HiLink javaScriptRegexpCharClass      Character
-  HiLink javaScriptCharacter            Character
-  HiLink javaScriptPrototype            Type
-  HiLink javaScriptConditional          Conditional
-  HiLink javaScriptBranch               Conditional
-  HiLink javaScriptRepeat               Repeat
-  HiLink javaScriptStatement            Statement
-  HiLink javaScriptFunction             Function
-  HiLink javaScriptError                Error
-  HiLink javaScriptParensError          Error
-  HiLink javaScriptParensErrA           Error
-  HiLink javaScriptParensErrB           Error
-  HiLink javaScriptParensErrC           Error
-  HiLink javaScriptOperator             Operator
-  HiLink javaScriptType                 Type
-  HiLink javaScriptThis                 Type
-  HiLink javaScriptNull                 Type
-  HiLink javaScriptNumber               Number
-  HiLink javaScriptFloat                Number
-  HiLink javaScriptBoolean              Boolean
-  HiLink javaScriptLabel                Label
-  HiLink javaScriptSpecial              Special
-  HiLink javaScriptSource               Special
-  HiLink javaScriptCommonJS             Include
-  HiLink javaScriptGlobalObjects        Special
-  HiLink javaScriptExceptions           Special
-
-  HiLink javaScriptDomErrNo             Constant
-  HiLink javaScriptDomNodeConsts        Constant
-  HiLink javaScriptDomElemAttrs         Label
-  HiLink javaScriptDomElemFuncs         PreProc
-
-  HiLink javaScriptHtmlEvents           Special
-  HiLink javaScriptHtmlElemAttrs        Label
-  HiLink javaScriptHtmlElemFuncs        PreProc
-
-  HiLink javaScriptCssStyles            Label
+  HiLink jsComment              Comment
+  HiLink jsLineComment          Comment
+  HiLink jsEnvComment           PreProc
+  HiLink jsDocComment           Comment
+  HiLink jsCommentTodo          Todo
+  HiLink jsCvsTag               Function
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  HiLink jsStringS              String
+  HiLink jsStringD              String
+  HiLink jsTernaryIfOperator    Conditional
+  HiLink jsRegexpString         String
+  HiLink jsRegexpCharClass      Character
+  HiLink jsCharacter            Character
+  HiLink jsPrototype            Type
+  HiLink jsConditional          Conditional
+  HiLink jsBranch               Conditional
+  HiLink jsRepeat               Repeat
+  HiLink jsStatement            Statement
+  HiLink jsFunction             Function
+  HiLink jsError                Error
+  HiLink jsParensError          Error
+  HiLink jsParensErrA           Error
+  HiLink jsParensErrB           Error
+  HiLink jsParensErrC           Error
+  HiLink jsOperator             Operator
+  HiLink jsType                 Type
+  HiLink jsThis                 Type
+  HiLink jsNull                 Type
+  HiLink jsNumber               Number
+  HiLink jsFloat                Number
+  HiLink jsBoolean              Boolean
+  HiLink jsLabel                Label
+  HiLink jsSpecial              Special
+  HiLink jsSource               Special
+  HiLink jsCommonJS             Include
+  HiLink jsGlobalObjects        Special
+  HiLink jsExceptions           Special
+
+  HiLink jsDomErrNo             Constant
+  HiLink jsDomNodeConsts        Constant
+  HiLink jsDomElemAttrs         Label
+  HiLink jsDomElemFuncs         PreProc
+
+  HiLink jsHtmlEvents           Special
+  HiLink jsHtmlElemAttrs        Label
+  HiLink jsHtmlElemFuncs        PreProc
+
+  HiLink jsCssStyles            Label
 
   delcommand HiLink
 endif
 
 " Define the htmlJavaScript for HTML syntax html.vim
 "syntax clear htmlJavaScript
-"syntax clear javaScriptExpression
-syntax cluster  htmlJavaScript contains=@javaScriptAll,javaScriptBracket,javaScriptParen,javaScriptBlock,javaScriptParenError
-syntax cluster  javaScriptExpression contains=@javaScriptAll,javaScriptBracket,javaScriptParen,javaScriptBlock,javaScriptParenError,@htmlPreproc
+"syntax clear jsExpression
+syntax cluster  htmlJavaScript       contains=@jsAll,jsBracket,jsParen,jsBlock,jsParenError
+syntax cluster  javaScriptExpression contains=@jsAll,jsBracket,jsParen,jsBlock,jsParenError,@htmlPreproc
 " Vim's default html.vim highlights all javascript as 'Special'
-hi! def link javaScript NONE
+hi! def link javaScript              NONE
 
 let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
   unlet main_syntax
 endif
-
-" vim: ts=4

From 5bfea9bd0c600224124d36084e9c5e2dab41903f Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Tue, 5 Mar 2013 19:02:14 -0800
Subject: [PATCH 0012/1043] Adds futurekeys to syntax highlighting

---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a9a6266f..4890a12e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -232,6 +232,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsCommonJS             Include
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special
+  HiLink jsFutureKeys           Special
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From bf639702485e32db84edd49244f5f9dbce29baa0 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Tue, 5 Mar 2013 19:46:04 -0800
Subject: [PATCH 0013/1043] Fixes whitespace nits in indent file

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 83e06901..5efe3d74 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,10 +1,6 @@
 " Vim indent file
-" Language:		Javascript
-" Maintainer:		Darrick Wiebe <darrick at innatesoftware.com>
-" URL:			http://github.com/pangloss/vim-javascript
-" Version:              1.0.0
-" Last Change:          August 31, 2009
-" Acknowledgement:      Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
+" Language: Javascript
+" Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
 
 " 0. Initialization {{{1
 " =================
@@ -117,11 +113,11 @@ function s:GetMSL(lnum, in_one_line_scope)
       " flag in_one_line_scope is set to 1
       "
       if a:in_one_line_scope
-	break
+        break
       end
       let msl_one_line = s:Match(lnum, s:one_line_scope_regex)
       if msl_one_line == 0
-	break
+        break
       endif
     endif
     let lnum = s:PrevNonBlankNonString(lnum - 1)
@@ -202,7 +198,7 @@ function s:ExitingOneLineScope(lnum)
     else
       let prev_msl = s:GetMSL(msl - 1, 1)
       if s:Match(prev_msl, s:one_line_scope_regex)
-	return prev_msl
+        return prev_msl
       endif
     endif
   endif
@@ -325,6 +321,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-" vim:set sw=2 sts=2 ts=8 noet:
-

From c6cf517c7f8e3ff9defcdcdb724ef7c65f4bef41 Mon Sep 17 00:00:00 2001
From: Mathieu Quinette <hickop@gmail.com>
Date: Thu, 7 Mar 2013 10:53:15 +0100
Subject: [PATCH 0014/1043] Correct the fix.

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 481be853..1521339e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -42,7 +42,7 @@ let s:syng_string = 'regex\c'
 let s:syng_multiline = 'comment\c'
 
 " Regex of syntax group names that are line comment.
-let s:syng_linecom = 'linecomment'
+let s:syng_linecom = 'linecomment\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."'"

From 4dee33f79486b805d566eaebe60f022f2af18ee6 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Thu, 7 Mar 2013 16:42:11 -0800
Subject: [PATCH 0015/1043] Adds multiple var indent and comma-first style

* Multiple variable indentation now possible thanks to the efforts of @utyf
  Some modifications were made to ensure that when coding without semicolons
  the indentation would be preserved/adjusted. Also multiline array, objects,
  and functions are now possible.

* Adds support for comma-first style indentation. Now when using comma-first
  style the indentation is automatically adjusted once you press the comma.
  The indentation will always dedent on carriage return.

Examples:

    var a = 1,
      b = 2,
      c = 3
    // dedents

    var a = 1
      , b = 2 // when pressing the comma it indents
      , c = 3
    // dedents

Fixes #53
---
 indent/javascript.vim | 108 ++++++++++++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 36 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 61796781..e0cc13ac 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -15,7 +15,7 @@ setlocal nosmartindent
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal indentkeys=0{,0},0),0],!^F,o,O,e
+setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
 
 " Only define the function once.
 if exists("*GetJavascriptIndent")
@@ -55,7 +55,9 @@ let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 let s:block_regex = '\%({\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
 " Var string
-let s:var_regex = '\s*var\s[^;]\+$'
+let s:var_regex = '\s*var\(.*\),$'
+
+let s:comma_first = '^\s*,'
 
 " 2. Auxiliary Functions {{{1
 " ======================
@@ -128,48 +130,55 @@ function s:GetMSL(lnum, in_one_line_scope)
   return msl
 endfunction
 
+function s:RemoveTrailingComments(content)
+  let single = '\/\/\(.*\)\s*$'
+  let multi = '\/\*\(.*\)\*\/\s*$'
+  return substitute(substitute(a:content, single, '', ''), multi, '', '')
+endfunction
+
 " Find if the string is inside var statement (but not the first string)
 function s:InVarStatement(lnum)
-    let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-    
-    while lnum > 0
-        let line = getline(lnum)
-
-        " if line has var statement, return it's number
-        if ( line =~ s:var_regex )
-            return lnum
-        endif
+  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
 
-        " if line has brackets or semi-colon, return 0
-        if ( line =~ '[{};]' )
-            return 0
-        endif
+  while lnum > 0
+    let line = getline(lnum)
 
-        let lnum = s:PrevNonBlankNonString(lnum - 1)
-    endwhile
+    " if line has var statement, return its number
+    if (line =~ s:var_regex)
+      return lnum
+    endif
 
-    return 0
+    let lnum = s:PrevNonBlankNonString(lnum - 1)
+  endwhile
+
+  return 0
 endfunction
 
 " Find line above with beginning of the var statement or returns 0 if it's not
 " this statement
 function s:GetVarIndent(lnum)
-    let lvar = s:InVarStatement(a:lnum)
-    let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
-    let prev_lvar = s:InVarStatement(prev_lnum)
+  let lvar = s:InVarStatement(a:lnum)
+  let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
+  let prev_lvar = s:InVarStatement(prev_lnum)
 
-    if ( lvar )
-        return indent(lvar) + &sw 
-    endif
+  if (lvar)
+    let line = s:RemoveTrailingComments(getline(prev_lnum))
 
-    if ( prev_lvar )
-        return indent(prev_lvar)
+    " if the line doesn't end in a comma, return to regular indent
+    if (line !~ ',\s*$')
+      return indent(lvar)
+    else
+      return indent(lvar) + &sw
     endif
+  endif
+
+  if (prev_lvar)
+    return indent(prev_lvar)
+  endif
 
-    return 'null'
-    
+  return 'null'
 endfunction
-        
+
 
 " Check if line 'lnum' has more opening brackets than closing ones.
 function s:LineHasOpeningBrackets(lnum)
@@ -264,16 +273,39 @@ function GetJavascriptIndent()
   " 3.2. Work on the current line {{{2
   " -----------------------------
 
+  let ind = -1
   " Get the current line.
   let line = getline(v:lnum)
-  let ind = -1
+  " previous nonblank line number
+  let prevline = prevnonblank(v:lnum - 1)
 
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
   " others we indent to the containing line's MSL's level.  Return -1 if fail.
-  let col = matchend(line, '^\s*[]})]')
+  let col = matchend(line, '^\s*[],})]')
   if col > 0 && !s:IsInStringOrComment(v:lnum, col)
     call cursor(v:lnum, col)
+
+    let lvar = s:InVarStatement(v:lnum)
+    if lvar
+      let prevline_contents = s:RemoveTrailingComments(getline(prevline))
+
+      " check for comma first
+      if (line[col - 1] =~ ',')
+        " if the previous line ends in comma or semicolon don't indent
+        if (prevline_contents =~ '[;,]\s*$')
+          return indent(s:GetMSL(line('.'), 0))
+        " get previous line indent, if it's comma first return prevline indent
+        elseif (prevline_contents =~ s:comma_first)
+          return indent(prevline)
+        " otherwise we indent 1 level
+        else
+          return indent(prevline) + &sw
+        endif
+      endif
+    endif
+
+
     let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
     if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
       if line[col-1]==')' && col('.') != col('$') - 1
@@ -285,12 +317,17 @@ function GetJavascriptIndent()
     return ind
   endif
 
+  " If the line is comma first, dedent 1 level
+  if (getline(prevline) =~ s:comma_first)
+    return indent(prevline) - &sw
+  endif
+
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
 
-  " Work with var statements' blocks
+  " Check for multiple var assignments
   let var_indent = s:GetVarIndent(v:lnum)
   if var_indent != 'null'
     return var_indent
@@ -302,16 +339,15 @@ function GetJavascriptIndent()
   " 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 ' */'.
-  let nonblank_lnum = prevnonblank(v:lnum - 1)
-  if line =~ '^\s*$' && s:IsInMultilineComment(nonblank_lnum, 1)
-    return indent(nonblank_lnum) - 1
+  if line =~ '^\s*$' && s:IsInMultilineComment(prevline, 1)
+    return indent(prevline) - 1
   endif
 
   " Find a non-blank, non-multi-line string line above the current line.
   let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
   " If the line is empty and inside a string, use the previous line.
-  if line =~ '^\s*$' && lnum != nonblank_lnum
+  if line =~ '^\s*$' && lnum != prevline
     return indent(prevnonblank(v:lnum))
   endif
 

From 870ffca4738f0de1772291c580bb17f852ba36ce Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Thu, 7 Mar 2013 22:07:18 -0800
Subject: [PATCH 0016/1043] Fixes some cases of multiple var indentation

* Syntax fix
* Indent 2 (twice) for vars

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2b90114c..2a6b33df 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -176,7 +176,7 @@ function s:GetVarIndent(lnum)
     if (line !~ ',\s*$')
       return indent(lvar)
     else
-      return indent(lvar) + &sw
+      return indent(lvar) + &sw * 2
     endif
   endif
 
@@ -337,7 +337,7 @@ function GetJavascriptIndent()
 
   " Check for multiple var assignments
   let var_indent = s:GetVarIndent(v:lnum)
-  if var_indent != 'null'
+  if var_indent !~ 'null'
     return var_indent
   endif
 

From 57daa9e1ae0a61330d43e12f5e2b02318ad18e80 Mon Sep 17 00:00:00 2001
From: Joel Holdbrooks <cjholdbrooks@gmail.com>
Date: Mon, 11 Mar 2013 16:39:48 -0700
Subject: [PATCH 0017/1043] Add new regular expression syntax groups

This adds new syntax ids for matching boundaries, back references,
zero-width modifiers, quantifiers, and grouping.

Also, jsSpecial has been patched to support null and control characters.
---
 syntax/javascript.vim | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4890a12e..9a884ab7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -69,11 +69,18 @@ endif   "" JSDoc end
 syntax case match
 
 "" Syntax in the JavaScript code
-syntax match   jsSpecial         "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\."
+syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc
 syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc
 syntax region  jsRegexpCharClass start=+\[+ end=+\]+ contained
-syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,@htmlPreproc oneline
+syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
+syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained
+syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained
+syntax match   jsRegexpOr        "\v\<@!\|"
+syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
+syntax cluster jsRegexpSpecial   contains=jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
+syntax region  jsRegexpGroup     start="\\\@<!(" matchgroup=jsRegexGroup end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial
+syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
@@ -206,6 +213,12 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStringD              String
   HiLink jsTernaryIfOperator    Conditional
   HiLink jsRegexpString         String
+  HiLink jsRegexpBoundary       SpecialChar
+  HiLink jsRegexpQuantifier     SpecialChar
+  HiLink jsRegexpOr             Conditional
+  HiLink jsRegexpMod            SpecialChar
+  HiLink jsRegexpBackRef        SpecialChar
+  HiLink jsRegexpGroup          jsRegexpString
   HiLink jsRegexpCharClass      Character
   HiLink jsCharacter            Character
   HiLink jsPrototype            Type

From df6bed93b756e2637f880c0608f5ada41a97d271 Mon Sep 17 00:00:00 2001
From: Joel Holdbrooks <cjholdbrooks@gmail.com>
Date: Mon, 11 Mar 2013 20:02:00 -0700
Subject: [PATCH 0018/1043] Contain jsRegexpOr

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 9a884ab7..f9a199e1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -76,7 +76,7 @@ syntax region  jsRegexpCharClass start=+\[+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained
 syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained
-syntax match   jsRegexpOr        "\v\<@!\|"
+syntax match   jsRegexpOr        "\v\<@!\|" contained
 syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial   contains=jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup     start="\\\@<!(" matchgroup=jsRegexGroup end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial

From 079c5adec83df236ffe78a9b84a48ab698aef690 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Fri, 8 Mar 2013 17:36:00 -0800
Subject: [PATCH 0019/1043] Adds fixes for multi var indent for comma first

Also comments out the multi var indent
---
 indent/javascript.vim | 57 +++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2a6b33df..608257bf 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -28,6 +28,8 @@ set cpo&vim
 " 1. Variables {{{1
 " ============
 
+let s:js_keywords = '^\s*\(break\|case\|catch\|continue\|debugger\|default\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
+
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|regex\|comment\c'
 
@@ -57,10 +59,10 @@ let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 " Regex that defines blocks.
 let s:block_regex = '\%({\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
-" Var string
-let s:var_regex = '\s*var\(.*\),$'
+let s:var_stmt = '^\s*var'
 
 let s:comma_first = '^\s*,'
+let s:comma_last = ',\s*$'
 
 " 2. Auxiliary Functions {{{1
 " ======================
@@ -145,46 +147,53 @@ function s:RemoveTrailingComments(content)
 endfunction
 
 " Find if the string is inside var statement (but not the first string)
-function s:InVarStatement(lnum)
+function s:InMultiVarStatement(lnum)
   let lnum = s:PrevNonBlankNonString(a:lnum - 1)
 
+"  let type = synIDattr(synID(lnum, indent(lnum) + 1, 0), 'name')
+
+  " loop through previous expressions to find a var statement
   while lnum > 0
     let line = getline(lnum)
 
-    " if line has var statement, return its number
-    if (line =~ s:var_regex)
-      return lnum
+    " if the line is a js keyword
+    if (line =~ 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 (line =~ s:var_stmt)
+        return lnum
+      endif
+
+      " other js keywords, not a var
+      return 0
     endif
 
     let lnum = s:PrevNonBlankNonString(lnum - 1)
   endwhile
 
+  " beginning of program, not a var
   return 0
 endfunction
 
 " Find line above with beginning of the var statement or returns 0 if it's not
 " this statement
 function s:GetVarIndent(lnum)
-  let lvar = s:InVarStatement(a:lnum)
+  let lvar = s:InMultiVarStatement(a:lnum)
   let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
-  let prev_lvar = s:InVarStatement(prev_lnum)
 
-  if (lvar)
+  if lvar
     let line = s:RemoveTrailingComments(getline(prev_lnum))
 
-    " if the line doesn't end in a comma, return to regular indent
-    if (line !~ ',\s*$')
-      return indent(lvar)
+    " if the previous line doesn't end in a comma, return to regular indent
+    if (line !~ s:comma_last)
+      return indent(prev_lnum) - &sw
     else
-      return indent(lvar) + &sw * 2
+      return indent(lvar) + &sw
     endif
   endif
 
-  if (prev_lvar)
-    return indent(prev_lvar)
-  endif
-
-  return 'null'
+  return -1
 endfunction
 
 
@@ -294,7 +303,7 @@ function GetJavascriptIndent()
   if col > 0 && !s:IsInStringOrComment(v:lnum, col)
     call cursor(v:lnum, col)
 
-    let lvar = s:InVarStatement(v:lnum)
+    let lvar = s:InMultiVarStatement(v:lnum)
     if lvar
       let prevline_contents = s:RemoveTrailingComments(getline(prevline))
 
@@ -308,7 +317,7 @@ function GetJavascriptIndent()
           return indent(prevline)
         " otherwise we indent 1 level
         else
-          return indent(prevline) + &sw
+          return indent(lvar) + &sw
         endif
       endif
     endif
@@ -336,10 +345,10 @@ function GetJavascriptIndent()
   endif
 
   " Check for multiple var assignments
-  let var_indent = s:GetVarIndent(v:lnum)
-  if var_indent !~ 'null'
-    return var_indent
-  endif
+"  let var_indent = s:GetVarIndent(v:lnum)
+"  if var_indent >= 0
+"    return var_indent
+"  endif
 
   " 3.3. Work on the previous line. {{{2
   " -------------------------------

From 6049b8f79a23d391ff6d6712efd4ab551f8df51a Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 11 Mar 2013 18:36:00 -0700
Subject: [PATCH 0020/1043] Adds concealing to some JS statements

---
 syntax/javascript.vim | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4890a12e..38dd8535 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -87,13 +87,14 @@ syntax keyword jsCommonJS       require module exports
 syntax keyword jsType           const undefined var void yield
 syntax keyword jsOperator       delete new in instanceof let typeof
 syntax keyword jsBoolean        true false
-syntax keyword jsNull           null
-syntax keyword jsThis           this
+syntax keyword jsNull           null conceal cchar=ø
+syntax keyword jsThis           this conceal cchar=@
 
 "" Statement Keywords
 syntax keyword jsConditional    if else
 syntax keyword jsRepeat         do while for
-syntax keyword jsBranch         break continue switch case default return
+syntax keyword jsBranch         break continue switch case default
+syntax keyword jsReturn         return conceal cchar=⇚
 syntax keyword jsStatement      try catch throw with finally
 
 syntax keyword jsGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number NaN Object Packages RegExp String Undefined java netscape sun
@@ -153,7 +154,7 @@ endif "DOM/HTML/CSS
 
 "" Code blocks
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsSource,jsCommonJS,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError
-syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsStatement,jsTernaryIf
+syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf
 syntax region  jsBracket    matchgroup=jsBracket transparent start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParen   transparent start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
 syntax region  jsBlock      matchgroup=jsBlock   transparent start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -173,14 +174,16 @@ endif
 
 "" Fold control
 if exists("b:javascript_fold")
-    syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite
+    syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite conceal cchar=ƒ
     syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
     syntax region  jsFuncName       contained matchgroup=jsFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=jsLineComment,jsComment nextgroup=jsFuncBlock skipwhite skipempty
     syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
 else
-    syntax keyword jsFunction       function
+    syntax keyword jsFunction       function conceal cchar=ƒ
 endif
 
+
+
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -211,6 +214,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsPrototype            Type
   HiLink jsConditional          Conditional
   HiLink jsBranch               Conditional
+  HiLink jsReturn               Type
   HiLink jsRepeat               Repeat
   HiLink jsStatement            Statement
   HiLink jsFunction             Function

From 0329a2499cf158b526f06d1b55400abd90d2778b Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Wed, 13 Mar 2013 22:23:09 -0700
Subject: [PATCH 0021/1043] Makes the conceal syntax optional

To use syntax concealing one must now put this line in their `.vimrc`

    let g:javascript_conceal = 1

Fixes #72
---
 syntax/javascript.vim | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 38dd8535..af0d6538 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -16,6 +16,10 @@ if !exists("main_syntax")
   let main_syntax = 'javascript'
 endif
 
+if !exists('g:javascript_conceal')
+  let g:javascript_conceal = 0
+endif
+
 "" Drop fold if it is set but VIM doesn't support it.
 let b:javascript_fold='true'
 if version < 600    " Don't support the old version
@@ -87,14 +91,21 @@ syntax keyword jsCommonJS       require module exports
 syntax keyword jsType           const undefined var void yield
 syntax keyword jsOperator       delete new in instanceof let typeof
 syntax keyword jsBoolean        true false
-syntax keyword jsNull           null conceal cchar=ø
-syntax keyword jsThis           this conceal cchar=@
+
+if g:javascript_conceal == 1
+  syntax keyword jsNull           null conceal cchar=ø
+  syntax keyword jsThis           this conceal cchar=@
+  syntax keyword jsReturn         return conceal cchar=⇚
+else
+  syntax keyword jsNull           null
+  syntax keyword jsThis           this
+  syntax keyword jsReturn         return
+endif
 
 "" Statement Keywords
 syntax keyword jsConditional    if else
 syntax keyword jsRepeat         do while for
 syntax keyword jsBranch         break continue switch case default
-syntax keyword jsReturn         return conceal cchar=⇚
 syntax keyword jsStatement      try catch throw with finally
 
 syntax keyword jsGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number NaN Object Packages RegExp String Undefined java netscape sun
@@ -174,12 +185,21 @@ endif
 
 "" Fold control
 if exists("b:javascript_fold")
+  if g:javascript_conceal == 1
     syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite conceal cchar=ƒ
-    syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
-    syntax region  jsFuncName       contained matchgroup=jsFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=jsLineComment,jsComment nextgroup=jsFuncBlock skipwhite skipempty
-    syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
+  else
+    syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite
+  endif
+
+  syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
+  syntax region  jsFuncName       contained matchgroup=jsFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=jsLineComment,jsComment nextgroup=jsFuncBlock skipwhite skipempty
+  syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
 else
+  if g:javascript_conceal == 1
     syntax keyword jsFunction       function conceal cchar=ƒ
+  else
+    syntax keyword jsFunction       function
+  endif
 endif
 
 

From 22475fcbc630d8048885fbe2badbcbefb235f8d1 Mon Sep 17 00:00:00 2001
From: Hsiaoming Yang <me@lepture.com>
Date: Sun, 12 May 2013 00:34:50 +0800
Subject: [PATCH 0022/1043] detect javascript from shbang

---
 ftdetect/javascript.vim | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index 6ddc900d..805e1978 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -2,3 +2,10 @@ au BufNewFile,BufRead *.js setf javascript
 au BufNewFile,BufRead *.jsm setf javascript
 au BufNewFile,BufRead *.json setf javascript
 au BufNewFile,BufRead Jakefile setf javascript
+
+fun! s:SelectJavascript()
+  if getline(1) =~# '^#!.*/bin/env\s\+node\>'
+    set ft=javascript
+  endif
+endfun
+au BufNewFile,BufRead * call s:SelectJavascript()

From caaa7ee42b835b82513e43f46d72b39b6e9263ca Mon Sep 17 00:00:00 2001
From: Brian Arnold <brianarn@gmail.com>
Date: Wed, 22 May 2013 00:13:43 -0500
Subject: [PATCH 0023/1043] Fixing multiline differentiation, fixes #77

This patch is not directly mine, it is from @drslump on issue #77 - see https://github.com/pangloss/vim-javascript/issues/77#issuecomment-18255638 for details

In testing, this change works beautifully to fix #77
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 608257bf..e305fa9a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -79,7 +79,7 @@ endfunction
 
 " Check if the character at lnum:col is inside a multi-line comment.
 function s:IsInMultilineComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
+  return !IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
 endfunction
 
 " Check if the character at lnum:col is a line comment.

From 575602dca734330a6d8f8c7f0725de14ed6f7676 Mon Sep 17 00:00:00 2001
From: kevnchu <kevnchu@gmail.com>
Date: Fri, 7 Jun 2013 14:08:53 -0700
Subject: [PATCH 0024/1043] Fixed multiline comment indentation.

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e305fa9a..42966418 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -79,7 +79,7 @@ endfunction
 
 " Check if the character at lnum:col is inside a multi-line comment.
 function s:IsInMultilineComment(lnum, col)
-  return !IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
+  return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
 endfunction
 
 " Check if the character at lnum:col is a line comment.

From 169e10b1eab91d8028444e20c51002de52f81648 Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Wed, 19 Jun 2013 14:20:55 -0400
Subject: [PATCH 0025/1043] add jsdoc tags from jsdoc v3.2-dev

---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 36bc699e..857b088c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -50,15 +50,15 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(augments\|base\|borrows\|class\|constructs\|default\|exception\|exports\|extends\|file\|member\|memberOf\|methodOf\|module\|name\|namespace\|optional\|requires\|title\|throws\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(augments\|base\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|memberOf\|methodOf\|mixes\|module\|name\|namespace\|optional\|requires\|title\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
-  syntax match  jsDocTags         contained "@\(type\|return\|returns\|api\)\>" nextgroup=jsDocTypeNoParam skipwhite
+  syntax match  jsDocTags         contained "@\(callback\|enum\|external\|this\|type\|typedef\|return\|returns\|api\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references
   syntax match  jsDocTags         contained "@\(lends\|link\|see\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(access\|addon\|alias\|author\|beta\|constant\|const\|constructor\|copyright\|deprecated\|description\|event\|example\|exec\|field\|fileOverview\|fileoverview\|function\|global\|ignore\|inner\|license\|overview\|private\|protected\|project\|public\|readonly\|since\|static\)\>"
+  syntax match  jsDocTags         contained "@\(abstract\|access\|addon\|alias\|author\|beta\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|exec\|field\|fileOverview\|fileoverview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|project\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
 
   syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite

From 3f7a3e55040d8d62f6b5705fc5c48bb9655266d5 Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Wed, 19 Jun 2013 15:00:59 -0400
Subject: [PATCH 0026/1043] add missing @arg tag

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 857b088c..6dbb536e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -52,7 +52,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   " tags containing a param
   syntax match  jsDocTags         contained "@\(augments\|base\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|memberOf\|methodOf\|mixes\|module\|name\|namespace\|optional\|requires\|title\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
-  syntax match  jsDocTags         contained "@\(argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
+  syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
   syntax match  jsDocTags         contained "@\(callback\|enum\|external\|this\|type\|typedef\|return\|returns\|api\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references

From 67a7a2f955adcf6218047f620c740b1c5ac4378b Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Wed, 19 Jun 2013 15:08:01 -0400
Subject: [PATCH 0027/1043] remove deprecated jsdoc tags

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6dbb536e..b4d6fd7f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -50,15 +50,15 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(augments\|base\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|memberOf\|methodOf\|mixes\|module\|name\|namespace\|optional\|requires\|title\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|memberOf\|mixes\|module\|name\|namespace\|requires\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
-  syntax match  jsDocTags         contained "@\(callback\|enum\|external\|this\|type\|typedef\|return\|returns\|api\)\>" nextgroup=jsDocTypeNoParam skipwhite
+  syntax match  jsDocTags         contained "@\(callback\|enum\|external\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references
-  syntax match  jsDocTags         contained "@\(lends\|link\|see\)\>" nextgroup=jsDocSeeTag skipwhite
+  syntax match  jsDocTags         contained "@\(lends\|see\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|addon\|alias\|author\|beta\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|exec\|field\|fileOverview\|fileoverview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|project\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
+  syntax match  jsDocTags         contained "@\(abstract\|access\|alias\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|fileOverview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
 
   syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite

From 336c41eb062d55fdda475aaee71086482f40554b Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Wed, 19 Jun 2013 17:48:18 -0400
Subject: [PATCH 0028/1043] highlight the parameter of the @alias tag
 (back-incompat) version

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b4d6fd7f..7523559a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -50,7 +50,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|memberOf\|mixes\|module\|name\|namespace\|requires\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|memberOf\|mixes\|module\|name\|namespace\|requires\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
@@ -58,7 +58,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   " tags containing references
   syntax match  jsDocTags         contained "@\(lends\|see\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|alias\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|fileOverview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
+  syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|fileOverview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
 
   syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite

From 56dea5e123fb3111c505fc7de7ea108e76c2db21 Mon Sep 17 00:00:00 2001
From: Robin Allen <roblovski@gmail.com>
Date: Sun, 23 Jun 2013 13:04:29 +0100
Subject: [PATCH 0029/1043] Fix case where line ends with [ within (

The opening square bracket would be treated as if it were an argument to
a function call delimited by the enclosing parentheses.

This adds square brackets to the already-existing special case which
handles braces in this context.

Examples:

    1.

        var a = [
            x

        but:

        var a = ([
                  x

    2.

        var a = fn({ // braces already handled correctly
            x: y

        but:

        var a = fn([
                    x
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 42966418..09abd0c8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -57,7 +57,7 @@ let s:msl_regex = '\%([\\*+/.:([]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' . s:line_
 let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 
 " Regex that defines blocks.
-let s:block_regex = '\%({\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
+let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
 let s:var_stmt = '^\s*var'
 

From 873da1385d6d33483860ec6a6bd56879f6f61010 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 11:06:18 -0400
Subject: [PATCH 0030/1043] Remove `jsSource` and `jsCommonJS`; not part of
 JavaScript

---
 syntax/javascript.vim | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 36bc699e..2c9b419b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -93,8 +93,6 @@ syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
 syntax keyword jsPrototype      prototype
 
 "" Program Keywords
-syntax keyword jsSource         import export
-syntax keyword jsCommonJS       require module exports
 syntax keyword jsType           const undefined var void yield
 syntax keyword jsOperator       delete new in instanceof let typeof
 syntax keyword jsBoolean        true false
@@ -171,7 +169,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsSource,jsCommonJS,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf
 syntax region  jsBracket    matchgroup=jsBracket transparent start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParen   transparent start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -265,8 +263,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBoolean              Boolean
   HiLink jsLabel                Label
   HiLink jsSpecial              Special
-  HiLink jsSource               Special
-  HiLink jsCommonJS             Include
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special

From a4373e6f0293b74f92d8af500713247dd25594aa Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 10:55:37 -0400
Subject: [PATCH 0031/1043] Add `jsIdentifier`

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 2c9b419b..539d10e2 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -73,6 +73,7 @@ endif   "" JSDoc end
 syntax case match
 
 "" Syntax in the JavaScript code
+syntax match   jsIdentifier      /\k\+/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc
 syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc
@@ -169,7 +170,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf
 syntax region  jsBracket    matchgroup=jsBracket transparent start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParen   transparent start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -219,6 +220,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   else
     command -nargs=+ HiLink hi def link <args>
   endif
+  HiLink jsIdentifier           Identifier
   HiLink jsComment              Comment
   HiLink jsLineComment          Comment
   HiLink jsEnvComment           PreProc

From c59b387e05b8679d5267b9501fd668bf7a2eedb2 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 10:57:54 -0400
Subject: [PATCH 0032/1043] Add `jsFuncCall`

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 539d10e2..367499c1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -74,6 +74,7 @@ syntax case match
 
 "" Syntax in the JavaScript code
 syntax match   jsIdentifier      /\k\+/
+syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc
 syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc
@@ -170,7 +171,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf
 syntax region  jsBracket    matchgroup=jsBracket transparent start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParen   transparent start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -251,6 +252,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRepeat               Repeat
   HiLink jsStatement            Statement
   HiLink jsFunction             Function
+  HiLink jsFuncCall             Function
   HiLink jsError                Error
   HiLink jsParensError          Error
   HiLink jsParensErrA           Error

From dbf6adbe7427551365cb2c61f8e9bcbb0fa88625 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 10:59:49 -0400
Subject: [PATCH 0033/1043] Remove `-` from valid characters for `jsLabel`

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 367499c1..f46f588c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -89,7 +89,7 @@ syntax region  jsRegexpGroup     start="\\\@<!(" matchgroup=jsRegexGroup end="\\
 syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
+syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype

From c242ceecd073426d1ce137f279189c6e1abac64b Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 11:00:37 -0400
Subject: [PATCH 0034/1043] Link `jsLabel` to `Identifier` highlight group

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f46f588c..f6921f5e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -265,7 +265,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsNumber               Number
   HiLink jsFloat                Number
   HiLink jsBoolean              Boolean
-  HiLink jsLabel                Label
+  HiLink jsLabel                Identifier
   HiLink jsSpecial              Special
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special

From 80ee77bc7dc6e51ec78f4b6a72bccf6284eb0ec9 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 11:03:54 -0400
Subject: [PATCH 0035/1043] Add `jsNoise` so users can subdue noisy syntax
 clutter

---
 syntax/javascript.vim | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f6921f5e..30c43299 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -90,6 +90,7 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/
+syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype
@@ -172,10 +173,10 @@ endif "DOM/HTML/CSS
 
 "" Code blocks
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall
-syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf
-syntax region  jsBracket    matchgroup=jsBracket transparent start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
-syntax region  jsParen      matchgroup=jsParen   transparent start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsBlock      matchgroup=jsBlock   transparent start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise
+syntax region  jsBracket    matchgroup=Noise   start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
+syntax region  jsParen      matchgroup=Noise   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBlock      matchgroup=Noise   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 
 "" catch errors caused by wrong parenthesis
@@ -266,6 +267,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFloat                Number
   HiLink jsBoolean              Boolean
   HiLink jsLabel                Identifier
+  HiLink jsNoise                Noise
   HiLink jsSpecial              Special
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special

From 4fcf5ce57f4fa0807feebffe4f75a70fad562f21 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 11:09:43 -0400
Subject: [PATCH 0036/1043] Update `jsType` and `jsOperator`

- Move `void` and `yield` from `jsType` to `jsOperator`

- Remove `undefined` from `jsType`

- Add `jsUndefined` keyword; link to `Constant` highlight group

- Add logical / comparison / assignment operators to `jsOperator`
---
 syntax/javascript.vim | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 30c43299..c6ae3c0a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -96,18 +96,21 @@ syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 syntax keyword jsPrototype      prototype
 
 "" Program Keywords
-syntax keyword jsType           const undefined var void yield
-syntax keyword jsOperator       delete new in instanceof let typeof
+syntax keyword jsType           const var function
+syntax keyword jsOperator       delete new in instanceof let typeof void yield
+syntax match   jsOperator       /\(!\|||\|&&\|+\|-\|<\|>\|=\)/
 syntax keyword jsBoolean        true false
 
 if g:javascript_conceal == 1
   syntax keyword jsNull           null conceal cchar=ø
   syntax keyword jsThis           this conceal cchar=@
   syntax keyword jsReturn         return conceal cchar=⇚
+  syntax keyword jsUndefined      undefined conceal cchar=¿
 else
   syntax keyword jsNull           null
   syntax keyword jsThis           this
   syntax keyword jsReturn         return
+  syntax keyword jsUndefined      undefined
 endif
 
 "" Statement Keywords
@@ -172,7 +175,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise
 syntax region  jsBracket    matchgroup=Noise   start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=Noise   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -263,6 +266,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsType                 Type
   HiLink jsThis                 Type
   HiLink jsNull                 Type
+  HiLink jsUndefined            Constant
   HiLink jsNumber               Number
   HiLink jsFloat                Number
   HiLink jsBoolean              Boolean

From 71e9619b8b36c35a9e2b4896e3fe0625aa9b2440 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 11:14:35 -0400
Subject: [PATCH 0037/1043] Add `jsNan` keyword; link to `Constant` highlight
 group

---
 syntax/javascript.vim | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c6ae3c0a..256aaf5b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -106,11 +106,13 @@ if g:javascript_conceal == 1
   syntax keyword jsThis           this conceal cchar=@
   syntax keyword jsReturn         return conceal cchar=⇚
   syntax keyword jsUndefined      undefined conceal cchar=¿
+  syntax keyword jsNan            NaN conceal cchar=ℕ
 else
   syntax keyword jsNull           null
   syntax keyword jsThis           this
   syntax keyword jsReturn         return
   syntax keyword jsUndefined      undefined
+  syntax keyword jsNan            NaN
 endif
 
 "" Statement Keywords
@@ -119,7 +121,7 @@ syntax keyword jsRepeat         do while for
 syntax keyword jsBranch         break continue switch case default
 syntax keyword jsStatement      try catch throw with finally
 
-syntax keyword jsGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number NaN Object Packages RegExp String Undefined java netscape sun
+syntax keyword jsGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number Object Packages RegExp String Undefined java netscape sun
 
 syntax keyword jsExceptions     Error EvalError RangeError ReferenceError SyntaxError TypeError URIError
 
@@ -175,7 +177,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise
 syntax region  jsBracket    matchgroup=Noise   start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=Noise   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -266,6 +268,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsType                 Type
   HiLink jsThis                 Type
   HiLink jsNull                 Type
+  HiLink jsNan                  Constant
   HiLink jsUndefined            Constant
   HiLink jsNumber               Number
   HiLink jsFloat                Number

From fb677cd26a5a339615d8f3f503701fd763447040 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 11:18:32 -0400
Subject: [PATCH 0038/1043] Refactor
 `jsFunction`/`jsFuncName`/`jsFuncBlock`/`jsOpAssign`

- Fix messy nested logic regarding `b:javasript_fold` by moving some
  stuff out of if statements

- Change `jsFuncName` to match only the function name
---
 syntax/javascript.vim | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 256aaf5b..364cfd82 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -196,26 +196,19 @@ if main_syntax == "javascript"
   syntax sync match jsHighlight grouphere jsBlock /{/
 endif
 
-"" Fold control
-if exists("b:javascript_fold")
-  if g:javascript_conceal == 1
-    syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite conceal cchar=ƒ
-  else
-    syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite
-  endif
-
-  syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
-  syntax region  jsFuncName       contained matchgroup=jsFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=jsLineComment,jsComment nextgroup=jsFuncBlock skipwhite skipempty
-  syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
+if g:javascript_conceal == 1
+  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite conceal cchar=ƒ
 else
-  if g:javascript_conceal == 1
-    syntax keyword jsFunction       function conceal cchar=ƒ
-  else
-    syntax keyword jsFunction       function
-  endif
+  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite
 endif
 
+syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
+syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/
 
+"" Fold control
+if exists("b:javascript_fold")
+  syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
+endif
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From c7aabe2488bab9f5236fe829aaf6fdec73b1df8f Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 23 Jul 2013 11:20:36 -0400
Subject: [PATCH 0039/1043] Change highlight links to be more semantically
 correct

- `jsReturn` links to `Statement`

- `jsFunction` links to `Type`

- `jsFuncName` links to `Function`

- `jsThis` links to `Special`

- `jsNull` links to `Constant`
---
 syntax/javascript.vim | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 364cfd82..5bb808ac 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -247,10 +247,11 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsPrototype            Type
   HiLink jsConditional          Conditional
   HiLink jsBranch               Conditional
-  HiLink jsReturn               Type
+  HiLink jsReturn               Statement
   HiLink jsRepeat               Repeat
   HiLink jsStatement            Statement
-  HiLink jsFunction             Function
+  HiLink jsFunction             Type
+  HiLink jsFuncName             Function
   HiLink jsFuncCall             Function
   HiLink jsError                Error
   HiLink jsParensError          Error
@@ -259,9 +260,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParensErrC           Error
   HiLink jsOperator             Operator
   HiLink jsType                 Type
-  HiLink jsThis                 Type
-  HiLink jsNull                 Type
+  HiLink jsThis                 Special
   HiLink jsNan                  Constant
+  HiLink jsNull                 Constant
   HiLink jsUndefined            Constant
   HiLink jsNumber               Number
   HiLink jsFloat                Number

From df84f57564217dcb9ebd106afb3222a822a0867c Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 24 Jul 2013 14:59:51 -0400
Subject: [PATCH 0040/1043] Move jsNoise higher up

---
 syntax/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5bb808ac..b78139a2 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -31,6 +31,8 @@ setlocal iskeyword+=$
 
 syntax sync fromstart
 
+syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
+
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
 syntax region  jsLineComment    start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell
@@ -90,7 +92,6 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/
-syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype

From b53a6fdf386371cb78ee9ca1efdfbbc3b1f97b6d Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 24 Jul 2013 15:18:27 -0400
Subject: [PATCH 0041/1043] Refactor `Statement` family

- Reorder to match `:help :hi` list

- Move `try`, `catch`, `throw`, and `finally` to `jsException`

- Move `with`, `new`, and `in` to `jsKeyword`

- Rename `jsBranch` to `jsLabel`; remove old, unnecessary `jsLabel`

- Move `yield`, `break`, and `continue` to `jsStatement`

- Move `switch` to `jsConditional`
---
 syntax/javascript.vim | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b78139a2..a5fecaf1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -91,14 +91,13 @@ syntax region  jsRegexpGroup     start="\\\@<!(" matchgroup=jsRegexGroup end="\\
 syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsLabel           /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype
 
 "" Program Keywords
 syntax keyword jsType           const var function
-syntax keyword jsOperator       delete new in instanceof let typeof void yield
+syntax keyword jsOperator       delete instanceof typeof void
 syntax match   jsOperator       /\(!\|||\|&&\|+\|-\|<\|>\|=\)/
 syntax keyword jsBoolean        true false
 
@@ -117,10 +116,12 @@ else
 endif
 
 "" Statement Keywords
-syntax keyword jsConditional    if else
+syntax keyword jsStatement      yield break continue
+syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
-syntax keyword jsBranch         break continue switch case default
-syntax keyword jsStatement      try catch throw with finally
+syntax keyword jsLabel          case default
+syntax keyword jsKeyword        new in with
+syntax keyword jsException      try catch throw finally
 
 syntax keyword jsGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number Object Packages RegExp String Undefined java netscape sun
 
@@ -178,8 +179,8 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan
-syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan,jsKeyword
+syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=Noise   start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=Noise   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
 syntax region  jsBlock      matchgroup=Noise   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -248,9 +249,12 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsPrototype            Type
   HiLink jsConditional          Conditional
   HiLink jsBranch               Conditional
+  HiLink jsLabel                Label
   HiLink jsReturn               Statement
   HiLink jsRepeat               Repeat
   HiLink jsStatement            Statement
+  HiLink jsException            Exception
+  HiLink jsKeyword              Keyword
   HiLink jsFunction             Type
   HiLink jsFuncName             Function
   HiLink jsFuncCall             Function
@@ -268,7 +272,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsNumber               Number
   HiLink jsFloat                Number
   HiLink jsBoolean              Boolean
-  HiLink jsLabel                Identifier
   HiLink jsNoise                Noise
   HiLink jsSpecial              Special
   HiLink jsGlobalObjects        Special

From 16aedfcb35db46d5becf076681cfb4ea6a32b3e0 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 24 Jul 2013 15:25:40 -0400
Subject: [PATCH 0042/1043] Refactor `jsType`

- Add `Infinity` keyword to `jsType`

- Move `const` and `var` to `jsStorageClass`

- Add `let` to `jsStorageClass`

- Link `jsNan`, `jsNull`, and `jsUndefined` to `Type` (from `Constant`)
---
 syntax/javascript.vim | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a5fecaf1..f6ea94f0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -96,7 +96,8 @@ syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-
 syntax keyword jsPrototype      prototype
 
 "" Program Keywords
-syntax keyword jsType           const var function
+syntax keyword jsType           function Infinity
+syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void
 syntax match   jsOperator       /\(!\|||\|&&\|+\|-\|<\|>\|=\)/
 syntax keyword jsBoolean        true false
@@ -179,7 +180,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan,jsKeyword
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=Noise   start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=Noise   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -265,10 +266,11 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParensErrC           Error
   HiLink jsOperator             Operator
   HiLink jsType                 Type
+  HiLink jsStorageClass         StorageClass
   HiLink jsThis                 Special
-  HiLink jsNan                  Constant
-  HiLink jsNull                 Constant
-  HiLink jsUndefined            Constant
+  HiLink jsNan                  Type
+  HiLink jsNull                 Type
+  HiLink jsUndefined            Type
   HiLink jsNumber               Number
   HiLink jsFloat                Number
   HiLink jsBoolean              Boolean

From 7c24dbd9361999733bb9a8395f2ab0c40610f831 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 24 Jul 2013 15:27:51 -0400
Subject: [PATCH 0043/1043] Update global objects / builtin functions

---
 syntax/javascript.vim | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f6ea94f0..f4075cc5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -124,9 +124,12 @@ syntax keyword jsLabel          case default
 syntax keyword jsKeyword        new in with
 syntax keyword jsException      try catch throw finally
 
-syntax keyword jsGlobalObjects  Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number Object Packages RegExp String Undefined java netscape sun
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console JavaArray JavaClass JavaObject JavaPackage Packages java netscape sun
+syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
-syntax keyword jsExceptions     Error EvalError RangeError ReferenceError SyntaxError TypeError URIError
+syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
+
+syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 
 syntax keyword jsFutureKeys     abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws goto private transient debugger implements protected volatile double import public
 
@@ -180,7 +183,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=Noise   start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=Noise   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -247,7 +250,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRegexpGroup          jsRegexpString
   HiLink jsRegexpCharClass      Character
   HiLink jsCharacter            Character
-  HiLink jsPrototype            Type
+  HiLink jsPrototype            Special
   HiLink jsConditional          Conditional
   HiLink jsBranch               Conditional
   HiLink jsLabel                Label
@@ -279,6 +282,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special
+  HiLink jsBuiltins             Special
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From c7ffd1b35ffabbeb3bc40ff0dfc2365e21c6fc76 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 24 Jul 2013 15:29:40 -0400
Subject: [PATCH 0044/1043] Link `jsFloat` to `Float` (from `Number`)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f4075cc5..a7f2ee96 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -275,7 +275,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsNull                 Type
   HiLink jsUndefined            Type
   HiLink jsNumber               Number
-  HiLink jsFloat                Number
+  HiLink jsFloat                Float
   HiLink jsBoolean              Boolean
   HiLink jsNoise                Noise
   HiLink jsSpecial              Special

From 10e3c20280f0d7acff35165007b5203b6037aca4 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Thu, 25 Jul 2013 09:26:42 -0400
Subject: [PATCH 0045/1043] Add missing operators

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index cd09a190..bf221e3f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -99,7 +99,7 @@ syntax keyword jsPrototype      prototype
 syntax keyword jsType           function Infinity
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void
-syntax match   jsOperator       /\(!\|||\|&&\|+\|-\|<\|>\|=\)/
+syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBoolean        true false
 
 if g:javascript_conceal == 1

From 2a7d133d286a9cc0675f22de10c6aefccb6b26d1 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Thu, 25 Jul 2013 09:32:55 -0400
Subject: [PATCH 0046/1043] Move `Infinity` to `jsNumber` (from `jsType`)

---
 syntax/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index bf221e3f..f6e5b0f5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -90,13 +90,14 @@ syntax cluster jsRegexpSpecial   contains=jsRegexpBoundary,jsRegexpBackRef,jsReg
 syntax region  jsRegexpGroup     start="\\\@<!(" matchgroup=jsRegexGroup end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial
 syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
+syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype
 
 "" Program Keywords
-syntax keyword jsType           function Infinity
+syntax keyword jsType           function
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/

From 501ad5d1cec53dc2a9d2ce1bb89b593209a3d500 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Thu, 25 Jul 2013 09:49:12 -0400
Subject: [PATCH 0047/1043] Link `jsNan` to `Number`

- Paradoxically, `typeof NaN` returns `number`
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f6e5b0f5..a93ef614 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -272,7 +272,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsType                 Type
   HiLink jsStorageClass         StorageClass
   HiLink jsThis                 Special
-  HiLink jsNan                  Type
+  HiLink jsNan                  Number
   HiLink jsNull                 Type
   HiLink jsUndefined            Type
   HiLink jsNumber               Number

From 3a091a413a43efb21af78301088e2a5fe7e39c28 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Fri, 26 Jul 2013 14:09:39 -0700
Subject: [PATCH 0048/1043] Adds contributing guide to readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index efc1ec60..c7fdc4a4 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,12 @@ let g:html_indent_style1 = "inc"
 Head over to [vim.org](http://www.vim.org/scripts/script.php?script_id=2075)
 for more information.
 
+## Contributing
+
+If you'd like to be added as a contributor the price of admission is 1 pull request.
+Please follow the general code style guides (read the code) and in your pull request explain
+the reason for the proposed change and how it is valuable.
+
 ## Bug report
 
 Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).

From e193b66dc06c8ba0fc59521517d0d1ac5b0420bf Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 26 Jul 2013 14:46:26 -0700
Subject: [PATCH 0049/1043] Isolating curly/square brackets and parenthesis

This commit creates new highlight groups called jsBrackets, jsParens and
jsBlocks that can be used to individually highlight (), {}, and [].

They are all mapped back to the Noise group for consistency though.
---
 syntax/javascript.vim | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index cd09a190..65174b7a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -185,9 +185,9 @@ endif "DOM/HTML/CSS
 "" Code blocks
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
-syntax region  jsBracket    matchgroup=Noise   start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
-syntax region  jsParen      matchgroup=Noise   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsBlock      matchgroup=Noise   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBracket    matchgroup=jsBrackets start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
+syntax region  jsParen      matchgroup=jsParens   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBlock      matchgroup=jsBlocks   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 
 "" catch errors caused by wrong parenthesis
@@ -278,6 +278,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFloat                Float
   HiLink jsBoolean              Boolean
   HiLink jsNoise                Noise
+  HiLink jsBrackets             Noise
+  HiLink jsParens               Noise
+  HiLink jsBlocks               Noise
   HiLink jsSpecial              Special
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special

From 20742192112a9efc2ea99179b814e6f8dd8585b6 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Fri, 26 Jul 2013 09:58:32 -0400
Subject: [PATCH 0050/1043] Move program keywords above comments

- Otherwise, `jsOperator` trumps `jsComment` and `jsLineComment`
---
 syntax/javascript.vim | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a93ef614..c7d3b5d7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -33,6 +33,13 @@ syntax sync fromstart
 
 syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 
+"" Program Keywords
+syntax keyword jsType           function
+syntax keyword jsStorageClass   const var let
+syntax keyword jsOperator       delete instanceof typeof void
+syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
+syntax keyword jsBoolean        true false
+
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
 syntax region  jsLineComment    start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell
@@ -96,13 +103,6 @@ syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype
 
-"" Program Keywords
-syntax keyword jsType           function
-syntax keyword jsStorageClass   const var let
-syntax keyword jsOperator       delete instanceof typeof void
-syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
-syntax keyword jsBoolean        true false
-
 if g:javascript_conceal == 1
   syntax keyword jsNull           null conceal cchar=ø
   syntax keyword jsThis           this conceal cchar=@

From 93a465a6445cb8c4b5f8fecb35d0836d6658464f Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Mon, 29 Jul 2013 14:46:48 -0400
Subject: [PATCH 0051/1043] Add `document` and `window` to global objects

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7df949ee..d3444d6d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -125,7 +125,7 @@ syntax keyword jsLabel          case default
 syntax keyword jsKeyword        new in with
 syntax keyword jsException      try catch throw finally
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console JavaArray JavaClass JavaObject JavaPackage Packages java netscape sun
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console JavaArray JavaClass JavaObject JavaPackage Packages java netscape sun document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From 4d541965bf4f4b126c2667e80d620c9bdb4d2be3 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 30 Jul 2013 09:25:23 -0400
Subject: [PATCH 0052/1043] Remove `jsIdentifier`

- (At least) temporarily removed

- Controversial, unclear if it's the correct way to go

- Contact Bram / other heads of Vim development for clarity
---
 syntax/javascript.vim | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d3444d6d..7681b2b6 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -82,7 +82,6 @@ endif   "" JSDoc end
 syntax case match
 
 "" Syntax in the JavaScript code
-syntax match   jsIdentifier      /\k\+/
 syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc
@@ -184,7 +183,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsIdentifier,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=jsBrackets start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParens   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -227,7 +226,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   else
     command -nargs=+ HiLink hi def link <args>
   endif
-  HiLink jsIdentifier           Identifier
   HiLink jsComment              Comment
   HiLink jsLineComment          Comment
   HiLink jsEnvComment           PreProc

From e50319120a780afa530d5c752b12cf3119305df7 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 2 Aug 2013 17:40:18 -0700
Subject: [PATCH 0053/1043] Removing legacy globals

This commit removes some seemingly legacy globals, mostly specific to
Java.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7681b2b6..52433af4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -124,7 +124,7 @@ syntax keyword jsLabel          case default
 syntax keyword jsKeyword        new in with
 syntax keyword jsException      try catch throw finally
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console JavaArray JavaClass JavaObject JavaPackage Packages java netscape sun document window
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From 4c5cf643bafe3b5f3e9f33abf7996e483257c3c7 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Fri, 2 Aug 2013 22:16:16 -0700
Subject: [PATCH 0054/1043] Removes html indentation

---
 README.md       |  21 --
 indent/html.vim | 539 ------------------------------------------------
 2 files changed, 560 deletions(-)
 delete mode 100644 indent/html.vim

diff --git a/README.md b/README.md
index c7fdc4a4..9172a9d5 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,6 @@ JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
 > Indentation of javascript in vim is terrible, and this is the very end of it.
 
-## Features
-
-1. very correct indentation for javascript
-2. support javascript indentation in html (provided by [lepture](https://github.com/lepture))
-
 ## Installation
 
 - Install with [Vundle](https://github.com/gmarik/vundle)
@@ -31,22 +26,6 @@ If you prefer tpope's pathogen, that's ok. Just clone it:
     cd ~/.vim/bundle
     git clone https://github.com/pangloss/vim-javascript.git
 
-## Configuration
-
-[html indentation](http://www.vim.org/scripts/script.php?script_id=2075)
-provided by Andy Wokula is faster. But you need to make some configuration.
-
-Suggested configuration:
-
-```vim
-let g:html_indent_inctags = "html,body,head,tbody"
-let g:html_indent_script1 = "inc"
-let g:html_indent_style1 = "inc"
-```
-
-Head over to [vim.org](http://www.vim.org/scripts/script.php?script_id=2075)
-for more information.
-
 ## Contributing
 
 If you'd like to be added as a contributor the price of admission is 1 pull request.
diff --git a/indent/html.vim b/indent/html.vim
deleted file mode 100644
index 4e9dcfa6..00000000
--- a/indent/html.vim
+++ /dev/null
@@ -1,539 +0,0 @@
-" Vim indent script for HTML
-" General: "{{{
-" File: html.vim (Vimscript #2075)
-" Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change: 2012 Jun 05
-" Last Changed By: Hsiaoming Yang <lepture@me.com>
-" Version: 0.8
-" Vim Version: Vim7
-" Description:
-"   Improved version of the distributed html indent script, faster on a
-"   range of lines.
-"
-" Customization:
-"   This section is about variables you can set in your vimrc.
-"
-" - You can set the indent for the first line after <script> and <style>
-"   "blocktags" (default "zero"):
-"
-"   :let g:html_indent_script1 = "inc"
-"   :let g:html_indent_style1 = "inc"
-"
-"   VALUE MEANING
-"   "zero"  zero indent
-"   "auto"  auto indent (same indent as the blocktag)
-"   "inc"   auto indent + one indent step
-"
-" - Many tags increase the indent for what follows per default (see
-"   "Add Indent Tags" below in this script).  You can add further tags with
-"
-"   :let g:html_indent_inctags = "html,body,head,tbody"
-"
-"   You can also remove such tags with
-"
-"   :let g:html_indent_autotags = "th,td,tr,tfoot,thead"
-"
-"   Default value is empty for both variables.  Note: the initial "inctags"
-"   are only defined once per Vim session.
-"
-"   User variables are only read when the script is sourced.  To enable your
-"   changes during a session, you can manually do
-"   :call HtmlIndent_CheckUserSettings()
-"   if you don't want to reload the html file.
-"
-" Detail:
-"   Calculation of indent inside "blocktags" with "alien" content:
-"   BLOCKTAG   INDENT EXPR	    WHEN APPLICABLE
-"   <script> : {customizable}   if first line of block
-"     : cindent(v:lnum)  if attributes empty or contain "java"
-"     : -1    else (vbscript, tcl, ...)
-"   <style>  : {customizable}   if first line of block
-"     : GetCSSIndent()   else
-"   <!-- --> : -1
-"
-" Credits:
-"   indent/html.vim (2006 Jun 05) from J. Zellner
-"   indent/css.vim (2006 Dec 20) from N. Weibull
-"
-" History:
-"   2011 Sep 09   added HTML5 tags (thx to J. Zuckerman)
-"   2012 Jun 05   added JavaScript Indention (thx to Hsiaoming Yang)
-" }}}
-
-" Init Folklore, check user settings (2nd time ++) "{{{
-if exists("b:did_indent")
-  finish
-endif
-
-" Initial indent/javascript before set did_indent = 1
-ru! indent/javascript.vim
-
-let b:did_indent = 1
-
-setlocal indentexpr=HtmlIndent()
-setlocal indentkeys=o,O,<Return>,<>>,{,},!^F
-
-let b:indent = {"lnum": -1}
-let b:undo_indent = "set inde< indk<| unlet b:indent"
-
-" Load Once:
-if exists("*HtmlIndent")
-  call HtmlIndent_CheckUserSettings()
-  finish
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-"}}}
-
-func! HtmlIndent_CheckUserSettings() "{{{
-  if exists("g:html_indent_inctags")
-    call s:AddITags(split(g:html_indent_inctags, ","))
-  endif
-  if exists("g:html_indent_autotags")
-    call s:RemoveITags(split(g:html_indent_autotags, ","))
-  endif
-
-  let indone = {"zero": 0
-        \,"auto": "indent(prevnonblank(v:lnum-1))"
-        \,"inc": "b:indent.blocktagind + &shiftwidth"}
-  if exists("g:html_indent_script1")
-    let s:js1indent = get(indone, g:html_indent_script1, indone.zero)
-  endif
-  if exists("g:html_indent_style1")
-    let s:css1indent = get(indone, g:html_indent_style1, indone.zero)
-  endif
-endfunc "}}}
-
-" Init Script Vars  "{{{
-let s:usestate = 1
-let s:css1indent = 0
-let s:js1indent = 0
-" not to be changed:
-let s:endtags = [0,0,0,0,0,0,0,0]   " some places unused
-let s:newstate = {}
-let s:countonly = 0
-"}}}
-func! s:AddITags(taglist) "{{{
-  for itag in a:taglist
-    let s:indent_tags[itag] = 1
-    let s:indent_tags['/'.itag] = -1
-  endfor
-endfunc "}}}
-func! s:AddBlockTag(tag, id, ...) "{{{
-  if !(a:id >= 2 && a:id < 2+len(s:endtags))
-    return
-  endif
-  let s:indent_tags[a:tag] = a:id
-  if a:0 == 0
-    let s:indent_tags['/'.a:tag] = -a:id
-    let s:endtags[a:id-2] = "</".a:tag.">"
-  else
-    let s:indent_tags[a:1] = -a:id
-    let s:endtags[a:id-2] = a:1
-  endif
-endfunc "}}}
-func! s:RemoveITags(taglist) "{{{
-  " remove itags (protect blocktags from being removed)
-  for itag in a:taglist
-    if !has_key(s:indent_tags, itag) || s:indent_tags[itag] != 1
-      continue
-    endif
-    unlet s:indent_tags[itag]
-    if itag =~ '^\w\+$'
-      unlet s:indent_tags["/".itag]
-    endif
-  endfor
-endfunc "}}}
-" Add Indent Tags: {{{
-if !exists("s:indent_tags")
-  let s:indent_tags = {}
-endif
-
-" old tags:
-call s:AddITags(['a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
-      \ 'blockquote', 'button', 'caption', 'center', 'cite', 'code', 'colgroup',
-      \ 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font', 'form',
-      \ 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'i', 'iframe', 'ins', 'kbd',
-      \ 'label', 'legend', 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
-      \ 'optgroup', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
-      \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
-      \ 'tr', 'tfoot', 'thead'])
-
-" tags added 2011 Sep 09 (especially HTML5 tags):
-call s:AddITags(['area', 'article', 'aside', 'audio', 'bdi', 'canvas',
-      \ 'command', 'datalist', 'details', 'embed', 'figure', 'footer',
-      \ 'header', 'group', 'keygen', 'mark', 'math', 'meter', 'nav', 'output',
-      \ 'progress', 'ruby', 'section', 'svg', 'texture', 'time', 'video',
-      \ 'wbr', 'text'])
-
-"}}}
-" Add Block Tags: contain alien content "{{{
-call s:AddBlockTag('pre', 2)
-call s:AddBlockTag('script', 3)
-call s:AddBlockTag('style', 4)
-call s:AddBlockTag('<!--', 5, '-->')
-"}}}
-
-func! s:CountITags(...) "{{{
-
-  " relative indent steps for current line [unit &sw]:
-  let s:curind = 0
-  " relative indent steps for next line [unit &sw]:
-  let s:nextrel = 0
-
-  if a:0==0
-    let s:block = s:newstate.block
-    let tmpline = substitute(s:curline, '<\zs\/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
-    if s:block == 3
-      let s:newstate.scripttype = s:GetScriptType(matchstr(tmpline, '\C.*<SCRIPT\>\zs[^>]*'))
-    endif
-    let s:newstate.block = s:block
-  else
-    let s:block = 0		" assume starting outside of a block
-    let s:countonly = 1	" don't change state
-    let tmpline = substitute(s:altline, '<\zs\/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
-    let s:countonly = 0
-  endif
-endfunc "}}}
-func! s:CheckTag(itag) "{{{
-  " "tag" or "/tag" or "<!--" or "-->"
-  let ind = get(s:indent_tags, a:itag)
-  if ind == -1
-    " closing tag
-    if s:block != 0
-      " ignore itag within a block
-      return "foo"
-    endif
-    if s:nextrel == 0
-      let s:curind -= 1
-    else
-      let s:nextrel -= 1
-    endif
-    " if s:curind >= 1
-    "     let s:curind -= 1
-    " else
-    "     let s:nextrel -= 1
-    " endif
-  elseif ind == 1
-    " opening tag
-    if s:block != 0
-      return "foo"
-    endif
-    let s:nextrel += 1
-  elseif ind != 0
-    " block-tag (opening or closing)
-    return s:Blocktag(a:itag, ind)
-  endif
-  " else ind==0 (other tag found): keep indent
-  return "foo"   " no matter
-endfunc "}}}
-func! s:Blocktag(blocktag, ind) "{{{
-  if a:ind > 0
-    " a block starts here
-    if s:block != 0
-      " already in a block (nesting) - ignore
-      " especially ignore comments after other blocktags
-      return "foo"
-    endif
-    let s:block = a:ind		" block type
-    if s:countonly
-      return "foo"
-    endif
-    let s:newstate.blocklnr = v:lnum
-    " save allover indent for the endtag
-    let s:newstate.blocktagind = b:indent.baseindent + (s:nextrel + s:curind) * &shiftwidth
-    if a:ind == 3
-      return "SCRIPT"    " all except this must be lowercase
-      " line is to be checked again for the type attribute
-    endif
-  else
-    let s:block = 0
-    " we get here if starting and closing block-tag on same line
-  endif
-  return "foo"
-endfunc "}}}
-func! s:GetScriptType(str) "{{{
-  if a:str == "" || a:str =~ "java"
-    return "javascript"
-  else
-    return ""
-  endif
-endfunc "}}}
-
-func! s:FreshState(lnum) "{{{
-  " Look back in the file (lines 1 to a:lnum-1) to calc a state for line
-  " a:lnum.  A state is to know ALL relevant details about the lines
-  " 1..a:lnum-1, initial calculating (here!) can be slow, but updating is
-  " fast (incremental).
-  " State:
-  "	lnum		last indented line == prevnonblank(a:lnum - 1)
-  "	block = 0	a:lnum located within special tag: 0:none, 2:<pre>,
-  "			3:<script>, 4:<style>, 5:<!--
-  "	baseindent	use this indent for line a:lnum as a start - kind of
-  "			autoindent (if block==0)
-  "	scripttype = ''	type attribute of a script tag (if block==3)
-  "	blocktagind	indent for current opening (get) and closing (set)
-  "			blocktag (if block!=0)
-  "	blocklnr	lnum of starting blocktag (if block!=0)
-  "	inattr		line {lnum} starts with attributes of a tag
-  let state = {}
-  let state.lnum = prevnonblank(a:lnum - 1)
-  let state.scripttype = ""
-  let state.blocktagind = -1
-  let state.block = 0
-  let state.baseindent = 0
-  let state.blocklnr = 0
-  let state.inattr = 0
-
-  if state.lnum == 0
-    return state
-  endif
-
-  " Heuristic:
-  " remember startline state.lnum
-  " look back for <pre, </pre, <script, </script, <style, </style tags
-  " remember stopline
-  " if opening tag found,
-  "	assume a:lnum within block
-  " else
-  "	look back in result range (stopline, startline) for comment
-  "	    \ delimiters (<!--, -->)
-  "	if comment opener found,
-  "	    assume a:lnum within comment
-  "	else
-  "	    assume usual html for a:lnum
-  "	    if a:lnum-1 has a closing comment
-  "		look back to get indent of comment opener
-  " FI
-
-  " look back for blocktag
-  call cursor(a:lnum, 1)
-  let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bW")
-  " fugly ... why isn't there searchstr()
-  let tagline = tolower(getline(stopline))
-  let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol-1)
-  if stopline > 0 && blocktag[0] != "/"
-    " opening tag found, assume a:lnum within block
-    let state.block = s:indent_tags[blocktag]
-    if state.block == 3
-      let state.scripttype = s:GetScriptType(matchstr(tagline, '\>[^>]*', stopcol))
-    endif
-    let state.blocklnr = stopline
-    " check preceding tags in the line:
-    let s:altline = tagline[: stopcol-2]
-    call s:CountITags(1)
-    let state.blocktagind = indent(stopline) + (s:curind + s:nextrel) * &shiftwidth
-    return state
-  elseif stopline == state.lnum
-    " handle special case: previous line (= state.lnum) contains a
-    " closing blocktag which is preceded by line-noise;
-    " blocktag == "/..."
-    let swendtag = match(tagline, '^\s*</') >= 0
-    if !swendtag
-      let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bW")
-      let s:altline = tolower(getline(bline)[: bcol-2])
-      call s:CountITags(1)
-      let state.baseindent = indent(bline) + (s:nextrel+s:curline) * &shiftwidth
-      return state
-    endif
-  endif
-
-  " else look back for comment
-  call cursor(a:lnum, 1)
-  let [comline, comcol, found] = searchpos('\(<!--\)\|-->', 'bpW', stopline)
-  if found == 2
-    " comment opener found, assume a:lnum within comment
-    let state.block = 5
-    let state.blocklnr = comline
-    " check preceding tags in the line:
-    let s:altline = tolower(getline(comline)[: comcol-2])
-    call s:CountITags(1)
-    let state.blocktagind = indent(comline) + (s:curind + s:nextrel) * &shiftwidth
-    return state
-  endif
-
-  " else within usual html
-  let s:altline = tolower(getline(state.lnum))
-  " check a:lnum-1 for closing comment (we need indent from the opening line)
-  let comcol = stridx(s:altline, '-->')
-  if comcol >= 0
-    call cursor(state.lnum, comcol+1)
-    let [comline, comcol] = searchpos('<!--', 'bW')
-    if comline == state.lnum
-      let s:altline = s:altline[: comcol-2]
-    else
-      let s:altline = tolower(getline(comline)[: comcol-2])
-    endif
-    call s:CountITags(1)
-    let state.baseindent = indent(comline) + (s:nextrel+s:curline) * &shiftwidth
-    return state
-    " TODO check tags that follow "-->"
-  endif
-
-  " else no comments
-  call s:CountITags(1)
-  let state.baseindent = indent(state.lnum) + s:nextrel * &shiftwidth
-  " line starts with end tag
-  let swendtag = match(s:altline, '^\s*</') >= 0
-  if !swendtag
-    let state.baseindent += s:curind * &shiftwidth
-  endif
-  return state
-endfunc "}}}
-
-func! s:Alien2() "{{{
-  " <pre> block
-  return -1
-endfunc "}}}
-func! s:Alien3() "{{{
-  " <script> javascript
-  if prevnonblank(v:lnum-1) == b:indent.blocklnr
-    " indent for the first line after <script>
-    return eval(s:js1indent)
-  endif
-  if b:indent.scripttype == "javascript"
-    "return cindent(v:lnum)
-    return GetJavascriptIndent()
-  else
-    return -1
-  endif
-endfunc "}}}
-func! s:Alien4() "{{{
-  " <style>
-  if prevnonblank(v:lnum-1) == b:indent.blocklnr
-    " indent for first content line
-    return eval(s:css1indent)
-  endif
-  return s:CSSIndent()
-endfunc
-
-func! s:CSSIndent() "{{{
-  " adopted $VIMRUNTIME/indent/css.vim
-  if getline(v:lnum) =~ '^\s*[*}]'
-    return cindent(v:lnum)
-  endif
-  let minline = b:indent.blocklnr
-  let pnum = s:css_prevnoncomment(v:lnum - 1, minline)
-  if pnum <= minline
-    " < is to catch errors
-    " indent for first content line after comments
-    return eval(s:css1indent)
-  endif
-  let ind = indent(pnum) + s:css_countbraces(pnum, 1) * &sw
-  let pline = getline(pnum)
-  if pline =~ '}\s*$'
-    let ind -= (s:css_countbraces(pnum, 0) - (pline =~ '^\s*}')) * &sw
-  endif
-  return ind
-endfunc "}}}
-func! s:css_prevnoncomment(lnum, stopline) "{{{
-  " caller starts from a line a:lnum-1 that is not a comment
-  let lnum = prevnonblank(a:lnum)
-  let ccol = match(getline(lnum), '\*/')
-  if ccol < 0
-    return lnum
-  endif
-  call cursor(lnum, ccol+1)
-  let lnum = search('/\*', 'bW', a:stopline)
-  if indent(".") == virtcol(".")-1
-    return prevnonblank(lnum-1)
-  else
-    return lnum
-  endif
-endfunc "}}}
-func! s:css_countbraces(lnum, count_open) "{{{
-  let brs = substitute(getline(a:lnum),'[''"].\{-}[''"]\|/\*.\{-}\*/\|/\*.*$\|[^{}]','','g')
-  let n_open = 0
-  let n_close = 0
-  for brace in split(brs, '\zs')
-    if brace == "{"
-      let n_open += 1
-    elseif brace == "}"
-      if n_open > 0
-        let n_open -= 1
-      else
-        let n_close += 1
-      endif
-    endif
-  endfor
-  return a:count_open ? n_open : n_close
-endfunc "}}}
-
-"}}}
-func! s:Alien5() "{{{
-  " <!-- -->
-  return -1
-endfunc "}}}
-
-func! HtmlIndent() "{{{
-  let s:curline = tolower(getline(v:lnum))
-
-  let s:newstate = {}
-  let s:newstate.lnum = v:lnum
-
-  " is the first non-blank in the line the start of a tag?
-  let swendtag = match(s:curline, '^\s*</') >= 0
-
-  if prevnonblank(v:lnum-1) == b:indent.lnum && s:usestate
-    " use state (continue from previous line)
-  else
-    " start over (know nothing)
-    let b:indent = s:FreshState(v:lnum)
-  endif
-
-  if b:indent.block >= 2
-    " within block
-    let endtag = s:endtags[b:indent.block-2]
-    let blockend = stridx(s:curline, endtag)
-    if blockend >= 0
-      " block ends here
-      let s:newstate.block = 0
-      " calc indent for REST OF LINE (may start more blocks):
-      let s:curline = strpart(s:curline, blockend+strlen(endtag))
-      call s:CountITags()
-      if swendtag && b:indent.block != 5
-        let indent = b:indent.blocktagind + s:curind * &shiftwidth
-        let s:newstate.baseindent = indent + s:nextrel * &shiftwidth
-      else
-        let indent = s:Alien{b:indent.block}()
-        let s:newstate.baseindent = b:indent.blocktagind + s:nextrel * &shiftwidth
-      endif
-      call extend(b:indent, s:newstate, "force")
-      return indent
-    else
-      " block continues
-      " indent this line with alien method
-      let indent = s:Alien{b:indent.block}()
-      call extend(b:indent, s:newstate, "force")
-      return indent
-    endif
-  else
-    " not within a block - within usual html
-    " if < 2 then always 0
-    let s:newstate.block = b:indent.block
-    call s:CountITags()
-    if swendtag
-      let indent = b:indent.baseindent + s:curind * &shiftwidth
-      let s:newstate.baseindent = indent + s:nextrel * &shiftwidth
-    else
-      let indent = b:indent.baseindent
-      let s:newstate.baseindent = indent + (s:curind + s:nextrel) * &shiftwidth
-    endif
-    call extend(b:indent, s:newstate, "force")
-    return indent
-  endif
-
-endfunc "}}}
-
-" check user settings (first time), clear cpo, Modeline: {{{1
-
-" DEBUG:
-com! -nargs=* IndHtmlLocal <args>
-
-call HtmlIndent_CheckUserSettings()
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim:set fdm=marker ts=8:

From 399e04839b9a2ba1bce623a866f3c474b299593d Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Fri, 2 Aug 2013 22:30:24 -0700
Subject: [PATCH 0055/1043] Adds config options to readme

---
 README.md | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index c7fdc4a4..d0574c02 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,7 @@ JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
 - Install with [Vundle](https://github.com/gmarik/vundle)
 
-If you are not using vundle, you really should have a try.
-Edit your vimrc:
+Add to vimrc:
 
     Bundle "pangloss/vim-javascript"
 
@@ -23,29 +22,39 @@ And install it:
     :so ~/.vimrc
     :BundleInstall
 
-
 - Install with [pathogen](https://github.com/tpope/vim-pathogen)
 
-If you prefer tpope's pathogen, that's ok. Just clone it:
-
     cd ~/.vim/bundle
     git clone https://github.com/pangloss/vim-javascript.git
 
 ## Configuration
 
-[html indentation](http://www.vim.org/scripts/script.php?script_id=2075)
-provided by Andy Wokula is faster. But you need to make some configuration.
+The following variables control certain syntax highlighting features. You can
+add them to your `.vimrc` to enable/disable their features.
+
+#### javascript_enable_domhtmlcss
+
+Enables HTML/CSS syntax highlighting in your JavaScript file.
+
+Default Value: 0
+
+#### b:javascript_fold
+
+Enables JavaScript code folding.
+
+Default Value: 1
+
+#### g:javascript_conceal
+
+Enables concealing characters. For example, `function` is replaced with `ƒ`
+
+Default Value: 0
 
-Suggested configuration:
+#### javascript_ignore_javaScriptdoc
 
-```vim
-let g:html_indent_inctags = "html,body,head,tbody"
-let g:html_indent_script1 = "inc"
-let g:html_indent_style1 = "inc"
-```
+Disables JSDoc syntax highlighting
 
-Head over to [vim.org](http://www.vim.org/scripts/script.php?script_id=2075)
-for more information.
+Default Value: 0
 
 ## Contributing
 

From fc627c7ef19737d0e98418caf7f6d130bf575b98 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Fri, 2 Aug 2013 22:33:04 -0700
Subject: [PATCH 0056/1043] Removes features

---
 README.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/README.md b/README.md
index d0574c02..76848261 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,6 @@
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
-> Indentation of javascript in vim is terrible, and this is the very end of it.
-
-## Features
-
-1. very correct indentation for javascript
-2. support javascript indentation in html (provided by [lepture](https://github.com/lepture))
-
 ## Installation
 
 - Install with [Vundle](https://github.com/gmarik/vundle)

From 51e43b6c6354292ac264cff72c19e25d0b93b7ad Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Fri, 2 Aug 2013 22:46:20 -0700
Subject: [PATCH 0057/1043] Removes Rakefile

---
 Rakefile | 89 --------------------------------------------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 Rakefile

diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index c6223ba2..00000000
--- a/Rakefile
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'rake'
-require 'rake/clean'
-
-files = ['syntax/javascript.vim', 'indent/javascript.vim']
-
-CLEAN.include 'tmp/*_ctags'
-
-desc "Make zip file"
-file 'javascript.zip' => files do |t|
-  File.unlink t.name if File.exists?(t.name)
-  system('zip','-q',t.name,*t.prerequisites)
-end
-
-desc "Make vimball"
-file 'javascript.vba' => files do |t|
-  File.unlink t.name if File.exists?(t.name)
-  File.open(t.name,"w") do |out|
-    out.puts '" Vimball Archiver by Charles E. Campbell, Jr., Ph.D.'
-    out.puts 'UseVimball'
-    out.puts 'finish'
-    t.prerequisites.each do |name|
-      File.open(name) do |file|
-        file.each_line {}
-        out.puts name
-        out.puts file.lineno
-        file.rewind
-        file.each_line {|l|out.puts l}
-      end
-    end
-  end
-end
-
-desc "Install"
-task :install do
-  vimfiles = if ENV['VIMFILES']
-               ENV['VIMFILES']
-             elsif RUBY_PLATFORM =~ /(win|w)32$/
-               File.expand_path("~/vimfiles")
-             else
-               File.expand_path("~/.vim")
-             end
-
-  puts "Installing javascript.vim"
-  files.each do |file|
-    target_file = File.join(vimfiles, file)
-    FileUtils.mkdir_p(File.dirname(target_file))
-    FileUtils.rm(target_file) rescue nil
-    FileUtils.cp(file, target_file)
-    puts "  Copied #{file} to #{target_file}"
-  end
-end
-
-desc "Copy ~/.ctags to tmp/original_ctags"
-task :get_original_ctags do
-  if File.exists?(File.expand_path("~/.ctags"))
-    File.unlink('tmp/original_ctags') if File.exists?('tmp/original_ctags')
-    FileUtils.cp(File.expand_path("~/.ctags"), 'tmp/original_ctags')
-  elsif not File.exists?("tmp/original_ctags")
-    File.open("tmp/original_ctags", "w") { }
-  end
-end
-
-desc "Combine tmp/original_ctags and extras/ctags"
-file 'tmp/combined_ctags' => ['tmp/original_ctags', 'extras/ctags'] do |t|
-  begin_string = '# Begin vim-javascript generated section'
-  end_string = '# End vim-javascript generated section'
-  File.unlink t.name if File.exists?(t.name)
-  File.open(t.name,"w") do |out|
-    orig = File.read('tmp/original_ctags')
-    orig.each_line.inject(true) do |can_print, line|
-      can_print = false if line.chomp == begin_string
-      out.puts line if can_print
-      can_print or line.chomp == end_string
-    end
-    out.puts begin_string
-    out.puts "# generated at #{ Time.now }"
-    out.puts File.read('extras/ctags')
-    out.puts end_string
-  end
-end
-
-desc "Add better javascript support to ctags"
-task :ctags => [:get_original_ctags, 'tmp/combined_ctags'] do
-  FileUtils.cp('tmp/combined_ctags', File.expand_path('~/.ctags'))
-end
-
-task 'zip' => 'javascript.zip'
-task 'vimball' => 'javascript.vba'
-task :default => [:zip, :vimball]

From 85eeb98aef37f8f4230be88df38b0ef83c7ad6fb Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sat, 3 Aug 2013 00:55:52 -0700
Subject: [PATCH 0058/1043] Adds leading ternary operator indentation support

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 09abd0c8..af2aa129 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -64,6 +64,8 @@ let s:var_stmt = '^\s*var'
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
+let s:ternary = '^\s\+[?|:]'
+
 " 2. Auxiliary Functions {{{1
 " ======================
 
@@ -339,6 +341,14 @@ function GetJavascriptIndent()
     return indent(prevline) - &sw
   endif
 
+  if (line =~ s:ternary)
+    if (getline(prevline) =~ s:ternary)
+      return indent(prevline)
+    else
+      return indent(prevline) + &sw
+    endif
+  endif
+
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
     return cindent(v:lnum)

From 9dda622a7da80874277d227c321a6771f49e88ca Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sat, 3 Aug 2013 01:00:55 -0700
Subject: [PATCH 0059/1043] Fixes case where there are nested conditionals

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index af2aa129..29fba2ba 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -65,6 +65,7 @@ let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
 let s:ternary = '^\s\+[?|:]'
+let s:ternary_q = '^\s\+?'
 
 " 2. Auxiliary Functions {{{1
 " ======================
@@ -342,7 +343,7 @@ function GetJavascriptIndent()
   endif
 
   if (line =~ s:ternary)
-    if (getline(prevline) =~ s:ternary)
+    if (getline(prevline) =~ s:ternary_q)
       return indent(prevline)
     else
       return indent(prevline) + &sw

From 68f95638a4f605799dbba69b13dea3faa6244aa9 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sat, 3 Aug 2013 14:42:01 -0700
Subject: [PATCH 0060/1043] Fixes README

---
 README.md | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c7beb472..76848261 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
-> Indentation of javascript in vim is terrible, and this is the very end of it.
-
 ## Installation
 
 - Install with [Vundle](https://github.com/gmarik/vundle)
@@ -22,6 +20,35 @@ And install it:
     cd ~/.vim/bundle
     git clone https://github.com/pangloss/vim-javascript.git
 
+## Configuration
+
+The following variables control certain syntax highlighting features. You can
+add them to your `.vimrc` to enable/disable their features.
+
+#### javascript_enable_domhtmlcss
+
+Enables HTML/CSS syntax highlighting in your JavaScript file.
+
+Default Value: 0
+
+#### b:javascript_fold
+
+Enables JavaScript code folding.
+
+Default Value: 1
+
+#### g:javascript_conceal
+
+Enables concealing characters. For example, `function` is replaced with `ƒ`
+
+Default Value: 0
+
+#### javascript_ignore_javaScriptdoc
+
+Disables JSDoc syntax highlighting
+
+Default Value: 0
+
 ## Contributing
 
 If you'd like to be added as a contributor the price of admission is 1 pull request.

From be40e8b7d29dc678309425b0e94031eefae493ac Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 2 Aug 2013 17:52:54 -0700
Subject: [PATCH 0061/1043] Tweaks to jsOperator, jsKeyword and jsStatement

This includes updates to the recent discussion regarding keywords,
operators, and statements.
---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 52433af4..b93d34fa 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -36,7 +36,7 @@ syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 "" Program Keywords
 syntax keyword jsType           function
 syntax keyword jsStorageClass   const var let
-syntax keyword jsOperator       delete instanceof typeof void
+syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBoolean        true false
 
@@ -117,11 +117,11 @@ else
 endif
 
 "" Statement Keywords
-syntax keyword jsStatement      yield break continue
+syntax keyword jsStatement      break continue with
 syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
 syntax keyword jsLabel          case default
-syntax keyword jsKeyword        new in with
+syntax keyword jsKeyword        yield
 syntax keyword jsException      try catch throw finally
 
 syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window

From c8db23b12d96bd01eb3929515e3a7623fff972fa Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 3 Aug 2013 14:30:32 -0700
Subject: [PATCH 0062/1043] Improvements to function, name and arguments

This commit is a first pass at adding a number of improvements to
functions and how they are detected.

Function declarations now have a higher granularity to expose the
function keyword, the name, the parenthesis, argument definitions, and
commas within the argument definitions.

I also added a new block type called jsFuncBlock which is unique from
jsBlock that defines a block region for function definitions.

This also ultimately differentiates function definitions from
jsFuncCall.
---
 syntax/javascript.vim | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b93d34fa..70361cf8 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -34,7 +34,6 @@ syntax sync fromstart
 syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 
 "" Program Keywords
-syntax keyword jsType           function
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
@@ -185,9 +184,10 @@ endif "DOM/HTML/CSS
 "" Code blocks
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
-syntax region  jsBracket    matchgroup=jsBrackets start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
-syntax region  jsParen      matchgroup=jsParens   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsBlock      matchgroup=jsBlocks   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
+syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBlock      matchgroup=jsBlocks       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsFuncBlock  matchgroup=jsFuncBlocks   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 
 "" catch errors caused by wrong parenthesis
@@ -203,18 +203,15 @@ if main_syntax == "javascript"
 endif
 
 if g:javascript_conceal == 1
-  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite conceal cchar=ƒ
+  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite conceal cchar=ƒ
 else
-  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite
+  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite
 endif
 
 syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
-syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/
-
-"" Fold control
-if exists("b:javascript_fold")
-  syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
-endif
+syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas nextgroup=jsFuncBlock keepend skipwhite
+syntax match   jsFuncArgCommas  contained ','
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -261,6 +258,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFunction             Type
   HiLink jsFuncName             Function
   HiLink jsFuncCall             Function
+  HiLink jsFuncParens           Function
+  HiLink jsFuncArgCommas        Function
+  HiLink jsFuncArgs             Function
   HiLink jsError                Error
   HiLink jsParensError          Error
   HiLink jsParensErrA           Error

From eaf58b824e8e0e1d9f81bca5ee437c4062a66a72 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 3 Aug 2013 14:50:26 -0700
Subject: [PATCH 0063/1043] Setting jsFuncBlocks to be part of Function group

This has the added benefit of differentiating curly brackets from an
object definition (Noise) vs brackets declaring a function (Function).
---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 70361cf8..a7cf6c9d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -261,6 +261,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncParens           Function
   HiLink jsFuncArgCommas        Function
   HiLink jsFuncArgs             Function
+  HiLink jsFuncBlocks           Function
   HiLink jsError                Error
   HiLink jsParensError          Error
   HiLink jsParensErrA           Error

From d3b37e8a433593a83e4fac6ad19fbe600e1f910f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 3 Aug 2013 15:32:18 -0700
Subject: [PATCH 0064/1043] Removing deprecated jsType groups

---
 syntax/javascript.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a7cf6c9d..4a67e240 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -182,7 +182,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -268,7 +268,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParensErrB           Error
   HiLink jsParensErrC           Error
   HiLink jsOperator             Operator
-  HiLink jsType                 Type
   HiLink jsStorageClass         StorageClass
   HiLink jsThis                 Special
   HiLink jsNan                  Number

From 9d59178e7831ac2536ee016ca5ce6d95b5968376 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 6 Aug 2013 15:23:35 -0700
Subject: [PATCH 0065/1043] Adding `jsArgsObj` keyword

Adding `arguments`, linked to `Special` only within `jsFuncBlock`
---
 syntax/javascript.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4a67e240..1c56c7be 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -212,6 +212,7 @@ syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipemp
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
 syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas nextgroup=jsFuncBlock keepend skipwhite
 syntax match   jsFuncArgCommas  contained ','
+syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -262,6 +263,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncArgCommas        Function
   HiLink jsFuncArgs             Function
   HiLink jsFuncBlocks           Function
+  HiLink jsArgsObj              Special
   HiLink jsError                Error
   HiLink jsParensError          Error
   HiLink jsParensErrA           Error

From eac3432f594f080232433e5012db0c29fdd963bd Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 6 Aug 2013 15:49:48 -0700
Subject: [PATCH 0066/1043] Removing gratuitous HiLink groups

Removing various function properties as per the discussion here:
https://github.com/pangloss/vim-javascript/pull/102#issuecomment-22214422
---
 syntax/javascript.vim | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1c56c7be..3f1611b2 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -259,10 +259,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFunction             Type
   HiLink jsFuncName             Function
   HiLink jsFuncCall             Function
-  HiLink jsFuncParens           Function
-  HiLink jsFuncArgCommas        Function
-  HiLink jsFuncArgs             Function
-  HiLink jsFuncBlocks           Function
   HiLink jsArgsObj              Special
   HiLink jsError                Error
   HiLink jsParensError          Error

From 17a0556a32a2e1cd39b68663db33d9f34f35607e Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 10:26:16 -0400
Subject: [PATCH 0067/1043] Update README; mention `beta` branch under
 `Contributing`

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76848261..3855bd74 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,8 @@ Default Value: 0
 
 If you'd like to be added as a contributor the price of admission is 1 pull request.
 Please follow the general code style guides (read the code) and in your pull request explain
-the reason for the proposed change and how it is valuable.
+the reason for the proposed change and how it is valuable. Development is done 
+on the `beta` branch, so be sure to fork from and send pull requests there.
 
 ## Bug report
 

From 8a2e0412798fa1deb2371f2401f5b519aa7978de Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 12:05:05 -0400
Subject: [PATCH 0068/1043] Change `Blocks` to `Braces`: `jsBlocks` and
 `jsFuncBlocks`

---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3f1611b2..5275a345 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -186,8 +186,8 @@ syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStri
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsBlock      matchgroup=jsBlocks       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsFuncBlock  matchgroup=jsFuncBlocks   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 
 "" catch errors caused by wrong parenthesis
@@ -277,7 +277,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsNoise                Noise
   HiLink jsBrackets             Noise
   HiLink jsParens               Noise
-  HiLink jsBlocks               Noise
+  HiLink jsBraces               Noise
   HiLink jsSpecial              Special
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special

From 3a148155e72345c43a5e836c7c48315b13e3e8d8 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 12:06:41 -0400
Subject: [PATCH 0069/1043] Add `jsFuncBraces` to `Noise`

---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5275a345..adabbb18 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -278,6 +278,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBrackets             Noise
   HiLink jsParens               Noise
   HiLink jsBraces               Noise
+  HiLink jsFuncBraces           Noise
   HiLink jsSpecial              Special
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special

From 6e54ebf7c499d34feb9e4df075775646b4852238 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 15:21:45 -0400
Subject: [PATCH 0070/1043] Update README to reflect new git flow development
 process

---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3855bd74..8032ca9c 100644
--- a/README.md
+++ b/README.md
@@ -51,10 +51,12 @@ Default Value: 0
 
 ## Contributing
 
-If you'd like to be added as a contributor the price of admission is 1 pull request.
-Please follow the general code style guides (read the code) and in your pull request explain
-the reason for the proposed change and how it is valuable. Development is done 
-on the `beta` branch, so be sure to fork from and send pull requests there.
+This project uses the [git 
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
+development. There's [a handy git module for git flow](/nvie/gitflow). If you'd 
+like to be added as a contributor, the price of admission is 1 pull request.  
+Please follow the general code style guides (read the code) and in your pull 
+request explain the reason for the proposed change and how it is valuable.
 
 ## Bug report
 

From cc77bdbb96adf3fe0ed89841e815b131c4b5cba9 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 15:25:45 -0400
Subject: [PATCH 0071/1043] Add version number

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8032ca9c..d84cf51e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript
+# vim-javascript v0.1.0
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 

From 1e154f25e1daf48b84d9b4bb74e67ce8c0f47cfd Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 15:34:21 -0400
Subject: [PATCH 0072/1043] Fix spacing issue in README file

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d84cf51e..8ec20c50 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.1.0
+# vim-javascript v0.1.1
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
@@ -52,10 +52,10 @@ Default Value: 0
 ## Contributing
 
 This project uses the [git 
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
-development. There's [a handy git module for git flow](/nvie/gitflow). If you'd 
-like to be added as a contributor, the price of admission is 1 pull request.  
-Please follow the general code style guides (read the code) and in your pull 
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
+development. There's [a handy git module for git flow](/nvie/gitflow). If you'd
+like to be added as a contributor, the price of admission is 1 pull request.
+Please follow the general code style guides (read the code) and in your pull
 request explain the reason for the proposed change and how it is valuable.
 
 ## Bug report

From 6ca76f3f1e53234f498b29fe22171eba4a484e36 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 7 Aug 2013 12:37:22 -0700
Subject: [PATCH 0073/1043] Higher specificity for `true` and `false`

Added two new keywords, `jsBooleanTrue` and `jsBooleanFalse`. Both link
back to the `Boolean` group for consistency.
---
 syntax/javascript.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index adabbb18..65cba7d9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -37,7 +37,8 @@ syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
-syntax keyword jsBoolean        true false
+syntax keyword jsBooleanTrue    true
+syntax keyword jsBooleanFalse   false
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -182,7 +183,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
@@ -273,7 +274,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsUndefined            Type
   HiLink jsNumber               Number
   HiLink jsFloat                Float
-  HiLink jsBoolean              Boolean
+  HiLink jsBooleanTrue          Boolean
+  HiLink jsBooleanFalse         Boolean
   HiLink jsNoise                Noise
   HiLink jsBrackets             Noise
   HiLink jsParens               Noise

From 5896732fcdf04e947624335fe0dba4de9b2e0763 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 16:04:29 -0400
Subject: [PATCH 0074/1043] Fix link to gitflow module in README

---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8ec20c50..54bf4aa0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.1.1
+# vim-javascript v0.1.2
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
@@ -52,11 +52,12 @@ Default Value: 0
 ## Contributing
 
 This project uses the [git 
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
-development. There's [a handy git module for git flow](/nvie/gitflow). If you'd
-like to be added as a contributor, the price of admission is 1 pull request.
-Please follow the general code style guides (read the code) and in your pull
-request explain the reason for the proposed change and how it is valuable.
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
+development. There's [a handy git module for git 
+flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor, 
+the price of admission is 1 pull request. Please follow the general code style 
+guides (read the code) and in your pull request explain the reason for the 
+proposed change and how it is valuable. 
 
 ## Bug report
 

From 25fa2c45dbe0aaa3d6d7a055e82b97df6b8c5ca0 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 16:06:13 -0400
Subject: [PATCH 0075/1043] Fix link to gitflow (original article) in README

- Make it protocol-agnostic
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 54bf4aa0..89a6e3b7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.1.2
+# vim-javascript v0.1.3
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
@@ -52,7 +52,7 @@ Default Value: 0
 ## Contributing
 
 This project uses the [git 
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
+flow](//nvie.com/posts/a-successful-git-branching-model/) model for 
 development. There's [a handy git module for git 
 flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor, 
 the price of admission is 1 pull request. Please follow the general code style 

From 960152aaaae19da13fe7c16e99a304c363de64f8 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 16:10:18 -0400
Subject: [PATCH 0076/1043] Force http on gitflow link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 89a6e3b7..6ebb4fd3 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Default Value: 0
 ## Contributing
 
 This project uses the [git 
-flow](//nvie.com/posts/a-successful-git-branching-model/) model for 
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
 development. There's [a handy git module for git 
 flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor, 
 the price of admission is 1 pull request. Please follow the general code style 

From b8f5d6410bbbe47131f872a33945aeace1d17c47 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Wed, 7 Aug 2013 16:10:18 -0400
Subject: [PATCH 0077/1043] Force http on gitflow link

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 89a6e3b7..ef981391 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.1.3
+# vim-javascript v0.1.4
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
@@ -52,7 +52,7 @@ Default Value: 0
 ## Contributing
 
 This project uses the [git 
-flow](//nvie.com/posts/a-successful-git-branching-model/) model for 
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
 development. There's [a handy git module for git 
 flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor, 
 the price of admission is 1 pull request. Please follow the general code style 

From b25654850f9ef317c40305ffc5e8b466f8cf18c9 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 7 Aug 2013 22:27:15 -0700
Subject: [PATCH 0078/1043] Removing jsOpAssign

I believe this may be some hold over from older theme settings,
and it gets in the way of jsOperator.
---
 syntax/javascript.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 65cba7d9..c8e9111c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -209,7 +209,6 @@ else
   syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite
 endif
 
-syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
 syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas nextgroup=jsFuncBlock keepend skipwhite
 syntax match   jsFuncArgCommas  contained ','

From 878fa130e1c4200a421a6fc7bbe65bde58f3f3c7 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 7 Aug 2013 22:50:31 -0700
Subject: [PATCH 0079/1043] Adding jsObjectKey

This is a specifier for keys in a JS object. This functionality was removed and
now is being added back in.

For now, I have not linked it to any group.
---
 syntax/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 65cba7d9..9c55bfa3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -98,6 +98,7 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype
@@ -187,7 +188,7 @@ syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStri
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 

From f0415ad445d0520a01f36173ce46c215e8eff8a8 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Thu, 8 Aug 2013 14:38:44 -0400
Subject: [PATCH 0080/1043] Add `jsFuncParens` to `Noise`

---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7426d15c..797b434c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -281,6 +281,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParens               Noise
   HiLink jsBraces               Noise
   HiLink jsFuncBraces           Noise
+  HiLink jsFuncParens           Noise
   HiLink jsSpecial              Special
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special

From 2bede5c7bdad09f5d9261361d0a71eaef518e73d Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 8 Aug 2013 14:19:31 -0700
Subject: [PATCH 0081/1043] Adding folds for main JS block types

This allows folding for objects, functions, arrays and multiline
parenthesis on function calls.
---
 syntax/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 797b434c..5f3f50b5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -186,10 +186,10 @@ endif "DOM/HTML/CSS
 "" Code blocks
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
-syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
-syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc
-syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained
+syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
+syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold
+syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 
 "" catch errors caused by wrong parenthesis

From 35f2609aa66c1bc2074c82d94aa160f3ff5e8664 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Fri, 9 Aug 2013 14:27:03 -0700
Subject: [PATCH 0082/1043] Delete .keep

---
 tmp/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tmp/.keep

diff --git a/tmp/.keep b/tmp/.keep
deleted file mode 100644
index e69de29b..00000000

From cf75f69984c82e49ea5e831d89cb838fdb436135 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 11 Aug 2013 17:11:42 -0700
Subject: [PATCH 0083/1043] Fix for nested ternaries

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5f3f50b5..f9a8cab3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -190,7 +190,7 @@ syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contai
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained fold
-syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
+syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 "" catch errors caused by wrong parenthesis
 syntax match   jsParensError    ")\|}\|\]"

From 6a89948c804c6b9799ffdc1a7d39a901e647ae15 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 13 Aug 2013 11:23:45 -0400
Subject: [PATCH 0084/1043] Unlink `jsFuncCall` from `Function`

- Close issue #111
---
 syntax/javascript.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f9a8cab3..74234782 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -259,7 +259,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsKeyword              Keyword
   HiLink jsFunction             Type
   HiLink jsFuncName             Function
-  HiLink jsFuncCall             Function
   HiLink jsArgsObj              Special
   HiLink jsError                Error
   HiLink jsParensError          Error

From 92987e14d7a1d3f6df98c632b065ac9ec3e9b336 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 13 Aug 2013 15:50:12 -0700
Subject: [PATCH 0085/1043] A few regexpengine=1 / vim 7.3 fixes

This commit fixes a couple general issues I found with Regexes.

Certain contained groups would break the ending of a regular expression,
causing the style to bleed out into other parts of the file. By adding
keepend we prevent the regex from leaking out.

Also, matchgroup for jsRegexpGroup must be set before start and end
definitions or else you incur bizarre highlighting behaviours. This has
now been fixed.

It does not fix Vim 7.4 and the regexpengine=2 issues, however these
still are necessary fixes for all users on vim 7.3
---
 syntax/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 74234782..da279dfb 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -93,8 +93,8 @@ syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" containe
 syntax match   jsRegexpOr        "\v\<@!\|" contained
 syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial   contains=jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-syntax region  jsRegexpGroup     start="\\\@<!(" matchgroup=jsRegexGroup end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial
-syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline
+syntax region  jsRegexpGroup     matchgroup=jsRegexGroup start="\\\@<!(" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
@@ -246,6 +246,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRegexpMod            SpecialChar
   HiLink jsRegexpBackRef        SpecialChar
   HiLink jsRegexpGroup          jsRegexpString
+  HiLink jsRegexGroup           jsRegexpString
   HiLink jsRegexpCharClass      Character
   HiLink jsCharacter            Character
   HiLink jsPrototype            Special

From 2133e7a96f577fb4f2808e2ec94b0d9c0f1c3a72 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 14 Aug 2013 11:17:43 -0700
Subject: [PATCH 0086/1043] Removing the unneeded matchgroup for jsRegexpGroup

---
 syntax/javascript.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index da279dfb..b2025406 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -93,7 +93,7 @@ syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" containe
 syntax match   jsRegexpOr        "\v\<@!\|" contained
 syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial   contains=jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-syntax region  jsRegexpGroup     matchgroup=jsRegexGroup start="\\\@<!(" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax region  jsRegexpGroup     start="\\\@<!(" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
@@ -246,7 +246,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRegexpMod            SpecialChar
   HiLink jsRegexpBackRef        SpecialChar
   HiLink jsRegexpGroup          jsRegexpString
-  HiLink jsRegexGroup           jsRegexpString
   HiLink jsRegexpCharClass      Character
   HiLink jsCharacter            Character
   HiLink jsPrototype            Special

From ce20af34b4cd6394016af9984a500a8649f164a1 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 13 Aug 2013 19:09:45 -0700
Subject: [PATCH 0087/1043] Removed deprecated highlight groups

There were a couple groups that aren't actually mapped to anything
anymore. Those are now removed.
---
 syntax/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b2025406..bbc7bdb7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -184,8 +184,8 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
-syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
+syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold
@@ -304,8 +304,8 @@ endif
 " Define the htmlJavaScript for HTML syntax html.vim
 "syntax clear htmlJavaScript
 "syntax clear jsExpression
-syntax cluster  htmlJavaScript       contains=@jsAll,jsBracket,jsParen,jsBlock,jsParenError
-syntax cluster  javaScriptExpression contains=@jsAll,jsBracket,jsParen,jsBlock,jsParenError,@htmlPreproc
+syntax cluster  htmlJavaScript       contains=@jsAll,jsBracket,jsParen,jsBlock
+syntax cluster  javaScriptExpression contains=@jsAll,jsBracket,jsParen,jsBlock,@htmlPreproc
 " Vim's default html.vim highlights all javascript as 'Special'
 hi! def link javaScript              NONE
 

From 2cf625ed95568c01ca1c4f9f198664acced3bf05 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Wed, 14 Aug 2013 22:20:41 -0700
Subject: [PATCH 0088/1043] Fixes maintainer comment and removes version

---
 syntax/javascript.vim | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index bbc7bdb7..95e5d739 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,11 +1,7 @@
 " Vim syntax file
 " Language:     JavaScript
-" Maintainer:   Josh Perez <josh at goatslacker.com>
-" Version:      0.7.9
+" Maintainer:   vim-javascript community
 " URL:          https://github.com/pangloss/vim-javascript
-"
-" TODO:
-"  - Add the HTML syntax inside the JSDoc
 
 if !exists("main_syntax")
   if version < 600

From a2710cd0e08f21a6355c7e0cde248018713c116b Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Thu, 15 Aug 2013 15:43:43 -0400
Subject: [PATCH 0089/1043] Bump version number: 0.8.0

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef981391..76b750de 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.1.4
+# vim-javascript v0.8.0
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 

From 42d9e77f887687396790277580df9d905ffc331e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 16 Aug 2013 17:43:16 -0700
Subject: [PATCH 0090/1043] Adds jsFunctionKey to jsObjectKey

As per a user's feature request, this adds a slightly higher specificity
for object keys that define a function.
---
 syntax/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 95e5d739..9bd5d0a9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -94,7 +94,8 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
+syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/ contains=jsFunctionKey
+syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\sfunction\)\@=/ contained
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype

From 71b9b5402796f5c18b71a2087a5c15b194f23474 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 16 Aug 2013 22:16:04 -0700
Subject: [PATCH 0091/1043] Removing `-` as a valid character for jsObjectKey

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 9bd5d0a9..a78af62f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -94,8 +94,8 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/ contains=jsFunctionKey
-syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\sfunction\)\@=/ contained
+syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey
+syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\sfunction\)\@=/ contained
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype

From 304815ab7d3d80115f4af99f2cea461623288abf Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 17 Aug 2013 02:23:16 -0700
Subject: [PATCH 0092/1043] Better whitespace support for jsFunctionKey

This allows 0 or more spaces after the `:` character in a jsFunctionKey
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a78af62f..413ae83d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -95,7 +95,7 @@ syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey
-syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\sfunction\)\@=/ contained
+syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\s*function\s*\)\@=/ contained
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype

From 764094a0db8aa682ad216bf26b3823814934a330 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 23 Aug 2013 15:49:36 -0700
Subject: [PATCH 0093/1043] README note on regexes

Providing a note for users to solve their issues with regexes.
---
 README.md | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 76b750de..c32c229e 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,24 @@
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
+## A Quick Note on Regexes
+
+Vim 7.4 was released recently, and unfortunately broke how this plugin
+handles regexes. There was no real easy way for us to fix this unless we
+completely rewrote how regexes work.
+
+Good News: There was a recent update to Vim 7.4 that fixes this issue.
+
+Make sure you are at least using Vim 7.4, with patches 1-7.
+
+If you are stuck on an older version of Vim 7.4 with no way to update,
+then simply perform the following commands to fix your current buffer:
+
+```
+:set regexpengine=1
+:syntax enable
+```
+
 ## Installation
 
 - Install with [Vundle](https://github.com/gmarik/vundle)
@@ -51,13 +69,13 @@ Default Value: 0
 
 ## Contributing
 
-This project uses the [git 
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
-development. There's [a handy git module for git 
-flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor, 
-the price of admission is 1 pull request. Please follow the general code style 
-guides (read the code) and in your pull request explain the reason for the 
-proposed change and how it is valuable. 
+This project uses the [git
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
+development. There's [a handy git module for git
+flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor,
+the price of admission is 1 pull request. Please follow the general code style
+guides (read the code) and in your pull request explain the reason for the
+proposed change and how it is valuable.
 
 ## Bug report
 

From 83f3ed7fa84272190484801e09b44f2140dcee04 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Aug 2013 11:34:04 -0700
Subject: [PATCH 0094/1043] Fixing jsFuncBlock when braces are on a new line

jsFuncBlock braces would not be highlighted if they where on a new line
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 413ae83d..d1931054 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -208,7 +208,7 @@ else
 endif
 
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas nextgroup=jsFuncBlock keepend skipwhite
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
 syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock
 

From 5cf4450463e1cff822a13f44b3c5bddb6ccab319 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 28 Aug 2013 14:54:32 -0700
Subject: [PATCH 0095/1043] Fixing jsNoise to work within ternaries

jsNoise really belongs in jsExpression, not jsAll.

By putting it in there, we make it far more consistent in how it works,
for example, now it properly works within the jsTernaryIf group.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d1931054..e72c63a4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -181,8 +181,8 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
-syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise
+syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold

From 776b7bcff1cc555e8c2ccbc09b202f0b147bec21 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 2 Sep 2013 14:46:26 -0700
Subject: [PATCH 0096/1043] v0.9.0

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 76b750de..f345a688 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.8.0
+# vim-javascript v0.9.0
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 
@@ -51,13 +51,13 @@ Default Value: 0
 
 ## Contributing
 
-This project uses the [git 
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for 
-development. There's [a handy git module for git 
-flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor, 
-the price of admission is 1 pull request. Please follow the general code style 
-guides (read the code) and in your pull request explain the reason for the 
-proposed change and how it is valuable. 
+This project uses the [git
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
+development. There's [a handy git module for git
+flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor,
+the price of admission is 1 pull request. Please follow the general code style
+guides (read the code) and in your pull request explain the reason for the
+proposed change and how it is valuable.
 
 ## Bug report
 

From ca3ee3801c3fede5652a1a6c4e5e7f6a8747a747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Reni=C3=A9?= <buburno@gmail.com>
Date: Thu, 12 Sep 2013 14:42:23 +0200
Subject: [PATCH 0097/1043] Fix formatting of pathogen instructions

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b2e3269c..3987b978 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ then simply perform the following commands to fix your current buffer:
 
 ## Installation
 
-- Install with [Vundle](https://github.com/gmarik/vundle)
+### Install with [Vundle](https://github.com/gmarik/vundle)
 
 Add to vimrc:
 
@@ -33,10 +33,10 @@ And install it:
     :so ~/.vimrc
     :BundleInstall
 
-- Install with [pathogen](https://github.com/tpope/vim-pathogen)
+### Install with [pathogen](https://github.com/tpope/vim-pathogen)
 
-    cd ~/.vim/bundle
-    git clone https://github.com/pangloss/vim-javascript.git
+      cd ~/.vim/bundle
+      git clone https://github.com/pangloss/vim-javascript.git
 
 ## Configuration
 

From 3882ae3b46dd8f74e3fde95aec1c2cd7a8c1da7f Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 11 Nov 2013 15:28:22 -0800
Subject: [PATCH 0098/1043] Adds es6 support for arrow function syntax

---
 syntax/javascript.vim | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e72c63a4..6b5f8b58 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -181,7 +181,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -212,6 +212,8 @@ syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=
 syntax match   jsFuncArgCommas  contained ','
 syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock
 
+syntax match jsArrowFunction /=>/
+
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -254,6 +256,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStatement            Statement
   HiLink jsException            Exception
   HiLink jsKeyword              Keyword
+  HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
   HiLink jsFuncName             Function
   HiLink jsArgsObj              Special

From 52c22556f27ba72fba2bdc4d86e4e6e4f45a1379 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 11 Nov 2013 15:31:43 -0800
Subject: [PATCH 0099/1043] Adds es6 support for rest parameters in function
 signatures

---
 syntax/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e72c63a4..227ed3be 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -208,8 +208,9 @@ else
 endif
 
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
+syntax match   jsFuncArgRest    contained /\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*/
 syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock
 
 " Define the default highlighting.

From 4b6c266d1f3ddb9a205fba75f73011c569a7b613 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 11 Nov 2013 20:21:03 -0800
Subject: [PATCH 0100/1043] Fixes issue with spec where rest parameter should
 be last

---
 syntax/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 227ed3be..5e7c1b9e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -210,7 +210,7 @@ endif
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
 syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
-syntax match   jsFuncArgRest    contained /\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*/
+syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock
 
 " Define the default highlighting.
@@ -223,6 +223,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   else
     command -nargs=+ HiLink hi def link <args>
   endif
+  HiLink jsFuncArgRest          Special
   HiLink jsComment              Comment
   HiLink jsLineComment          Comment
   HiLink jsEnvComment           PreProc

From ef239d8612fd06d6a3acf09f6cea9949e77ed0b9 Mon Sep 17 00:00:00 2001
From: Eddie Monge <eddie@eddiemonge.com>
Date: Fri, 15 Nov 2013 11:09:20 -0800
Subject: [PATCH 0101/1043] JSON is not JavaScript

ref #50
---
 ftdetect/javascript.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index 805e1978..036b352d 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1,6 +1,5 @@
 au BufNewFile,BufRead *.js setf javascript
 au BufNewFile,BufRead *.jsm setf javascript
-au BufNewFile,BufRead *.json setf javascript
 au BufNewFile,BufRead Jakefile setf javascript
 
 fun! s:SelectJavascript()

From d52f8995425be609a53fa19232589bbcf57a51e3 Mon Sep 17 00:00:00 2001
From: Merrick Christensen <merrick.christensen@gmail.com>
Date: Mon, 2 Dec 2013 16:46:10 -0700
Subject: [PATCH 0102/1043] feature(conceal): add prototype to the list of
 conceals

---
 syntax/javascript.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6b5f8b58..0f40bbbe 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -106,12 +106,14 @@ if g:javascript_conceal == 1
   syntax keyword jsReturn         return conceal cchar=⇚
   syntax keyword jsUndefined      undefined conceal cchar=¿
   syntax keyword jsNan            NaN conceal cchar=ℕ
+  syntax keyword jsPrototype      prototype conceal cchar=¶
 else
   syntax keyword jsNull           null
   syntax keyword jsThis           this
   syntax keyword jsReturn         return
   syntax keyword jsUndefined      undefined
   syntax keyword jsNan            NaN
+  syntax keyword jsPrototype      prototype
 endif
 
 "" Statement Keywords

From a6f71af54cb1d3b31de2984b51d6cf3e59320338 Mon Sep 17 00:00:00 2001
From: Merrick Christensen <merrick.christensen@gmail.com>
Date: Tue, 3 Dec 2013 17:02:49 -0700
Subject: [PATCH 0103/1043] remove redundant prototype declaration

---
 syntax/javascript.vim | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0f40bbbe..bf427d28 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -97,9 +97,6 @@ syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-
 syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey
 syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\s*function\s*\)\@=/ contained
 
-"" JavaScript Prototype
-syntax keyword jsPrototype      prototype
-
 if g:javascript_conceal == 1
   syntax keyword jsNull           null conceal cchar=ø
   syntax keyword jsThis           this conceal cchar=@

From bad20eb0a635c0771fba39496cee5e63d4fdb255 Mon Sep 17 00:00:00 2001
From: Vital Kudzelka <vital.kudzelka@gmail.com>
Date: Thu, 23 Jan 2014 11:57:00 +0300
Subject: [PATCH 0104/1043] Case agnostic JSDoc tags

The latest documentation for JSDoc3 use lowercase tags (http://usejsdoc.org/),
but the oldest versions may use camel case (see https://code.google.com/p/jsdoc-toolkit/wiki/TagReference).
The current syntax supports both of them.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index bf427d28..c786fd19 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -55,7 +55,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|memberOf\|mixes\|module\|name\|namespace\|requires\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
@@ -63,7 +63,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   " tags containing references
   syntax match  jsDocTags         contained "@\(lends\|see\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|fileOverview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
+  syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|file[oO]verview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
 
   syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite

From 3f06dbba16cc43237612ba69b98a7220b7f02f34 Mon Sep 17 00:00:00 2001
From: Vital Kudzelka <vital.kudzelka@gmail.com>
Date: Thu, 23 Jan 2014 12:35:34 +0300
Subject: [PATCH 0105/1043] Add missed @tutorial tag

See documentation http://usejsdoc.org/tags-tutorial.html.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c786fd19..f5b5b6a3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -61,7 +61,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   " tags containing type but no param
   syntax match  jsDocTags         contained "@\(callback\|enum\|external\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references
-  syntax match  jsDocTags         contained "@\(lends\|see\)\>" nextgroup=jsDocSeeTag skipwhite
+  syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
   syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|file[oO]verview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
 

From dd7f97727a5ad8f32afbfd5645de420dd10c37c4 Mon Sep 17 00:00:00 2001
From: David Chambers <dc@davidchambers.me>
Date: Sun, 9 Feb 2014 13:01:13 -0800
Subject: [PATCH 0106/1043] regexp: prevent escaped "]" from terminating
 character class

Each of the following character classes contains an escaped "]":

    /[\]]/
    /[\]x]/
    /[\\\]]/

The following character class does *not* contain an escaped "]":

    /[\\]/
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f5b5b6a3..ad69e404 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -82,7 +82,7 @@ syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc
 syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc
-syntax region  jsRegexpCharClass start=+\[+ end=+\]+ contained
+syntax region  jsRegexpCharClass start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained
 syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained

From 8fddc6f4f75fbd874bcad751549a72de166dad22 Mon Sep 17 00:00:00 2001
From: David Chambers <dc@davidchambers.me>
Date: Sun, 9 Feb 2014 13:19:52 -0800
Subject: [PATCH 0107/1043] regexp: prevent unescaped "/" in character class
 from terminating regexp

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ad69e404..90360dd5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -90,7 +90,7 @@ syntax match   jsRegexpOr        "\v\<@!\|" contained
 syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial   contains=jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup     start="\\\@<!(" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/

From cb0fa68ce9503e1d6f28744c36a865b718bbd0af Mon Sep 17 00:00:00 2001
From: David Chambers <dc@davidchambers.me>
Date: Mon, 17 Feb 2014 15:01:25 -0800
Subject: [PATCH 0108/1043] string: spell-check string literals

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 90360dd5..3aad33a2 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -80,8 +80,8 @@ syntax case match
 "" Syntax in the JavaScript code
 syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
-syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc
-syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc
+syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsRegexpCharClass start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained

From 46fe678d350d711d7db0395269f1a9128f473943 Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Wed, 19 Feb 2014 20:19:17 -0500
Subject: [PATCH 0109/1043] Add basic support for ECMAScript 6 Template Strings

Spec: http://tc39wiki.calculist.org/es6/template-strings/
---
 syntax/javascript.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3aad33a2..24ce236f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -80,8 +80,10 @@ syntax case match
 "" Syntax in the JavaScript code
 syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
+syntax match   jsTemplateVar     "\${.\{-}}"
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsTemplateString  start=+`+  skip=+\\\\\|\\$`+  end=+`+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
 syntax region  jsRegexpCharClass start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained
@@ -180,7 +182,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -236,6 +238,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocParam             Label
   HiLink jsStringS              String
   HiLink jsStringD              String
+  HiLink jsTemplateString       String
   HiLink jsTernaryIfOperator    Conditional
   HiLink jsRegexpString         String
   HiLink jsRegexpBoundary       SpecialChar
@@ -281,6 +284,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncBraces           Noise
   HiLink jsFuncParens           Noise
   HiLink jsSpecial              Special
+  HiLink jsTemplateVar          Special
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special

From 045cbaff2280bde3421fb574adef516a6a59110e Mon Sep 17 00:00:00 2001
From: mrhooray <ruihu.pvt@gmail.com>
Date: Tue, 11 Mar 2014 12:04:44 -0700
Subject: [PATCH 0110/1043] support CommonJS syntax highlighting

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ded23301..bb92a1c0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -35,6 +35,7 @@ syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
+syntax keyword jsCommonJS       require module exports
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -182,7 +183,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -291,6 +292,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special
   HiLink jsBuiltins             Special
+  HiLink jsCommonJS             Include
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From d2412a100b93adffe18ee66b72455048d95fc996 Mon Sep 17 00:00:00 2001
From: David Chambers <dc@davidchambers.me>
Date: Thu, 13 Mar 2014 14:47:56 -0700
Subject: [PATCH 0111/1043] regexp: add jsSpecial to jsRegexpSpecial cluster

Most significantly, this causes shorthand character classes within
groups to be highlighted. For example:

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ded23301..c09b0b93 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -90,9 +90,9 @@ syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained
 syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained
 syntax match   jsRegexpOr        "\v\<@!\|" contained
 syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
-syntax cluster jsRegexpSpecial   contains=jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
+syntax cluster jsRegexpSpecial   contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup     start="\\\@<!(" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsSpecial,jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/

From bbf61f2870ec430adcb0fd3605a63bd5b61b37d9 Mon Sep 17 00:00:00 2001
From: David Chambers <dc@davidchambers.me>
Date: Thu, 13 Mar 2014 15:37:57 -0700
Subject: [PATCH 0112/1043] limit scope in which jsSpecial may be matched

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c09b0b93..487e2e5f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -79,7 +79,7 @@ syntax case match
 
 "" Syntax in the JavaScript code
 syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
-syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
+syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
 syntax match   jsTemplateVar     "\${.\{-}}"
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc,@Spell

From 7126372eb97755376a62ecdd1c8819e777ac7496 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 13 Mar 2014 19:12:35 -0400
Subject: [PATCH 0113/1043] Adding additional `contained`s

The intention of this commit is to perhaps improve performance, but also
clean up a bit of the how a couple regexes are used.

By adding `contained` to `jsObjectKey`, I think we might get a nice
performance boost, especially on larger files since it won't attemp that
lookbehind everywhere.

Adding `contained` to the newer regex for string templating stuff
in ES6 seems more 'accurate' or proper.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 487e2e5f..05025cd8 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -80,7 +80,7 @@ syntax case match
 "" Syntax in the JavaScript code
 syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
-syntax match   jsTemplateVar     "\${.\{-}}"
+syntax match   jsTemplateVar     "\${.\{-}}" contained
 syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsTemplateString  start=+`+  skip=+\\\\\|\\$`+  end=+`+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
@@ -96,7 +96,7 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey
+syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey contained
 syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\s*function\s*\)\@=/ contained
 
 if g:javascript_conceal == 1

From d6a4e2ef5e6953616ba7d304285da489cddfdb58 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 13 Mar 2014 19:30:10 -0400
Subject: [PATCH 0114/1043] Fixing odd indentation levels in syntax file

For some reason a whole group of regexes where indented 2 space.  Not
sure why, perhaps a holdover from some other era of whitespace
organization.  Anyays, pulling it back for now.  This is a purely
aesthetic/cleanup commit, nothing major.
---
 syntax/javascript.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 05025cd8..7d27707e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -134,18 +134,18 @@ syntax keyword jsFutureKeys     abstract enum int short boolean export interface
 
 "" DOM/HTML/CSS specified things
 
-  " DOM2 Objects
-  syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
-  syntax keyword jsExceptions     DOMException
+" DOM2 Objects
+syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
+syntax keyword jsExceptions     DOMException
 
-  " DOM2 CONSTANT
-  syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
-  syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
+" DOM2 CONSTANT
+syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
+syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
 
-  " HTML events and internal variables
-  syntax case ignore
-  syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
-  syntax case match
+" HTML events and internal variables
+syntax case ignore
+syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
+syntax case match
 
 " Follow stuff should be highligh within a special context
 " While it can't be handled with context depended with Regex based highlight

From 7f6cdb6aaa7c9b5d60f01a2d95117536c6798f3f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 17 Mar 2014 19:58:01 -0400
Subject: [PATCH 0115/1043] Adding a proper CONTRIBUTING file

---
 CONTRIBUTING.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..1128b9bb
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,13 @@
+## Contributing
+
+This project uses the [git
+flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
+development. There's [a handy git module for git
+flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor,
+the price of admission is 1 pull request. Please follow the general code style
+guides (read the code) and in your pull request explain the reason for the
+proposed change and how it is valuable.
+
+## Bug report
+
+Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).

From 8704ea152b99311f8c4cf334ff5e4bfa81cf6b16 Mon Sep 17 00:00:00 2001
From: Christian Wesselhoeft <christian@cwesselhoeft.com>
Date: Mon, 12 May 2014 21:38:40 -0700
Subject: [PATCH 0116/1043] Add some ES6 keywords.

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0bd0ac08..f8d249cf 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -121,7 +121,7 @@ syntax keyword jsStatement      break continue with
 syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
 syntax keyword jsLabel          case default
-syntax keyword jsKeyword        yield
+syntax keyword jsKeyword        yield import export default extends class
 syntax keyword jsException      try catch throw finally
 
 syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
@@ -131,7 +131,7 @@ syntax keyword jsExceptions     Error EvalError InternalError RangeError Referen
 
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 
-syntax keyword jsFutureKeys     abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws goto private transient debugger implements protected volatile double import public
+syntax keyword jsFutureKeys     abstract enum int short boolean interface static byte long super char final native synchronized float package throws goto private transient debugger implements protected volatile double public
 
 "" DOM/HTML/CSS specified things
 

From d9baadd38fda087040c8ea5e8da5e8cbbca36375 Mon Sep 17 00:00:00 2001
From: Riobard <me@riobard.com>
Date: Thu, 3 Apr 2014 14:44:49 -0230
Subject: [PATCH 0117/1043] Allow customizing individual concealing characters

---
 README.md             | 18 +++++++++++++-----
 syntax/javascript.vim | 27 +++++++--------------------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 3987b978..83dcdf47 100644
--- a/README.md
+++ b/README.md
@@ -55,11 +55,6 @@ Enables JavaScript code folding.
 
 Default Value: 1
 
-#### g:javascript_conceal
-
-Enables concealing characters. For example, `function` is replaced with `ƒ`
-
-Default Value: 0
 
 #### javascript_ignore_javaScriptdoc
 
@@ -67,6 +62,19 @@ Disables JSDoc syntax highlighting
 
 Default Value: 0
 
+#### Concealing Characters
+
+You can customize concealing characters by defining one or more of the following
+variables:
+
+    let g:javascript_conceal_function   = "ƒ"
+    let g:javascript_conceal_null       = "ø"
+    let g:javascript_conceal_this       = "@"
+    let g:javascript_conceal_return     = "⇚"
+    let g:javascript_conceal_undefined  = "¿"
+    let g:javascript_conceal_NaN        = "ℕ"
+    let g:javascript_conceal_prototype  = "¶"
+
 ## Contributing
 
 This project uses the [git
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0bd0ac08..1fddb5b7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -100,21 +100,12 @@ syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-
 syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey contained
 syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\s*function\s*\)\@=/ contained
 
-if g:javascript_conceal == 1
-  syntax keyword jsNull           null conceal cchar=ø
-  syntax keyword jsThis           this conceal cchar=@
-  syntax keyword jsReturn         return conceal cchar=⇚
-  syntax keyword jsUndefined      undefined conceal cchar=¿
-  syntax keyword jsNan            NaN conceal cchar=ℕ
-  syntax keyword jsPrototype      prototype conceal cchar=¶
-else
-  syntax keyword jsNull           null
-  syntax keyword jsThis           this
-  syntax keyword jsReturn         return
-  syntax keyword jsUndefined      undefined
-  syntax keyword jsNan            NaN
-  syntax keyword jsPrototype      prototype
-endif
+exe 'syntax keyword jsNull      null      '.(exists('g:javascript_conceal_null')        ? 'conceal cchar='.g:javascript_conceal_null        : '')
+exe 'syntax keyword jsReturn    return    '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
+exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefined')   ? 'conceal cchar='.g:javascript_conceal_undefined   : '')
+exe 'syntax keyword jsNan       NaN       '.(exists('g:javascript_conceal_NaN')         ? 'conceal cchar='.g:javascript_conceal_NaN         : '')
+exe 'syntax keyword jsPrototype prototype '.(exists('g:javascript_conceal_prototype')   ? 'conceal cchar='.g:javascript_conceal_prototype   : '')
+exe 'syntax keyword jsThis      this      '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
 
 "" Statement Keywords
 syntax keyword jsStatement      break continue with
@@ -203,11 +194,7 @@ if main_syntax == "javascript"
   syntax sync match jsHighlight grouphere jsBlock /{/
 endif
 
-if g:javascript_conceal == 1
-  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite conceal cchar=ƒ
-else
-  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite
-endif
+exe 'syntax match jsFunction /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
 syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest nextgroup=jsFuncBlock keepend skipwhite skipempty

From 1881c848a049c2071acad6d97f3e4b114b502304 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Tue, 8 Jul 2014 16:10:35 -0400
Subject: [PATCH 0118/1043] Add blurb about pull requests to CONTRIBUTING.md

---
 CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1128b9bb..c47cbc86 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,11 @@ the price of admission is 1 pull request. Please follow the general code style
 guides (read the code) and in your pull request explain the reason for the
 proposed change and how it is valuable.
 
+## Pull Requests
+
+Please make your pull requests against the `develop` branch; we stage changes
+for testing there to avoid unexpected breakages for our users. :)
+
 ## Bug report
 
 Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).

From ca201905da0b44b703cd744e65d29bb9d3a11926 Mon Sep 17 00:00:00 2001
From: Jelte Fennema <github-tech@jeltef.nl>
Date: Wed, 9 Jul 2014 19:06:53 +0200
Subject: [PATCH 0119/1043] Fix gq to not split strings halfway through

---
 indent/javascript.vim | 50 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 29fba2ba..f1bc70dd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -15,6 +15,7 @@ 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\,,!^F,o,O,e
 
 " Only define the function once.
@@ -437,3 +438,52 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+function! Fixedgq(lnum, count)
+    let l:count = a:count
+
+    if len(getline(a:lnum)) < 80 && 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, 81)
+    let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
+    call cursor(a:lnum, 81)
+    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, 81)
+        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

From 03bd5d28bc488a5dc6ebd9796af4a06a143d752d Mon Sep 17 00:00:00 2001
From: Xueqiao Xu <xueqiaoxu@gmail.com>
Date: Thu, 10 Jul 2014 11:20:52 -0700
Subject: [PATCH 0120/1043] Add Closure Compiler annotations

---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5d0e4d11..427b71f3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -56,15 +56,15 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
-  syntax match  jsDocTags         contained "@\(callback\|enum\|external\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
+  syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references
   syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|event\|example\|file[oO]verview\|function\|global\|ignore\|inner\|instance\|license\|method\|mixin\|overview\|private\|protected\|public\|readonly\|since\|static\|todo\|summary\|undocumented\|virtual\)\>"
+  syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
   syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite

From 0077e5782dff5213cf013470d7937aed30825096 Mon Sep 17 00:00:00 2001
From: Jelte Fennema <github-tech@jeltef.nl>
Date: Wed, 16 Jul 2014 19:22:34 +0200
Subject: [PATCH 0121/1043] Fix some gq bugs when tw was set

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f1bc70dd..42682e9b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -442,6 +442,10 @@ unlet s:cpo_save
 function! Fixedgq(lnum, count)
     let l:count = a:count
 
+    if mode() == 'i' " gq was not pressed, but tw was set
+        return 1
+    endif
+
     if len(getline(a:lnum)) < 80 && l:count == 1 " No need for gq
         return 1
     endif
@@ -468,7 +472,7 @@ function! Fixedgq(lnum, count)
     endif
 
     " Try breaking after string
-    if breakpoint[1] == indent(a:lnum)
+    if breakpoint[1] <= indent(a:lnum)
         call cursor(a:lnum, 81)
         let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
     endif

From 18106a3db0ce01b74c9b65b30870af2f04e20beb Mon Sep 17 00:00:00 2001
From: Quinn Strahl <qstrahl@gmail.com>
Date: Thu, 14 Aug 2014 14:39:25 -0400
Subject: [PATCH 0122/1043] Use &tw instead of hard-coded 80 for formatting

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 42682e9b..c4d24a43 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -440,13 +440,15 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 function! Fixedgq(lnum, count)
+    let l:tw = &tw ? &tw : 72;
+
     let l:count = a:count
 
     if mode() == 'i' " gq was not pressed, but tw was set
         return 1
     endif
 
-    if len(getline(a:lnum)) < 80 && l:count == 1 " No need for gq
+    if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
         return 1
     endif
 
@@ -460,9 +462,9 @@ function! Fixedgq(lnum, count)
 
     let l:winview = winsaveview()
 
-    call cursor(a:lnum, 81)
+    call cursor(a:lnum, l:tw + 1)
     let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
-    call cursor(a:lnum, 81)
+    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
@@ -473,7 +475,7 @@ function! Fixedgq(lnum, count)
 
     " Try breaking after string
     if breakpoint[1] <= indent(a:lnum)
-        call cursor(a:lnum, 81)
+        call cursor(a:lnum, l:tw + 1)
         let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
     endif
 

From 51a337b77335aae369b194076d9eb2a2990eba2b Mon Sep 17 00:00:00 2001
From: Quinn Strahl <me@qstrahl.com>
Date: Thu, 14 Aug 2014 14:53:37 -0400
Subject: [PATCH 0123/1043] Use a default &tw of 80 for formatting

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c4d24a43..5cde88d1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -440,7 +440,7 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 function! Fixedgq(lnum, count)
-    let l:tw = &tw ? &tw : 72;
+    let l:tw = &tw ? &tw : 80;
 
     let l:count = a:count
 

From 057ed8049c2bf81502f9da8e264ad5ea2f01f3bf Mon Sep 17 00:00:00 2001
From: Jed Borovik <mr.borovik@gmail.com>
Date: Sat, 20 Sep 2014 22:48:04 -0700
Subject: [PATCH 0124/1043] Add @api annotation

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 427b71f3..dfec8071 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -56,7 +56,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param

From 9b8524865e024f8c816f918296af3c413aca03e1 Mon Sep 17 00:00:00 2001
From: David Chambers <dc@davidchambers.me>
Date: Thu, 9 Oct 2014 22:25:08 -0700
Subject: [PATCH 0125/1043] regexp: prevent ")" inside character class from
 terminating group

/([)])/ is currently not handled correctly: the first ")" mistakenly
terminates the jsRegexpGroup and consequently the jsRegexpCharClass,
since the former contains the latter.

This commit adds a skip pattern to prevent a ")" character inside a
character class from terminating a jsRegexpGroup.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 427b71f3..2aac3043 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -92,7 +92,7 @@ syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" containe
 syntax match   jsRegexpOr        "\v\<@!\|" contained
 syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial   contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-syntax region  jsRegexpGroup     start="\\\@<!(" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax region  jsRegexpGroup     start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity

From 86e376c62495e7644a886b36c0763de69369a902 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <qstrahl@gmail.com>
Date: Mon, 24 Nov 2014 10:13:02 -0500
Subject: [PATCH 0126/1043] Make strings EOL-terminated

---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 2aac3043..754dbbfe 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -82,9 +82,9 @@ syntax case match
 syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
 syntax match   jsTemplateVar     "\${.\{-}}" contained
-syntax region  jsStringD         start=+"+  skip=+\\\\\|\\$"+  end=+"+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsStringS         start=+'+  skip=+\\\\\|\\$'+  end=+'+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString  start=+`+  skip=+\\\\\|\\$`+  end=+`+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsStringD         start=+"+  skip=+\\\\"\|\\$+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsStringS         start=+'+  skip=+\\\\'\|\\$+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsTemplateString  start=+`+  skip=+\\\\`\|\\$+  end=+`\|$+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
 syntax region  jsRegexpCharClass start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained

From dc8b363b9b194037bf46a8278280f8a502804b06 Mon Sep 17 00:00:00 2001
From: Quinn Strahl <qstrahl@gmail.com>
Date: Mon, 24 Nov 2014 16:13:48 -0500
Subject: [PATCH 0127/1043] Simplify string skip pattern

---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 754dbbfe..beb6b527 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -82,9 +82,9 @@ syntax case match
 syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
 syntax match   jsTemplateVar     "\${.\{-}}" contained
-syntax region  jsStringD         start=+"+  skip=+\\\\"\|\\$+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsStringS         start=+'+  skip=+\\\\'\|\\$+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString  start=+`+  skip=+\\\\`\|\\$+  end=+`\|$+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsStringD         start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsStringS         start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsTemplateString  start=+`+  skip=+\\\(`\|$\)+  end=+`\|$+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
 syntax region  jsRegexpCharClass start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained

From 5d204c996f04256b302fd48769e28b4e792bb9d3 Mon Sep 17 00:00:00 2001
From: Bastian Winkler <buz@netbuz.org>
Date: Mon, 1 Dec 2014 13:12:36 +0100
Subject: [PATCH 0128/1043] Add syntax support for ES6 generators

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index beb6b527..ff4d1f80 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -194,8 +194,9 @@ if main_syntax == "javascript"
   syntax sync match jsHighlight grouphere jsBlock /{/
 endif
 
-exe 'syntax match jsFunction /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 
+syntax match   jsGenerator      contained '\*' nextgroup=jsFuncName skipwhite
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
 syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
@@ -250,6 +251,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsKeyword              Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
+  HiLink jsGenerator            jsFunction
   HiLink jsFuncName             Function
   HiLink jsArgsObj              Special
   HiLink jsError                Error

From e84c352a5aa6347ea913e70b157ba47b32ffa13a Mon Sep 17 00:00:00 2001
From: crusoexia <xiawenlan1984@gmail.com>
Date: Sat, 6 Dec 2014 10:28:34 +0800
Subject: [PATCH 0129/1043] add js assignment expression and relate identifier
 match syntax

---
 syntax/javascript.vim | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index beb6b527..81fa234d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -97,8 +97,14 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey contained
-syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\s*function\s*\)\@=/ contained
+syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
+syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
+
+syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis
+syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
+syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis contained
+syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained
+syntax match   jsFuncAssignIdent    /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
 
 exe 'syntax keyword jsNull      null      '.(exists('g:javascript_conceal_null')        ? 'conceal cchar='.g:javascript_conceal_null        : '')
 exe 'syntax keyword jsReturn    return    '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
@@ -174,7 +180,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold

From 063e7a0f61970847b64533b5fc1036b53310fca2 Mon Sep 17 00:00:00 2001
From: David Chambers <dc@davidchambers.me>
Date: Sun, 7 Dec 2014 22:03:38 -0800
Subject: [PATCH 0130/1043] number: match literals such as 1e-3

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ff4d1f80..f63abc39 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -94,7 +94,7 @@ syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial   contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup     start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
-syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
+syntax match   jsNumber          /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey contained

From 8f0bc59dd7732b49bd21181aa353b915dc57e034 Mon Sep 17 00:00:00 2001
From: Ryan McIntyre <rmcintyre@acronym.com>
Date: Mon, 8 Dec 2014 21:05:52 -0500
Subject: [PATCH 0131/1043] modified jsDocParam to highlight jsdoc optional
 parameter and default value

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index beb6b527..c6bb6902 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -70,7 +70,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
   syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\)\+"
+  syntax match  jsDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
   syntax case match

From 54481c98e56cee66b9cf1524341a85f8bf3ba14d Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 19 Dec 2014 13:35:39 -0800
Subject: [PATCH 0132/1043] Added jsNoise matching to jsAssignmentExpr

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0ab714b6..3ff4a10c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -100,7 +100,7 @@ syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-
 syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
 syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
 
-syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis
+syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise
 syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
 syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis contained
 syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained

From 75d9087840101230af0aee67765b52af006400ac Mon Sep 17 00:00:00 2001
From: Jelte Fennema <github-tech@jeltef.nl>
Date: Thu, 8 Jan 2015 12:35:15 +0100
Subject: [PATCH 0133/1043] Disable custom gq for comments

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5cde88d1..d483409e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -443,11 +443,17 @@ 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:IsLineComment(a:lnum, l:first_char) || s:IsInMultilineComment(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

From ead4c2ca335518a6c2bc06e010afb44680d91d41 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 8 Jan 2015 11:52:49 -0800
Subject: [PATCH 0134/1043] Updated README to properly reflect Vundle's API

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 83dcdf47..0718620c 100644
--- a/README.md
+++ b/README.md
@@ -26,12 +26,12 @@ then simply perform the following commands to fix your current buffer:
 
 Add to vimrc:
 
-    Bundle "pangloss/vim-javascript"
+    Plugin "pangloss/vim-javascript"
 
 And install it:
 
     :so ~/.vimrc
-    :BundleInstall
+    :PluginInstall
 
 ### Install with [pathogen](https://github.com/tpope/vim-pathogen)
 

From 29c2875e6e82e469afcf33352ba321d351acd3e6 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 15 Jan 2015 13:36:41 -0800
Subject: [PATCH 0135/1043] Renamed and fixed block comments

---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0ef56cbc..c8e02b09 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -53,7 +53,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   "syntax include @javaHtml <sfile>:p:h/html.vim
   "unlet b:current_syntax
 
-  syntax region jsDocComment      matchgroup=jsComment start="/\*\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+  syntax region jsBlockComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
   syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
@@ -180,7 +180,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -225,7 +225,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsComment              Comment
   HiLink jsLineComment          Comment
   HiLink jsEnvComment           PreProc
-  HiLink jsDocComment           Comment
+  HiLink jsBlockComment         Comment
   HiLink jsCommentTodo          Todo
   HiLink jsCvsTag               Function
   HiLink jsDocTags              Special

From 1ee35c5d5dd96675ffcea5659b6ce44cd8e4db56 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 15 Jan 2015 13:59:41 -0800
Subject: [PATCH 0136/1043] Alignment fixes and removal of deprecated comments

---
 syntax/javascript.vim | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c8e02b09..4300ddb7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -79,26 +79,26 @@ endif   "" JSDoc end
 syntax case match
 
 "" Syntax in the JavaScript code
-syntax match   jsFuncCall        /\k\+\%(\s*(\)\@=/
-syntax match   jsSpecial         "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
-syntax match   jsTemplateVar     "\${.\{-}}" contained
-syntax region  jsStringD         start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsStringS         start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString  start=+`+  skip=+\\\(`\|$\)+  end=+`\|$+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
-syntax region  jsRegexpCharClass start=+\[+ skip=+\\.+ end=+\]+ contained
+syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
+syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
+syntax match   jsTemplateVar      "\${.\{-}}" contained
+syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`\|$+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
-syntax match   jsRegexpBackRef   "\v\\[1-9][0-9]*" contained
+syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained
 syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained
-syntax match   jsRegexpOr        "\v\<@!\|" contained
-syntax match   jsRegexpMod       "\v\(@<=\?[:=!>]" contained
-syntax cluster jsRegexpSpecial   contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-syntax region  jsRegexpGroup     start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
-syntax match   jsNumber          /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
-syntax keyword jsNumber          Infinity
-syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
-syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
+syntax match   jsRegexpOr         "\v\<@!\|" contained
+syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
+syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
+syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax region  jsRegexpString     start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
+syntax keyword jsNumber           Infinity
+syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
+syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
 
 syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise
 syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
@@ -304,10 +304,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 endif
 
 " Define the htmlJavaScript for HTML syntax html.vim
-"syntax clear htmlJavaScript
-"syntax clear jsExpression
 syntax cluster  htmlJavaScript       contains=@jsAll,jsBracket,jsParen,jsBlock
 syntax cluster  javaScriptExpression contains=@jsAll,jsBracket,jsParen,jsBlock,@htmlPreproc
+
 " Vim's default html.vim highlights all javascript as 'Special'
 hi! def link javaScript              NONE
 

From 1769504fd3f9c53525dca17d9ad4f84159de8dff Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Tue, 20 Jan 2015 11:37:58 -0800
Subject: [PATCH 0137/1043] Adds es6 modules support and change class

---
 syntax/javascript.vim | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4300ddb7..5b523e44 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -35,7 +35,7 @@ syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
-syntax keyword jsCommonJS       require module exports
+syntax keyword jsModules        import export default from as
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -118,7 +118,8 @@ syntax keyword jsStatement      break continue with
 syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
 syntax keyword jsLabel          case default
-syntax keyword jsKeyword        yield import export default extends class
+syntax keyword jsKeyword        yield
+syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
 
 syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
@@ -180,7 +181,7 @@ endif "DOM/HTML/CSS
 
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsModules
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -267,6 +268,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParensErrC           Error
   HiLink jsOperator             Operator
   HiLink jsStorageClass         StorageClass
+  HiLink jsClass                Structure
   HiLink jsThis                 Special
   HiLink jsNan                  Number
   HiLink jsNull                 Type
@@ -287,7 +289,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special
   HiLink jsBuiltins             Special
-  HiLink jsCommonJS             Include
+  HiLink jsModules              Include
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From c76ae11fb6fd39a881b05d331fc960375fd3f8cb Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 12:28:06 -0800
Subject: [PATCH 0138/1043] Better module support

---
 syntax/javascript.vim | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5b523e44..06b5b989 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -35,7 +35,11 @@ syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
-syntax keyword jsModules        import export default from as
+syntax match jsModules          /import\|export/
+syntax keyword jsModuleWords    default from as contained
+
+syntax region jsModuleContainer      start="\(import\|export\) \?" end="$" contains=jsModuleWords,jsStringS,jsStringD,jsTemplateString,jsModules,jsArrowFunction,jsClass,jsFunction,jsStorageClass,jsOperator
+
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -84,7 +88,7 @@ syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" c
 syntax match   jsTemplateVar      "\${.\{-}}" contained
 syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`\|$+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
 syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained
@@ -179,9 +183,8 @@ endif "DOM/HTML/CSS
 
 "" end DOM/HTML/CSS specified things
 
-
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsModules
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsModuleContainer
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -290,6 +293,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFutureKeys           Special
   HiLink jsBuiltins             Special
   HiLink jsModules              Include
+  HiLink jsModuleWords          Include
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From fcf7a26b33c5c164c9b8b868cb86c37d7d03f11c Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 12:41:53 -0800
Subject: [PATCH 0139/1043] More rigid syntax checking

---
 syntax/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 06b5b989..2e78296a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -38,8 +38,9 @@ syntax keyword jsBooleanFalse   false
 syntax match jsModules          /import\|export/
 syntax keyword jsModuleWords    default from as contained
 
-syntax region jsModuleContainer      start="\(import\|export\) \?" end="$" contains=jsModuleWords,jsStringS,jsStringD,jsTemplateString,jsModules,jsArrowFunction,jsClass,jsFunction,jsStorageClass,jsOperator
+syntax region jsImportContainer      start="import \?" end="$" contains=jsModuleWords,jsModules,jsComment,jsStringS,jsStringD,jsTemplateString
 
+syntax region jsExportContainer      start="export \?" end="$" contains=jsModuleWords,jsModules,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -184,7 +185,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsModuleContainer
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold

From 97ff4e35c4d41e718037165eb2906cde4ca25e39 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 12:56:54 -0800
Subject: [PATCH 0140/1043] Removes static and super from reserved words

---
 README.md             | 2 ++
 syntax/javascript.vim | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0718620c..4f29b897 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,8 @@ variables:
     let g:javascript_conceal_undefined  = "¿"
     let g:javascript_conceal_NaN        = "ℕ"
     let g:javascript_conceal_prototype  = "¶"
+    let g:javascript_conceal_static     = "•"
+    let g:javascript_conceal_super      = "Ω"
 
 ## Contributing
 
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 2e78296a..76bc9bf5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -117,6 +117,8 @@ exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefi
 exe 'syntax keyword jsNan       NaN       '.(exists('g:javascript_conceal_NaN')         ? 'conceal cchar='.g:javascript_conceal_NaN         : '')
 exe 'syntax keyword jsPrototype prototype '.(exists('g:javascript_conceal_prototype')   ? 'conceal cchar='.g:javascript_conceal_prototype   : '')
 exe 'syntax keyword jsThis      this      '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
+exe 'syntax keyword jsStatic    static    '.(exists('g:javascript_conceal_static')      ? 'conceal cchar='.g:javascript_conceal_static      : '')
+exe 'syntax keyword jsSuper     super     '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
 
 "" Statement Keywords
 syntax keyword jsStatement      break continue with
@@ -134,7 +136,7 @@ syntax keyword jsExceptions     Error EvalError InternalError RangeError Referen
 
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 
-syntax keyword jsFutureKeys     abstract enum int short boolean interface static byte long super char final native synchronized float package throws goto private transient debugger implements protected volatile double public
+syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient debugger implements protected volatile double public
 
 "" DOM/HTML/CSS specified things
 
@@ -185,7 +187,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -274,6 +276,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStorageClass         StorageClass
   HiLink jsClass                Structure
   HiLink jsThis                 Special
+  HiLink jsStatic               Special
+  HiLink jsSuper                Special
   HiLink jsNan                  Number
   HiLink jsNull                 Type
   HiLink jsUndefined            Type

From f4c1c9cf87dc28f84682ee888400e31b3c15ba92 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 12:58:36 -0800
Subject: [PATCH 0141/1043] Fixes code whitespace issue

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 76bc9bf5..99502580 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -35,7 +35,7 @@ syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
-syntax match jsModules          /import\|export/
+syntax match   jsModules        /import\|export/
 syntax keyword jsModuleWords    default from as contained
 
 syntax region jsImportContainer      start="import \?" end="$" contains=jsModuleWords,jsModules,jsComment,jsStringS,jsStringD,jsTemplateString

From 687a90049b7781cd0bf270573db7d8f529fe034f Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 12:59:42 -0800
Subject: [PATCH 0142/1043] Adds Symbol to global

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 99502580..e7aa4d5b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -129,7 +129,7 @@ syntax keyword jsKeyword        yield
 syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From 8dbf2245629be2bc314a91e4acfdee0e25ec6fcf Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 13:00:25 -0800
Subject: [PATCH 0143/1043] Adds Map, WeakMap, and Set

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e7aa4d5b..6619b364 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -129,7 +129,7 @@ syntax keyword jsKeyword        yield
 syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From bed1189698f62712db2d5a1eb7ac9cc594477833 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 13:44:59 -0800
Subject: [PATCH 0144/1043] Adds tagged templates

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6619b364..2f1a9ebb 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -89,7 +89,8 @@ syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" c
 syntax match   jsTemplateVar      "\${.\{-}}" contained
 syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+  contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsTaggedTemplate   start=/\k\+\(\n\|\s\)\?`/     end=+`\|$+  contains=jsTemplateString
 syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained
@@ -187,7 +188,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -243,6 +244,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStringS              String
   HiLink jsStringD              String
   HiLink jsTemplateString       String
+  HiLink jsTaggedTemplate       StorageClass
   HiLink jsTernaryIfOperator    Conditional
   HiLink jsRegexpString         String
   HiLink jsRegexpBoundary       SpecialChar

From 2a037505ffcf923ae7ebc4e97ede37b2e82648ca Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 13:45:25 -0800
Subject: [PATCH 0145/1043] Adds Promise to globals

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 2f1a9ebb..a6f277de 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -130,7 +130,7 @@ syntax keyword jsKeyword        yield
 syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From b3c811bc5ed9e00b03d6c5e02133c96f4e5b203e Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 14:00:02 -0800
Subject: [PATCH 0146/1043] Adds of operator

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a6f277de..da2c2d75 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -37,6 +37,7 @@ syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 syntax match   jsModules        /import\|export/
 syntax keyword jsModuleWords    default from as contained
+syntax keyword jsOf             of contained
 
 syntax region jsImportContainer      start="import \?" end="$" contains=jsModuleWords,jsModules,jsComment,jsStringS,jsStringD,jsTemplateString
 
@@ -191,7 +192,7 @@ endif "DOM/HTML/CSS
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
-syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
+syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
@@ -275,6 +276,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParensErrB           Error
   HiLink jsParensErrC           Error
   HiLink jsOperator             Operator
+  HiLink jsOf                   Operator
   HiLink jsStorageClass         StorageClass
   HiLink jsClass                Structure
   HiLink jsThis                 Special

From 6d167f10eb1c9aefea54951c26307612fc4da129 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 25 Jan 2015 14:13:23 -0800
Subject: [PATCH 0147/1043] Adds support for default arguments

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index da2c2d75..4dd5c8fb 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -213,7 +213,7 @@ exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsF
 
 syntax match   jsGenerator      contained '\*' nextgroup=jsFuncName skipwhite
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
 syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock

From 5fa60043d753388c18df34319ed5eb28a286964c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 25 Jan 2015 23:39:15 -0800
Subject: [PATCH 0148/1043] A fix for #212

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d483409e..9a20c192 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -53,7 +53,7 @@ let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' .
 
 " Regex that defines continuation lines.
 " TODO: this needs to deal with if ...: and so on
-let s:msl_regex = '\%([\\*+/.:([]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' . s:line_term
+let s:msl_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' . s:line_term
 
 let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 

From 7848de5df449ab9812461cd12f482783adb51ac6 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 26 Jan 2015 19:35:12 -0800
Subject: [PATCH 0149/1043] Fixes module syntax for common js

---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4dd5c8fb..29ff8063 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -35,13 +35,13 @@ syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
-syntax match   jsModules        /import\|export/
+syntax keyword jsModules        import export contained
 syntax keyword jsModuleWords    default from as contained
 syntax keyword jsOf             of contained
 
-syntax region jsImportContainer      start="import \?" end="$" contains=jsModuleWords,jsModules,jsComment,jsStringS,jsStringD,jsTemplateString
+syntax region jsImportContainer      start="^\s\?import \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsStringS,jsStringD,jsTemplateString
 
-syntax region jsExportContainer      start="export \?" end="$" contains=jsModuleWords,jsModules,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained

From 2180f51d060a96b76389ad1a4efb3606c3f08e79 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Wed, 28 Jan 2015 01:13:08 -0800
Subject: [PATCH 0150/1043] Fixes tagged templates on multi lines

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4dd5c8fb..7481a566 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -91,7 +91,7 @@ syntax match   jsTemplateVar      "\${.\{-}}" contained
 syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
-syntax region  jsTaggedTemplate   start=/\k\+\(\n\|\s\)\?`/     end=+`\|$+  contains=jsTemplateString
+syntax region  jsTaggedTemplate   start=/\k\+\(\(\n\|\s\)\+\)\?`/ end=+`\|$+ contains=jsTemplateString
 syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained

From b022c816a513dd783c671dc86c97a9457705eb51 Mon Sep 17 00:00:00 2001
From: Daniel Sabelnikov <dsabelnikov@gmail.com>
Date: Thu, 29 Jan 2015 14:24:46 +0300
Subject: [PATCH 0151/1043] issue#34

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9a20c192..0a2f839e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -49,11 +49,11 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st
 let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' . s:line_term
+let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]=[^=].*,\)' . s:line_term
 
 " Regex that defines continuation lines.
 " TODO: this needs to deal with if ...: and so on
-let s:msl_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)' . s:line_term
+let s:msl_regex = s:continuation_regex
 
 let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 

From 368bad6632a7d5c8f45c63df1975ec5faf2a418c Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Mon, 2 Feb 2015 15:33:42 -0800
Subject: [PATCH 0152/1043] Adds jsClass to all expressions

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index fb89f4b3..56c7422d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -189,7 +189,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold

From e9709a9fb29ed0739eb244b5e70211c1ab647535 Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 8 Feb 2015 19:14:50 -0800
Subject: [PATCH 0153/1043] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4f29b897..27cc1e1a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.9.0
+# vim-javascript v0.10.0
 
 JavaScript bundle for vim, this bundle provides syntax and indent plugins.
 

From 6cad2d987a0b9a2c41a035026673cb8d4db94e0e Mon Sep 17 00:00:00 2001
From: Josh Perez <josh@goatslacker.com>
Date: Sun, 15 Feb 2015 17:42:41 -0800
Subject: [PATCH 0154/1043] Fixes #242

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 56c7422d..a2c49ab3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -91,7 +91,7 @@ syntax match   jsTemplateVar      "\${.\{-}}" contained
 syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
-syntax region  jsTaggedTemplate   start=/\k\+\(\(\n\|\s\)\+\)\?`/ end=+`\|$+ contains=jsTemplateString
+syntax region  jsTaggedTemplate   start=/\k\+\(\(\n\|\s\)\+\)\?`/ end=+`+ contains=jsTemplateString keepend
 syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained

From 3afb1731ab5708963da85c321406d8e6f7294a2b Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Thu, 5 Mar 2015 15:14:22 +0100
Subject: [PATCH 0155/1043] Vundle requires single quotes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27cc1e1a..1cc50aee 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ then simply perform the following commands to fix your current buffer:
 
 Add to vimrc:
 
-    Plugin "pangloss/vim-javascript"
+    Plugin 'pangloss/vim-javascript'
 
 And install it:
 

From b39a28f650b0c365a2d12590ae52d52f95f8c550 Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Thu, 26 Mar 2015 16:59:12 +0000
Subject: [PATCH 0156/1043] One liner for Pathogen

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 27cc1e1a..34145e4d 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,7 @@ And install it:
 
 ### Install with [pathogen](https://github.com/tpope/vim-pathogen)
 
-      cd ~/.vim/bundle
-      git clone https://github.com/pangloss/vim-javascript.git
+      git clone https://github.com/pangloss/vim-javascript.git ~/.vim/bundle/vim-javascript
 
 ## Configuration
 

From 152e2e58a67c427bc7613ece02dfe86463ae6464 Mon Sep 17 00:00:00 2001
From: Joe Lencioni <joe.lencioni@brigade.com>
Date: Sun, 26 Apr 2015 07:43:43 -0700
Subject: [PATCH 0157/1043] Add `setlocal suffixesadd+=.js` to ftplugin

This suffixesadd setting helps Vim understand text that references a
path and does not contain the .js extension, as is often the case in
CommonJS style require statements. This improves motions like `gf` and
commands like `:find`. More information:

  http://usevim.com/2013/01/04/vim101-jumping/
---
 ftplugin/javascript.vim | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ftplugin/javascript.vim

diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim
new file mode 100644
index 00000000..9e2fc9b0
--- /dev/null
+++ b/ftplugin/javascript.vim
@@ -0,0 +1 @@
+setlocal suffixesadd+=.js

From 8bd60a331642e1d71f5edcae05f0df55ae25c0de Mon Sep 17 00:00:00 2001
From: Joe Lencioni <joe.lencioni@brigade.com>
Date: Sun, 26 Apr 2015 10:43:59 -0700
Subject: [PATCH 0158/1043] Add `const` and `let` to indent file

These keywords are part of ES6 and are used like the `var` keyword. This
commit makes the indentation file treat them the same as `var`.
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0a2f839e..e30580c3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -29,7 +29,7 @@ set cpo&vim
 " 1. Variables {{{1
 " ============
 
-let s:js_keywords = '^\s*\(break\|case\|catch\|continue\|debugger\|default\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
+let s:js_keywords = '^\s*\(break\|case\|catch\|const\|continue\|debugger\|default\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|let\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
 
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|regex\|comment\c'
@@ -60,7 +60,7 @@ let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 " Regex that defines blocks.
 let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
-let s:var_stmt = '^\s*var'
+let s:var_stmt = '^\s*(const\|let\|var)'
 
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'

From 89ce201ec50381b7a11da7e6bb0089b81dadcf48 Mon Sep 17 00:00:00 2001
From: crusoexia <xiawenlan1984@gmail.com>
Date: Thu, 28 May 2015 22:16:31 +0800
Subject: [PATCH 0159/1043] fix issue #107, makes 'arguments' become global
 keyword

---
 syntax/javascript.vim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a2c49ab3..7c719de4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -38,10 +38,11 @@ syntax keyword jsBooleanFalse   false
 syntax keyword jsModules        import export contained
 syntax keyword jsModuleWords    default from as contained
 syntax keyword jsOf             of contained
+syntax keyword jsArgsObj        arguments
 
 syntax region jsImportContainer      start="^\s\?import \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsStringS,jsStringD,jsTemplateString
 
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -107,9 +108,9 @@ syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+
 syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
 syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
 
-syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise
+syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
 syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
-syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis contained
+syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis,jsArgsObj contained
 syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained
 syntax match   jsFuncAssignIdent    /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
 
@@ -189,7 +190,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass,jsArgsObj
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -216,7 +217,6 @@ syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup
 syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
 syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
-syntax keyword jsArgsObj        arguments contained containedin=jsFuncBlock
 
 syntax match jsArrowFunction /=>/
 

From 9564d9076b1a22b246a3a0c218788bdbed4d62c8 Mon Sep 17 00:00:00 2001
From: Alexander Skafte <AlexanderSkafte@users.noreply.github.com>
Date: Thu, 18 Jun 2015 20:54:46 +0200
Subject: [PATCH 0160/1043] Found a typo

It shouldn't say "gackgroundPosition", right?
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 56c7422d..1efe8c68 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -175,7 +175,7 @@ if exists("javascript_enable_domhtmlcss")
     syntax keyword jsCssStyles      contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout
     syntax keyword jsCssStyles      contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop
     syntax keyword jsCssStyles      contained listStyle listStyleImage listStylePosition listStyleType
-    syntax keyword jsCssStyles      contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat
+    syntax keyword jsCssStyles      contained background backgroundAttachment backgroundColor backgroundImage backgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat
     syntax keyword jsCssStyles      contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType
     syntax keyword jsCssStyles      contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText
     syntax keyword jsCssStyles      contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor

From bcf4bfee6c56990b3e435f41a88acd9f2227ce0e Mon Sep 17 00:00:00 2001
From: Gianni Chiappetta <gianni@runlevel6.org>
Date: Wed, 15 Jul 2015 13:29:06 -0400
Subject: [PATCH 0161/1043] Add jsNoise and jsBlock to jsImportContainer

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7c719de4..1ad89979 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -40,7 +40,7 @@ syntax keyword jsModuleWords    default from as contained
 syntax keyword jsOf             of contained
 syntax keyword jsArgsObj        arguments
 
-syntax region jsImportContainer      start="^\s\?import \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsStringS,jsStringD,jsTemplateString
+syntax region jsImportContainer      start="^\s\?import \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
 
 syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj
 

From 139f6f6aed6aba06e6d2d1267abd968109518bef Mon Sep 17 00:00:00 2001
From: Chris Carpita <ccarpita@gmail.com>
Date: Wed, 15 Jul 2015 16:16:19 -0400
Subject: [PATCH 0162/1043] fix: export region should support es6 class and
 block openings

Currently, the following syntax results in an error on the closing
brace:

```js
export default {
} // <-- error here

export default class Modules extends Base {
} // <-- error here
```

This patch adds jsBlock to be included in a jsExportContainer region
so that region matching will continue to the end of the class or block.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1ad89979..1f3c6768 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -42,7 +42,7 @@ syntax keyword jsArgsObj        arguments
 
 syntax region jsImportContainer      start="^\s\?import \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
 
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj,jsBlock
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained

From 325c0487f90707ef3e3669c1125779c7e5734037 Mon Sep 17 00:00:00 2001
From: Chris Carpita <carpita@spotify.com>
Date: Thu, 16 Jul 2015 23:27:02 -0400
Subject: [PATCH 0163/1043] fix GH-272: Highlight arrow funcs without
 parenthesized params

Arrow expressions with "naked" single parameters are currently not being
recognized as such, due to the mis-labeling of the expression as assignment.

```js
// The part: `x =` looks like assignment to syntax rules:
let myFunc = x => 3;
```

This change introduces a negative lookahead for the `>` character in
the assignment matcher.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1ad89979..b01b0881 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -108,7 +108,7 @@ syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+
 syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
 syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
 
-syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
+syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\(>\)\@!/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
 syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
 syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis,jsArgsObj contained
 syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained

From a489b170684eaf5d0f5b5fa8ee0dc9a063297a79 Mon Sep 17 00:00:00 2001
From: Chris Carpita <carpita@spotify.com>
Date: Thu, 16 Jul 2015 23:45:32 -0400
Subject: [PATCH 0164/1043] fix GH-247: Single-line comments after import
 statement

The single line comment in the following statement is currently no
highlighted:

```js
import Y from 'Y' // this should be a comment
```

This introduces jsLineComment as being containable in an import statement,
and also closes the import statement on semicolon so that other expressions
can be highlighted correctly.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1ad89979..08bfd4c5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -40,7 +40,7 @@ syntax keyword jsModuleWords    default from as contained
 syntax keyword jsOf             of contained
 syntax keyword jsArgsObj        arguments
 
-syntax region jsImportContainer      start="^\s\?import \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
+syntax region jsImportContainer      start="^\s\?import \?" end="@\(;|$\)" contains=jsModules,jsModuleWords,jsLineComment,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
 
 syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj
 

From bf0858a188365839495bf2feed6212dc24a950e0 Mon Sep 17 00:00:00 2001
From: glortho <jed@dataverse.me>
Date: Fri, 17 Jul 2015 16:46:09 -0400
Subject: [PATCH 0165/1043] Adding support for ES7/ES2016 decorators

---
 syntax/javascript.vim | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6867b120..5b29833f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -107,6 +107,8 @@ syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
 syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
+syntax match   jsDecorator        "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
+syntax match   jsDecoratorFunction "[a-zA-Z_][a-zA-Z0-9_.]*" display contained nextgroup=jsFunc skipwhite
 
 syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\(>\)\@!/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
 syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
@@ -190,7 +192,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass,jsArgsObj
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass,jsArgsObj,jsDecorator
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -303,6 +305,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBuiltins             Special
   HiLink jsModules              Include
   HiLink jsModuleWords          Include
+  HiLink jsDecorator            Special
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From dfc554e8aac36cd910947e1e69ac12d765157010 Mon Sep 17 00:00:00 2001
From: Chris Carpita <carpita@spotify.com>
Date: Tue, 21 Jul 2015 15:25:26 -0400
Subject: [PATCH 0166/1043] fix: import statement ending regex

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5b29833f..e157a44c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -40,7 +40,7 @@ syntax keyword jsModuleWords    default from as contained
 syntax keyword jsOf             of contained
 syntax keyword jsArgsObj        arguments
 
-syntax region jsImportContainer      start="^\s\?import \?" end="@\(;|$\)" contains=jsModules,jsModuleWords,jsLineComment,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
+syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsLineComment,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
 
 syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj,jsBlock
 

From 487e0c659bcb95f136012566242e527271fab12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20LAJOIE?= <orel@melix.net>
Date: Tue, 3 Mar 2015 15:01:59 +0100
Subject: [PATCH 0167/1043] Manage case indent

* Multi case
* half indent for case
* indent when typing : in case

case is now use as a block delimiter

Before:

switch(name) {
    case 1:
        break;
    case 2:
        a = b;
    foo();
    bar();
    break;
    case 4:
        case 3:
        if (true) {
        foo();
    }
    bar();
    c = d;
    break;
    default:
        foo();
    break;
}

After:

switch(name) {
  case 1:
    break;
  case 2:
    a = b;
    foo();
    bar();
    break;
  case 4:
  case 3:
    if (true) {
        foo();
    }
    bar();
    c = d;
    break;
  default:
    foo();
    break;
}
---
 indent/javascript.vim | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e30580c3..20c84481 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -16,7 +16,7 @@ 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\,,!^F,o,O,e
+setlocal indentkeys=0{,0},0),0],0\,:,!^F,o,O,e
 
 " Only define the function once.
 if exists("*GetJavascriptIndent")
@@ -29,8 +29,8 @@ set cpo&vim
 " 1. Variables {{{1
 " ============
 
-let s:js_keywords = '^\s*\(break\|case\|catch\|const\|continue\|debugger\|default\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|let\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
-
+let s:js_keywords = '^\s*\(break\|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\)'
+let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|regex\|comment\c'
 
@@ -53,7 +53,7 @@ let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]
 
 " Regex that defines continuation lines.
 " TODO: this needs to deal with if ...: and so on
-let s:msl_regex = s:continuation_regex
+let s:msl_regex = s:continuation_regex.'|'.s:expr_case
 
 let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
 
@@ -300,6 +300,17 @@ function GetJavascriptIndent()
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
 
+  if (line =~ s:expr_case)
+    if (getline(prevline) =~ s:expr_case)
+      return indent(prevline)
+    else
+      if (getline(prevline) =~ s:block_regex)
+        return indent(prevline) + &sw/2
+      else
+        return indent(prevline) - &sw/2
+      endif
+    endif
+  endif
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
   " others we indent to the containing line's MSL's level.  Return -1 if fail.
@@ -342,6 +353,9 @@ function GetJavascriptIndent()
   if (getline(prevline) =~ s:comma_first)
     return indent(prevline) - &sw
   endif
+  if (getline(prevline) =~ s:expr_case)
+    return indent(prevline) + &sw/2
+  endif
 
   if (line =~ s:ternary)
     if (getline(prevline) =~ s:ternary_q)
@@ -385,15 +399,19 @@ function GetJavascriptIndent()
     return 0
   endif
 
-  " Set up variables for current line.
-  let line = getline(lnum)
-  let ind = indent(lnum)
 
   " If the previous line ended with a block opening, add a level of indent.
   if s:Match(lnum, s:block_regex)
-    return indent(s:GetMSL(lnum, 0)) + &sw
+    if (line =~ s:expr_case)
+      return indent(s:GetMSL(lnum, 0)) + &sw/2
+    else
+      return indent(s:GetMSL(lnum, 0)) + &sw
+    endif
   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 line =~ '[[({]'

From 5cbbdd4e514da3404c6b3596135fe1dc48c99222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20LAJOIE?= <orel@melix.net>
Date: Tue, 3 Mar 2015 21:05:05 +0100
Subject: [PATCH 0168/1043] Case indent: use cinoptions : and = values

:N    Place case labels N characters from the indent of the switch().
            (default 'shiftwidth').

=N    Place statements occurring after a case label N characters from
            the indent of the label.  (default 'shiftwidth').

(Same as default cindent)
---
 indent/javascript.vim | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 20c84481..0f526db9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -68,6 +68,16 @@ let s:comma_last = ',\s*$'
 let s:ternary = '^\s\+[?|:]'
 let s:ternary_q = '^\s\+?'
 
+let s:case_indent = &sw
+let s:case_indent_after = &sw
+let m = matchlist(&cinoptions, ':\(.\)')
+if (len(m) > 2)
+    let s:case_indent = m[1]
+endif
+let m = matchlist(&cinoptions, '=\(.\)')
+if (len(m) > 2)
+    let s:case_indent_after = m[1]
+endif
 " 2. Auxiliary Functions {{{1
 " ======================
 
@@ -305,9 +315,9 @@ function GetJavascriptIndent()
       return indent(prevline)
     else
       if (getline(prevline) =~ s:block_regex)
-        return indent(prevline) + &sw/2
+        return indent(prevline) + s:case_indent
       else
-        return indent(prevline) - &sw/2
+        return indent(prevline) - s:case_indent_after
       endif
     endif
   endif
@@ -354,7 +364,7 @@ function GetJavascriptIndent()
     return indent(prevline) - &sw
   endif
   if (getline(prevline) =~ s:expr_case)
-    return indent(prevline) + &sw/2
+    return indent(prevline) + s:case_indent_after
   endif
 
   if (line =~ s:ternary)

From e9ee38953ea60455fc3db0c8c6dd35aa912ad78a Mon Sep 17 00:00:00 2001
From: Will Binns-Smith <wbinnssmith@gmail.com>
Date: Sat, 18 Jul 2015 23:28:09 -0700
Subject: [PATCH 0169/1043] Add support for async and await keywords

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5b29833f..0b03a493 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -133,6 +133,7 @@ syntax keyword jsLabel          case default
 syntax keyword jsKeyword        yield
 syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
+syntax keyword jsAsyncKeyword   async await
 
 syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
@@ -192,7 +193,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass,jsArgsObj,jsDecorator
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass,jsArgsObj,jsDecorator,jsAsyncKeyword
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -267,6 +268,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStatement            Statement
   HiLink jsException            Exception
   HiLink jsKeyword              Keyword
+  HiLink jsAsyncKeyword         Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
   HiLink jsGenerator            jsFunction

From 131c2d364eac7a40630e7eadffe5e1f0b3559b50 Mon Sep 17 00:00:00 2001
From: Viacheslav Lotsmanov <lotsmanov89@gmail.com>
Date: Wed, 16 Sep 2015 12:07:49 +0300
Subject: [PATCH 0170/1043] Added jsdoc synonym @prop for @property

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 05f5fe34..d49cd027 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -65,7 +65,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   " tags containing a param
   syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
-  syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\)\>" nextgroup=jsDocType skipwhite
+  syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
   syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references

From 49d46bf9e9fac03ff760961a7c73265ddbbda476 Mon Sep 17 00:00:00 2001
From: Delapouite <delapouite@gmail.com>
Date: Wed, 23 Sep 2015 20:07:06 +0200
Subject: [PATCH 0171/1043] feat(conceal): add arrow_function option

---
 README.md             | 19 ++++++++++---------
 syntax/javascript.vim |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1cc50aee..797c89e4 100644
--- a/README.md
+++ b/README.md
@@ -67,15 +67,16 @@ Default Value: 0
 You can customize concealing characters by defining one or more of the following
 variables:
 
-    let g:javascript_conceal_function   = "ƒ"
-    let g:javascript_conceal_null       = "ø"
-    let g:javascript_conceal_this       = "@"
-    let g:javascript_conceal_return     = "⇚"
-    let g:javascript_conceal_undefined  = "¿"
-    let g:javascript_conceal_NaN        = "ℕ"
-    let g:javascript_conceal_prototype  = "¶"
-    let g:javascript_conceal_static     = "•"
-    let g:javascript_conceal_super      = "Ω"
+    let g:javascript_conceal_function       = "ƒ"
+    let g:javascript_conceal_null           = "ø"
+    let g:javascript_conceal_this           = "@"
+    let g:javascript_conceal_return         = "⇚"
+    let g:javascript_conceal_undefined      = "¿"
+    let g:javascript_conceal_NaN            = "ℕ"
+    let g:javascript_conceal_prototype      = "¶"
+    let g:javascript_conceal_static         = "•"
+    let g:javascript_conceal_super          = "Ω"
+    let g:javascript_conceal_arrow_function = "⇒"
 
 ## Contributing
 
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d49cd027..0b7fcd03 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -221,7 +221,7 @@ syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=
 syntax match   jsFuncArgCommas  contained ','
 syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 
-syntax match jsArrowFunction /=>/
+exe 'syntax match jsArrowFunction /=>/ '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From de7a60c5c803fb240610d6dc233ae13c61b30468 Mon Sep 17 00:00:00 2001
From: Vitor Cortez <vitor.a.cortez@gmail.com>
Date: Wed, 30 Sep 2015 23:38:41 -0300
Subject: [PATCH 0172/1043] Add dollar sign to jsDocParam matches

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d49cd027..ae4b3d1a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -77,7 +77,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
   syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
+  syntax match  jsDocParam        contained "\%(#\|\$\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
   syntax case match

From 4c983baf28818fdf941faa73cab6e81d3f45d0a3 Mon Sep 17 00:00:00 2001
From: Simon Olofsson <simon@olofsson.de>
Date: Tue, 6 Oct 2015 11:58:51 +0200
Subject: [PATCH 0173/1043] Add common DOM Functions

getElementById, getElementsByClassName, querySelector and
querySelectorAll are often used Functions.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d49cd027..a3086cb8 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -166,7 +166,7 @@ if exists("javascript_enable_domhtmlcss")
 
     " DOM2 things
     syntax match jsDomElemAttrs     contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/
-    syntax match jsDomElemFuncs     contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=jsParen skipwhite
+    syntax match jsDomElemFuncs     contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementById\|getElementsByClassName\|getElementsByTagName\|querySelector\|querySelectorAll\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=jsParen skipwhite
     " HTML things
     syntax match jsHtmlElemAttrs    contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/
     syntax match jsHtmlElemFuncs    contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=jsParen skipwhite

From 7b9e11ad89549f08e1c750fc46bff0a03f059d95 Mon Sep 17 00:00:00 2001
From: William Chargin <wchargin@gmail.com>
Date: Wed, 30 Dec 2015 16:43:57 -0800
Subject: [PATCH 0174/1043] Make arrow-functions one-liners

Summary:
This fixes the indentation for expression arrow functions
that are continued on multiple lines.
This does not affect the `FunctionBody` variant of arrow functions,
which were already correct due to the opening brace.

Resolves pangloss/vim-javascript#332.

Test Plan:
Type
```javascript
const myNiftyArrowFunction = (foo, bar) =>
    foo + bar;
myNiftyArrowFunction(1, 2);
```
and note that it's indented correctly as you type.
Then run `gg=G` and make sure that it stays indented correctly.

Note also that the indentation of
```javascript
const myFunctionBodiedArrowFunction = (foo, bar) => {
    doAThing();
    return foo + bar;
};
myFunctionBodiedArrowFunction(1, 2);
```
is still correct.
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0f526db9..6ce1db8f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -55,7 +55,7 @@ let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]
 " TODO: this needs to deal with if ...: and so on
 let s:msl_regex = s:continuation_regex.'|'.s:expr_case
 
-let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
+let s:one_line_scope_regex = '\%(\<\%(if\|else\|for\|while\)\>\|=>\)[^{;]*' . s:line_term
 
 " Regex that defines blocks.
 let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term

From c024f95c08b9bbd897f082620ddd14fb9fe8eff1 Mon Sep 17 00:00:00 2001
From: William Chargin <wchargin@gmail.com>
Date: Fri, 1 Jan 2016 15:52:13 -0800
Subject: [PATCH 0175/1043] Respect 'very-magic' in 'jsAssignmentExpr' regexp

Summary:
This regex was modified in 325c0487f90707ef3e3669c1125779c7e5734037,
where the tokens `\(>\)\@!` were added.
This was supposed to be a negative lookahead for a literal `>`.
However, this didn't work because the regexp has the `\v` flag,
so the regexp actually ended up matching nothing.

Closes #333.

Test Plan:
Install the [gerw/vim-HiLinkTrace][HLT] plugin.
Write `let x = 3` in a new JavaScript file.
Place the cursor on the `x` and enter `:HLT<CR>`.
Before the patch is applied,
the `SynStack` and `HltTrace` fields of the message should be blank.
Then, apply the patch, relaunch vim, and repeat the `HLT` command;
the message should now contain `SynStack: jsAssignmentExpr->...`.

  [HLT]: https://github.com/gerw/vim-HiLinkTrace
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d49cd027..af2ee5ab 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -110,7 +110,7 @@ syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function
 syntax match   jsDecorator        "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
 syntax match   jsDecoratorFunction "[a-zA-Z_][a-zA-Z0-9_.]*" display contained nextgroup=jsFunc skipwhite
 
-syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\(>\)\@!/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
+syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\>@!/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
 syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
 syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis,jsArgsObj contained
 syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained

From ca58cdddebf27d330eb0d27efa749fda7063cb68 Mon Sep 17 00:00:00 2001
From: Kevin Fahy <kfahy@evernote.com>
Date: Fri, 8 Jan 2016 21:27:29 -0800
Subject: [PATCH 0176/1043] Fix nested template variable syntax highlighting

Accept JS expressions in template variables so that their contents are
highlighted normally. Change `jsTemplateVar` to a region rather than
a match.

Fixes #316
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 74fa7ffd..58aad0c5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -88,7 +88,7 @@ syntax case match
 "" Syntax in the JavaScript code
 syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
-syntax match   jsTemplateVar      "\${.\{-}}" contained
+syntax region  jsTemplateVar      matchgroup=jsBraces start=+${+ end=+}+ contained contains=@jsExpression
 syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc

From ee412e34c850e319171503142066bb75cab50964 Mon Sep 17 00:00:00 2001
From: James Whitney <james@whitney.io>
Date: Wed, 20 Jan 2016 01:21:53 +1100
Subject: [PATCH 0177/1043] Add jsComment to jsFuncArgs

Fixes #297
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 74fa7ffd..b4e9b132 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -217,7 +217,7 @@ exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsF
 
 syntax match   jsGenerator      contained '\*' nextgroup=jsFuncName skipwhite
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr,jsComment nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
 syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 

From f41da19fc0b60ec578263392932b05fe0c618d3b Mon Sep 17 00:00:00 2001
From: James Whitney <james@whitney.io>
Date: Wed, 20 Jan 2016 08:56:19 +1100
Subject: [PATCH 0178/1043] Add jsLineComment to jsFuncArgs

Fixes #297
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b4e9b132..4fa4906e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -217,7 +217,7 @@ exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsF
 
 syntax match   jsGenerator      contained '\*' nextgroup=jsFuncName skipwhite
 syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr,jsComment nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr,jsComment,jsLineComment nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas  contained ','
 syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 

From 68290c3e7fdb1fe2e4874be2cd881457bdd320c8 Mon Sep 17 00:00:00 2001
From: Artem Baguinski <abaguinski@depraktijkindex.nl>
Date: Tue, 26 Jan 2016 10:28:36 +0100
Subject: [PATCH 0179/1043] make the m variable script-local

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6ce1db8f..e1e1fc7e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -70,13 +70,13 @@ let s:ternary_q = '^\s\+?'
 
 let s:case_indent = &sw
 let s:case_indent_after = &sw
-let m = matchlist(&cinoptions, ':\(.\)')
-if (len(m) > 2)
-    let s:case_indent = m[1]
+let s:m = matchlist(&cinoptions, ':\(.\)')
+if (len(s:m) > 2)
+    let s:case_indent = s:m[1]
 endif
-let m = matchlist(&cinoptions, '=\(.\)')
-if (len(m) > 2)
-    let s:case_indent_after = m[1]
+let s:m = matchlist(&cinoptions, '=\(.\)')
+if (len(s:m) > 2)
+    let s:case_indent_after = s:m[1]
 endif
 " 2. Auxiliary Functions {{{1
 " ======================

From 32137f1f0c228d25b45057bd4e0b7329ab181c0e Mon Sep 17 00:00:00 2001
From: Zheng Chaoping <zbinlin@gmail.com>
Date: Fri, 29 Jan 2016 23:07:52 +0800
Subject: [PATCH 0180/1043] Use shfitwidth() instead of &sw in
 indent/javascript.vim

---
 indent/javascript.vim | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e1e1fc7e..1aeeb89a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -26,6 +26,17 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+" Get shiftwidth value
+if exists('*shiftwidth')
+  func s:sw()
+    return shiftwidth()
+  endfunc
+else
+  func s:sw()
+    return &sw
+  endfunc
+endif
+
 " 1. Variables {{{1
 " ============
 
@@ -68,8 +79,8 @@ let s:comma_last = ',\s*$'
 let s:ternary = '^\s\+[?|:]'
 let s:ternary_q = '^\s\+?'
 
-let s:case_indent = &sw
-let s:case_indent_after = &sw
+let s:case_indent = s:sw()
+let s:case_indent_after = s:sw()
 let s:m = matchlist(&cinoptions, ':\(.\)')
 if (len(s:m) > 2)
     let s:case_indent = s:m[1]
@@ -201,9 +212,9 @@ function s:GetVarIndent(lnum)
 
     " if the previous line doesn't end in a comma, return to regular indent
     if (line !~ s:comma_last)
-      return indent(prev_lnum) - &sw
+      return indent(prev_lnum) - s:sw()
     else
-      return indent(lvar) + &sw
+      return indent(lvar) + s:sw()
     endif
   endif
 
@@ -342,7 +353,7 @@ function GetJavascriptIndent()
           return indent(prevline)
         " otherwise we indent 1 level
         else
-          return indent(lvar) + &sw
+          return indent(lvar) + s:sw()
         endif
       endif
     endif
@@ -361,7 +372,7 @@ function GetJavascriptIndent()
 
   " If the line is comma first, dedent 1 level
   if (getline(prevline) =~ s:comma_first)
-    return indent(prevline) - &sw
+    return indent(prevline) - s:sw()
   endif
   if (getline(prevline) =~ s:expr_case)
     return indent(prevline) + s:case_indent_after
@@ -371,7 +382,7 @@ function GetJavascriptIndent()
     if (getline(prevline) =~ s:ternary_q)
       return indent(prevline)
     else
-      return indent(prevline) + &sw
+      return indent(prevline) + s:sw()
     endif
   endif
 
@@ -413,9 +424,9 @@ function GetJavascriptIndent()
   " If the previous line ended with a block opening, add a level of indent.
   if s:Match(lnum, s:block_regex)
     if (line =~ s:expr_case)
-      return indent(s:GetMSL(lnum, 0)) + &sw/2
+      return indent(s:GetMSL(lnum, 0)) + s:sw()/2
     else
-      return indent(s:GetMSL(lnum, 0)) + &sw
+      return indent(s:GetMSL(lnum, 0)) + s:sw()
     endif
   endif
 
@@ -428,12 +439,12 @@ function GetJavascriptIndent()
     let counts = s:LineHasOpeningBrackets(lnum)
     if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
       if col('.') + 1 == col('$')
-        return ind + &sw
+        return ind + s:sw()
       else
         return virtcol('.')
       endif
     elseif counts[1] == '1' || counts[2] == '1'
-      return ind + &sw
+      return ind + s:sw()
     else
       call cursor(v:lnum, vcol)
     end
@@ -443,18 +454,18 @@ function GetJavascriptIndent()
   " --------------------------
 
   let ind_con = ind
-  let ind = s:IndentWithContinuation(lnum, ind_con, &sw)
+  let ind = s:IndentWithContinuation(lnum, ind_con, s:sw())
 
   " }}}2
   "
   "
   let ols = s:InOneLineScope(lnum)
   if ols > 0
-    let ind = ind + &sw
+    let ind = ind + s:sw()
   else
     let ols = s:ExitingOneLineScope(lnum)
     while ols > 0 && ind > 0
-      let ind = ind - &sw
+      let ind = ind - s:sw()
       let ols = s:InOneLineScope(ols - 1)
     endwhile
   endif

From bc74a6fff6ab7d0b616bd7a361c06277a193172f Mon Sep 17 00:00:00 2001
From: Damion Vega <hi@djv.io>
Date: Sat, 13 Feb 2016 23:02:00 -0700
Subject: [PATCH 0181/1043] Added Buffer to jsGlobalObjects

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4fa4906e..20930a86 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -135,7 +135,7 @@ syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
 syntax keyword jsAsyncKeyword   async await
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
 syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From 62c15f60211b45d0ce0d9becf5ce4983aa5ddb62 Mon Sep 17 00:00:00 2001
From: Cameron Steffen <cam.steffen94@gmail.com>
Date: Mon, 7 Sep 2015 00:39:32 -0500
Subject: [PATCH 0182/1043] Issue #294 better one line scope

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1aeeb89a..a39e1335 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -66,7 +66,7 @@ let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]
 " TODO: this needs to deal with if ...: and so on
 let s:msl_regex = s:continuation_regex.'|'.s:expr_case
 
-let s:one_line_scope_regex = '\%(\<\%(if\|else\|for\|while\)\>\|=>\)[^{;]*' . s:line_term
+let s:one_line_scope_regex = '\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(.*)\)' . s:line_term
 
 " Regex that defines blocks.
 let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term

From fd99d77784979ce8097c3432cf838e7e3a47650c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 4 Mar 2016 17:11:14 -0800
Subject: [PATCH 0183/1043] Adding first pass at ES6 Class support

---
 syntax/javascript.vim | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index dc6e5e0b..4305b13b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -42,7 +42,7 @@ syntax keyword jsArgsObj        arguments
 
 syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsLineComment,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
 
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj,jsBlock
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj,jsBlock,jsClassDefinition
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -131,7 +131,6 @@ syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
 syntax keyword jsLabel          case default
 syntax keyword jsKeyword        yield
-syntax keyword jsClass          extends class
 syntax keyword jsException      try catch throw finally
 syntax keyword jsAsyncKeyword   async await
 
@@ -193,12 +192,13 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass,jsArgsObj,jsDecorator,jsAsyncKeyword
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold
-syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained fold
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold
+syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions contained fold
+syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition contained fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 "" catch errors caused by wrong parenthesis
@@ -223,6 +223,10 @@ syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 
 exe 'syntax match jsArrowFunction /=>/ '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
+syntax keyword jsClassKeywords extends class contained
+syntax keyword jsClassMethodDefinitions get set static contained nextgroup=jsFuncName skipwhite skipempty
+syntax match jsClassDefinition /class [a-zA-Z_$][0-9a-zA-Z_$ \n]*/  contains=jsClassKeywords nextgroup=jsClassBlock skipwhite skipempty
+
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -282,7 +286,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsOperator             Operator
   HiLink jsOf                   Operator
   HiLink jsStorageClass         StorageClass
-  HiLink jsClass                Structure
+  HiLink jsClassKeywords        Structure
   HiLink jsThis                 Special
   HiLink jsStatic               Special
   HiLink jsSuper                Special
@@ -299,6 +303,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBraces               Noise
   HiLink jsFuncBraces           Noise
   HiLink jsFuncParens           Noise
+  HiLink jsClassBraces          Noise
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
   HiLink jsGlobalObjects        Special
@@ -320,6 +325,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 
   HiLink jsCssStyles            Label
 
+  HiLink jsClassMethodDefinitions Type
+
   delcommand HiLink
 endif
 

From 995183bd1e39fe3b4094dd217470ce92cc183972 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 4 Mar 2016 19:52:27 -0800
Subject: [PATCH 0184/1043] ES6 Class Fixes

* Added support for . within class definition and mapped to jsClassNoise
* Linked jsClassNoise to Noise
* Tweaked code/whitespace alignment of the jsClass* section
---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4305b13b..3f2ef5be 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -224,8 +224,9 @@ syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
 exe 'syntax match jsArrowFunction /=>/ '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 syntax keyword jsClassKeywords extends class contained
+syntax match   jsClassNoise /\./ contained
 syntax keyword jsClassMethodDefinitions get set static contained nextgroup=jsFuncName skipwhite skipempty
-syntax match jsClassDefinition /class [a-zA-Z_$][0-9a-zA-Z_$ \n]*/  contains=jsClassKeywords nextgroup=jsClassBlock skipwhite skipempty
+syntax match   jsClassDefinition /class [a-zA-Z_$][0-9a-zA-Z_$ \n.]*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -304,6 +305,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncBraces           Noise
   HiLink jsFuncParens           Noise
   HiLink jsClassBraces          Noise
+  HiLink jsClassNoise           Noise
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
   HiLink jsGlobalObjects        Special

From 43784bc2ac2729197fd14e3c79bdb53e11753f37 Mon Sep 17 00:00:00 2001
From: juneidy <juneidy@amristar.com>
Date: Mon, 21 Dec 2015 08:48:17 +0800
Subject: [PATCH 0185/1043] Added jsduck documentation types

Allowed single quote for param, misplaced localdoc

Allowed dash for param
---
 syntax/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index dc6e5e0b..5a6a8dd1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -63,21 +63,21 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsBlockComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
-  syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
+  syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
   syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
   " tags containing references
   syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+  syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
   syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
   syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\$\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
+  syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
   syntax case match

From 5fea23eee943645dc648a98ae265ad209d5484ad Mon Sep 17 00:00:00 2001
From: bounceme <mac@Macs-MacBook-Pro.local>
Date: Thu, 31 Mar 2016 21:59:50 -0700
Subject: [PATCH 0186/1043] fast attempt for issues with multiple declarations

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a39e1335..82cd621c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -64,7 +64,7 @@ let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]
 
 " Regex that defines continuation lines.
 " TODO: this needs to deal with if ...: and so on
-let s:msl_regex = s:continuation_regex.'|'.s:expr_case
+let s:msl_regex = s:continuation_regex.'\|'.s:expr_case
 
 let s:one_line_scope_regex = '\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(.*)\)' . s:line_term
 

From a57c0a154960604e85f2ce53b0c5fc09b4433148 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 3 Apr 2016 19:16:33 -0700
Subject: [PATCH 0187/1043] Higher specificity for jsTemplate braces

---
 syntax/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 18f8df97..4613136e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -88,7 +88,7 @@ syntax case match
 "" Syntax in the JavaScript code
 syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
 syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
-syntax region  jsTemplateVar      matchgroup=jsBraces start=+${+ end=+}+ contained contains=@jsExpression
+syntax region  jsTemplateVar      matchgroup=jsTemplateBraces start=+${+ end=+}+ contained contains=@jsExpression
 syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
@@ -308,6 +308,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsClassNoise           Noise
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
+  HiLink jsTemplateBraces       jsBraces
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special

From 73232334f004e21e556ff84041481722c0d2904a Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 3 Apr 2016 19:50:52 -0700
Subject: [PATCH 0188/1043] Improvements to rest highlighting

* Added higher specificity to the dots in the spread declaration
---
 syntax/javascript.vim | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4613136e..5bd26ccc 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -215,11 +215,12 @@ endif
 
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 
-syntax match   jsGenerator      contained '\*' nextgroup=jsFuncName skipwhite
-syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr,jsComment,jsLineComment nextgroup=jsFuncBlock keepend skipwhite skipempty
-syntax match   jsFuncArgCommas  contained ','
-syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
+syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName skipwhite
+syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
+syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr,jsComment,jsLineComment nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax match   jsFuncArgCommas   contained ','
+syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
+syntax match   jsFuncArgRestDots contained /\.\.\./
 
 exe 'syntax match jsArrowFunction /=>/ '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
@@ -316,6 +317,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsModules              Include
   HiLink jsModuleWords          Include
   HiLink jsDecorator            Special
+  HiLink jsFuncArgRestDots      Noise
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From c1ea11050a996d050fa0a2ef41419bac603b9007 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 3 Apr 2016 16:53:50 -0700
Subject: [PATCH 0189/1043] Adding jsFuncBlock support

---
 syntax/javascript.vim | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5bd26ccc..dfbb261f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -198,7 +198,7 @@ syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contai
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold
 syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions contained fold
-syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition contained fold
+syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 "" catch errors caused by wrong parenthesis
@@ -214,6 +214,7 @@ if main_syntax == "javascript"
 endif
 
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsArrowFunction /=>/ skipwhite skipempty nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName skipwhite
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
@@ -222,8 +223,6 @@ syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots contained /\.\.\./
 
-exe 'syntax match jsArrowFunction /=>/ '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
-
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained
 syntax keyword jsClassMethodDefinitions get set static contained nextgroup=jsFuncName skipwhite skipempty

From ae177c45e0ec305b14a9cc93e508ca170c6dce00 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 3 Apr 2016 18:01:36 -0700
Subject: [PATCH 0190/1043] First pass at handling lamba arguments

---
 syntax/javascript.vim | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index dfbb261f..f6379319 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -192,7 +192,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
@@ -214,7 +214,7 @@ if main_syntax == "javascript"
 endif
 
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
-exe 'syntax match jsArrowFunction /=>/ skipwhite skipempty nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName skipwhite
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
@@ -223,6 +223,11 @@ syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots contained /\.\.\./
 
+" Matches a single keyword argument with no parens
+syntax match   jsArrowFuncArgs  /\(\k\)\+\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend
+" Matches a series of arguments surrounded in parens
+syntax match   jsArrowFuncArgs  /(\(\k\|,\|\s\|\n\)*)\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend
+
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained
 syntax keyword jsClassMethodDefinitions get set static contained nextgroup=jsFuncName skipwhite skipempty

From 91f860b1b038a9b501af31440d80a4ab183dc04b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 3 Apr 2016 18:15:23 -0700
Subject: [PATCH 0191/1043] Linking jsArrowFuncArgs to jsFuncArgs

---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f6379319..079fe3f5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -282,6 +282,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
   HiLink jsGenerator            jsFunction
+  HiLink jsArrowFuncArgs        jsFuncArgs
   HiLink jsFuncName             Function
   HiLink jsArgsObj              Special
   HiLink jsError                Error

From 82473d0d6e6455c9a9d93faff1a655d4ea173a35 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 3 Apr 2016 19:38:07 -0700
Subject: [PATCH 0192/1043] Allow ... in arrow arguments definition

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 079fe3f5..2ba6dd74 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -226,7 +226,7 @@ syntax match   jsFuncArgRestDots contained /\.\.\./
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\(\k\)\+\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend
 " Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /(\(\k\|,\|\s\|\n\)*)\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend
+syntax match   jsArrowFuncArgs  /(\(\k\|,\|\s\|\n\|\.\)*)\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend
 
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained

From 6590bbcdf3e88eb3c8da32ab66f3baaffcbbf5ea Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 3 Apr 2016 20:18:41 -0700
Subject: [PATCH 0193/1043] Fix Generator definitions

Tacking this on since it relates to ES6 functions.  The generator
astericks were breaking the highlighting of function arguments.  This
should fix generators
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 2ba6dd74..d696a0af 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -216,7 +216,7 @@ endif
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
-syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName skipwhite
+syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName,jsFuncArgs skipwhite
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
 syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr,jsComment,jsLineComment nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas   contained ','

From d8c18d9d3a6b40496791d41efb49a2b26856c21e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 4 Apr 2016 01:56:52 -0700
Subject: [PATCH 0194/1043] Fix Comment Regions

Our comment detection was a bit buggy because we did not use the extend
keyword.  This meant that if the comment was contained within a region
or a match of sorts, it would get pre-maturely ended by a containing
group.  Using the extend keyword means that it will override any
containing parent matcher and still display a comment, which is how JS
actually interprets the code.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d696a0af..21c33880 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -46,11 +46,11 @@ syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsM
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
-syntax region  jsLineComment    start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell
+syntax region  jsLineComment    start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell extend
 syntax region  jsEnvComment     start="\%^#!" end="$" display
 syntax region  jsLineComment    start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell fold
 syntax region  jsCvsTag         start="\$\cid:" end="\$" oneline contained
-syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold
+syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold extend
 
 "" JSDoc / JSDoc Toolkit
 if !exists("javascript_ignore_javaScriptdoc")

From 36f34b25d63211f1fab20c1f748a3dd070b4c270 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 4 Apr 2016 02:10:46 -0700
Subject: [PATCH 0195/1043] Improved function declaration destructuring

This should vastly improve how destructuring is handled in function
declarations. It is still far from perfect, and a major problem right
now is how to support multiple lines in lambda functions
---
 syntax/javascript.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 21c33880..212d452d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -218,15 +218,16 @@ exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=
 
 syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName,jsFuncArgs skipwhite
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr,jsComment,jsLineComment nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsLineComment,jsStringS,jsStringD,jsNumber,jsFuncArgDestructuring nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots contained /\.\.\./
+syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|(\|)\)/ extend
 
 " Matches a single keyword argument with no parens
-syntax match   jsArrowFuncArgs  /\(\k\)\+\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend
+syntax match   jsArrowFuncArgs  /\(\k\)\+\s*\(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction
 " Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /(\(\k\|,\|\s\|\n\|\.\)*)\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend
+syntax match   jsArrowFuncArgs  /(\%(.\)*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction
 
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained
@@ -323,6 +324,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsModuleWords          Include
   HiLink jsDecorator            Special
   HiLink jsFuncArgRestDots      Noise
+  HiLink jsFuncArgDestructuring Noise
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From 113abc2678fe27d570990daac0c0c0d68a0efe8b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 5 Apr 2016 17:23:10 -0700
Subject: [PATCH 0196/1043] Fix jsBlock vs jsFuncBlock priority

Since we had to remove the contained argument for jsFuncBlock, it caused
false positives for object definitions at the top level of a file.  I've
made jsBlock a higher priorty than jsFuncBlock by placing jsBlock AFTER
jsFuncBlock.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 212d452d..0fa7130d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -196,9 +196,9 @@ syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTa
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold
 syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions contained fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 "" catch errors caused by wrong parenthesis

From 293108695f704e70aeb86fb4d7596bce751c5701 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 9 Apr 2016 23:05:16 -0700
Subject: [PATCH 0197/1043] line following arrow indentation

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a39e1335..f3a567f0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -60,13 +60,13 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st
 let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]=[^=].*,\)' . s:line_term
+let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]=[^=>].*,\)' . s:line_term
 
 " Regex that defines continuation lines.
 " TODO: this needs to deal with if ...: and so on
 let s:msl_regex = s:continuation_regex.'|'.s:expr_case
 
-let s:one_line_scope_regex = '\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(.*)\)' . s:line_term
+let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(.*)\)\|=>\)' . s:line_term
 
 " Regex that defines blocks.
 let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term

From f286f94dcdb62ce8e5264aff641e3abe275daab0 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 9 Apr 2016 14:34:23 -0700
Subject: [PATCH 0198/1043] Fix lambda definitions in class definitions

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0fa7130d..70b796fb 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -196,7 +196,7 @@ syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTa
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
-syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions contained fold
+syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs contained fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf

From 734cdfc04eddf77e2d37c4f7291defff6334198b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 12 Apr 2016 11:02:15 -0700
Subject: [PATCH 0199/1043] Improve one line scope

#293
this will detect the start and end parentheses,allowing statements with parentheses to come after the condition parens.This regex can detect with up to 4 levels of nesting.
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9ed79e4d..27249a8a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -66,7 +66,7 @@ let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]
 " TODO: this needs to deal with if ...: and so on
 let s:msl_regex = s:continuation_regex.'\|'.s:expr_case
 
-let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(.*)\)\|=>\)' . s:line_term
+let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*([^()]*)[^()]*\))[^()]*\))[^()]*\))\)\|=>\)' . s:line_term
 
 " Regex that defines blocks.
 let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term

From f13009e4071c492f48fedc2afd9a07c046e17189 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 14 Apr 2016 14:57:40 -0700
Subject: [PATCH 0200/1043] Adding [ and ] to jsFuncArgDestructuring

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 70b796fb..b9f8fc98 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -222,7 +222,7 @@ syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end
 syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots contained /\.\.\./
-syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|(\|)\)/ extend
+syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|(\|)\|\[\|\]\)/ extend
 
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\(\k\)\+\s*\(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction

From 17fa18caeaa0c0f7df33a3a77ead1afebb9b29c1 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 15 Apr 2016 19:32:22 -0700
Subject: [PATCH 0201/1043] simplifies the parentheses handling

also a possible fix for the last example in #329 and #315
---
 indent/javascript.vim | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9ed79e4d..217bf3bb 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -69,9 +69,9 @@ let s:msl_regex = s:continuation_regex.'\|'.s:expr_case
 let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(.*)\)\|=>\)' . s:line_term
 
 " Regex that defines blocks.
-let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
+let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
-let s:var_stmt = '^\s*(const\|let\|var)'
+let s:var_stmt = '^\s*\%(const\|let\|var\)'
 
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
@@ -240,7 +240,7 @@ function s:LineHasOpeningBrackets(lnum)
     endif
     let pos = match(line, '[][(){}]', pos + 1)
   endwhile
-  return (open_0 > 0) . (open_2 > 0) . (open_4 > 0)
+  return (open_0 > 0 ? 1 : (open_0 == 0 ? 0 : 2)) . (open_2 > 0) . (open_4 > 0)
 endfunction
 
 function s:Match(lnum, regex)
@@ -448,7 +448,19 @@ function GetJavascriptIndent()
     else
       call cursor(v:lnum, vcol)
     end
-  endif
+  elseif line =~ ')' || line =~ s:comma_last
+    let counts = s:LineHasOpeningBrackets(lnum)
+    if counts[0] == '2'
+      call cursor(lnum, 1)
+      " Search for the opening tag
+      let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
+      if mnum > 0
+        return indent(s:GetMSL(mnum, 0)) 
+      end
+    elseif  line !~ s:var_stmt
+      return indent(prevline)
+    end
+  end
 
   " 3.4. Work on the MSL line. {{{2
   " --------------------------

From 7d371ddeada2091a2bd32c0e1bb9e567731a8071 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 19 Apr 2016 12:44:08 -0700
Subject: [PATCH 0202/1043] Fixing comments in ES6 Class declarations

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b9f8fc98..6ff1a01c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -196,7 +196,7 @@ syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTa
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
-syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs contained fold
+syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsBlockComment,jsLineComment contained fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold
 syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf

From 3208fc5d6ce9ae676cb0b97400a7b7a7efa9704b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 19 Apr 2016 19:54:44 -0700
Subject: [PATCH 0203/1043] Operator first support,including ternary,dot etc.

the previous pr is being difficult, sorry
---
 indent/javascript.vim | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 217bf3bb..71c08017 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,14 +71,13 @@ let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(.*)\)\|
 " Regex that defines blocks.
 let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
+let s:operator_first = '^\s*\%([-*/+.:?]\|||\|&&\)'
+
 let s:var_stmt = '^\s*\%(const\|let\|var\)'
 
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
-let s:ternary = '^\s\+[?|:]'
-let s:ternary_q = '^\s\+?'
-
 let s:case_indent = s:sw()
 let s:case_indent_after = s:sw()
 let s:m = matchlist(&cinoptions, ':\(.\)')
@@ -378,13 +377,38 @@ function GetJavascriptIndent()
     return indent(prevline) + s:case_indent_after
   endif
 
-  if (line =~ s:ternary)
-    if (getline(prevline) =~ s:ternary_q)
+  " If line starts with an operator...
+  if (s:Match(v:lnum, s:operator_first))
+    if (s:Match(prevline, s:operator_first))
+      " and so does previous line, don't indent
       return indent(prevline)
-    else
+    end
+    let counts = s:LineHasOpeningBrackets(prevline)
+    if counts[0] == '2'
+      call cursor(prevline, 1)
+      " Search for the opening tag
+      let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
+      if mnum > 0 && s:Match(mnum, s:operator_first)
+        return indent(mnum)
+      end
+    elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
+      " otherwise, indent 1 level
       return indent(prevline) + s:sw()
-    endif
-  endif
+    end
+    " If previous line starts with an operator...
+  elseif s:Match(prevline, s:operator_first) && !s:Match(prevline, s:comma_last)
+    let counts = s:LineHasOpeningBrackets(prevline)
+    if counts[0] == '2' && counts[1] == '1'
+      call cursor(prevline, 1)
+      " Search for the opening tag
+      let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
+      if mnum > 0 && !s:Match(mnum, s:operator_first)
+        return indent(mnum) + s:sw()
+      end
+    elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
+      return indent(prevline) - s:sw()
+    end
+  end
 
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)

From 992b76dc5d1c21cc4689b7d069edaa4c077735fe Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 17 Apr 2016 21:11:27 -0700
Subject: [PATCH 0204/1043] Temporarily disabled jsArrowFuncArgs with parens

This is until we can figure out how to properly match all the crazy use
cases.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6ff1a01c..de7be809 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -227,7 +227,7 @@ syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|(\|)\|\[\|\]\)/ e
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\(\k\)\+\s*\(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction
 " Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /(\%(.\)*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction
+" syntax match   jsArrowFuncArgs  /(\%(.\)*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction
 
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained

From 16673accd3c491be227cb9e22a0fef33cc812521 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 20 Apr 2016 14:24:01 -0700
Subject: [PATCH 0205/1043] Adding a license note to the README

I basically just copied what Tim Pope has done for his projects, an
example can be seen here:

https://github.com/tpope/vim-pathogen#license
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 797c89e4..1ad4078c 100644
--- a/README.md
+++ b/README.md
@@ -91,3 +91,7 @@ proposed change and how it is valuable.
 ## Bug report
 
 Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
+
+## License
+
+Distributed under the same terms as Vim itself. See `:help license`.

From 6cb0c96b66c1c2554ba0ebd8ead7f9ac938ce49a Mon Sep 17 00:00:00 2001
From: bounceme <mac@Macs-MacBook-Pro.local>
Date: Wed, 20 Apr 2016 17:04:57 -0700
Subject: [PATCH 0206/1043] old changes reset

---
 indent/javascript.vim | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 82cd621c..c3d331ce 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -43,7 +43,10 @@ endif
 let s:js_keywords = '^\s*\(break\|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\)'
 let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'string\|regex\|comment\c'
+let s:syng_strcom = '\%(\%(template\)\@<!string\|regex\|comment\)\c'
+
+" Regex of syntax group names that are or delimit template strings
+let s:syng_template = 'template\c'
 
 " Regex of syntax group names that are strings.
 let s:syng_string = 'regex\c'
@@ -102,6 +105,11 @@ 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 template string.
+function s:IsInTempl(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_template
+endfunction
+
 " Check if the character at lnum:col is inside a multi-line comment.
 function s:IsInMultilineComment(lnum, col)
   return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
@@ -386,6 +394,14 @@ function GetJavascriptIndent()
     endif
   endif
 
+  if getline(prevline) =~ '^\s*`$' && s:IsInTempl(v:lnum, 1)
+    if line !~ '^\s*`$'
+      return indent(prevline) + s:sw()
+    endif
+  elseif line =~ '^\s*`$' && s:IsInTempl(prevline, 1)
+    return indent(prevline) - s:sw()
+  endif
+
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
     return cindent(v:lnum)

From ff62d63ed140839bc6c8f8d244dee27cb5620e5b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Apr 2016 16:31:06 -0700
Subject: [PATCH 0207/1043] #324

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5dfdc6ca..05713a33 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -119,13 +119,13 @@ function s:PrevNonBlankNonString(lnum)
     " Go in and out of blocks comments as necessary.
     " If the line isn't empty (with opt. comment) or in a string, end search.
     let line = getline(lnum)
-    if line =~ '/\*'
+    if s:IsInMultilineComment(lnum, matchend(line, '/\*') - 1)
       if in_block
         let in_block = 0
       else
         break
       endif
-    elseif !in_block && line =~ '\*/'
+    elseif !in_block && s:IsInMultilineComment(lnum, matchend(line, '\*/') - 1)
       let in_block = 1
     elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
       break

From b9feef0864cfd77822ace829267b91c33df7c34f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 17 Apr 2016 21:20:44 -0700
Subject: [PATCH 0208/1043] Improved lambda argument handling

---
 syntax/javascript.vim | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index de7be809..d3af0a12 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -195,10 +195,10 @@ endif "DOM/HTML/CSS
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
-syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
+syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend
 syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsBlockComment,jsLineComment contained fold
-syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold
+syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold extend
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 "" catch errors caused by wrong parenthesis
@@ -213,21 +213,21 @@ if main_syntax == "javascript"
   syntax sync match jsHighlight grouphere jsBlock /{/
 endif
 
+syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName,jsFuncArgs skipwhite
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsLineComment,jsStringS,jsStringD,jsNumber,jsFuncArgDestructuring nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsLineComment,jsStringS,jsStringD,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots contained /\.\.\./
-syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|(\|)\|\[\|\]\)/ extend
 
 " Matches a single keyword argument with no parens
-syntax match   jsArrowFuncArgs  /\(\k\)\+\s*\(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction
+syntax match   jsArrowFuncArgs  /\(\k\)\+\s*\(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
 " Matches a series of arguments surrounded in parens
-" syntax match   jsArrowFuncArgs  /(\%(.\)*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction
+syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
 
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained

From a607a7d36012c16e45040f105fad2162b992a101 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 20 Apr 2016 18:59:41 -0700
Subject: [PATCH 0209/1043] spanning multiple lines detection

In progress but here are the effects so far
```

if ( a == b
    && c == d
    && e == f
    || g == h
    || i == j ) {
  a = b
    + c
    - d;
}
```
as opposed to this which would indent everything following it:
```

if ( a == b
    && c == d
    && e == f
    || g == h
    || i == j ) {
  a = b
    + c
    - d;
    }
```
---
 indent/javascript.vim | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5dfdc6ca..ca0ded20 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -145,9 +145,21 @@ function s:GetMSL(lnum, in_one_line_scope)
     " Otherwise, terminate search as we have found our MSL already.
     let line = getline(lnum)
     let col = match(line, s:msl_regex) + 1
+    let line2 = getline(msl)
+    let col2 = matchend(line2, ')')
     if (col > 0 && !s:IsInStringOrComment(lnum, col)) || s:IsInString(lnum, strlen(line))
       let msl = lnum
+
+    " if there are more closing brackets, continue from the line which has the matching opening bracket
+    elseif col2 > 0 && !s:IsInStringOrComment(msl, col2) && s:LineHasOpeningBrackets(msl)[0] == '2'
+      call cursor(msl, 1)
+      if searchpair('(', '', ')', 'bW', s:skip_expr) > 0
+        let lnum = line('.')
+        let msl = lnum
+      endif
+
     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
       "
@@ -158,7 +170,7 @@ function s:GetMSL(lnum, in_one_line_scope)
       if msl_one_line == 0
         break
       endif
-    endif
+    end
     let lnum = s:PrevNonBlankNonString(lnum - 1)
   endwhile
   return msl
@@ -396,7 +408,7 @@ function GetJavascriptIndent()
       return indent(prevline) + s:sw()
     end
     " If previous line starts with an operator...
-  elseif s:Match(prevline, s:operator_first) && !s:Match(prevline, s:comma_last)
+  elseif s:Match(prevline, s:operator_first) && !s:Match(prevline, s:comma_last) && !s:Match(prevline, '};\=' . s:line_term)
     let counts = s:LineHasOpeningBrackets(prevline)
     if counts[0] == '2' && counts[1] == '1'
       call cursor(prevline, 1)
@@ -472,7 +484,14 @@ function GetJavascriptIndent()
     else
       call cursor(v:lnum, vcol)
     end
-  elseif line =~ ')' || line =~ s:comma_last
+  elseif line =~ '.\+};\=' . s:line_term
+    call cursor(lnum, 1)
+    " Search for the opening tag
+    let mnum = searchpair('{', '', '}', 'bW', s:skip_expr)
+    if mnum > 0
+      return indent(s:GetMSL(mnum, 0)) 
+    end
+  elseif line =~ '.\+);\=' || line =~ s:comma_last
     let counts = s:LineHasOpeningBrackets(lnum)
     if counts[0] == '2'
       call cursor(lnum, 1)
@@ -481,7 +500,7 @@ function GetJavascriptIndent()
       if mnum > 0
         return indent(s:GetMSL(mnum, 0)) 
       end
-    elseif  line !~ s:var_stmt
+    elseif line !~ s:var_stmt
       return indent(prevline)
     end
   end

From 1da09b62272c3860c2a9119d5081041de034d381 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 22 Apr 2016 16:05:45 -0700
Subject: [PATCH 0210/1043] Move jsDocTag @file to a different jsDocTag group

Apparently there is no `nextgroup` match for the @file type.

Fixes #341
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d3af0a12..4624c718 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -63,7 +63,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsBlockComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
   " tags containing type and param
   syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
   " tags containing type but no param
@@ -71,7 +71,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   " tags containing references
   syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
   " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+  syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
   syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite

From af37b2253c975c6608992d3ece93b02314b604c5 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 24 Apr 2016 09:44:06 -0700
Subject: [PATCH 0211/1043] [-+] not by another

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2d7f3524..cadd33cf 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -63,7 +63,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st
 let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]=[^=>].*,\)' . s:line_term
+let s:continuation_regex = '\%([\\*/.:]\|+\@<!+\|-\@<!-\|\%(<%\)\@<!=\|\W[|&?]\|||\|&&\|[^=]=[^=>].*,\)' . s:line_term
 
 " Regex that defines continuation lines.
 " TODO: this needs to deal with if ...: and so on
@@ -74,7 +74,7 @@ let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()
 " Regex that defines blocks.
 let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
-let s:operator_first = '^\s*\%([-*/+.:?]\|||\|&&\)'
+let s:operator_first = '^\s*\%([*/.:?]\|\([-+]\)\1\@!\|||\|&&\)'
 
 let s:var_stmt = '^\s*\%(const\|let\|var\)'
 

From f7cec8c79798e8d79f2bf95fe1a5f4eee44086bf Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 22:13:25 -0700
Subject: [PATCH 0212/1043] Fixing bizarre jsDocParam bug

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4624c718..10d15689 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -77,7 +77,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
   syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
+  syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
   syntax case match

From e74d7582248949f605af9098b90222d19d56b546 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 24 Apr 2016 12:13:21 -0700
Subject: [PATCH 0213/1043] Refactored README.md

* De-prioritized the not on regexes
* Added vim-plug installation instructions
* Improved header hierarchy
* Improved configuration variables documentation
* Removed some deprecated instructions
* Tweaks misc content
---
 README.md | 67 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 1ad4078c..f5459983 100644
--- a/README.md
+++ b/README.md
@@ -1,68 +1,64 @@
 # vim-javascript v0.10.0
 
-JavaScript bundle for vim, this bundle provides syntax and indent plugins.
+JavaScript bundle for vim, this bundle provides syntax highlighting and
+improved indentation.
 
-## A Quick Note on Regexes
 
-Vim 7.4 was released recently, and unfortunately broke how this plugin
-handles regexes. There was no real easy way for us to fix this unless we
-completely rewrote how regexes work.
+## Installation
 
-Good News: There was a recent update to Vim 7.4 that fixes this issue.
+### Install with [Vundle](https://github.com/gmarik/vundle)
 
-Make sure you are at least using Vim 7.4, with patches 1-7.
+Add to vimrc:
 
-If you are stuck on an older version of Vim 7.4 with no way to update,
-then simply perform the following commands to fix your current buffer:
+    Plugin 'pangloss/vim-javascript'
 
-```
-:set regexpengine=1
-:syntax enable
-```
+And install it:
 
-## Installation
+    :so ~/.vimrc
+    :PluginInstall
 
-### Install with [Vundle](https://github.com/gmarik/vundle)
+### Install with [vim-plug](https://github.com/junegunn/vim-plug)
 
 Add to vimrc:
 
-    Plugin 'pangloss/vim-javascript'
+    Plug 'pangloss/vim-javascript'
 
 And install it:
 
     :so ~/.vimrc
-    :PluginInstall
+    :PlugInstall
 
 ### Install with [pathogen](https://github.com/tpope/vim-pathogen)
 
       cd ~/.vim/bundle
       git clone https://github.com/pangloss/vim-javascript.git
 
-## Configuration
+
+## Configuration Variables
 
 The following variables control certain syntax highlighting features. You can
 add them to your `.vimrc` to enable/disable their features.
 
-#### javascript_enable_domhtmlcss
+```
+let g:javascript_enable_domhtmlcss = 1
+```
 
 Enables HTML/CSS syntax highlighting in your JavaScript file.
 
 Default Value: 0
 
-#### b:javascript_fold
+-----------------
 
-Enables JavaScript code folding.
-
-Default Value: 1
-
-
-#### javascript_ignore_javaScriptdoc
+```
+let g:javascript_ignore_javaScriptdoc = 1
+```
 
 Disables JSDoc syntax highlighting
 
 Default Value: 0
 
-#### Concealing Characters
+
+## Concealing Characters
 
 You can customize concealing characters by defining one or more of the following
 variables:
@@ -78,6 +74,7 @@ variables:
     let g:javascript_conceal_super          = "Ω"
     let g:javascript_conceal_arrow_function = "⇒"
 
+
 ## Contributing
 
 This project uses the [git
@@ -88,10 +85,24 @@ the price of admission is 1 pull request. Please follow the general code style
 guides (read the code) and in your pull request explain the reason for the
 proposed change and how it is valuable.
 
-## Bug report
+
+## Bug Reports
 
 Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
 
+
+## A Quick Note on Regexes
+
+Vim 7.4 with patches LESS than 1-7 exhibits a bug that broke how we handle
+javascript regexes. Please update to a newer version or run the following
+commands to fix:
+
+```
+:set regexpengine=1
+:syntax enable
+```
+
+
 ## License
 
 Distributed under the same terms as Vim itself. See `:help license`.

From 2f0b1d266f396aed09d06c87ec5533974d6e4994 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 24 Apr 2016 12:14:25 -0700
Subject: [PATCH 0214/1043] Removing deprecated folding logic

b:javascript_fold is no longer used anymore. Folding is done through
`set foldmethod=syntax`
---
 syntax/javascript.vim | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 10d15689..9a6933e3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -16,12 +16,6 @@ if !exists('g:javascript_conceal')
   let g:javascript_conceal = 0
 endif
 
-"" Drop fold if it is set but VIM doesn't support it.
-let b:javascript_fold='true'
-if version < 600    " Don't support the old version
-  unlet! b:javascript_fold
-endif
-
 "" dollar sign is permittd anywhere in an identifier
 setlocal iskeyword+=$
 

From 48067d6dc9eb2361b24d4fc3c3a4f87303c7c007 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 24 Apr 2016 12:16:38 -0700
Subject: [PATCH 0215/1043] Add code folding documentation

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index f5459983..617df9f1 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,17 @@ Disables JSDoc syntax highlighting
 
 Default Value: 0
 
+-----------------
+
+```
+set foldmethod=syntax
+```
+
+Enables code folding based on our syntax file.
+
+Please note this can have a dramatic effect on performance and because it is a
+global vim option, we do not set it ourselves.
+
 
 ## Concealing Characters
 

From a51d0f3c4057bfd05c8695fdb5cfec79a0dfe9f5 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 24 Apr 2016 13:00:38 -0700
Subject: [PATCH 0216/1043] Update javascript.vim

https://github.com/pangloss/vim-javascript/pull/367#issuecomment-214022633
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cadd33cf..80778907 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -159,7 +159,7 @@ function s:GetMSL(lnum, in_one_line_scope)
       let msl = lnum
 
     " if there are more closing brackets, continue from the line which has the matching opening bracket
-    elseif col2 > 0 && !s:IsInStringOrComment(msl, col2) && s:LineHasOpeningBrackets(msl)[0] == '2'
+    elseif col2 > 0 && !s:IsInStringOrComment(msl, col2) && s:LineHasOpeningBrackets(msl)[0] == '2' && !a:in_one_line_scope
       call cursor(msl, 1)
       if searchpair('(', '', ')', 'bW', s:skip_expr) > 0
         let lnum = line('.')
@@ -490,12 +490,12 @@ function GetJavascriptIndent()
   if line =~ '[[({]'
     let counts = s:LineHasOpeningBrackets(lnum)
     if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
-      if col('.') + 1 == col('$')
+      if col('.') + 1 == col('$') || line =~ s:one_line_scope_regex
         return ind + s:sw()
       else
         return virtcol('.')
       endif
-    elseif counts[1] == '1' || counts[2] == '1'
+    elseif counts[1] == '1' || counts[2] == '1' && counts[0] != '2'
       return ind + s:sw()
     else
       call cursor(v:lnum, vcol)

From 1c75d8a3c61de3c97edae7070ba3656974600a34 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 24 Apr 2016 11:38:42 -0700
Subject: [PATCH 0217/1043] Fix JSDoc record matching

This should fix #320
---
 syntax/javascript.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 9a6933e3..ca615470 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -67,8 +67,10 @@ if !exists("javascript_ignore_javaScriptdoc")
   " other tags (no extra syntax)
   syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
-  syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
+  syntax region jsDocType         matchgroup=jsDocTypeBrackets start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite contains=jsDocTypeRecord
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+  syntax region jsDocTypeRecord   start=/{/ end=/}/ contained extend contains=jsDocTypeRecord
+  syntax region jsDocTypeRecord   start=/\[/ end=/\]/ contained extend contains=jsDocTypeRecord
   syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
   syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
@@ -248,6 +250,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocTags              Special
   HiLink jsDocSeeTag            Function
   HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
   HiLink jsDocTypeNoParam       Type
   HiLink jsDocParam             Label
   HiLink jsStringS              String

From a7f221678a912ad44654b013770338dc80df7c16 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 18:12:34 -0700
Subject: [PATCH 0218/1043] Optimize JSNoise and JSOperator regexes

Not using groups seems to help a bunch with performance
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ca615470..5635d11e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -21,12 +21,12 @@ setlocal iskeyword+=$
 
 syntax sync fromstart
 
-syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
+syntax match   jsNoise           /[:,\;\.]\{1}/
 
 "" Program Keywords
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void new in
-syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
+syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 syntax keyword jsModules        import export contained

From 01ecaf9ab2640e13e4708b00f9eb2173a18de712 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 18:14:02 -0700
Subject: [PATCH 0219/1043] Removing deprecated selectors

I think these matchers where for functions, and from another era of
project ownership. They added a TON of performance overhead, and I could
never replicate a scenario where they matched.
---
 syntax/javascript.vim | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5635d11e..1ff8bda9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -36,7 +36,7 @@ syntax keyword jsArgsObj        arguments
 
 syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsLineComment,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
 
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj,jsBlock,jsClassDefinition
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
@@ -106,12 +106,6 @@ syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function
 syntax match   jsDecorator        "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
 syntax match   jsDecoratorFunction "[a-zA-Z_][a-zA-Z0-9_.]*" display contained nextgroup=jsFunc skipwhite
 
-syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\>@!/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
-syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
-syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis,jsArgsObj contained
-syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained
-syntax match   jsFuncAssignIdent    /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
-
 exe 'syntax keyword jsNull      null      '.(exists('g:javascript_conceal_null')        ? 'conceal cchar='.g:javascript_conceal_null        : '')
 exe 'syntax keyword jsReturn    return    '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
 exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefined')   ? 'conceal cchar='.g:javascript_conceal_undefined   : '')
@@ -188,7 +182,7 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend

From f7d220719168fe0ca84eb9c9a3d77bdc50388584 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 18:16:50 -0700
Subject: [PATCH 0220/1043] Optimized jsGlobalObjects

We had some special matching for Intl and certain submethods. It seems
needless to do this for the following reasons:

* The look behind added massive overhead (especially since the rule was
  not contained)
* We never do any special matching for any other global objects, so why
  these?
---
 syntax/javascript.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1ff8bda9..e9d4b986 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -124,8 +124,7 @@ syntax keyword jsKeyword        yield
 syntax keyword jsException      try catch throw finally
 syntax keyword jsAsyncKeyword   async await
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
-syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
+syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
 
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 

From 33eb9fe82ac16f8e9fe994224aeffc502e0cef41 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 18:18:14 -0700
Subject: [PATCH 0221/1043] Optimized jsArrowFuncArgs selector

Shaved off some average time by removing the groups, which weren't
really needed to begin with
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e9d4b986..47f9483f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -214,7 +214,7 @@ syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))
 syntax match   jsFuncArgRestDots contained /\.\.\./
 
 " Matches a single keyword argument with no parens
-syntax match   jsArrowFuncArgs  /\(\k\)\+\s*\(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
+syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
 " Matches a series of arguments surrounded in parens
 syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
 

From 508c1a337bc06556a9d425f77f86788f303195d3 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 18:20:01 -0700
Subject: [PATCH 0222/1043] Remove syntax sync clear

The optimizations it provides really doesn't seem to help much and
usually just results in weird syntax matching errors unless you run
`syntax sync fromstart`
---
 syntax/javascript.vim | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 47f9483f..504c5594 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -196,12 +196,6 @@ syntax match   jsParensErrA     contained "\]"
 syntax match   jsParensErrB     contained ")"
 syntax match   jsParensErrC     contained "}"
 
-if main_syntax == "javascript"
-  syntax sync clear
-  syntax sync ccomment jsComment minlines=200
-  syntax sync match jsHighlight grouphere jsBlock /{/
-endif
-
 syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')

From 3a4991eaf5c52ea4d546402418a02a22ae60a0df Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 21:28:52 -0700
Subject: [PATCH 0223/1043] Improved jsTaggedTemplate performance

Another match that turns up pretty high in the list of total time spent
under `syntime`
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 504c5594..ea934452 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -88,7 +88,7 @@ syntax region  jsTemplateVar      matchgroup=jsTemplateBraces start=+${+ end=+}+
 syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
 syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
-syntax region  jsTaggedTemplate   start=/\k\+\(\(\n\|\s\)\+\)\?`/ end=+`+ contains=jsTemplateString keepend
+syntax region  jsTaggedTemplate   start=/\k\+\%([\n\s]\+\)\?`/ end=+`+ contains=jsTemplateString keepend
 syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained

From 842b0ceaa87936c1eb449617e7045ad33b81854e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 21 Apr 2016 21:37:03 -0700
Subject: [PATCH 0224/1043] Improved performance of jsRegexpString

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ea934452..3d9ab190 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -97,7 +97,7 @@ syntax match   jsRegexpOr         "\v\<@!\|" contained
 syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString     start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/

From c2bc4c70140ec761fe02c6b3a9a8370a182e931f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 24 Apr 2016 14:18:56 -0700
Subject: [PATCH 0225/1043] Limiting jsRegexpString look behinds

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3d9ab190..3bdb39a6 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -97,7 +97,7 @@ syntax match   jsRegexpOr         "\v\<@!\|" contained
 syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/

From 4b6f9c5d9d15deb12d14d85a155d73c9b7da6019 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 25 Apr 2016 11:48:35 -0700
Subject: [PATCH 0226/1043] Bumping version number to v1.0.0

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 617df9f1..fb5139c9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v0.10.0
+# vim-javascript v1.0.0
 
 JavaScript bundle for vim, this bundle provides syntax highlighting and
 improved indentation.

From 105a4aadfebcefda2645e0eec079cde72479788b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 25 Apr 2016 15:58:39 -0700
Subject: [PATCH 0227/1043] Switch mechanics, indent

also now that I know about cindent i'm curious if there are other places like this to remove code and increase performance
---
 indent/javascript.vim | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 80778907..0e1c8e84 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -65,10 +65,6 @@ let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 " Regex that defines continuation lines, not including (, {, or [.
 let s:continuation_regex = '\%([\\*/.:]\|+\@<!+\|-\@<!-\|\%(<%\)\@<!=\|\W[|&?]\|||\|&&\|[^=]=[^=>].*,\)' . s:line_term
 
-" Regex that defines continuation lines.
-" TODO: this needs to deal with if ...: and so on
-let s:msl_regex = s:continuation_regex.'\|'.s:expr_case
-
 let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*([^()]*)[^()]*\))[^()]*\))[^()]*\))\)\|=>\)' . s:line_term
 
 " Regex that defines blocks.
@@ -81,16 +77,6 @@ let s:var_stmt = '^\s*\%(const\|let\|var\)'
 let s:comma_first = '^\s*,'
 let s:comma_last = ',\s*$'
 
-let s:case_indent = s:sw()
-let s:case_indent_after = s:sw()
-let s:m = matchlist(&cinoptions, ':\(.\)')
-if (len(s:m) > 2)
-    let s:case_indent = s:m[1]
-endif
-let s:m = matchlist(&cinoptions, '=\(.\)')
-if (len(s:m) > 2)
-    let s:case_indent_after = s:m[1]
-endif
 " 2. Auxiliary Functions {{{1
 " ======================
 
@@ -152,10 +138,10 @@ function s:GetMSL(lnum, in_one_line_scope)
     " 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 col = match(line, s:msl_regex) + 1
+    let col = match(line, s:continuation_regex) + 1
     let line2 = getline(msl)
     let col2 = matchend(line2, ')')
-    if (col > 0 && !s:IsInStringOrComment(lnum, col)) || s:IsInString(lnum, strlen(line))
+    if (col > 0 && !s:IsInStringOrComment(lnum, col) && !s:Match(lnum, s:expr_case)) || s:IsInString(lnum, strlen(line))
       let msl = lnum
 
     " if there are more closing brackets, continue from the line which has the matching opening bracket
@@ -327,7 +313,6 @@ endfunction
 function GetJavascriptIndent()
   " 3.1. Setup {{{2
   " ----------
-
   " Set up variables for restoring position in file.  Could use v:lnum here.
   let vcol = col('.')
 
@@ -341,15 +326,7 @@ function GetJavascriptIndent()
   let prevline = prevnonblank(v:lnum - 1)
 
   if (line =~ s:expr_case)
-    if (getline(prevline) =~ s:expr_case)
-      return indent(prevline)
-    else
-      if (getline(prevline) =~ s:block_regex)
-        return indent(prevline) + s:case_indent
-      else
-        return indent(prevline) - s:case_indent_after
-      endif
-    endif
+    return cindent(v:lnum)
   endif
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
@@ -393,9 +370,6 @@ function GetJavascriptIndent()
   if (getline(prevline) =~ s:comma_first)
     return indent(prevline) - s:sw()
   endif
-  if (getline(prevline) =~ s:expr_case)
-    return indent(prevline) + s:case_indent_after
-  endif
 
   " If line starts with an operator...
   if (s:Match(v:lnum, s:operator_first))
@@ -475,11 +449,7 @@ function GetJavascriptIndent()
 
   " If the previous line ended with a block opening, add a level of indent.
   if s:Match(lnum, s:block_regex)
-    if (line =~ s:expr_case)
-      return indent(s:GetMSL(lnum, 0)) + s:sw()/2
-    else
-      return indent(s:GetMSL(lnum, 0)) + s:sw()
-    endif
+    return indent(s:GetMSL(lnum, 0)) + s:sw()
   endif
 
   " Set up variables for current line.

From dde16a0564a78c58939721d7127e412f648a72da Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 26 Apr 2016 13:20:04 -0700
Subject: [PATCH 0228/1043] Fix class definitions with no name

Fixes #401
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3bdb39a6..4ca08ecd 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -215,7 +215,7 @@ syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite conta
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained
 syntax keyword jsClassMethodDefinitions get set static contained nextgroup=jsFuncName skipwhite skipempty
-syntax match   jsClassDefinition /class [a-zA-Z_$][0-9a-zA-Z_$ \n.]*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
+syntax match   jsClassDefinition /class\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From c4ccee6950c465d2a78c9f0b284a6ccf1b48a1a4 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 26 Apr 2016 21:27:06 -0700
Subject: [PATCH 0229/1043] Custom jsFuncName for object definitions

This ES6 version of jsFuncName requires some special handling to not, by
default, overwrite jsObjectKey and also not overwrite jsFuncCall.
---
 syntax/javascript.vim | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4ca08ecd..a49c31f0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -185,9 +185,9 @@ syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTa
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend
-syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsBlockComment,jsLineComment contained fold
+syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsBlockComment,jsLineComment,jsGenerator contained fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition fold extend
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition extend
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 "" catch errors caused by wrong parenthesis
@@ -200,8 +200,11 @@ syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
-syntax match   jsGenerator       contained '\*' nextgroup=jsFuncName,jsFuncArgs skipwhite
-syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
+syntax match   jsGenerator       contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
+syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
+" These versions of jsFuncName is for use in object declarations with no key
+syntax match   jsFuncName        contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
+syntax match   jsFuncName        contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
 syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsLineComment,jsStringS,jsStringD,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots

From b4e2faecd485f078a03c4ecef405c548c0992018 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 27 Apr 2016 15:52:33 -0700
Subject: [PATCH 0230/1043] Update javascript.vim

---
 indent/javascript.vim | 53 +++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0e1c8e84..788d4753 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -360,7 +360,7 @@ function GetJavascriptIndent()
       if line[col-1]==')' && col('.') != col('$') - 1
         let ind = virtcol('.')-1
       else
-        let ind = indent(s:GetMSL(line('.'), 0))
+        let ind = s:InMultiVarStatement(line('.')) ? indent(line('.')) : indent(s:GetMSL(line('.'), 0))
       endif
     endif
     return ind
@@ -369,7 +369,9 @@ function GetJavascriptIndent()
   " If the line is comma first, dedent 1 level
   if (getline(prevline) =~ s:comma_first)
     return indent(prevline) - s:sw()
-  endif
+  elseif getline(s:PrevNonBlankNonString(prevline - 1)) =~ '[])}]' . s:comma_last && getline(prevline) !~ s:comma_last && getline(prevline) !~ s:block_regex
+    return indent(prevline) - s:sw()
+  end
 
   " If line starts with an operator...
   if (s:Match(v:lnum, s:operator_first))
@@ -390,17 +392,26 @@ function GetJavascriptIndent()
       return indent(prevline) + s:sw()
     end
     " If previous line starts with an operator...
-  elseif s:Match(prevline, s:operator_first) && !s:Match(prevline, s:comma_last) && !s:Match(prevline, '};\=' . s:line_term)
+  elseif (s:Match(prevline, s:operator_first) && !s:Match(prevline, s:comma_last) && !s:Match(prevline, '};\=' . s:line_term)) || s:Match(prevline, ');\=' . s:line_term)
     let counts = s:LineHasOpeningBrackets(prevline)
-    if counts[0] == '2' && counts[1] == '1'
+    if counts[0] == '2' && !s:Match(prevline, s:operator_first)
       call cursor(prevline, 1)
       " Search for the opening tag
       let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
-      if mnum > 0 && !s:Match(mnum, s:operator_first)
-        return indent(mnum) + s:sw()
+      if mnum > 0 && s:Match(mnum, s:operator_first)
+        return indent(mnum) - s:sw()
+      end
+    elseif s:Match(prevline, s:operator_first)
+      if counts[0] == '2' && counts[1] == '1'
+        call cursor(prevline, 1)
+        " Search for the opening tag
+        let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
+        if mnum > 0 && !s:Match(mnum, s:operator_first)
+          return indent(mnum) + s:sw()
+        end
+      elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
+        return indent(prevline) - s:sw()
       end
-    elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
-      return indent(prevline) - s:sw()
     end
   end
 
@@ -449,7 +460,7 @@ function GetJavascriptIndent()
 
   " If the previous line ended with a block opening, add a level of indent.
   if s:Match(lnum, s:block_regex)
-    return indent(s:GetMSL(lnum, 0)) + s:sw()
+    return s:InMultiVarStatement(lnum) ? indent(lnum) + s:sw() : indent(s:GetMSL(lnum, 0)) + s:sw()
   endif
 
   " Set up variables for current line.
@@ -457,7 +468,7 @@ function GetJavascriptIndent()
   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 line =~ '[[({]'
+  if line =~ '[[({})\]]'
     let counts = s:LineHasOpeningBrackets(lnum)
     if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
       if col('.') + 1 == col('$') || line =~ s:one_line_scope_regex
@@ -465,29 +476,17 @@ function GetJavascriptIndent()
       else
         return virtcol('.')
       endif
-    elseif counts[1] == '1' || counts[2] == '1' && counts[0] != '2'
-      return ind + s:sw()
-    else
-      call cursor(v:lnum, vcol)
-    end
-  elseif line =~ '.\+};\=' . s:line_term
-    call cursor(lnum, 1)
-    " Search for the opening tag
-    let mnum = searchpair('{', '', '}', 'bW', s:skip_expr)
-    if mnum > 0
-      return indent(s:GetMSL(mnum, 0)) 
-    end
-  elseif line =~ '.\+);\=' || line =~ s:comma_last
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts[0] == '2'
+    elseif counts[0] == '2'
       call cursor(lnum, 1)
       " Search for the opening tag
       let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
       if mnum > 0
         return indent(s:GetMSL(mnum, 0)) 
       end
-    elseif line !~ s:var_stmt
-      return indent(prevline)
+    elseif counts[1] == '1' || counts[2] == '1' && counts[0] != '2'
+      return ind + s:sw()
+    else
+      call cursor(v:lnum, vcol)
     end
   end
 

From 50c433e8249bcd7a46ca57361dec7756b99c3de9 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 29 Apr 2016 11:21:09 -0700
Subject: [PATCH 0231/1043] Fix Issue 406

I am commenting this out since I am working through a better
implementation.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a49c31f0..8ef89b0c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -203,8 +203,8 @@ exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=
 syntax match   jsGenerator       contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
 " These versions of jsFuncName is for use in object declarations with no key
-syntax match   jsFuncName        contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
-syntax match   jsFuncName        contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
+" syntax match   jsFuncName        contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
+" syntax match   jsFuncName        contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
 syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsLineComment,jsStringS,jsStringD,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots

From d2fa17618209e051f9d3ea815c6dffd4fe9a221c Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 29 Apr 2016 18:15:46 -0700
Subject: [PATCH 0232/1043] multiline comment (#408)

* Update javascript.vim

* Update javascript.vim
---
 indent/javascript.vim | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 788d4753..e8afa805 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -70,7 +70,7 @@ let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()
 " Regex that defines blocks.
 let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
-let s:operator_first = '^\s*\%([*/.:?]\|\([-+]\)\1\@!\|||\|&&\)'
+let s:operator_first = '^\s*\%([*.:?]\|\([/-+]\)\1\@!\|||\|&&\)'
 
 let s:var_stmt = '^\s*\%(const\|let\|var\)'
 
@@ -325,6 +325,11 @@ function GetJavascriptIndent()
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
 
+  " If we are in a multi-line comment, cindent does the right thing.
+  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
+    return cindent(v:lnum)
+  endif
+
   if (line =~ s:expr_case)
     return cindent(v:lnum)
   endif
@@ -423,11 +428,6 @@ function GetJavascriptIndent()
     return indent(prevline) - s:sw()
   endif
 
-  " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
-    return cindent(v:lnum)
-  endif
-
   " Check for multiple var assignments
 "  let var_indent = s:GetVarIndent(v:lnum)
 "  if var_indent >= 0

From 617ccb50d644ad864421e471482219b4b380f5e2 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 29 Apr 2016 18:49:26 -0700
Subject: [PATCH 0233/1043] Update javascript.vim

oh my
---
 indent/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e8afa805..cadf7ccc 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -70,7 +70,7 @@ let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()
 " Regex that defines blocks.
 let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
 
-let s:operator_first = '^\s*\%([*.:?]\|\([/-+]\)\1\@!\|||\|&&\)'
+let s:operator_first = '^\s*\%([*.:?]\|\([-/+]\)\1\@!\|||\|&&\)'
 
 let s:var_stmt = '^\s*\%(const\|let\|var\)'
 
@@ -330,6 +330,7 @@ function GetJavascriptIndent()
     return cindent(v:lnum)
   endif
 
+  " cindent each line which has a switch label
   if (line =~ s:expr_case)
     return cindent(v:lnum)
   endif

From 8fb5fa8c6352133229e0c8a63d277cf6fdd72baf Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 2 May 2016 10:05:33 -0700
Subject: [PATCH 0234/1043] parentheses regex is thankfully gone (#412)

proper asi for control statements
---
 indent/javascript.vim | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cadf7ccc..1f6a1759 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -65,7 +65,22 @@ let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 " Regex that defines continuation lines, not including (, {, or [.
 let s:continuation_regex = '\%([\\*/.:]\|+\@<!+\|-\@<!-\|\%(<%\)\@<!=\|\W[|&?]\|||\|&&\|[^=]=[^=>].*,\)' . s:line_term
 
-let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*([^()]*)[^()]*\))[^()]*\))[^()]*\))\)\|=>\)' . s:line_term
+let s:one_line_scope_regex = '\%(\<else\>\|=>\)' . s:line_term
+
+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('\<\%(while\|for\|if\)\>\s*(', 'ce', a:lnum) > 0 && searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 && col('.') + 1 == col('$')
+    call cursor(a:lnum, mypos)
+    return 1
+  else
+    call cursor(a:lnum, mypos)
+    return 0
+  end
+endfunction
 
 " Regex that defines blocks.
 let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
@@ -160,7 +175,7 @@ function s:GetMSL(lnum, in_one_line_scope)
       if a:in_one_line_scope
         break
       end
-      let msl_one_line = s:Match(lnum, s:one_line_scope_regex)
+      let msl_one_line = s:Onescope(lnum)
       if msl_one_line == 0
         break
       endif
@@ -285,7 +300,7 @@ endfunction
 
 function s:InOneLineScope(lnum)
   let msl = s:GetMSL(a:lnum, 1)
-  if msl > 0 && s:Match(msl, s:one_line_scope_regex)
+  if msl > 0 && s:Onescope(msl)
     return msl
   endif
   return 0
@@ -295,11 +310,11 @@ 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:Match(msl, s:one_line_scope_regex)
+    if s:Onescope(msl)
       return 0
     else
       let prev_msl = s:GetMSL(msl - 1, 1)
-      if s:Match(prev_msl, s:one_line_scope_regex)
+      if s:Onescope(prev_msl)
         return prev_msl
       endif
     endif
@@ -472,7 +487,7 @@ function GetJavascriptIndent()
   if line =~ '[[({})\]]'
     let counts = s:LineHasOpeningBrackets(lnum)
     if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
-      if col('.') + 1 == col('$') || line =~ s:one_line_scope_regex
+      if col('.') + 1 == col('$') || s:Onescope(lnum)
         return ind + s:sw()
       else
         return virtcol('.')

From 0fecb9295aa34d277a121d5915e3b94ac48d1f22 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 2 May 2016 11:45:29 -0700
Subject: [PATCH 0235/1043] Temporary fix for older versions of vim

Will need to better fix this soon, just getting this hotfix out asap
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 8ef89b0c..775f1995 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -97,7 +97,7 @@ syntax match   jsRegexpOr         "\v\<@!\|" contained
 syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/

From 8f16491ac58e019d48063cfa78a1386372201f87 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 6 May 2016 20:59:39 -0700
Subject: [PATCH 0236/1043] indent following line ending in comma with arrow
 (#420)

an example here : https://github.com/jason0x43/vim-js-indent/issues/4#issuecomment-207838966
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1f6a1759..f55fe742 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -63,7 +63,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st
 let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*/.:]\|+\@<!+\|-\@<!-\|\%(<%\)\@<!=\|\W[|&?]\|||\|&&\|[^=]=[^=>].*,\)' . s:line_term
+let s:continuation_regex = '\%([\\*/.:]\|+\@<!+\|-\@<!-\|\%(<%\)\@<!=\|\W[|&?]\|||\|&&\|\%(=>.*\|=\)\@<!=[^=>].*,\)' . s:line_term
 
 let s:one_line_scope_regex = '\%(\<else\>\|=>\)' . s:line_term
 

From c9eda1f5c10ffb91484ebc3f8b42322daface234 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 6 May 2016 21:32:49 -0700
Subject: [PATCH 0237/1043] template fixes (#422)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f55fe742..ec5853ea 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -43,7 +43,7 @@ endif
 let s:js_keywords = '^\s*\(break\|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\)'
 let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(\%(template\)\@<!string\|regex\|comment\)\c'
+let s:syng_strcom = '\%(string\|regex\|comment\)\c'
 
 " Regex of syntax group names that are or delimit template strings
 let s:syng_template = 'template\c'
@@ -136,7 +136,7 @@ function s:PrevNonBlankNonString(lnum)
       endif
     elseif !in_block && s:IsInMultilineComment(lnum, matchend(line, '\*/') - 1)
       let in_block = 1
-    elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
+    elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && !s:IsInTempl(lnum,1) && s:IsInStringOrComment(lnum, strlen(line)))
       break
     endif
     let lnum = prevnonblank(lnum - 1)

From aa9a46ae98889636679b23f520336910e5b114cb Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 8 May 2016 11:55:57 -0700
Subject: [PATCH 0238/1043] for better switch handling (#424)

#423
---
 indent/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ec5853ea..9dde3526 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -17,6 +17,7 @@ setlocal nosmartindent
 setlocal indentexpr=GetJavascriptIndent()
 setlocal formatexpr=Fixedgq(v:lnum,v:count)
 setlocal indentkeys=0{,0},0),0],0\,:,!^F,o,O,e
+setlocal cinoptions+=j1,J1
 
 " Only define the function once.
 if exists("*GetJavascriptIndent")

From b3ebfa5d96a9776e92be704ec55b7be76c082870 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 8 May 2016 20:18:54 -0700
Subject: [PATCH 0239/1043] c style opening curly braces (#426)

* c style opening curly braces

#68

* Update javascript.vim
---
 indent/javascript.vim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9dde3526..e3693173 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -345,6 +345,11 @@ function GetJavascriptIndent()
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
+  
+  " single opening bracket will assume you want a c style of indenting
+  if s:Match(v:lnum, '^\s*{' . s:line_term) && s:GetMSL(v:lnum,0) == v:lnum
+    return cindent(v:lnum)
+  endif
 
   " cindent each line which has a switch label
   if (line =~ s:expr_case)

From 7137e7eac1961f79b8063c49fe6957ae65456d9a Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 3 May 2016 16:05:52 -0700
Subject: [PATCH 0240/1043] Prevent limited lookbehinds in older vers of vim

---
 syntax/javascript.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 775f1995..57812317 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -97,7 +97,11 @@ syntax match   jsRegexpOr         "\v\<@!\|" contained
 syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+if v:version > 703 || v:version == 603 && has("patch1088")
+  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+else
+  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+endif
 syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/

From 61b89844d011fcd05028705364e7ab63525d4663 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 9 May 2016 13:25:53 -0700
Subject: [PATCH 0241/1043] specify template as a string

this doesn't change any behavior it is just for clarity
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e3693173..808bcb95 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -44,7 +44,7 @@ endif
 let s:js_keywords = '^\s*\(break\|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\)'
 let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(string\|regex\|comment\)\c'
+let s:syng_strcom = '\%(string\|regex\|comment\|template\)\c'
 
 " Regex of syntax group names that are or delimit template strings
 let s:syng_template = 'template\c'

From a6e90baf0e4a53f9c30961f60f8bce406d6f48be Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 10 May 2016 14:05:08 -0700
Subject: [PATCH 0242/1043] minor changes (#429)

* Update javascript.vim

* 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 808bcb95..f1979fae 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -347,7 +347,7 @@ function GetJavascriptIndent()
   endif
   
   " single opening bracket will assume you want a c style of indenting
-  if s:Match(v:lnum, '^\s*{' . s:line_term) && s:GetMSL(v:lnum,0) == v:lnum
+  if s:Match(v:lnum, '^\s*{' . s:line_term)
     return cindent(v:lnum)
   endif
 

From 206b85cfbe928697baa8a8562ca0384149dc70e0 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 11 May 2016 12:25:50 -0700
Subject: [PATCH 0243/1043] literal indentation in a multiline string (#430)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f1979fae..9ccf59c7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -340,6 +340,11 @@ function GetJavascriptIndent()
   let line = getline(v:lnum)
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
+  
+  " to not change multiline string values 
+  if (synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string' || s:IsInTempl(v:lnum, 1)) && line !~ '^\s*[''"`]'
+    return
+  endif
 
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)

From dc117664c4de7c49ec427795dbd62538cd85a22b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 11 May 2016 20:19:32 -0700
Subject: [PATCH 0244/1043] last actual column (#431)

should be considered last non whitespace non comment
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9ccf59c7..5c774e4d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,7 +74,7 @@ function s:Onescope(lnum)
   end
   let mypos = col('.')
   call cursor(a:lnum, 1)
-  if search('\<\%(while\|for\|if\)\>\s*(', 'ce', a:lnum) > 0 && searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 && col('.') + 1 == col('$')
+  if search('\<\%(while\|for\|if\)\>\s*(', 'ce', a:lnum) > 0 && searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 && col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
     call cursor(a:lnum, mypos)
     return 1
   else
@@ -189,7 +189,7 @@ endfunction
 function s:RemoveTrailingComments(content)
   let single = '\/\/\(.*\)\s*$'
   let multi = '\/\*\(.*\)\*\/\s*$'
-  return substitute(substitute(a:content, single, '', ''), multi, '', '')
+  return substitute(substitute(substitute(a:content, single, '', ''), multi, '', ''), '\s\+$', '', '')
 endfunction
 
 " Find if the string is inside var statement (but not the first string)

From fd98935f224dab93361216d513eb550ba602a31b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 11 May 2016 21:11:42 -0700
Subject: [PATCH 0245/1043] more fixes (#432)

also I'm removing all the template string indentation, will leave it as a comment if someone can justify actually changing a string
---
 indent/javascript.vim | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5c774e4d..bbd8dd98 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -291,9 +291,11 @@ function s:IndentWithContinuation(lnum, ind, width)
   if s:Match(lnum, s:continuation_regex)
     if lnum == p_lnum
       return msl_ind + a:width
-    else
+    elseif !s:InMultiVarStatement(a:lnum)
       return msl_ind
-    endif
+    else
+      return msl_ind - a:width
+    end
   endif
 
   return a:ind
@@ -401,8 +403,12 @@ function GetJavascriptIndent()
   " If the line is comma first, dedent 1 level
   if (getline(prevline) =~ s:comma_first)
     return indent(prevline) - s:sw()
-  elseif getline(s:PrevNonBlankNonString(prevline - 1)) =~ '[])}]' . s:comma_last && getline(prevline) !~ s:comma_last && getline(prevline) !~ s:block_regex
-    return indent(prevline) - s:sw()
+  elseif getline(s:PrevNonBlankNonString(prevline - 1)) =~ '[])}]' . s:comma_last && getline(prevline) !~ s:block_regex
+    if getline(prevline) !~ s:comma_last
+      return indent(prevline) - s:sw()
+    else
+      return indent(prevline)
+    end
   end
 
   " If line starts with an operator...
@@ -447,13 +453,13 @@ function GetJavascriptIndent()
     end
   end
 
-  if getline(prevline) =~ '^\s*`$' && s:IsInTempl(v:lnum, 1)
-    if line !~ '^\s*`$'
-      return indent(prevline) + s:sw()
-    endif
-  elseif line =~ '^\s*`$' && s:IsInTempl(prevline, 1)
-    return indent(prevline) - s:sw()
-  endif
+  " if getline(prevline) =~ '^\s*`$' && s:IsInTempl(v:lnum, 1)
+  "   if line !~ '^\s*`$'
+  "     return indent(prevline) + s:sw()
+  "   endif
+  " elseif line =~ '^\s*`$' && s:IsInTempl(prevline, 1)
+  "   return indent(prevline) - s:sw()
+  " endif
 
   " Check for multiple var assignments
 "  let var_indent = s:GetVarIndent(v:lnum)

From 75fcd09e7b8a0bd906c6006803912fec9136c019 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 11 May 2016 21:18:48 -0700
Subject: [PATCH 0246/1043] must actually return a number

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bbd8dd98..524331f9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -345,7 +345,7 @@ function GetJavascriptIndent()
   
   " to not change multiline string values 
   if (synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string' || s:IsInTempl(v:lnum, 1)) && line !~ '^\s*[''"`]'
-    return
+    return indent(v:lnum)
   endif
 
   " If we are in a multi-line comment, cindent does the right thing.

From 7c7add5fe62c701cd634eebbecdc5ccc13d60096 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 11 May 2016 23:11:27 -0700
Subject: [PATCH 0247/1043] my mistake

should have said more bugs #432
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 524331f9..d22b128c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -291,10 +291,10 @@ function s:IndentWithContinuation(lnum, ind, width)
   if s:Match(lnum, s:continuation_regex)
     if lnum == p_lnum
       return msl_ind + a:width
-    elseif !s:InMultiVarStatement(a:lnum)
-      return msl_ind
-    else
+    elseif s:InMultiVarStatement(lnum)
       return msl_ind - a:width
+    else
+      return msl_ind
     end
   endif
 

From 3ebaef31a9cd19a9ed5639b284bad3177482c454 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 12 May 2016 15:36:56 -0700
Subject: [PATCH 0248/1043] slight changes continuing from before

this should be working now
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d22b128c..900581ba 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -291,7 +291,7 @@ function s:IndentWithContinuation(lnum, ind, width)
   if s:Match(lnum, s:continuation_regex)
     if lnum == p_lnum
       return msl_ind + a:width
-    elseif s:InMultiVarStatement(lnum)
+    elseif s:InMultiVarStatement(lnum) && getline(lnum) =~ s:comma_last
       return msl_ind - a:width
     else
       return msl_ind

From 04e412b77da3ae059bdf038e910bf36fca81a93b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 12 May 2016 23:54:30 -0700
Subject: [PATCH 0249/1043] removing some clutter (#434)

also added a modeline to fold away the gq code
---
 indent/javascript.vim | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 900581ba..533b5b3d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -46,9 +46,6 @@ let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(string\|regex\|comment\|template\)\c'
 
-" Regex of syntax group names that are or delimit template strings
-let s:syng_template = 'template\c'
-
 " Regex of syntax group names that are strings.
 let s:syng_string = 'regex\c'
 
@@ -106,11 +103,6 @@ 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 template string.
-function s:IsInTempl(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_template
-endfunction
-
 " Check if the character at lnum:col is inside a multi-line comment.
 function s:IsInMultilineComment(lnum, col)
   return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
@@ -137,7 +129,7 @@ function s:PrevNonBlankNonString(lnum)
       endif
     elseif !in_block && s:IsInMultilineComment(lnum, matchend(line, '\*/') - 1)
       let in_block = 1
-    elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && !s:IsInTempl(lnum,1) && s:IsInStringOrComment(lnum, strlen(line)))
+    elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -329,12 +321,12 @@ endfunction
 " =========================
 
 function GetJavascriptIndent()
-  " 3.1. Setup {{{2
+  " 3.1. Setup {{{1
   " ----------
   " Set up variables for restoring position in file.  Could use v:lnum here.
   let vcol = col('.')
 
-  " 3.2. Work on the current line {{{2
+  " 3.2. Work on the current line {{{1
   " -----------------------------
 
   let ind = -1
@@ -344,7 +336,7 @@ function GetJavascriptIndent()
   let prevline = prevnonblank(v:lnum - 1)
   
   " to not change multiline string values 
-  if (synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string' || s:IsInTempl(v:lnum, 1)) && line !~ '^\s*[''"`]'
+  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template' && line !~ '^\s*[''"`]'
     return indent(v:lnum)
   endif
 
@@ -453,21 +445,13 @@ function GetJavascriptIndent()
     end
   end
 
-  " if getline(prevline) =~ '^\s*`$' && s:IsInTempl(v:lnum, 1)
-  "   if line !~ '^\s*`$'
-  "     return indent(prevline) + s:sw()
-  "   endif
-  " elseif line =~ '^\s*`$' && s:IsInTempl(prevline, 1)
-  "   return indent(prevline) - s:sw()
-  " endif
-
   " Check for multiple var assignments
 "  let var_indent = s:GetVarIndent(v:lnum)
 "  if var_indent >= 0
 "    return var_indent
 "  endif
 
-  " 3.3. Work on the previous line. {{{2
+  " 3.3. Work on the previous line. {{{1
   " -------------------------------
 
   " If the line is empty and the previous nonblank line was a multi-line
@@ -523,7 +507,7 @@ function GetJavascriptIndent()
     end
   end
 
-  " 3.4. Work on the MSL line. {{{2
+  " 3.4. Work on the MSL line. {{{1
   " --------------------------
 
   let ind_con = ind
@@ -550,7 +534,7 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
+" gq{{{2
 function! Fixedgq(lnum, count)
     let l:tw = &tw ? &tw : 80;
 
@@ -611,3 +595,5 @@ function! Fixedgq(lnum, count)
 
     return 0
 endfunction
+"}}}
+" vim: foldmethod=marker:foldlevel=1

From 2c70878710f46c12ab94c0df7217f0bf995acff8 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 17 May 2016 17:11:41 -0700
Subject: [PATCH 0250/1043] random fixes and improvements (#435)

* random fixes and improvements

this also removes the parentheses alignment, we can leave it in I suppose, but I'd like to revisit that later. if anyone objects please let me know.this needs to be cleaned up a bit before merging

* Update javascript.vim

* Update javascript.vim

* Update javascript.vim
---
 indent/javascript.vim | 104 ++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 50 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 533b5b3d..fa2f8a87 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -41,8 +41,8 @@ endif
 " 1. Variables {{{1
 " ============
 
-let s:js_keywords = '^\s*\(break\|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\)'
-let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
+let s:js_keywords = '^\s*\%(break\|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*\%(case\s\+[^\:]*\|default\)\s*:\s*\C'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(string\|regex\|comment\|template\)\c'
 
@@ -61,9 +61,9 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st
 let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*/.:]\|+\@<!+\|-\@<!-\|\%(<%\)\@<!=\|\W[|&?]\|||\|&&\|\%(=>.*\|=\)\@<!=[^=>].*,\)' . s:line_term
+let s:continuation_regex = '\%([\\*/.?:]\|+\@<!+\|-\@<!-\|=\|||\|&&\|\%(=>.*\)\@<!=[^=>],\)' . s:line_term
 
-let s:one_line_scope_regex = '\%(\<else\>\|=>\)' . s:line_term
+let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
 
 function s:Onescope(lnum)
   if getline(a:lnum) =~ s:one_line_scope_regex
@@ -71,7 +71,7 @@ function s:Onescope(lnum)
   end
   let mypos = col('.')
   call cursor(a:lnum, 1)
-  if search('\<\%(while\|for\|if\)\>\s*(', 'ce', a:lnum) > 0 && searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 && col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
+  if search('\<\%(while\|for\|if\)\>\s*(\C', 'ce', a:lnum) > 0 && searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 && col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
     call cursor(a:lnum, mypos)
     return 1
   else
@@ -85,10 +85,10 @@ let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)
 
 let s:operator_first = '^\s*\%([*.:?]\|\([-/+]\)\1\@!\|||\|&&\)'
 
-let s:var_stmt = '^\s*\%(const\|let\|var\)'
+let s:var_stmt = '^\s*\%(const\|let\|var\)\s\+\C'
 
 let s:comma_first = '^\s*,'
-let s:comma_last = ',\s*$'
+let s:comma_last = ',' . s:line_term
 
 " 2. Auxiliary Functions {{{1
 " ======================
@@ -185,28 +185,35 @@ function s:RemoveTrailingComments(content)
 endfunction
 
 " Find if the string is inside var statement (but not the first string)
-function s:InMultiVarStatement(lnum)
+function s:InMultiVarStatement(lnum, cont, prev)
   let lnum = s:PrevNonBlankNonString(a:lnum - 1)
 
-"  let type = synIDattr(synID(lnum, indent(lnum) + 1, 0), 'name')
+  "  let type = synIDattr(synID(lnum, indent(lnum) + 1, 0), 'name')
 
   " loop through previous expressions to find a var statement
-  while lnum > 0
+  while lnum > 0 && (s:Match(lnum, s:comma_last) || (a:cont && getline(lnum) =~ '^\s*}') || (a:prev && s:Match(a:prev, s:comma_last)))
     let line = getline(lnum)
-
     " if the line is a js keyword
     if (line =~ 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 (line =~ s:var_stmt)
+      if (line =~ s:var_stmt) && line =~ s:comma_last
         return lnum
       endif
 
       " other js keywords, not a var
-      return 0
+      if line !~ s:comma_last
+        return 0
+      end
     endif
-
+    if a:cont
+      call cursor(lnum,1)
+      if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
+        let lnum = line('.')
+        continue
+      end
+    end
     let lnum = s:PrevNonBlankNonString(lnum - 1)
   endwhile
 
@@ -217,7 +224,7 @@ endfunction
 " Find line above with beginning of the var statement or returns 0 if it's not
 " this statement
 function s:GetVarIndent(lnum)
-  let lvar = s:InMultiVarStatement(a:lnum)
+  let lvar = s:InMultiVarStatement(a:lnum, 0,0)
   let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
 
   if lvar
@@ -253,7 +260,7 @@ function s:LineHasOpeningBrackets(lnum)
     endif
     let pos = match(line, '[][(){}]', pos + 1)
   endwhile
-  return (open_0 > 0 ? 1 : (open_0 == 0 ? 0 : 2)) . (open_2 > 0) . (open_4 > 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))
 endfunction
 
 function s:Match(lnum, regex)
@@ -283,11 +290,11 @@ function s:IndentWithContinuation(lnum, ind, width)
   if s:Match(lnum, s:continuation_regex)
     if lnum == p_lnum
       return msl_ind + a:width
-    elseif s:InMultiVarStatement(lnum) && getline(lnum) =~ s:comma_last
-      return msl_ind - a:width
     else
       return msl_ind
     end
+  elseif s:InMultiVarStatement(p_lnum, 0,v:lnum)
+    return indent(p_lnum) - s:sw()
   endif
 
   return a:ind
@@ -354,6 +361,9 @@ function GetJavascriptIndent()
   if (line =~ s:expr_case)
     return cindent(v:lnum)
   endif
+  if s:Match(v:lnum, s:comma_first) && s:Match(prevline,s:var_stmt)
+    return indent(prevline) + s:sw()
+  end
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
   " others we indent to the containing line's MSL's level.  Return -1 if fail.
@@ -361,8 +371,8 @@ function GetJavascriptIndent()
   if col > 0 && !s:IsInStringOrComment(v:lnum, col)
     call cursor(v:lnum, col)
 
-    let lvar = s:InMultiVarStatement(v:lnum)
-    if lvar
+    let lvar = s:InMultiVarStatement(v:lnum, 0, 0) || line =~ s:comma_first
+    if lvar || line =~ s:comma_first
       let prevline_contents = s:RemoveTrailingComments(getline(prevline))
 
       " check for comma first
@@ -383,11 +393,7 @@ function GetJavascriptIndent()
 
     let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
     if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
-      if line[col-1]==')' && col('.') != col('$') - 1
-        let ind = virtcol('.')-1
-      else
-        let ind = s:InMultiVarStatement(line('.')) ? indent(line('.')) : indent(s:GetMSL(line('.'), 0))
-      endif
+      let ind = s:InMultiVarStatement(line('.'), 0, 0) ? indent(line('.')) : indent(s:GetMSL(line('.'), 0))
     endif
     return ind
   endif
@@ -395,12 +401,6 @@ function GetJavascriptIndent()
   " If the line is comma first, dedent 1 level
   if (getline(prevline) =~ s:comma_first)
     return indent(prevline) - s:sw()
-  elseif getline(s:PrevNonBlankNonString(prevline - 1)) =~ '[])}]' . s:comma_last && getline(prevline) !~ s:block_regex
-    if getline(prevline) !~ s:comma_last
-      return indent(prevline) - s:sw()
-    else
-      return indent(prevline)
-    end
   end
 
   " If line starts with an operator...
@@ -445,12 +445,6 @@ function GetJavascriptIndent()
     end
   end
 
-  " Check for multiple var assignments
-"  let var_indent = s:GetVarIndent(v:lnum)
-"  if var_indent >= 0
-"    return var_indent
-"  endif
-
   " 3.3. Work on the previous line. {{{1
   " -------------------------------
 
@@ -477,7 +471,7 @@ function GetJavascriptIndent()
 
   " 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) ? indent(lnum) + s:sw() : indent(s:GetMSL(lnum, 0)) + s:sw()
+    return s:InMultiVarStatement(lnum, 0, 0) ? indent(lnum) + s:sw() : indent(s:GetMSL(lnum, 0)) + s:sw()
   endif
 
   " Set up variables for current line.
@@ -485,22 +479,27 @@ function GetJavascriptIndent()
   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 line =~ '[[({})\]]'
+  if s:Match(lnum, '[[({})\]]')
     let counts = s:LineHasOpeningBrackets(lnum)
-    if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
-      if col('.') + 1 == col('$') || s:Onescope(lnum)
-        return ind + s:sw()
-      else
-        return virtcol('.')
-      endif
-    elseif counts[0] == '2'
+    if counts[0] == '2'
       call cursor(lnum, 1)
       " Search for the opening tag
-      let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
-      if mnum > 0
-        return indent(s:GetMSL(mnum, 0)) 
+      if searchpair('(', '', ')', 'bW', s:skip_expr) > 0
+        return indent(s:GetMSL(line('.'), 0)) 
       end
-    elseif counts[1] == '1' || counts[2] == '1' && counts[0] != '2'
+    elseif counts[1] == '2' && line !~ '^\s*}'
+      call cursor(lnum, 1)
+      " Search for the opening tag
+      if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
+        return indent(s:GetMSL(line('.'), 0)) 
+      end
+    elseif counts[2] == '2' && line !~ '^\s*]'
+      call cursor(lnum, 1)
+      " Search for the opening tag
+      if searchpair('\[', '', '\]', 'bW', s:skip_expr) > 0
+        return indent(s:GetMSL(line('.'), 0)) 
+      end
+    elseif counts[1] == '1' || counts[2] == '1' || counts[0] == '1' || s:Onescope(lnum)
       return ind + s:sw()
     else
       call cursor(v:lnum, vcol)
@@ -509,7 +508,12 @@ function GetJavascriptIndent()
 
   " 3.4. Work on the MSL line. {{{1
   " --------------------------
+  if s:Match(lnum, s:comma_last) && !s:Match(lnum,  s:continuation_regex)
+    return line =~ s:var_stmt ? indent(lnum) + s:sw() : indent(lnum)
 
+  elseif s:InMultiVarStatement(lnum, 1, v:lnum) && line !~ s:var_stmt 
+    return indent(lnum) - s:sw()
+  end
   let ind_con = ind
   let ind = s:IndentWithContinuation(lnum, ind_con, s:sw())
 

From bf34e60dc378e06cb1ce7abc499bfd57b9dae9aa Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 17 May 2016 21:49:31 -0700
Subject: [PATCH 0251/1043] Forcing `class` text to be a keyword

This class regex will match if the text class is contained within a
larger variable name, and therefore is broken.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 57812317..c9ba7dd9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -222,7 +222,7 @@ syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite conta
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained
 syntax keyword jsClassMethodDefinitions get set static contained nextgroup=jsFuncName skipwhite skipempty
-syntax match   jsClassDefinition /class\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
+syntax match   jsClassDefinition /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From 77387efb230d435ad655e5364bb0741121e0f87b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 21 May 2016 13:41:11 -0700
Subject: [PATCH 0252/1043] Update javascript.vim (#437)

regexes have been cleaned and no longer have ruby specifics. all of the regex matching has been either refactored to use the s:match function if it is needed to look at the syntax of the characters, or changed to be a simple match to save performance.the current file has none of the bugs i talked about that were caused by the last commit
---
 indent/javascript.vim | 92 ++++++++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index fa2f8a87..76b50099 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -58,10 +58,10 @@ let s:syng_linecom = 'linecomment\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:line_term = '\s*\%(\%(\/\/\).*\)\=$'
+let s:line_term = '\s*\%(\%(\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*/.?:]\|+\@<!+\|-\@<!-\|=\|||\|&&\|\%(=>.*\)\@<!=[^=>],\)' . s:line_term
+let s:continuation_regex = '\%([\\*/.?:]\|+\@<!+\|-\@<!-\|=\|||\|&&\)' . s:line_term
 
 let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
 
@@ -81,7 +81,7 @@ function s:Onescope(lnum)
 endfunction
 
 " Regex that defines blocks.
-let s:block_regex = '\%([{([]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
+let s:block_regex = '[{([]' . s:line_term
 
 let s:operator_first = '^\s*\%([*.:?]\|\([-/+]\)\1\@!\|||\|&&\)'
 
@@ -179,8 +179,8 @@ function s:GetMSL(lnum, in_one_line_scope)
 endfunction
 
 function s:RemoveTrailingComments(content)
-  let single = '\/\/\(.*\)\s*$'
-  let multi = '\/\*\(.*\)\*\/\s*$'
+  let single = '\/\/\%(.*\)\s*$'
+  let multi = '\/\*\%(.*\)\*\/\s*$'
   return substitute(substitute(substitute(a:content, single, '', ''), multi, '', ''), '\s\+$', '', '')
 endfunction
 
@@ -192,28 +192,26 @@ function s:InMultiVarStatement(lnum, cont, prev)
 
   " loop through previous expressions to find a var statement
   while lnum > 0 && (s:Match(lnum, s:comma_last) || (a:cont && getline(lnum) =~ '^\s*}') || (a:prev && s:Match(a:prev, s:comma_last)))
-    let line = getline(lnum)
     " if the line is a js keyword
-    if (line =~ s:js_keywords)
+    if a:cont
+      call cursor(lnum,1)
+      if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
+        let lnum = line('.')
+      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 (line =~ s:var_stmt) && line =~ s:comma_last
+      if s:Match(lnum, s:var_stmt) && s:Match(lnum, s:comma_last)
         return lnum
       endif
 
       " other js keywords, not a var
-      if line !~ s:comma_last
+      if !s:Match(lnum, s:comma_last)
         return 0
       end
     endif
-    if a:cont
-      call cursor(lnum,1)
-      if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
-        let lnum = line('.')
-        continue
-      end
-    end
     let lnum = s:PrevNonBlankNonString(lnum - 1)
   endwhile
 
@@ -221,25 +219,25 @@ function s:InMultiVarStatement(lnum, cont, prev)
   return 0
 endfunction
 
-" Find line above with beginning of the var statement or returns 0 if it's not
+" Find line above with beginning of the var statement or returns 0 if it's not"{{{2
 " this statement
-function s:GetVarIndent(lnum)
-  let lvar = s:InMultiVarStatement(a:lnum, 0,0)
-  let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
+" function s:GetVarIndent(lnum)
+"   let lvar = s:InMultiVarStatement(a:lnum, 0,0)
+"   let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
 
-  if lvar
-    let line = s:RemoveTrailingComments(getline(prev_lnum))
+"   if lvar
+"     let line = s:RemoveTrailingComments(getline(prev_lnum))
 
-    " if the previous line doesn't end in a comma, return to regular indent
-    if (line !~ s:comma_last)
-      return indent(prev_lnum) - s:sw()
-    else
-      return indent(lvar) + s:sw()
-    endif
-  endif
+"     " if the previous line doesn't end in a comma, return to regular indent
+"     if (line !~ s:comma_last)
+"       return indent(prev_lnum) - s:sw()
+"     else
+"       return indent(lvar) + s:sw()
+"     endif
+"   endif
 
-  return -1
-endfunction
+"   return -1
+" endfunction"}}}
 
 
 " Check if line 'lnum' has more opening brackets than closing ones.
@@ -361,8 +359,13 @@ function GetJavascriptIndent()
   if (line =~ s:expr_case)
     return cindent(v:lnum)
   endif
-  if s:Match(v:lnum, s:comma_first) && s:Match(prevline,s:var_stmt)
-    return indent(prevline) + s:sw()
+
+  " the part first where we deal with comma first
+  if line =~ s:comma_first
+    let counts = s:LineHasOpeningBrackets(prevline)
+    if (s:Match(prevline, s:var_stmt) || counts[0] == '1' || counts[1] == '1' || counts[2] == '1')
+      return indent(prevline) + s:sw()
+    end
   end
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
@@ -373,15 +376,14 @@ function GetJavascriptIndent()
 
     let lvar = s:InMultiVarStatement(v:lnum, 0, 0) || line =~ s:comma_first
     if lvar || line =~ s:comma_first
-      let prevline_contents = s:RemoveTrailingComments(getline(prevline))
 
       " check for comma first
       if (line[col - 1] =~ ',')
         " if the previous line ends in comma or semicolon don't indent
-        if (prevline_contents =~ '[;,]\s*$')
+        if (getline(prevline) =~ '[;,]' . s:line_term)
           return indent(s:GetMSL(line('.'), 0))
         " get previous line indent, if it's comma first return prevline indent
-        elseif (prevline_contents =~ s:comma_first)
+        elseif s:Match(prevline, s:comma_first)
           return indent(prevline)
         " otherwise we indent 1 level
         else
@@ -399,12 +401,12 @@ function GetJavascriptIndent()
   endif
 
   " If the line is comma first, dedent 1 level
-  if (getline(prevline) =~ s:comma_first)
+  if s:Match(prevline, s:comma_first)
     return indent(prevline) - s:sw()
   end
 
   " If line starts with an operator...
-  if (s:Match(v:lnum, s:operator_first))
+  if (line =~ s:operator_first)
     if (s:Match(prevline, s:operator_first))
       " and so does previous line, don't indent
       return indent(prevline)
@@ -422,7 +424,7 @@ function GetJavascriptIndent()
       return indent(prevline) + s:sw()
     end
     " If previous line starts with an operator...
-  elseif (s:Match(prevline, s:operator_first) && !s:Match(prevline, s:comma_last) && !s:Match(prevline, '};\=' . s:line_term)) || s:Match(prevline, ');\=' . s:line_term)
+  elseif (s:Match(prevline, s:operator_first) && getline(prevline) !~ s:comma_last && getline(prevline) !~ '};\=' . s:line_term) || getline(prevline) =~ ');\=' . s:line_term
     let counts = s:LineHasOpeningBrackets(prevline)
     if counts[0] == '2' && !s:Match(prevline, s:operator_first)
       call cursor(prevline, 1)
@@ -487,13 +489,13 @@ function GetJavascriptIndent()
       if searchpair('(', '', ')', 'bW', s:skip_expr) > 0
         return indent(s:GetMSL(line('.'), 0)) 
       end
-    elseif counts[1] == '2' && line !~ '^\s*}'
+    elseif counts[1] == '2' && !s:Match(lnum, '^\s*}')
       call cursor(lnum, 1)
       " Search for the opening tag
       if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
         return indent(s:GetMSL(line('.'), 0)) 
       end
-    elseif counts[2] == '2' && line !~ '^\s*]'
+    elseif counts[2] == '2' && !s:Match(lnum, '^\s*]')
       call cursor(lnum, 1)
       " Search for the opening tag
       if searchpair('\[', '', '\]', 'bW', s:skip_expr) > 0
@@ -509,10 +511,12 @@ function GetJavascriptIndent()
   " 3.4. Work on the MSL line. {{{1
   " --------------------------
   if s:Match(lnum, s:comma_last) && !s:Match(lnum,  s:continuation_regex)
-    return line =~ s:var_stmt ? indent(lnum) + s:sw() : indent(lnum)
+    return s:Match(lnum, s:var_stmt) ? indent(lnum) + s:sw() : indent(lnum)
 
-  elseif s:InMultiVarStatement(lnum, 1, v:lnum) && line !~ s:var_stmt 
-    return indent(lnum) - s:sw()
+  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
   end
   let ind_con = ind
   let ind = s:IndentWithContinuation(lnum, ind_con, s:sw())

From c180b0c322d578be6c510a9c0970e50322875877 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 21 May 2016 21:05:51 -0700
Subject: [PATCH 0253/1043] little bug affecting previous few commits

another tiny commit, this is just fix which for a small bug that slipped past me
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 76b50099..975da3ac 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -291,7 +291,7 @@ function s:IndentWithContinuation(lnum, ind, width)
     else
       return msl_ind
     end
-  elseif s:InMultiVarStatement(p_lnum, 0,v:lnum)
+  elseif s:InMultiVarStatement(p_lnum, 0, s:PrevNonBlankNonString(p_lnum - 1))
     return indent(p_lnum) - s:sw()
   endif
 

From c5fba22a90f17c4a09b961bc1834cfb8679adb28 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 24 May 2016 12:44:40 -0700
Subject: [PATCH 0254/1043] wrapping comments improved (#440)

* wrapping comments improved

this improves most regexes and the prevnonblanknonstring function
---
 indent/javascript.vim | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 975da3ac..3fac0ab4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -41,8 +41,9 @@ endif
 " 1. Variables {{{1
 " ============
 
-let s:js_keywords = '^\s*\%(break\|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*\%(case\s\+[^\:]*\|default\)\s*:\s*\C'
+let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
+let s:js_keywords = s:line_pre . '\%(break\|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\s\+[^\:]*\|default\)\s*:\s*\C'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(string\|regex\|comment\|template\)\c'
 
@@ -50,7 +51,7 @@ let s:syng_strcom = '\%(string\|regex\|comment\|template\)\c'
 let s:syng_string = 'regex\c'
 
 " Regex of syntax group names that are strings or documentation.
-let s:syng_multiline = 'comment\c'
+let s:syng_multiline = '\%(comment\|doc\)\c'
 
 " Regex of syntax group names that are line comment.
 let s:syng_linecom = 'linecomment\c'
@@ -61,7 +62,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_st
 let s:line_term = '\s*\%(\%(\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*/.?:]\|+\@<!+\|-\@<!-\|=\|||\|&&\)' . s:line_term
+let s:continuation_regex = '\%([*.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
 
 let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
 
@@ -83,11 +84,11 @@ endfunction
 " Regex that defines blocks.
 let s:block_regex = '[{([]' . s:line_term
 
-let s:operator_first = '^\s*\%([*.:?]\|\([-/+]\)\1\@!\|||\|&&\)'
+let s:operator_first = s:line_pre . '\%([.:?]\|\([-/+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
 
-let s:var_stmt = '^\s*\%(const\|let\|var\)\s\+\C'
+let s:var_stmt = s:line_pre . '\%(const\|let\|var\)\s\+\C'
 
-let s:comma_first = '^\s*,'
+let s:comma_first = s:line_pre . ','
 let s:comma_last = ',' . s:line_term
 
 " 2. Auxiliary Functions {{{1
@@ -121,15 +122,15 @@ function s:PrevNonBlankNonString(lnum)
     " Go in and out of blocks comments as necessary.
     " If the line isn't empty (with opt. comment) or in a string, end search.
     let line = getline(lnum)
-    if s:IsInMultilineComment(lnum, matchend(line, '/\*') - 1)
+    if s:IsInMultilineComment(lnum, matchend(line, '^\s*/\*') - 1) && line !~ s:line_pre . '$'
       if in_block
         let in_block = 0
       else
         break
       endif
-    elseif !in_block && s:IsInMultilineComment(lnum, matchend(line, '\*/') - 1)
+    elseif !in_block && s:IsInMultilineComment(lnum, match(line, '\*/\s*$') + 1) && line !~ s:line_pre . '$'
       let in_block = 1
-    elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
+    elseif !in_block && line !~ s:line_pre . '\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -191,7 +192,7 @@ function s:InMultiVarStatement(lnum, cont, 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) || (a:cont && getline(lnum) =~ '^\s*}') || (a:prev && s:Match(a:prev, s:comma_last)))
+  while lnum > 0 && (s:Match(lnum, s:comma_last) || (a:cont && getline(lnum) =~ s:line_pre . '}') || (a:prev && s:Match(a:prev, s:comma_last)))
     " if the line is a js keyword
     if a:cont
       call cursor(lnum,1)
@@ -341,17 +342,18 @@ function GetJavascriptIndent()
   let prevline = prevnonblank(v:lnum - 1)
   
   " to not change multiline string values 
-  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template' && line !~ '^\s*[''"`]'
+  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template' && line !~ s:line_pre . '[''"`]'
     return indent(v:lnum)
   endif
 
   " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
+  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1) &&
+    \ s:IsInMultilineComment(v:lnum, match(line, '\s*$'))
     return cindent(v:lnum)
   endif
   
   " single opening bracket will assume you want a c style of indenting
-  if s:Match(v:lnum, '^\s*{' . s:line_term)
+  if s:Match(v:lnum, s:line_pre . '{' . s:line_term)
     return cindent(v:lnum)
   endif
 
@@ -370,7 +372,7 @@ function GetJavascriptIndent()
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
   " others we indent to the containing line's MSL's level.  Return -1 if fail.
-  let col = matchend(line, '^\s*[],})]')
+  let col = matchend(line, s:line_pre . '[],})]')
   if col > 0 && !s:IsInStringOrComment(v:lnum, col)
     call cursor(v:lnum, col)
 
@@ -489,13 +491,13 @@ function GetJavascriptIndent()
       if searchpair('(', '', ')', 'bW', s:skip_expr) > 0
         return indent(s:GetMSL(line('.'), 0)) 
       end
-    elseif counts[1] == '2' && !s:Match(lnum, '^\s*}')
+    elseif counts[1] == '2' && !s:Match(lnum, s:line_pre . '}')
       call cursor(lnum, 1)
       " Search for the opening tag
       if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
         return indent(s:GetMSL(line('.'), 0)) 
       end
-    elseif counts[2] == '2' && !s:Match(lnum, '^\s*]')
+    elseif counts[2] == '2' && !s:Match(lnum, s:line_pre . ']')
       call cursor(lnum, 1)
       " Search for the opening tag
       if searchpair('\[', '', '\]', 'bW', s:skip_expr) > 0

From fe096c0eec788006516b5be8ce580dbc23f7144f Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 25 May 2016 11:58:00 -0700
Subject: [PATCH 0255/1043] another edge side effect (#443)

this is just a more correct, thorough check, for multiline comments
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3fac0ab4..d3caf4ae 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -348,7 +348,7 @@ function GetJavascriptIndent()
 
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1) &&
-    \ s:IsInMultilineComment(v:lnum, match(line, '\s*$'))
+    \ s:IsInMultilineComment(v:lnum, match(line, '\s*$')) && line !~ '^\/\*'
     return cindent(v:lnum)
   endif
   

From d54b138f9113739780f1f61c9fe5aeec0e0ea088 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 26 May 2016 00:20:26 -0700
Subject: [PATCH 0256/1043] a comma should be considered an operator

this fixes some serious issues with the way a continuation is detected and also removes the specific code for comma first style,which was very breakable
---
 indent/javascript.vim | 56 +++++++++++++------------------------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d3caf4ae..a0b78714 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -72,7 +72,9 @@ function s:Onescope(lnum)
   end
   let mypos = col('.')
   call cursor(a:lnum, 1)
-  if search('\<\%(while\|for\|if\)\>\s*(\C', 'ce', a:lnum) > 0 && searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 && col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
+  if search('\<\%(while\|for\|if\)\>\s*(\C', 'ce', a:lnum) > 0 &&
+        \ searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 &&
+        \ col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
     call cursor(a:lnum, mypos)
     return 1
   else
@@ -84,11 +86,10 @@ endfunction
 " Regex that defines blocks.
 let s:block_regex = '[{([]' . s:line_term
 
-let s:operator_first = s:line_pre . '\%([.:?]\|\([-/+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
+let s:operator_first = s:line_pre . '\%([.,:?]\|\([-/+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
 
 let s:var_stmt = s:line_pre . '\%(const\|let\|var\)\s\+\C'
 
-let s:comma_first = s:line_pre . ','
 let s:comma_last = ',' . s:line_term
 
 " 2. Auxiliary Functions {{{1
@@ -148,9 +149,11 @@ function s:GetMSL(lnum, in_one_line_scope)
     " Otherwise, terminate search as we have found our MSL already.
     let line = getline(lnum)
     let col = match(line, s:continuation_regex) + 1
+    let coal = match(line, s:comma_last) + 1
     let line2 = getline(msl)
     let col2 = matchend(line2, ')')
-    if (col > 0 && !s:IsInStringOrComment(lnum, col) && !s:Match(lnum, s:expr_case)) || s:IsInString(lnum, strlen(line))
+    if ((col > 0 && !s:IsInStringOrComment(lnum, col) || coal > 0 && !s:IsInStringOrComment(lnum,coal)) &&
+          \ !s:Match(lnum, s:expr_case)) || s:IsInString(lnum, strlen(line))
       let msl = lnum
 
     " if there are more closing brackets, continue from the line which has the matching opening bracket
@@ -192,7 +195,9 @@ function s:InMultiVarStatement(lnum, cont, 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) || (a:cont && getline(lnum) =~ s:line_pre . '}') || (a:prev && s:Match(a:prev, s:comma_last)))
+  while lnum > 0 && (s:Match(lnum, s:comma_last) ||(a:cont && getline(lnum) =~ s:line_pre . '}') ||
+        \ s:Match(lnum,s:continuation_regex)) || (a:prev && (s:Match(a:prev, s:comma_last) ||
+        \ s:Match(a:prev,s:continuation_regex)))
     " if the line is a js keyword
     if a:cont
       call cursor(lnum,1)
@@ -204,12 +209,12 @@ function s:InMultiVarStatement(lnum, cont, prev)
       " 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)
+      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)
+      if !s:Match(lnum, s:comma_last)||!s:Match(lnum,s:continuation_regex)
         return 0
       end
     endif
@@ -348,7 +353,7 @@ function GetJavascriptIndent()
 
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1) &&
-    \ s:IsInMultilineComment(v:lnum, match(line, '\s*$')) && line !~ '^\/\*'
+        \ s:IsInMultilineComment(v:lnum, match(line, '\s*$')) && line !~ '^\/\*'
     return cindent(v:lnum)
   endif
   
@@ -362,38 +367,13 @@ function GetJavascriptIndent()
     return cindent(v:lnum)
   endif
 
-  " the part first where we deal with comma first
-  if line =~ s:comma_first
-    let counts = s:LineHasOpeningBrackets(prevline)
-    if (s:Match(prevline, s:var_stmt) || counts[0] == '1' || counts[1] == '1' || counts[2] == '1')
-      return indent(prevline) + s:sw()
-    end
-  end
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
   " others we indent to the containing line's MSL's level.  Return -1 if fail.
-  let col = matchend(line, s:line_pre . '[],})]')
+  let col = matchend(line, s:line_pre . '[]})]')
   if col > 0 && !s:IsInStringOrComment(v:lnum, col)
     call cursor(v:lnum, col)
 
-    let lvar = s:InMultiVarStatement(v:lnum, 0, 0) || line =~ s:comma_first
-    if lvar || line =~ s:comma_first
-
-      " check for comma first
-      if (line[col - 1] =~ ',')
-        " if the previous line ends in comma or semicolon don't indent
-        if (getline(prevline) =~ '[;,]' . s:line_term)
-          return indent(s:GetMSL(line('.'), 0))
-        " get previous line indent, if it's comma first return prevline indent
-        elseif s:Match(prevline, s:comma_first)
-          return indent(prevline)
-        " otherwise we indent 1 level
-        else
-          return indent(lvar) + s:sw()
-        endif
-      endif
-    endif
-
 
     let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
     if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
@@ -402,11 +382,6 @@ function GetJavascriptIndent()
     return ind
   endif
 
-  " If the line is comma first, dedent 1 level
-  if s:Match(prevline, s:comma_first)
-    return indent(prevline) - s:sw()
-  end
-
   " If line starts with an operator...
   if (line =~ s:operator_first)
     if (s:Match(prevline, s:operator_first))
@@ -426,7 +401,8 @@ function GetJavascriptIndent()
       return indent(prevline) + s:sw()
     end
     " If previous line starts with an operator...
-  elseif (s:Match(prevline, s:operator_first) && getline(prevline) !~ s:comma_last && getline(prevline) !~ '};\=' . s:line_term) || getline(prevline) =~ ');\=' . s:line_term
+  elseif (s:Match(prevline, s:operator_first) && getline(prevline) !~ s:continuation_regex &&
+        \ getline(prevline) !~ '};\=' . s:line_term) || getline(prevline) =~ ');\=' . s:line_term
     let counts = s:LineHasOpeningBrackets(prevline)
     if counts[0] == '2' && !s:Match(prevline, s:operator_first)
       call cursor(prevline, 1)

From b5de6ec2cc28bf28064712241d3fd624b966c336 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 26 May 2016 11:10:09 -0700
Subject: [PATCH 0257/1043] Update javascript.vim

---
 indent/javascript.vim | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a0b78714..8bd4bcf5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -389,20 +389,20 @@ function GetJavascriptIndent()
       return indent(prevline)
     end
     let counts = s:LineHasOpeningBrackets(prevline)
-    if counts[0] == '2'
+    if counts[0] == '2' || counts[1] == '2' || counts[2] == '2'
       call cursor(prevline, 1)
       " Search for the opening tag
-      let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
-      if mnum > 0 && s:Match(mnum, s:operator_first)
-        return indent(mnum)
+      let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
+      if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0 && s:Match(line('.'), s:operator_first)
+        return indent(line('.'))
       end
     elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
       " otherwise, indent 1 level
       return indent(prevline) + s:sw()
     end
+
     " If previous line starts with an operator...
-  elseif (s:Match(prevline, s:operator_first) && getline(prevline) !~ s:continuation_regex &&
-        \ getline(prevline) !~ '};\=' . s:line_term) || getline(prevline) =~ ');\=' . s:line_term
+  elseif (s:Match(prevline, s:operator_first) && !s:Match(prevline,s:continuation_regex))||getline(prevline) =~ ');\=' . s:line_term
     let counts = s:LineHasOpeningBrackets(prevline)
     if counts[0] == '2' && !s:Match(prevline, s:operator_first)
       call cursor(prevline, 1)
@@ -412,14 +412,7 @@ function GetJavascriptIndent()
         return indent(mnum) - s:sw()
       end
     elseif s:Match(prevline, s:operator_first)
-      if counts[0] == '2' && counts[1] == '1'
-        call cursor(prevline, 1)
-        " Search for the opening tag
-        let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
-        if mnum > 0 && !s:Match(mnum, s:operator_first)
-          return indent(mnum) + s:sw()
-        end
-      elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
+      if counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
         return indent(prevline) - s:sw()
       end
     end

From fcec8b72d238e8c49b8755f294551c671ce3b0fd Mon Sep 17 00:00:00 2001
From: dNItro <dNItro@users.noreply.github.com>
Date: Fri, 27 May 2016 01:30:45 +0430
Subject: [PATCH 0258/1043] Shebang doesn't have to contain env

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

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index 036b352d..d6aa6d01 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -3,7 +3,7 @@ au BufNewFile,BufRead *.jsm setf javascript
 au BufNewFile,BufRead Jakefile setf javascript
 
 fun! s:SelectJavascript()
-  if getline(1) =~# '^#!.*/bin/env\s\+node\>'
+  if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
     set ft=javascript
   endif
 endfun

From 5b143bd2ad8dd4b98e4087d6991be423b9df7a2d Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 26 May 2016 14:48:21 -0700
Subject: [PATCH 0259/1043] change the regex engine according to warning (#449)

* change the regex engine according to warning
the readme won't tell the user to change the regexpengine now that the correct one is set
---
 README.md               | 12 ------------
 ftplugin/javascript.vim |  3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index fb5139c9..85b0d0b9 100644
--- a/README.md
+++ b/README.md
@@ -102,18 +102,6 @@ proposed change and how it is valuable.
 Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
 
 
-## A Quick Note on Regexes
-
-Vim 7.4 with patches LESS than 1-7 exhibits a bug that broke how we handle
-javascript regexes. Please update to a newer version or run the following
-commands to fix:
-
-```
-:set regexpengine=1
-:syntax enable
-```
-
-
 ## License
 
 Distributed under the same terms as Vim itself. See `:help license`.
diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim
index 9e2fc9b0..58755a4a 100644
--- a/ftplugin/javascript.vim
+++ b/ftplugin/javascript.vim
@@ -1 +1,4 @@
 setlocal suffixesadd+=.js
+if (v:version < 704 || (v:version == 704 && !has('patch002'))) && exists('&regexpengine')
+  set re=1
+end

From 120352b1205af843d1d316686b61ac91b4a25278 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 30 May 2016 11:13:12 -0700
Subject: [PATCH 0260/1043] readability changes in the indent script (#450)

this makes almost no difference to the indenter's effects. I found that our most time consuming indent operation is from the 'skip_expr' which looks at syntax items, removing 'regex' from it seems to help a bit but it still will be slow on long lines
---
 indent/javascript.vim | 118 +++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 77 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8bd4bcf5..78d5d4e5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -117,21 +117,17 @@ endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevNonBlankNonString(lnum)
-  let in_block = 0
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
-    " Go in and out of blocks comments as necessary.
-    " If the line isn't empty (with opt. comment) or in a string, end search.
     let line = getline(lnum)
-    if s:IsInMultilineComment(lnum, matchend(line, '^\s*/\*') - 1) && line !~ s:line_pre . '$'
-      if in_block
-        let in_block = 0
-      else
-        break
-      endif
-    elseif !in_block && s:IsInMultilineComment(lnum, match(line, '\*/\s*$') + 1) && line !~ s:line_pre . '$'
-      let in_block = 1
-    elseif !in_block && line !~ s:line_pre . '\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
+    let com = match(line, '\*\/') + 1
+    if s:IsInMultilineComment(lnum, com)
+      call cursor(lnum, com)
+      let parlnum = search('\/\*', 'nbW')
+      if parlnum > 0
+        let lnum = parlnum
+      end
+    elseif line !~ '^' . s:line_term
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -148,11 +144,9 @@ function s:GetMSL(lnum, in_one_line_scope)
     " 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 col = match(line, s:continuation_regex) + 1
-    let coal = match(line, s:comma_last) + 1
     let line2 = getline(msl)
     let col2 = matchend(line2, ')')
-    if ((col > 0 && !s:IsInStringOrComment(lnum, col) || coal > 0 && !s:IsInStringOrComment(lnum,coal)) &&
+    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
 
@@ -201,8 +195,9 @@ function s:InMultiVarStatement(lnum, cont, prev)
     " if the line is a js keyword
     if a:cont
       call cursor(lnum,1)
-      if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
-        let lnum = line('.')
+      let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+      if parlnum > 0
+        let lnum = parlnum
       end
     end
     if s:Match(lnum, s:js_keywords)
@@ -225,27 +220,6 @@ function s:InMultiVarStatement(lnum, cont, prev)
   return 0
 endfunction
 
-" Find line above with beginning of the var statement or returns 0 if it's not"{{{2
-" this statement
-" function s:GetVarIndent(lnum)
-"   let lvar = s:InMultiVarStatement(a:lnum, 0,0)
-"   let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
-
-"   if lvar
-"     let line = s:RemoveTrailingComments(getline(prev_lnum))
-
-"     " if the previous line doesn't end in a comma, return to regular indent
-"     if (line !~ s:comma_last)
-"       return indent(prev_lnum) - s:sw()
-"     else
-"       return indent(lvar) + s:sw()
-"     endif
-"   endif
-
-"   return -1
-" endfunction"}}}
-
-
 " Check if line 'lnum' has more opening brackets than closing ones.
 function s:LineHasOpeningBrackets(lnum)
   let open_0 = 0
@@ -345,15 +319,14 @@ function GetJavascriptIndent()
   let line = getline(v:lnum)
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
-  
+
   " to not change multiline string values 
-  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template' && line !~ s:line_pre . '[''"`]'
-    return indent(v:lnum)
+  if line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template'
+    return -1
   endif
 
   " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1) &&
-        \ s:IsInMultilineComment(v:lnum, match(line, '\s*$')) && line !~ '^\/\*'
+  if s:IsInMultilineComment(v:lnum, 1) && line !~ '^\/\*'
     return cindent(v:lnum)
   endif
   
@@ -375,45 +348,47 @@ function GetJavascriptIndent()
     call cursor(v:lnum, col)
 
 
-    let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
-    if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
-      let ind = s:InMultiVarStatement(line('.'), 0, 0) ? indent(line('.')) : indent(s:GetMSL(line('.'), 0))
+    let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+    if parlnum > 0
+      let ind = s:InMultiVarStatement(parlnum, 0, 0) ? indent(parlnum) : indent(s:GetMSL(parlnum, 0))
     endif
     return ind
   endif
 
+  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
+
   " If line starts with an operator...
   if (line =~ s:operator_first)
-    if (s:Match(prevline, s:operator_first))
+    if (s:Match(lnum, s:operator_first))
       " and so does previous line, don't indent
-      return indent(prevline)
+      return indent(lnum)
     end
-    let counts = s:LineHasOpeningBrackets(prevline)
+    let counts = s:LineHasOpeningBrackets(lnum)
     if counts[0] == '2' || counts[1] == '2' || counts[2] == '2'
-      call cursor(prevline, 1)
+      call cursor(lnum, 1)
       " Search for the opening tag
-      let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
-      if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0 && s:Match(line('.'), s:operator_first)
-        return indent(line('.'))
+      let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+      if parlnum > 0 && s:Match(parlnum, s:operator_first)
+        return indent(parlnum)
       end
     elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
       " otherwise, indent 1 level
-      return indent(prevline) + s:sw()
+      return indent(lnum) + s:sw()
     end
 
     " If previous line starts with an operator...
-  elseif (s:Match(prevline, s:operator_first) && !s:Match(prevline,s:continuation_regex))||getline(prevline) =~ ');\=' . s:line_term
-    let counts = s:LineHasOpeningBrackets(prevline)
-    if counts[0] == '2' && !s:Match(prevline, s:operator_first)
-      call cursor(prevline, 1)
+  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[0] == '2' && !s:Match(lnum, s:operator_first)
+      call cursor(lnum, 1)
       " Search for the opening tag
-      let mnum = searchpair('(', '', ')', 'bW', s:skip_expr)
+      let mnum = searchpair('(', '', ')', 'nbW', s:skip_expr)
       if mnum > 0 && s:Match(mnum, s:operator_first)
         return indent(mnum) - s:sw()
       end
-    elseif s:Match(prevline, s:operator_first)
+    elseif s:Match(lnum, s:operator_first)
       if counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
-        return indent(prevline) - s:sw()
+        return indent(lnum) - s:sw()
       end
     end
   end
@@ -429,7 +404,6 @@ function GetJavascriptIndent()
   endif
 
   " Find a non-blank, non-multi-line string line above the current line.
-  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
   " If the line is empty and inside a string, use the previous line.
   if line =~ '^\s*$' && lnum != prevline
@@ -454,23 +428,13 @@ function GetJavascriptIndent()
   " add indent depending on the bracket type.
   if s:Match(lnum, '[[({})\]]')
     let counts = s:LineHasOpeningBrackets(lnum)
-    if counts[0] == '2'
-      call cursor(lnum, 1)
-      " Search for the opening tag
-      if searchpair('(', '', ')', 'bW', s:skip_expr) > 0
-        return indent(s:GetMSL(line('.'), 0)) 
-      end
-    elseif counts[1] == '2' && !s:Match(lnum, s:line_pre . '}')
-      call cursor(lnum, 1)
-      " Search for the opening tag
-      if searchpair('{', '', '}', 'bW', s:skip_expr) > 0
-        return indent(s:GetMSL(line('.'), 0)) 
-      end
-    elseif counts[2] == '2' && !s:Match(lnum, s:line_pre . ']')
+    if counts[0] == '2' || (counts[1] == '2' && !s:Match(lnum, s:line_pre . '}')) ||
+          \ (counts[2] == '2' && !s:Match(lnum, s:line_pre . ']'))
       call cursor(lnum, 1)
       " Search for the opening tag
-      if searchpair('\[', '', '\]', 'bW', s:skip_expr) > 0
-        return indent(s:GetMSL(line('.'), 0)) 
+      let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+      if parlnum > 0
+        return indent(s:GetMSL(parlnum, 0)) 
       end
     elseif counts[1] == '1' || counts[2] == '1' || counts[0] == '1' || s:Onescope(lnum)
       return ind + s:sw()

From 12bbabac6034b46d3d5ea764f7bc81694702e2e9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 31 May 2016 14:29:08 -0700
Subject: [PATCH 0261/1043] timeout the paren searching (#453)

the search pair function almost stalls my decently powerful macbook pro on really long lines, could be annoying because of minification etc.this function just makes it backwards compatible in old vim versions or builds without this feature
---
 indent/javascript.vim | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 78d5d4e5..85badf8a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -42,7 +42,7 @@ endif
 " ============
 
 let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
-let s:js_keywords = s:line_pre . '\%(break\|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: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\s\+[^\:]*\|default\)\s*:\s*\C'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(string\|regex\|comment\|template\)\c'
@@ -59,6 +59,14 @@ let s:syng_linecom = 'linecomment\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."'"
 
+func s:lookForParens(start,end,flags,stop)
+  try 
+    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,a:stop,300)
+  catch /E118/
+    return searchpair(a:start,'',a:end,a:flags,0,a:stop)
+  endtry
+endfunc
+
 let s:line_term = '\s*\%(\%(\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
 " Regex that defines continuation lines, not including (, {, or [.
@@ -73,7 +81,7 @@ function s:Onescope(lnum)
   let mypos = col('.')
   call cursor(a:lnum, 1)
   if search('\<\%(while\|for\|if\)\>\s*(\C', 'ce', a:lnum) > 0 &&
-        \ searchpair('(', '', ')', 'W', s:skip_expr, a:lnum) > 0 &&
+        \ s:lookForParens('(', ')', 'W', a:lnum) > 0 &&
         \ col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
     call cursor(a:lnum, mypos)
     return 1
@@ -153,7 +161,7 @@ function s:GetMSL(lnum, in_one_line_scope)
     " if there are more closing brackets, continue from the line which has the matching opening bracket
     elseif col2 > 0 && !s:IsInStringOrComment(msl, col2) && s:LineHasOpeningBrackets(msl)[0] == '2' && !a:in_one_line_scope
       call cursor(msl, 1)
-      if searchpair('(', '', ')', 'bW', s:skip_expr) > 0
+      if s:lookForParens('(', ')', 'bW', 0) > 0
         let lnum = line('.')
         let msl = lnum
       endif
@@ -185,17 +193,18 @@ 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 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) ||(a:cont && getline(lnum) =~ s:line_pre . '}') ||
-        \ s:Match(lnum,s:continuation_regex)) || (a:prev && (s:Match(a:prev, s:comma_last) ||
-        \ s:Match(a:prev,s:continuation_regex)))
+        \ 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 a:cont
       call cursor(lnum,1)
-      let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
       if parlnum > 0
         let lnum = parlnum
       end
@@ -214,6 +223,7 @@ function s:InMultiVarStatement(lnum, cont, prev)
       end
     endif
     let lnum = s:PrevNonBlankNonString(lnum - 1)
+    let prev = prev && lnum > 0 ? prev : 0
   endwhile
 
   " beginning of program, not a var
@@ -348,7 +358,7 @@ function GetJavascriptIndent()
     call cursor(v:lnum, col)
 
 
-    let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+    let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
     if parlnum > 0
       let ind = s:InMultiVarStatement(parlnum, 0, 0) ? indent(parlnum) : indent(s:GetMSL(parlnum, 0))
     endif
@@ -367,7 +377,7 @@ function GetJavascriptIndent()
     if counts[0] == '2' || counts[1] == '2' || counts[2] == '2'
       call cursor(lnum, 1)
       " Search for the opening tag
-      let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
       if parlnum > 0 && s:Match(parlnum, s:operator_first)
         return indent(parlnum)
       end
@@ -382,7 +392,7 @@ function GetJavascriptIndent()
     if counts[0] == '2' && !s:Match(lnum, s:operator_first)
       call cursor(lnum, 1)
       " Search for the opening tag
-      let mnum = searchpair('(', '', ')', 'nbW', s:skip_expr)
+      let mnum = s:lookForParens('(', ')', 'nbW', 0)
       if mnum > 0 && s:Match(mnum, s:operator_first)
         return indent(mnum) - s:sw()
       end
@@ -432,7 +442,7 @@ function GetJavascriptIndent()
           \ (counts[2] == '2' && !s:Match(lnum, s:line_pre . ']'))
       call cursor(lnum, 1)
       " Search for the opening tag
-      let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', s:skip_expr)
+      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
       if parlnum > 0
         return indent(s:GetMSL(parlnum, 0)) 
       end

From 51bf45fe4957f0fa3fc996e5b3a0bf2ff549b9b0 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 2 Jun 2016 09:38:19 -0700
Subject: [PATCH 0262/1043] limiting for slow function and operator fix (#455)

* prevent repeated calls of searchpair

```
var magicWords = ['abracadabra', 'gesundheit', 'ventrilo'],
  spells = {
    'fireball': function() {
      setOnFire()
    },
    'water': function() {
      putOut()
    }
  },
  a = 1,
  b = 'abc',
  etc, somethingElse
someFunc(param1, param2,
  param3, param4)
```
at the line which starts with a curly brace followed by a comment this was added for traversing the comma less property lines, however this only needs to be called once.this improves performance when using the endline operator style

an operator would previously  create an unnecessary indent when following a line which was the first of a list of block enclosed items, e.g. a array, function call, or object
before:
```
      vardefaultModules = {
        'http:': http
          ,'https:': https
      }
```
after:
```
      vardefaultModules = {
        'http:': http
        ,'https:': https
      }
```
---
 indent/javascript.vim | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 85badf8a..a76a1b89 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -193,16 +193,18 @@ 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) ||(a:cont && getline(lnum) =~ s:line_pre . '}') ||
+  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 a:cont
+    if cont
+      let cont = 0
       call cursor(lnum,1)
       let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
       if parlnum > 0
@@ -381,7 +383,9 @@ function GetJavascriptIndent()
       if parlnum > 0 && s:Match(parlnum, s:operator_first)
         return indent(parlnum)
       end
-    elseif counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
+    elseif (counts[0] != '1' && counts[1] != '1' && counts[2] != '1') && 
+          \ (!s:Match(s:PrevNonBlankNonString(lnum - 1), s:block_regex) ||
+          \ s:Match(lnum, s:var_stmt))
       " otherwise, indent 1 level
       return indent(lnum) + s:sw()
     end

From d00e8ddf6f10e14837d25e97dac35cd10f1a55a2 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 2 Jun 2016 14:48:49 -0700
Subject: [PATCH 0263/1043] get a correct indent for initial operator first

looking at how the line found with searchpair starts
after:
```
    var protocol = defaultModules = {
      'http:': http
      ,'https:': https
    }
      ,htpModles = slf.htpModules || {}

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a76a1b89..6a477b7b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -380,8 +380,8 @@ function GetJavascriptIndent()
       call cursor(lnum, 1)
       " Search for the opening tag
       let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if parlnum > 0 && s:Match(parlnum, s:operator_first)
-        return indent(parlnum)
+      if parlnum > 0
+        return !s:Match(parlnum, s:operator_first) ? indent(lnum) + s:sw() : indent(parlnum)
       end
     elseif (counts[0] != '1' && counts[1] != '1' && counts[2] != '1') && 
           \ (!s:Match(s:PrevNonBlankNonString(lnum - 1), s:block_regex) ||

From 06d8d160e0400c4e088bbae64fec53ad3f1bda2b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 2 Jun 2016 17:33:52 -0700
Subject: [PATCH 0264/1043] Improve jsClassMethodDefinition matches

Currently in a class definition, you can actually have a method called
`get`.  However with our match of `get` `set` and `static` as keywords,
we broke the ability to properly support those method names.  This
should fix those cases.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ff3e302d..91dad525 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -221,7 +221,7 @@ syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite conta
 
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained
-syntax keyword jsClassMethodDefinitions get set static contained nextgroup=jsFuncName skipwhite skipempty
+syntax match   jsClassMethodDefinitions /\%(get\|set\|static\)\%( \k\+\)\@=/ contained nextgroup=jsFuncName skipwhite skipempty
 syntax match   jsClassDefinition /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
 " Define the default highlighting.

From c9dc41ff5bbb4f056463a504a1f326a84ffc5286 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 2 Jun 2016 21:07:05 -0700
Subject: [PATCH 0265/1043] working detection of object/array properties (#460)

* working detection of object properties

the previous method is likely slower and doesn't really work

* fun args supported

also add support for func args
---
 indent/javascript.vim | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6a477b7b..d6144a9b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -383,9 +383,8 @@ function GetJavascriptIndent()
       if parlnum > 0
         return !s:Match(parlnum, s:operator_first) ? indent(lnum) + s:sw() : indent(parlnum)
       end
-    elseif (counts[0] != '1' && counts[1] != '1' && counts[2] != '1') && 
-          \ (!s:Match(s:PrevNonBlankNonString(lnum - 1), s:block_regex) ||
-          \ s:Match(lnum, s:var_stmt))
+    elseif line !~ s:line_pre . ',\s*\%(\%(\([''"]\).*\1\)\|\%(\h\w*\)\)\s*:.*' . s:line_term &&
+          \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsbracket\|jsparen'
       " otherwise, indent 1 level
       return indent(lnum) + s:sw()
     end

From 943d90b293baa2c5d53e7ac4d3cfc71a1bac1ae9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 3 Jun 2016 11:10:06 -0700
Subject: [PATCH 0266/1043] spread operator doesn't change indent (#462)

i don't know if this actually makes very much sense

```
10
  ..toString()
```
is invalid
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d6144a9b..53cd0acd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -94,7 +94,7 @@ endfunction
 " Regex that defines blocks.
 let s:block_regex = '[{([]' . s:line_term
 
-let s:operator_first = s:line_pre . '\%([.,:?]\|\([-/+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
+let s:operator_first = s:line_pre . '\%([,:?]\|\([-/.+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
 
 let s:var_stmt = s:line_pre . '\%(const\|let\|var\)\s\+\C'
 

From ec96793e9b1db5d32b7a4e6f77ae80c45f78cf05 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 29 Apr 2016 11:58:57 -0700
Subject: [PATCH 0267/1043] First attempted pass at jsObjectBlock

---
 syntax/javascript.vim | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 91dad525..ca3178b4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -30,7 +30,9 @@ syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 syntax keyword jsModules        import export contained
-syntax keyword jsModuleWords    default from as contained
+syntax keyword jsModules        export contained nextgroup=jsObjectBlock skipwhite skipempty
+syntax keyword jsModuleWords    from as contained
+syntax keyword jsModuleWords    default contained nextgroup=jsObjectBlock skipwhite skipempty
 syntax keyword jsOf             of contained
 syntax keyword jsArgsObj        arguments
 
@@ -185,13 +187,14 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
+syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsObjectBlock,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
 syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend
 syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsBlockComment,jsLineComment,jsGenerator contained fold
 syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition extend
+syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition,jsObjectBlock extend
+syntax region  jsObjectBlock matchgroup=jsObjectBraces      start="\%()[\r\n\t ]*\)\@<!{"  end="}"  contains=@jsAll,jsObjectKey,jsParensErrB,jsParen,jsNoise extend
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 "" catch errors caused by wrong parenthesis
@@ -207,8 +210,8 @@ exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=
 syntax match   jsGenerator       contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
 " These versions of jsFuncName is for use in object declarations with no key
-" syntax match   jsFuncName        contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
-" syntax match   jsFuncName        contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsBlock contains=jsGenerator
+syntax match   jsFuncName        contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
+syntax match   jsFuncName        contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
 syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsLineComment,jsStringS,jsStringD,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
@@ -305,6 +308,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncParens           Noise
   HiLink jsClassBraces          Noise
   HiLink jsClassNoise           Noise
+  HiLink jsObjectBraces         Noise
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
   HiLink jsTemplateBraces       jsBraces

From 671e605cdca372c7826152553ff9ce92862d48b8 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 15:07:29 -0700
Subject: [PATCH 0268/1043] Notes and general cleanup

* Re-organized a couple things
* Added some TODO comments to remind myself what needs to be done
---
 syntax/javascript.vim | 127 ++++++++++++++++++++----------------------
 1 file changed, 59 insertions(+), 68 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ca3178b4..37be4b84 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -20,8 +20,13 @@ endif
 setlocal iskeyword+=$
 
 syntax sync fromstart
+" TODO: Figure out what type of casing I need
+" syntax case ignore
+syntax case match
 
 syntax match   jsNoise           /[:,\;\.]\{1}/
+syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
+syntax match   jsParensError    /\%()\|}\|\]\)/
 
 "" Program Keywords
 syntax keyword jsStorageClass   const var let
@@ -30,33 +35,28 @@ syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 syntax keyword jsModules        import export contained
+" TODO: Not sure if jsObjectBlock should be nextgroup here
 syntax keyword jsModules        export contained nextgroup=jsObjectBlock skipwhite skipempty
 syntax keyword jsModuleWords    from as contained
 syntax keyword jsModuleWords    default contained nextgroup=jsObjectBlock skipwhite skipempty
 syntax keyword jsOf             of contained
 syntax keyword jsArgsObj        arguments
 
-syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsLineComment,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
-
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
+syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsComment,jsString,jsTemplateString,jsNoise,jsBlock
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
-syntax region  jsLineComment    start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell extend
+syntax region  jsComment        start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell extend
+syntax region  jsComment        start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell fold
+syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold extend
 syntax region  jsEnvComment     start="\%^#!" end="$" display
-syntax region  jsLineComment    start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell fold
 syntax region  jsCvsTag         start="\$\cid:" end="\$" oneline contained
-syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold extend
 
 "" JSDoc / JSDoc Toolkit
 if !exists("javascript_ignore_javaScriptdoc")
-  syntax case ignore
-
   "" syntax coloring for javadoc comments (HTML)
-  "syntax include @javaHtml <sfile>:p:h/html.vim
-  "unlet b:current_syntax
-
-  syntax region jsBlockComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+  syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
   syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
@@ -77,20 +77,20 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
   syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
-
-  syntax case match
 endif   "" JSDoc end
 
-syntax case match
+" Strings, Templates, Numbers
+syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsTaggedTemplate   start=/\k\+\%([\n\s]\+\)\?`/ end=+`+ contains=jsTemplateString keepend
+syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
+syntax keyword jsNumber           Infinity
+syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 
-"" Syntax in the JavaScript code
-syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
+" Regular Expressions
 syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
 syntax region  jsTemplateVar      matchgroup=jsTemplateBraces start=+${+ end=+}+ contained contains=@jsExpression
-syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
-syntax region  jsTaggedTemplate   start=/\k\+\%([\n\s]\+\)\?`/ end=+`+ contains=jsTemplateString keepend
 syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
 syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
 syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained
@@ -104,11 +104,10 @@ if v:version > 703 || v:version == 603 && has("patch1088")
 else
   syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 endif
-syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
-syntax keyword jsNumber           Infinity
-syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+
 syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
 syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
+" TODO: Put this in jsClassBlock only
 syntax match   jsDecorator        "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
 syntax match   jsDecoratorFunction "[a-zA-Z_][a-zA-Z0-9_.]*" display contained nextgroup=jsFunc skipwhite
 
@@ -121,41 +120,38 @@ exe 'syntax keyword jsThis      this      '.(exists('g:javascript_conceal_this')
 exe 'syntax keyword jsStatic    static    '.(exists('g:javascript_conceal_static')      ? 'conceal cchar='.g:javascript_conceal_static      : '')
 exe 'syntax keyword jsSuper     super     '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
 
-"" Statement Keywords
-syntax keyword jsStatement      break continue with
+" Statement Keywords
+syntax keyword jsStatement      break continue with yield
+" TODO: Create special block regions for these 2 lines
 syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
+" TODO: Contain these in Switch block only
 syntax keyword jsLabel          case default
-syntax keyword jsKeyword        yield
+" TODO: Create try/catch blocks
 syntax keyword jsException      try catch throw finally
 syntax keyword jsAsyncKeyword   async await
 
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
-
+" Keywords
+syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
-
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
-
 syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient debugger implements protected volatile double public
 
-"" DOM/HTML/CSS specified things
-
-" DOM2 Objects
+"" DOM2 Objects
 syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
 syntax keyword jsExceptions     DOMException
 
-" DOM2 CONSTANT
+"" DOM2 CONSTANT
 syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
 syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
 
-" HTML events and internal variables
-syntax case ignore
+"" HTML events and internal variables
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
-syntax case match
 
-" Follow stuff should be highligh within a special context
+" Following stuff should be highligh within a special context
 " While it can't be handled with context depended with Regex based highlight
 " So, turn it off by default
+" TODO: Can we just remove this?
 if exists("javascript_enable_domhtmlcss")
 
     " DOM2 things
@@ -187,32 +183,26 @@ endif "DOM/HTML/CSS
 "" end DOM/HTML/CSS specified things
 
 "" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsObjectBlock,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
-syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
-syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
-syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend
-syntax region  jsClassBlock matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsBlockComment,jsLineComment,jsGenerator contained fold
-syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition,jsObjectBlock extend
-syntax region  jsObjectBlock matchgroup=jsObjectBraces      start="\%()[\r\n\t ]*\)\@<!{"  end="}"  contains=@jsAll,jsObjectKey,jsParensErrB,jsParen,jsNoise extend
-syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
-
-"" catch errors caused by wrong parenthesis
-syntax match   jsParensError    ")\|}\|\]"
-syntax match   jsParensErrA     contained "\]"
-syntax match   jsParensErrB     contained ")"
-syntax match   jsParensErrC     contained "}"
-
-syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
-exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
-exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+" TODO: This should really only be for arrays... figure out the array scope better
+syntax region  jsBracket     matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensError,jsBracket,jsParen,jsBlock,@htmlPreproc fold
+" TODO: This is a region to create jsParensErrors. We'll need to create special contained regions for if/else/switch statements
+syntax region  jsParen       matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensError,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend
+syntax region  jsClassBlock  matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator contained fold
+syntax region  jsFuncBlock   matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensError,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
+" TODO: jsBlock should be made ONLY for switch/if/else statements
+syntax region  jsBlock       matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensError,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition,jsObjectBlock extend
+" TODO: Should NOT include jsAll - should onyl accept aspects for keys, using nextgroup for everything else
+syntax region  jsObjectBlock matchgroup=jsObjectBraces      start="\%()[\r\n\t ]*\)\@<!{"  end="}"  contains=@jsAll,jsObjectKey,jsParensError,jsParen,jsNoise extend
+syntax region  jsTernaryIf   matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
 
 syntax match   jsGenerator       contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
-" These versions of jsFuncName is for use in object declarations with no key
+" These versions of jsFuncName is for use in object declarations with no key -
+" TODO: May not need this at all actually
 syntax match   jsFuncName        contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
 syntax match   jsFuncName        contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
-syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsLineComment,jsStringS,jsStringD,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
+syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas   contained ','
 syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots contained /\.\.\./
@@ -222,11 +212,19 @@ syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArg
 " Matches a series of arguments surrounded in parens
 syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
 
+exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+
 syntax keyword jsClassKeywords extends class contained
 syntax match   jsClassNoise /\./ contained
 syntax match   jsClassMethodDefinitions /\%(get\|set\|static\)\%( \k\+\)\@=/ contained nextgroup=jsFuncName skipwhite skipempty
 syntax match   jsClassDefinition /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
+" TODO: Look to optimize this, so it can be properly used in nextgroup= stuff
+syntax cluster jsExpression  contains=jsComment,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsObjectBlock,jsBlock,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
+" TODO: This may actually need to be optimized
+syntax cluster jsAll         contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
+
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -239,9 +237,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   endif
   HiLink jsFuncArgRest          Special
   HiLink jsComment              Comment
-  HiLink jsLineComment          Comment
   HiLink jsEnvComment           PreProc
-  HiLink jsBlockComment         Comment
   HiLink jsCommentTodo          Todo
   HiLink jsCvsTag               Function
   HiLink jsDocTags              Special
@@ -251,8 +247,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocTypeRecord        jsDocType
   HiLink jsDocTypeNoParam       Type
   HiLink jsDocParam             Label
-  HiLink jsStringS              String
-  HiLink jsStringD              String
+  HiLink jsString               String
   HiLink jsTemplateString       String
   HiLink jsTaggedTemplate       StorageClass
   HiLink jsTernaryIfOperator    Conditional
@@ -273,7 +268,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRepeat               Repeat
   HiLink jsStatement            Statement
   HiLink jsException            Exception
-  HiLink jsKeyword              Keyword
   HiLink jsAsyncKeyword         Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
@@ -283,9 +277,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsArgsObj              Special
   HiLink jsError                Error
   HiLink jsParensError          Error
-  HiLink jsParensErrA           Error
-  HiLink jsParensErrB           Error
-  HiLink jsParensErrC           Error
   HiLink jsOperator             Operator
   HiLink jsOf                   Operator
   HiLink jsStorageClass         StorageClass

From 6c2de108fbe66faea75e358774a12da1b44c0de0 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 15:21:51 -0700
Subject: [PATCH 0269/1043] Removing DOM CSS stuff

I truly believe this has no place in a JS syntax file...
---
 syntax/javascript.vim | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 37be4b84..f72543b6 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -148,40 +148,6 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 "" HTML events and internal variables
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
-" Following stuff should be highligh within a special context
-" While it can't be handled with context depended with Regex based highlight
-" So, turn it off by default
-" TODO: Can we just remove this?
-if exists("javascript_enable_domhtmlcss")
-
-    " DOM2 things
-    syntax match jsDomElemAttrs     contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/
-    syntax match jsDomElemFuncs     contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementById\|getElementsByClassName\|getElementsByTagName\|querySelector\|querySelectorAll\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=jsParen skipwhite
-    " HTML things
-    syntax match jsHtmlElemAttrs    contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/
-    syntax match jsHtmlElemFuncs    contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=jsParen skipwhite
-
-    " CSS Styles in JavaScript
-    syntax keyword jsCssStyles      contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition
-    syntax keyword jsCssStyles      contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition
-    syntax keyword jsCssStyles      contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode
-    syntax keyword jsCssStyles      contained bottom height left position right top width zIndex
-    syntax keyword jsCssStyles      contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout
-    syntax keyword jsCssStyles      contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop
-    syntax keyword jsCssStyles      contained listStyle listStyleImage listStylePosition listStyleType
-    syntax keyword jsCssStyles      contained background backgroundAttachment backgroundColor backgroundImage backgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat
-    syntax keyword jsCssStyles      contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType
-    syntax keyword jsCssStyles      contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText
-    syntax keyword jsCssStyles      contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor
-
-    " Highlight ways
-    syntax match jsDotNotation      "\." nextgroup=jsPrototype,jsDomElemAttrs,jsDomElemFuncs,jsHtmlElemAttrs,jsHtmlElemFuncs
-    syntax match jsDotNotation      "\.style\." nextgroup=jsCssStyles
-
-endif "DOM/HTML/CSS
-
-"" end DOM/HTML/CSS specified things
-
 "" Code blocks
 " TODO: This should really only be for arrays... figure out the array scope better
 syntax region  jsBracket     matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensError,jsBracket,jsParen,jsBlock,@htmlPreproc fold

From a0d1abc172cd0d701c115b7c0197c5dfa288f278 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 15:39:50 -0700
Subject: [PATCH 0270/1043] More refactoring

* Checked all aspects of jsExpression - In preparation for it to be
  properly used
* Code style tweaks - contained is such an important option, ensuring
  it's always first
---
 syntax/javascript.vim | 108 ++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 51 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f72543b6..723957ee 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -30,28 +30,29 @@ syntax match   jsParensError    /\%()\|}\|\]\)/
 
 "" Program Keywords
 syntax keyword jsStorageClass   const var let
-syntax keyword jsOperator       delete instanceof typeof void new in
+syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
-syntax keyword jsModules        import export contained
+syntax keyword jsModules        contained import export
 " TODO: Not sure if jsObjectBlock should be nextgroup here
-syntax keyword jsModules        export contained nextgroup=jsObjectBlock skipwhite skipempty
-syntax keyword jsModuleWords    from as contained
-syntax keyword jsModuleWords    default contained nextgroup=jsObjectBlock skipwhite skipempty
-syntax keyword jsOf             of contained
-syntax keyword jsArgsObj        arguments
+syntax keyword jsModules        contained export nextgroup=jsObjectBlock skipwhite skipempty
+syntax keyword jsModuleWords    contained from as
+syntax keyword jsModuleWords    contained default nextgroup=jsObjectBlock skipwhite skipempty
+" TODO: This should be contained in jsFuncBlock only
+syntax keyword jsArgsObj        contained arguments
 
 syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsComment,jsString,jsTemplateString,jsNoise,jsBlock
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
+" TODO: Can the contains just be @jsExpression?
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
 
 "" JavaScript comments
-syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
+syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
 syntax region  jsComment        start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell extend
 syntax region  jsComment        start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell fold
 syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold extend
 syntax region  jsEnvComment     start="\%^#!" end="$" display
-syntax region  jsCvsTag         start="\$\cid:" end="\$" oneline contained
+syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
 
 "" JSDoc / JSDoc Toolkit
 if !exists("javascript_ignore_javaScriptdoc")
@@ -69,11 +70,11 @@ if !exists("javascript_ignore_javaScriptdoc")
   " other tags (no extra syntax)
   syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
-  syntax region jsDocType         matchgroup=jsDocTypeBrackets start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite contains=jsDocTypeRecord
+  syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" oneline nextgroup=jsDocParam skipwhite contains=jsDocTypeRecord
   syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
-  syntax region jsDocTypeRecord   start=/{/ end=/}/ contained extend contains=jsDocTypeRecord
-  syntax region jsDocTypeRecord   start=/\[/ end=/\]/ contained extend contains=jsDocTypeRecord
-  syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
+  syntax region jsDocTypeRecord   contained start=/{/ end=/}/ extend contains=jsDocTypeRecord
+  syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ extend contains=jsDocTypeRecord
+  syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
   syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
@@ -89,44 +90,46 @@ syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 
 " Regular Expressions
-syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
-syntax region  jsTemplateVar      matchgroup=jsTemplateBraces start=+${+ end=+}+ contained contains=@jsExpression
-syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
-syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
-syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained
-syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained
-syntax match   jsRegexpOr         "\v\<@!\|" contained
-syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
-syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax match   jsSpecial          contained "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
+syntax region  jsTemplateVar      contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression
+syntax region  jsRegexpCharClass  contained start=+\[+ skip=+\\.+ end=+\]+
+syntax match   jsRegexpBoundary   contained "\v%(\<@![\^$]|\\[bB])"
+syntax match   jsRegexpBackRef    contained "\v\\[1-9][0-9]*"
+syntax match   jsRegexpQuantifier contained "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??"
+syntax match   jsRegexpOr         contained "\v\<@!\|"
+syntax match   jsRegexpMod        contained "\v\(@<=\?[:=!>]"
+syntax region  jsRegexpGroup      contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 if v:version > 703 || v:version == 603 && has("patch1088")
   syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 else
   syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
 endif
+syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
-syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
-syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
+syntax match   jsObjectKey        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey
+syntax match   jsFunctionKey      contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
 " TODO: Put this in jsClassBlock only
 syntax match   jsDecorator        "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
-syntax match   jsDecoratorFunction "[a-zA-Z_][a-zA-Z0-9_.]*" display contained nextgroup=jsFunc skipwhite
+" TODO: This should contained within function definition stuff...
+syntax match   jsDecoratorFunction contained "[a-zA-Z_][a-zA-Z0-9_.]*" display nextgroup=jsFunc skipwhite
 
 exe 'syntax keyword jsNull      null      '.(exists('g:javascript_conceal_null')        ? 'conceal cchar='.g:javascript_conceal_null        : '')
-exe 'syntax keyword jsReturn    return    '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
+exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
 exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefined')   ? 'conceal cchar='.g:javascript_conceal_undefined   : '')
 exe 'syntax keyword jsNan       NaN       '.(exists('g:javascript_conceal_NaN')         ? 'conceal cchar='.g:javascript_conceal_NaN         : '')
 exe 'syntax keyword jsPrototype prototype '.(exists('g:javascript_conceal_prototype')   ? 'conceal cchar='.g:javascript_conceal_prototype   : '')
-exe 'syntax keyword jsThis      this      '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
-exe 'syntax keyword jsStatic    static    '.(exists('g:javascript_conceal_static')      ? 'conceal cchar='.g:javascript_conceal_static      : '')
-exe 'syntax keyword jsSuper     super     '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
+" TODO: This group should only be included in functions
+exe 'syntax keyword jsThis      this   contained '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
+" TODO: this group should only be contained in functions
+exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
 
 " Statement Keywords
-syntax keyword jsStatement      break continue with yield
+syntax keyword jsStatement      contained break continue with yield
 " TODO: Create special block regions for these 2 lines
 syntax keyword jsConditional    if else switch
 syntax keyword jsRepeat         do while for
 " TODO: Contain these in Switch block only
-syntax keyword jsLabel          case default
+syntax keyword jsLabel          contained case default
 " TODO: Create try/catch blocks
 syntax keyword jsException      try catch throw finally
 syntax keyword jsAsyncKeyword   async await
@@ -135,17 +138,21 @@ syntax keyword jsAsyncKeyword   async await
 syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
+" TODO: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
 syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient debugger implements protected volatile double public
 
-"" DOM2 Objects
+" DISCUSS: Should we really be matching stuff like this?
+" DOM2 Objects
 syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
 syntax keyword jsExceptions     DOMException
 
-"" DOM2 CONSTANT
+" DISCUSS: Should we really be matching stuff like this?
+" DOM2 CONSTANT
 syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
 syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
 
-"" HTML events and internal variables
+" DISCUSS: Should we really be special matching on these props?
+" HTML events and internal variables
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 "" Code blocks
@@ -153,8 +160,8 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 syntax region  jsBracket     matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensError,jsBracket,jsParen,jsBlock,@htmlPreproc fold
 " TODO: This is a region to create jsParensErrors. We'll need to create special contained regions for if/else/switch statements
 syntax region  jsParen       matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensError,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend
-syntax region  jsClassBlock  matchgroup=jsClassBraces  start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator contained fold
-syntax region  jsFuncBlock   matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensError,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
+syntax region  jsClassBlock  matchgroup=jsClassBraces  contained start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator  fold
+syntax region  jsFuncBlock   matchgroup=jsFuncBraces   contained start="{"  end="}"  contains=@jsAll,jsParensError,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
 " TODO: jsBlock should be made ONLY for switch/if/else statements
 syntax region  jsBlock       matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensError,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition,jsObjectBlock extend
 " TODO: Should NOT include jsAll - should onyl accept aspects for keys, using nextgroup for everything else
@@ -165,13 +172,13 @@ syntax match   jsGenerator       contained /\*/ nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
 " These versions of jsFuncName is for use in object declarations with no key -
 " TODO: May not need this at all actually
-syntax match   jsFuncName        contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
-syntax match   jsFuncName        contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
+syntax match   jsFuncName             contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
+syntax match   jsFuncName             contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
 syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
-syntax region  jsFuncArgs        contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
-syntax match   jsFuncArgCommas   contained ','
-syntax match   jsFuncArgRest     contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
-syntax match   jsFuncArgRestDots contained /\.\.\./
+syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax match   jsFuncArgCommas        contained ','
+syntax match   jsFuncArgRest          contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
+syntax match   jsFuncArgRestDots      contained /\.\.\./
 
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
@@ -181,15 +188,15 @@ syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite conta
 exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
-syntax keyword jsClassKeywords extends class contained
-syntax match   jsClassNoise /\./ contained
-syntax match   jsClassMethodDefinitions /\%(get\|set\|static\)\%( \k\+\)\@=/ contained nextgroup=jsFuncName skipwhite skipempty
-syntax match   jsClassDefinition /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
+syntax keyword jsClassKeywords          contained extends class
+syntax match   jsClassNoise             contained /\./
+syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ nextgroup=jsFuncName skipwhite skipempty
+syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
 " TODO: Look to optimize this, so it can be properly used in nextgroup= stuff
-syntax cluster jsExpression  contains=jsComment,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsObjectBlock,jsBlock,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsImportContainer,jsExportContainer,jsArgsObj,jsDecorator,jsAsyncKeyword,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObjectBlock,jsBlock,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
 " TODO: This may actually need to be optimized
-syntax cluster jsAll         contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException,jsComment,jsAsyncKeyword
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -248,7 +255,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStorageClass         StorageClass
   HiLink jsClassKeywords        Structure
   HiLink jsThis                 Special
-  HiLink jsStatic               Special
   HiLink jsSuper                Special
   HiLink jsNan                  Number
   HiLink jsNull                 Type

From c48323a215a472a0a4a2a71ca08f10096e1eeb73 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 17:04:10 -0700
Subject: [PATCH 0271/1043] Tons of syntax block granularity

With the refactoring of jsExpression, I was able to add a ton of finer
granularity to various new region types.

Current new regions:

* jsObject
* jsArray
* jsParenIfElse
* jsParenRepeat
* jsParenSwitch
* jsClassBlock
* jsBlock
* jsSwitchBlock
* jsTernaryIf
---
 syntax/javascript.vim | 78 +++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 723957ee..5a75daec 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -42,9 +42,10 @@ syntax keyword jsModuleWords    contained default nextgroup=jsObjectBlock skipwh
 " TODO: This should be contained in jsFuncBlock only
 syntax keyword jsArgsObj        contained arguments
 
+" TODO: Go over these contains with a fine toothed comb
 syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsComment,jsString,jsTemplateString,jsNoise,jsBlock
 " TODO: Can the contains just be @jsExpression?
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
+syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsArray,jsParen,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
 
 "" JavaScript comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
@@ -81,9 +82,9 @@ if !exists("javascript_ignore_javaScriptdoc")
 endif   "" JSDoc end
 
 " Strings, Templates, Numbers
-syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
+syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell
+syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial
 syntax region  jsTaggedTemplate   start=/\k\+\%([\n\s]\+\)\?`/ end=+`+ contains=jsTemplateString keepend
 syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
@@ -100,16 +101,25 @@ syntax match   jsRegexpOr         contained "\v\<@!\|"
 syntax match   jsRegexpMod        contained "\v\(@<=\?[:=!>]"
 syntax region  jsRegexpGroup      contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 if v:version > 703 || v:version == 603 && has("patch1088")
-  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend
 else
-  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
+  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
-syntax match   jsObjectKey        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey
-syntax match   jsFunctionKey      contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
+syntax match   jsObjectKey         contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/   contains=jsFunctionKey  nextgroup=jsObjectValue
+syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell nextgroup=jsObjectValue
+syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell nextgroup=jsObjectValue
+syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression nextgroup=jsObjectValue keepend
+syntax match   jsObjectSeparator   contained /,/
+syntax region  jsObjectValue       contained start=/:/ end=/,/ contains=@jsExpression keepend
+syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty
+syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
+syntax match   jsObjectGetSet      contained /\%(get\|set\|static\)\%( \k\+\)\@=/ nextgroup=jsObjectFuncName skipwhite skipempty
+
+
 " TODO: Put this in jsClassBlock only
-syntax match   jsDecorator        "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
+syntax match   jsDecorator         contained "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
 " TODO: This should contained within function definition stuff...
 syntax match   jsDecoratorFunction contained "[a-zA-Z_][a-zA-Z0-9_.]*" display nextgroup=jsFunc skipwhite
 
@@ -126,8 +136,9 @@ exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal
 " Statement Keywords
 syntax keyword jsStatement      contained break continue with yield
 " TODO: Create special block regions for these 2 lines
-syntax keyword jsConditional    if else switch
-syntax keyword jsRepeat         do while for
+syntax keyword jsConditional    if else         skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
+syntax keyword jsConditional    switch       skipwhite skipempty nextgroup=jsParenSwitch
+syntax keyword jsRepeat         do while for skipwhite skipempty nextgroup=jsParenRepeat
 " TODO: Contain these in Switch block only
 syntax keyword jsLabel          contained case default
 " TODO: Create try/catch blocks
@@ -157,23 +168,22 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 
 "" Code blocks
 " TODO: This should really only be for arrays... figure out the array scope better
-syntax region  jsBracket     matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensError,jsBracket,jsParen,jsBlock,@htmlPreproc fold
+syntax region  jsArray                 matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression fold extend
 " TODO: This is a region to create jsParensErrors. We'll need to create special contained regions for if/else/switch statements
-syntax region  jsParen       matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensError,jsParen,jsBracket,jsBlock,@htmlPreproc fold extend
-syntax region  jsClassBlock  matchgroup=jsClassBraces  contained start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator  fold
-syntax region  jsFuncBlock   matchgroup=jsFuncBraces   contained start="{"  end="}"  contains=@jsAll,jsParensError,jsParen,jsBracket,jsBlock,@htmlPreproc,jsClassDefinition fold extend
-" TODO: jsBlock should be made ONLY for switch/if/else statements
-syntax region  jsBlock       matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensError,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc,jsClassDefinition,jsObjectBlock extend
-" TODO: Should NOT include jsAll - should onyl accept aspects for keys, using nextgroup for everything else
-syntax region  jsObjectBlock matchgroup=jsObjectBraces      start="\%()[\r\n\t ]*\)\@<!{"  end="}"  contains=@jsAll,jsObjectKey,jsParensError,jsParen,jsNoise extend
-syntax region  jsTernaryIf   matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
-
-syntax match   jsGenerator       contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
-syntax match   jsFuncName        contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
-" These versions of jsFuncName is for use in object declarations with no key -
-" TODO: May not need this at all actually
-syntax match   jsFuncName             contained /\%(^[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
-syntax match   jsFuncName             contained /\%(,[\r\n\t ]*\)\@<=[*\r\n\t ]*[a-zA-Z_$][0-9a-zA-Z_$]*[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty containedin=jsObjectBlock contains=jsGenerator
+" syntax region  jsParen       matchgroup=jsParens            start="("  end=")"  contains=@jsAll,jsOf,jsParensError,jsParen,jsBracket,jsBlock fold extend
+syntax region  jsParen                 matchgroup=jsParens            start="("  end=")"  contains=@jsAll fold extend
+syntax region  jsParenIfElse contained matchgroup=jsParens            start="(" end=")"  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
+syntax region  jsParenRepeat contained matchgroup=jsParens            start="(" end=")"  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
+syntax region  jsParenSwitch contained matchgroup=jsParens            start="(" end=")"  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock fold extend
+syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator  fold
+syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start="{"  end="}"  contains=@jsAll fold extend
+syntax region  jsBlock       contained matchgroup=jsBraces            start="{"  end="}"  contains=@jsAll extend fold
+syntax region  jsSwitchBlock contained matchgroup=jsBraces            start="{"  end="}"  contains=@jsAll,jsLabel extend fold
+syntax region  jsObject                matchgroup=jsObjectBraces      start="{"  end="}"  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator extend keepend
+syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
+
+syntax match   jsGenerator            contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
+syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
 syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
 syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
 syntax match   jsFuncArgCommas        contained ','
@@ -194,9 +204,9 @@ syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
 " TODO: Look to optimize this, so it can be properly used in nextgroup= stuff
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObjectBlock,jsBlock,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs
+syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError
 " TODO: This may actually need to be optimized
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException,jsComment,jsAsyncKeyword
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsComment,jsAsyncKeyword
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -221,9 +231,10 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocTypeNoParam       Type
   HiLink jsDocParam             Label
   HiLink jsString               String
+  HiLink jsObjectKeyString      String
   HiLink jsTemplateString       String
   HiLink jsTaggedTemplate       StorageClass
-  HiLink jsTernaryIfOperator    Conditional
+  HiLink jsTernaryIfOperator    Operator
   HiLink jsRegexpString         String
   HiLink jsRegexpBoundary       SpecialChar
   HiLink jsRegexpQuantifier     SpecialChar
@@ -247,6 +258,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsGenerator            jsFunction
   HiLink jsArrowFuncArgs        jsFuncArgs
   HiLink jsFuncName             Function
+  HiLink jsObjectFuncName       Function
   HiLink jsArgsObj              Special
   HiLink jsError                Error
   HiLink jsParensError          Error
@@ -272,6 +284,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsClassBraces          Noise
   HiLink jsClassNoise           Noise
   HiLink jsObjectBraces         Noise
+  HiLink jsObjectSeparator      Noise
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
   HiLink jsTemplateBraces       jsBraces
@@ -297,13 +310,14 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsCssStyles            Label
 
   HiLink jsClassMethodDefinitions Type
+  HiLink jsObjectGetSet           Type
 
   delcommand HiLink
 endif
 
 " Define the htmlJavaScript for HTML syntax html.vim
-syntax cluster  htmlJavaScript       contains=@jsAll,jsBracket,jsParen,jsBlock
-syntax cluster  javaScriptExpression contains=@jsAll,jsBracket,jsParen,jsBlock,@htmlPreproc
+syntax cluster  htmlJavaScript       contains=@jsAll,jsArray,jsParen,jsBlock
+syntax cluster  javaScriptExpression contains=@jsAll,jsArray,jsParen,jsBlock
 
 " Vim's default html.vim highlights all javascript as 'Special'
 hi! def link javaScript              NONE

From 533beaa3c504b4285b2f74d2b95da0797578d887 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 17:46:37 -0700
Subject: [PATCH 0272/1043] Bug fixes and tweaks

I think this is actually in a really good place. It seems to work well
in my test phaser.js file
---
 syntax/javascript.vim | 142 ++++++++++++++++++++----------------------
 1 file changed, 67 insertions(+), 75 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5a75daec..4f5bc07c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -39,7 +39,6 @@ syntax keyword jsModules        contained import export
 syntax keyword jsModules        contained export nextgroup=jsObjectBlock skipwhite skipempty
 syntax keyword jsModuleWords    contained from as
 syntax keyword jsModuleWords    contained default nextgroup=jsObjectBlock skipwhite skipempty
-" TODO: This should be contained in jsFuncBlock only
 syntax keyword jsArgsObj        contained arguments
 
 " TODO: Go over these contains with a fine toothed comb
@@ -47,45 +46,11 @@ syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=
 " TODO: Can the contains just be @jsExpression?
 syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsArray,jsParen,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
 
-"" JavaScript comments
-syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
-syntax region  jsComment        start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell extend
-syntax region  jsComment        start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell fold
-syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold extend
-syntax region  jsEnvComment     start="\%^#!" end="$" display
-syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
-
-"" JSDoc / JSDoc Toolkit
-if !exists("javascript_ignore_javaScriptdoc")
-  "" syntax coloring for javadoc comments (HTML)
-  syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
-
-  " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
-  " tags containing type and param
-  syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
-  " tags containing type but no param
-  syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
-  " tags containing references
-  syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
-  " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
-
-  syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" oneline nextgroup=jsDocParam skipwhite contains=jsDocTypeRecord
-  syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
-  syntax region jsDocTypeRecord   contained start=/{/ end=/}/ extend contains=jsDocTypeRecord
-  syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ extend contains=jsDocTypeRecord
-  syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
-  syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
-  syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
-endif   "" JSDoc end
-
 " Strings, Templates, Numbers
-syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell
-syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial
-syntax region  jsTaggedTemplate   start=/\k\+\%([\n\s]\+\)\?`/ end=+`+ contains=jsTemplateString keepend
+syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
+syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial extend
+syntax region  jsTaggedTemplate   start=/\k\+\%([\n\s]\+\)\?`/ end=+`+ contains=jsTemplateString extend
 syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
@@ -101,24 +66,23 @@ syntax match   jsRegexpOr         contained "\v\<@!\|"
 syntax match   jsRegexpMod        contained "\v\(@<=\?[:=!>]"
 syntax region  jsRegexpGroup      contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 if v:version > 703 || v:version == 603 && has("patch1088")
-  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend
+  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 else
-  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend
+  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
-syntax match   jsObjectKey         contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/   contains=jsFunctionKey  nextgroup=jsObjectValue
+syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/   contains=jsFunctionKey  nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell nextgroup=jsObjectValue
-syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression nextgroup=jsObjectValue keepend
+syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression nextgroup=jsObjectValue extend
 syntax match   jsObjectSeparator   contained /,/
-syntax region  jsObjectValue       contained start=/:/ end=/,/ contains=@jsExpression keepend
+syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
 syntax match   jsObjectGetSet      contained /\%(get\|set\|static\)\%( \k\+\)\@=/ nextgroup=jsObjectFuncName skipwhite skipempty
 
 
-" TODO: Put this in jsClassBlock only
 syntax match   jsDecorator         contained "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
 " TODO: This should contained within function definition stuff...
 syntax match   jsDecoratorFunction contained "[a-zA-Z_][a-zA-Z0-9_.]*" display nextgroup=jsFunc skipwhite
@@ -128,22 +92,20 @@ exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal
 exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefined')   ? 'conceal cchar='.g:javascript_conceal_undefined   : '')
 exe 'syntax keyword jsNan       NaN       '.(exists('g:javascript_conceal_NaN')         ? 'conceal cchar='.g:javascript_conceal_NaN         : '')
 exe 'syntax keyword jsPrototype prototype '.(exists('g:javascript_conceal_prototype')   ? 'conceal cchar='.g:javascript_conceal_prototype   : '')
-" TODO: This group should only be included in functions
 exe 'syntax keyword jsThis      this   contained '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
-" TODO: this group should only be contained in functions
 exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
 
 " Statement Keywords
-syntax keyword jsStatement      contained break continue with yield
-" TODO: Create special block regions for these 2 lines
-syntax keyword jsConditional    if else         skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
-syntax keyword jsConditional    switch       skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat         do while for skipwhite skipempty nextgroup=jsParenRepeat
-" TODO: Contain these in Switch block only
-syntax keyword jsLabel          contained case default
-" TODO: Create try/catch blocks
-syntax keyword jsException      try catch throw finally
-syntax keyword jsAsyncKeyword   async await
+syntax keyword jsStatement    contained break continue with yield
+syntax keyword jsConditional            if else   skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
+syntax keyword jsConditional            switch    skipwhite skipempty nextgroup=jsParenSwitch
+syntax keyword jsRepeat                 while for skipwhite skipempty nextgroup=jsParenRepeat
+syntax keyword jsRepeat                 do        skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsLabel        contained case default
+syntax keyword jsException              try finally skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsException              catch       skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsException              throw
+syntax keyword jsAsyncKeyword           async await
 
 " Keywords
 syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
@@ -167,25 +129,23 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 "" Code blocks
-" TODO: This should really only be for arrays... figure out the array scope better
 syntax region  jsArray                 matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression fold extend
-" TODO: This is a region to create jsParensErrors. We'll need to create special contained regions for if/else/switch statements
-" syntax region  jsParen       matchgroup=jsParens            start="("  end=")"  contains=@jsAll,jsOf,jsParensError,jsParen,jsBracket,jsBlock fold extend
-syntax region  jsParen                 matchgroup=jsParens            start="("  end=")"  contains=@jsAll fold extend
-syntax region  jsParenIfElse contained matchgroup=jsParens            start="(" end=")"  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
-syntax region  jsParenRepeat contained matchgroup=jsParens            start="(" end=")"  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
-syntax region  jsParenSwitch contained matchgroup=jsParens            start="(" end=")"  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock fold extend
-syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start="{"  end="}"  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator  fold
-syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start="{"  end="}"  contains=@jsAll fold extend
-syntax region  jsBlock       contained matchgroup=jsBraces            start="{"  end="}"  contains=@jsAll extend fold
-syntax region  jsSwitchBlock contained matchgroup=jsBraces            start="{"  end="}"  contains=@jsAll,jsLabel extend fold
-syntax region  jsObject                matchgroup=jsObjectBraces      start="{"  end="}"  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator extend keepend
-syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
+syntax region  jsParen                 matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll fold extend
+syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
+syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
+syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock fold extend
+syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock fold extend
+syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator  fold
+syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll fold extend
+syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
+syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment extend
+syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/:/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
 syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
-syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock keepend skipwhite skipempty
+syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock extend skipwhite skipempty
 syntax match   jsFuncArgCommas        contained ','
 syntax match   jsFuncArgRest          contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots      contained /\.\.\./
@@ -203,10 +163,42 @@ syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ nextgroup=jsFuncName skipwhite skipempty
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
 
-" TODO: Look to optimize this, so it can be properly used in nextgroup= stuff
-syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError
-" TODO: This may actually need to be optimized
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsComment,jsAsyncKeyword
+" Comments
+syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
+syntax region  jsComment        start=+\/\/+ end=+$+ contains=jsCommentTodo,@Spell extend keepend
+syntax region  jsComment        start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ contains=jsCommentTodo,@Spell fold extend keepend
+syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold extend keepend
+syntax region  jsEnvComment     start="\%^#!" end="$" display
+syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
+
+"" JSDoc / JSDoc Toolkit
+if !exists("javascript_ignore_javaScriptdoc")
+  "" syntax coloring for javadoc comments (HTML)
+  syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+  " tags containing a param
+  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  " tags containing type and param
+  syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
+  " tags containing type but no param
+  syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
+  " tags containing references
+  syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
+  " other tags (no extra syntax)
+  syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+  syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" oneline nextgroup=jsDocParam skipwhite contains=jsDocTypeRecord
+  syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+  syntax region jsDocTypeRecord   contained start=/{/ end=/}/ extend contains=jsDocTypeRecord
+  syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ extend contains=jsDocTypeRecord
+  syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+  syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+  syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+  syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+endif   "" JSDoc end
+
+syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArgsObj,jsThis,jsSuper
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsAsyncKeyword
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From da492ea96c0351707202bf88c52db4b938cb3d8e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 18:14:29 -0700
Subject: [PATCH 0273/1043] Improvements to import/exports syntax matching

---
 syntax/javascript.vim | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4f5bc07c..d4feffa7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -16,7 +16,7 @@ if !exists('g:javascript_conceal')
   let g:javascript_conceal = 0
 endif
 
-"" dollar sign is permittd anywhere in an identifier
+" Dollar sign is permittd anywhere in an identifier
 setlocal iskeyword+=$
 
 syntax sync fromstart
@@ -28,23 +28,24 @@ syntax match   jsNoise           /[:,\;\.]\{1}/
 syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
 syntax match   jsParensError    /\%()\|}\|\]\)/
 
-"" Program Keywords
+" Program Keywords
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
-syntax keyword jsModules        contained import export
-" TODO: Not sure if jsObjectBlock should be nextgroup here
-syntax keyword jsModules        contained export nextgroup=jsObjectBlock skipwhite skipempty
-syntax keyword jsModuleWords    contained from as
-syntax keyword jsModuleWords    contained default nextgroup=jsObjectBlock skipwhite skipempty
-syntax keyword jsArgsObj        contained arguments
-
-" TODO: Go over these contains with a fine toothed comb
-syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsComment,jsString,jsTemplateString,jsNoise,jsBlock
-" TODO: Can the contains just be @jsExpression?
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsArray,jsParen,jsFuncCall,jsUndefined,jsNan,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsArgsObj,jsBlock,jsClassDefinition
+
+" Modules
+syntax keyword jsModuleKeywords  contained import
+syntax keyword jsModuleKeywords  contained export skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsModuleOperators contained from
+syntax keyword jsModuleOperators contained as
+syntax region  jsModuleGroup     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
+syntax match   jsModuleAsterisk  contained /*/
+syntax keyword jsModuleDefault   contained default skipwhite skipempty nextgroup=@jsExpression
+syntax region jsImportContainer  start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
+syntax match  jsExportContainer   /\<export\> / contains=jsModuleKeywords skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
+syntax region jsExportBlock      contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
 
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
@@ -149,6 +150,7 @@ syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(
 syntax match   jsFuncArgCommas        contained ','
 syntax match   jsFuncArgRest          contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots      contained /\.\.\./
+syntax keyword jsArguments            contained arguments
 
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
@@ -197,7 +199,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 endif   "" JSDoc end
 
-syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArgsObj,jsThis,jsSuper
+syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsAsyncKeyword
 
 " Define the default highlighting.
@@ -251,7 +253,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsArrowFuncArgs        jsFuncArgs
   HiLink jsFuncName             Function
   HiLink jsObjectFuncName       Function
-  HiLink jsArgsObj              Special
+  HiLink jsArguments            Special
   HiLink jsError                Error
   HiLink jsParensError          Error
   HiLink jsOperator             Operator
@@ -284,11 +286,13 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsExceptions           Special
   HiLink jsFutureKeys           Special
   HiLink jsBuiltins             Special
-  HiLink jsModules              Include
-  HiLink jsModuleWords          Include
+  HiLink jsModuleKeywords       Include
+  HiLink jsModuleOperators      Include
+  HiLink jsModuleDefault        Include
   HiLink jsDecorator            Special
   HiLink jsFuncArgRestDots      Noise
   HiLink jsFuncArgDestructuring Noise
+  HiLink jsModuleAsterisk       Noise
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From 99d658fec94b57ea4c4ce9b854404d6cb397b7ea Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 18:25:48 -0700
Subject: [PATCH 0274/1043] Code style tweaks

Trying to make argument order more uniform
---
 syntax/javascript.vim | 80 +++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d4feffa7..d017e3f5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -73,38 +73,33 @@ else
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
-syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/   contains=jsFunctionKey  nextgroup=jsObjectValue
-syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell nextgroup=jsObjectValue
-syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell nextgroup=jsObjectValue
-syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression nextgroup=jsObjectValue extend
+syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue extend
 syntax match   jsObjectSeparator   contained /,/
 syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
-syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ nextgroup=jsFuncArgs skipwhite skipempty
+syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
-syntax match   jsObjectGetSet      contained /\%(get\|set\|static\)\%( \k\+\)\@=/ nextgroup=jsObjectFuncName skipwhite skipempty
+syntax match   jsObjectGetSet      contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
 
-
-syntax match   jsDecorator         contained "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
-" TODO: This should contained within function definition stuff...
-syntax match   jsDecoratorFunction contained "[a-zA-Z_][a-zA-Z0-9_.]*" display nextgroup=jsFunc skipwhite
-
-exe 'syntax keyword jsNull      null      '.(exists('g:javascript_conceal_null')        ? 'conceal cchar='.g:javascript_conceal_null        : '')
-exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
-exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefined')   ? 'conceal cchar='.g:javascript_conceal_undefined   : '')
-exe 'syntax keyword jsNan       NaN       '.(exists('g:javascript_conceal_NaN')         ? 'conceal cchar='.g:javascript_conceal_NaN         : '')
-exe 'syntax keyword jsPrototype prototype '.(exists('g:javascript_conceal_prototype')   ? 'conceal cchar='.g:javascript_conceal_prototype   : '')
-exe 'syntax keyword jsThis      this   contained '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
-exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
+exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
+exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '')
+exe 'syntax keyword jsUndefined undefined        '.(exists('g:javascript_conceal_undefined') ? 'conceal cchar='.g:javascript_conceal_undefined  : '')
+exe 'syntax keyword jsNan       NaN              '.(exists('g:javascript_conceal_NaN')       ? 'conceal cchar='.g:javascript_conceal_NaN        : '')
+exe 'syntax keyword jsPrototype prototype        '.(exists('g:javascript_conceal_prototype') ? 'conceal cchar='.g:javascript_conceal_prototype  : '')
+exe 'syntax keyword jsThis      this   contained '.(exists('g:javascript_conceal_this')      ? 'conceal cchar='.g:javascript_conceal_this       : '')
+exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
 
 " Statement Keywords
 syntax keyword jsStatement    contained break continue with yield
-syntax keyword jsConditional            if else   skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
-syntax keyword jsConditional            switch    skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat                 while for skipwhite skipempty nextgroup=jsParenRepeat
-syntax keyword jsRepeat                 do        skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsConditional            if else      skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
+syntax keyword jsConditional            switch       skipwhite skipempty nextgroup=jsParenSwitch
+syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat
+syntax keyword jsRepeat                 do           skipwhite skipempty nextgroup=jsBlock
 syntax keyword jsLabel        contained case default
-syntax keyword jsException              try finally skipwhite skipempty nextgroup=jsBlock
-syntax keyword jsException              catch       skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsException              try finally  skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsException              catch        skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
 
@@ -143,27 +138,29 @@ syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/
 syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment extend
 syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/:/  contains=@jsExpression
 
-syntax match   jsGenerator            contained /\*/ nextgroup=jsFuncName,jsFuncArgs skipwhite skipempty
-syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite skipempty
+syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
+syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
-syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs nextgroup=jsFuncBlock extend skipwhite skipempty
+syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs skipwhite skipempty nextgroup=jsFuncBlock extend
 syntax match   jsFuncArgCommas        contained ','
 syntax match   jsFuncArgRest          contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots      contained /\.\.\./
 syntax keyword jsArguments            contained arguments
 
 " Matches a single keyword argument with no parens
-syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
+syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
 " Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ skipempty skipwhite contains=jsFuncArgs nextgroup=jsArrowFunction extend
+syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
-exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
-exe 'syntax match jsArrowFunction /=>/ skipwhite nextgroup=jsFuncBlock contains=jsFuncBraces '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock contains=jsFuncBraces           '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ nextgroup=jsFuncName skipwhite skipempty
-syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/  contains=jsClassKeywords,jsClassNoise nextgroup=jsClassBlock skipwhite skipempty
+syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName
+syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock
+syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
+syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
@@ -179,20 +176,20 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
   " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
+  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
   " tags containing type and param
-  syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
+  syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
   " tags containing type but no param
-  syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
+  syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
   " tags containing references
-  syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
+  syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
   " other tags (no extra syntax)
   syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
-  syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" oneline nextgroup=jsDocParam skipwhite contains=jsDocTypeRecord
-  syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
-  syntax region jsDocTypeRecord   contained start=/{/ end=/}/ extend contains=jsDocTypeRecord
-  syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ extend contains=jsDocTypeRecord
+  syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+  syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+  syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+  syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
   syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
   syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
   syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
@@ -290,6 +287,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsModuleOperators      Include
   HiLink jsModuleDefault        Include
   HiLink jsDecorator            Special
+  HiLink jsDecoratorFunction    Special
   HiLink jsFuncArgRestDots      Noise
   HiLink jsFuncArgDestructuring Noise
   HiLink jsModuleAsterisk       Noise

From 9550877e615a5b614e21d418022448ef44b107f6 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 18:33:42 -0700
Subject: [PATCH 0275/1043] jsTaggedTemplate tweaks

I don't think it needs to be a region, and infact incurs some annoying
complexity if so
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d017e3f5..7e6f7ba3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -51,7 +51,7 @@ syntax region jsExportBlock      contained matchgroup=jsBraces start=/{/ end=/}/
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
 syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend
 syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial extend
-syntax region  jsTaggedTemplate   start=/\k\+\%([\n\s]\+\)\?`/ end=+`+ contains=jsTemplateString extend
+syntax match   jsTaggedTemplate   /\k\+\%(`\)\@=/ nextgroup=jsTemplateString
 syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/

From 79b73b3fe609f59cf113a97f5207a4397a02177c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 18:35:39 -0700
Subject: [PATCH 0276/1043] Whitespace

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7e6f7ba3..3c594c5f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -67,9 +67,9 @@ syntax match   jsRegexpOr         contained "\v\<@!\|"
 syntax match   jsRegexpMod        contained "\v\(@<=\?[:=!>]"
 syntax region  jsRegexpGroup      contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 if v:version > 703 || v:version == 603 && has("patch1088")
-  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
+  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 else
-  syntax region  jsRegexpString     start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
+  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 

From c3a505bd822fe3b110a2901b4bb5cff6f82568a7 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 19:04:00 -0700
Subject: [PATCH 0277/1043] First pass at fix for #433

---
 syntax/javascript.vim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3c594c5f..d83594e5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -131,7 +131,7 @@ syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/
 syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
 syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock fold extend
 syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock fold extend
-syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator  fold
+syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty  fold
 syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll fold extend
 syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
@@ -157,10 +157,12 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName
+syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
+syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassEquals
+syntax match   jsClassEquals            contained /=/ skipwhite skipempty nextgroup=@jsExpression
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
@@ -291,6 +293,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncArgRestDots      Noise
   HiLink jsFuncArgDestructuring Noise
   HiLink jsModuleAsterisk       Noise
+  HiLink jsClassEquals          Operator
+  HiLink jsClassProperty        Identifier
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From a0155f59d9b5590ae654b1eeb6c0a9340ab7edc0 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 19:46:48 -0700
Subject: [PATCH 0278/1043] First pass at fixing/supporting #425 & #393

There is one caveat right now, to properly support it, we sort of
require semicolons. Not sure if this is something people will be happy
with or not...
---
 syntax/javascript.vim | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d83594e5..5637af84 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -76,7 +76,7 @@ syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBa
 syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue extend
+syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
 syntax match   jsObjectSeparator   contained /,/
 syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
@@ -131,7 +131,7 @@ syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/
 syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
 syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock fold extend
 syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock fold extend
-syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty  fold
+syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsNoise fold
 syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll fold extend
 syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
@@ -139,7 +139,7 @@ syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/
 syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/:/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
-syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
 syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs skipwhite skipempty nextgroup=jsFuncBlock extend
 syntax match   jsFuncArgCommas        contained ','
@@ -161,8 +161,10 @@ syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
-syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassEquals
-syntax match   jsClassEquals            contained /=/ skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
+syntax region  jsClassValue             contained matchgroup=jsNoise start=/=/ end=/;/ contains=@jsExpression
+syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs extend
+syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
@@ -251,6 +253,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsGenerator            jsFunction
   HiLink jsArrowFuncArgs        jsFuncArgs
   HiLink jsFuncName             Function
+  HiLink jsClassFuncName        jsFuncName
   HiLink jsObjectFuncName       Function
   HiLink jsArguments            Special
   HiLink jsError                Error
@@ -293,7 +296,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncArgRestDots      Noise
   HiLink jsFuncArgDestructuring Noise
   HiLink jsModuleAsterisk       Noise
-  HiLink jsClassEquals          Operator
   HiLink jsClassProperty        Identifier
 
   HiLink jsDomErrNo             Constant

From 648e924dde3b4118bec960480c5526d8dfc45ebb Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 19:59:54 -0700
Subject: [PATCH 0279/1043] Add support for spread operator

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5637af84..59754549 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -32,6 +32,7 @@ syntax match   jsParensError    /\%()\|}\|\]\)/
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
+syntax match   jsSpreadOperator /\.\.\./
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
@@ -135,7 +136,7 @@ syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/
 syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll fold extend
 syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
-syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment extend
+syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator extend
 syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/:/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
@@ -200,7 +201,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 endif   "" JSDoc end
 
-syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
+syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsSpreadOperator
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsAsyncKeyword
 
 " Define the default highlighting.
@@ -297,6 +298,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncArgDestructuring Noise
   HiLink jsModuleAsterisk       Noise
   HiLink jsClassProperty        Identifier
+  HiLink jsSpreadOperator       Operator
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From 8679129ee3284f0719f9a946d2c0654c959eb57c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 20:15:39 -0700
Subject: [PATCH 0280/1043] Renaming jsArray to jsBracket

Because it's not ALWAYS an array
---
 syntax/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 59754549..178f222c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -126,7 +126,7 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 "" Code blocks
-syntax region  jsArray                 matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression fold extend
+syntax region  jsBracket               matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression fold extend
 syntax region  jsParen                 matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll fold extend
 syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
 syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
@@ -201,7 +201,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 endif   "" JSDoc end
 
-syntax cluster jsExpression  contains=jsArray,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsSpreadOperator
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsSpreadOperator
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsAsyncKeyword
 
 " Define the default highlighting.
@@ -318,8 +318,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 endif
 
 " Define the htmlJavaScript for HTML syntax html.vim
-syntax cluster  htmlJavaScript       contains=@jsAll,jsArray,jsParen,jsBlock
-syntax cluster  javaScriptExpression contains=@jsAll,jsArray,jsParen,jsBlock
+syntax cluster  htmlJavaScript       contains=@jsAll
+syntax cluster  javaScriptExpression contains=@jsAll
 
 " Vim's default html.vim highlights all javascript as 'Special'
 hi! def link javaScript              NONE

From 42512308afb616e1305a43576c41650034637213 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 20:18:34 -0700
Subject: [PATCH 0281/1043] Changing a TODO to a DISCUSS

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 178f222c..307d005d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -108,7 +108,7 @@ syntax keyword jsAsyncKeyword           async await
 syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
-" TODO: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
+" DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
 syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient debugger implements protected volatile double public
 
 " DISCUSS: Should we really be matching stuff like this?

From 37cdc8cccce0b3a5ac304ee0605d0e659875fec4 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Jun 2016 22:24:57 -0700
Subject: [PATCH 0282/1043] Improvements to jsClassValue endcase

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 307d005d..6320c3a3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -163,7 +163,7 @@ syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
-syntax region  jsClassValue             contained matchgroup=jsNoise start=/=/ end=/;/ contains=@jsExpression
+syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs extend
 syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 

From e6182482bff8b9eb0fa85c2128a3d9abb9cc95be Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 6 Jun 2016 13:20:38 -0700
Subject: [PATCH 0283/1043] Unlinking jsFutureKeys

We can use this as a test. By unlinking it, it shouldn't ever have any
color theme associated with it, and if people complain, they can still
highlight it. Otherwise if we hear no complaints after a while, we just
pull it completely.
---
 syntax/javascript.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6320c3a3..a5b7a47c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -287,7 +287,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsTemplateBraces       jsBraces
   HiLink jsGlobalObjects        Special
   HiLink jsExceptions           Special
-  HiLink jsFutureKeys           Special
   HiLink jsBuiltins             Special
   HiLink jsModuleKeywords       Include
   HiLink jsModuleOperators      Include

From 8aea86351a9919018490e288244e7c780c31d271 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 8 Jun 2016 12:53:21 -0700
Subject: [PATCH 0284/1043] Debugger is no longer a future keys

It's now technically a statement
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a5b7a47c..6e9fd109 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -93,7 +93,7 @@ exe 'syntax keyword jsThis      this   contained '.(exists('g:javascript_conceal
 exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
 
 " Statement Keywords
-syntax keyword jsStatement    contained break continue with yield
+syntax keyword jsStatement    contained break continue with yield debugger
 syntax keyword jsConditional            if else      skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
 syntax keyword jsConditional            switch       skipwhite skipempty nextgroup=jsParenSwitch
 syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat
@@ -109,7 +109,7 @@ syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Obje
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 " DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
-syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient debugger implements protected volatile double public
+syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient implements protected volatile double public
 
 " DISCUSS: Should we really be matching stuff like this?
 " DOM2 Objects

From 5a0ae763938d8eb2553ed2ab89d199caef1cb2a0 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 9 Jun 2016 10:58:12 -0700
Subject: [PATCH 0285/1043] Misc tweaks

* Fixes to jsSpreadOperator
* Added fold to jsObject
* Organized fold/extend arguments better
---
 syntax/javascript.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6e9fd109..5e78feba 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -32,7 +32,7 @@ syntax match   jsParensError    /\%()\|}\|\]\)/
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
-syntax match   jsSpreadOperator /\.\.\./
+syntax match   jsSpreadOperator /\.\.\./ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
@@ -126,17 +126,17 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 "" Code blocks
-syntax region  jsBracket               matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression fold extend
-syntax region  jsParen                 matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll fold extend
-syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
-syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock fold extend
-syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock fold extend
-syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock fold extend
-syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsNoise fold
-syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll fold extend
+syntax region  jsBracket               matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression extend fold
+syntax region  jsParen                 matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll extend fold
+syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
+syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsNoise extend fold
+syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
-syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator extend
+syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator extend fold
 syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/:/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs

From fc3874662664a6d86c27dc0aa77d60ba8e7f6933 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 10 Jun 2016 17:44:43 -0700
Subject: [PATCH 0286/1043] Potential fix for jsClassValue region

This fix may actually work out for us when using jsClassValue. There
still are some cases where it could be tripped up, for example on multi
line equations and stuff, but for the most part I think it should do the
trick.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5e78feba..c463c3c4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -163,7 +163,7 @@ syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
-syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\)\@=/ contains=@jsExpression
+syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs extend
 syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 
@@ -296,7 +296,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncArgRestDots      Noise
   HiLink jsFuncArgDestructuring Noise
   HiLink jsModuleAsterisk       Noise
-  HiLink jsClassProperty        Identifier
+  HiLink jsClassProperty        jsObjectKey
   HiLink jsSpreadOperator       Operator
 
   HiLink jsDomErrNo             Constant

From e38617a517159711129f998d70e063962c2c09eb Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 10 Jun 2016 17:50:40 -0700
Subject: [PATCH 0287/1043] Fix computed class properties

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c463c3c4..830ebb08 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -164,7 +164,7 @@ syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunct
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
-syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs extend
+syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
 syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 
 " Comments

From ceb3341b8ddfa40acfa4470e4b8679f0766d340f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 10 Jun 2016 17:51:45 -0700
Subject: [PATCH 0288/1043] Make ternary handling more robust

This should help with errant detection in files that use Flow. It also
makes things safer so when typing out a ternary expression, you don't
get weird flickering of major syntax region changes.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 830ebb08..c82f950a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -137,7 +137,7 @@ syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/
 syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
 syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator extend fold
-syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/:/  contains=@jsExpression
+syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs

From 8e710ba8eaad6d1b4caa9947b69315498e323300 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 11 Jun 2016 15:55:01 -0700
Subject: [PATCH 0289/1043] changes according to #466 (#463)

support less common object defs .
comment detection compatibility.
only use a c style when not in a block
---
 indent/javascript.vim | 78 +++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 43 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 53cd0acd..84d69690 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -16,7 +16,7 @@ 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\,:,!^F,o,O,e
+setlocal indentkeys=0{,0},0),0],0\,*<Return>,:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
 
 " Only define the function once.
@@ -45,16 +45,13 @@ 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\s\+[^\:]*\|default\)\s*:\s*\C'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(string\|regex\|comment\|template\)\c'
+let s:syng_strcom = '\%(string\|regex\|special\|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_multiline = '\%(comment\|doc\)\c'
-
-" Regex of syntax group names that are line comment.
-let s:syng_linecom = 'linecomment\c'
+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."'"
@@ -114,13 +111,8 @@ function s:IsInString(lnum, col)
 endfunction
 
 " Check if the character at lnum:col is inside a multi-line comment.
-function s:IsInMultilineComment(lnum, col)
-  return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
-endfunction
-
-" Check if the character at lnum:col is a line comment.
-function s:IsLineComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_linecom
+function s:IsInComment(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_comment
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
@@ -128,14 +120,14 @@ function s:PrevNonBlankNonString(lnum)
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
     let line = getline(lnum)
-    let com = match(line, '\*\/') + 1
-    if s:IsInMultilineComment(lnum, com)
+    let com = match(line, '\%(\/\*.*\)\@<!\*\/') + 1
+    if s:IsInComment(lnum, com)
       call cursor(lnum, com)
-      let parlnum = search('\/\*', 'nbW')
+      let parlnum = search('\%(\/\/.*\)\@<!\/\*', 'nbW')
       if parlnum > 0
         let lnum = parlnum
       end
-    elseif line !~ '^' . s:line_term
+    elseif line !~ '^' . s:line_term && !s:IsInStringOrComment(lnum,1)
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -153,18 +145,17 @@ function s:GetMSL(lnum, in_one_line_scope)
     " Otherwise, terminate search as we have found our MSL already.
     let line = getline(lnum)
     let line2 = getline(msl)
-    let col2 = matchend(line2, ')')
     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 there are more closing brackets, continue from the line which has the matching opening bracket
-    elseif col2 > 0 && !s:IsInStringOrComment(msl, col2) && s:LineHasOpeningBrackets(msl)[0] == '2' && !a:in_one_line_scope
-      call cursor(msl, 1)
-      if s:lookForParens('(', ')', 'bW', 0) > 0
-        let lnum = line('.')
-        let msl = lnum
-      endif
+      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
 
@@ -331,6 +322,8 @@ function GetJavascriptIndent()
   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'
@@ -338,12 +331,13 @@ function GetJavascriptIndent()
   endif
 
   " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1) && line !~ '^\/\*'
+  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
   
   " single opening bracket will assume you want a c style of indenting
-  if s:Match(v:lnum, s:line_pre . '{' . s:line_term)
+  if s:Match(v:lnum, s:line_pre . '{' . s:line_term) && !s:Match(lnum,s:block_regex) &&
+        \ !s:Match(lnum,s:comma_last)
     return cindent(v:lnum)
   endif
 
@@ -358,8 +352,6 @@ function GetJavascriptIndent()
   let col = matchend(line, s:line_pre . '[]})]')
   if col > 0 && !s:IsInStringOrComment(v:lnum, col)
     call cursor(v:lnum, col)
-
-
     let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
     if parlnum > 0
       let ind = s:InMultiVarStatement(parlnum, 0, 0) ? indent(parlnum) : indent(s:GetMSL(parlnum, 0))
@@ -367,7 +359,6 @@ function GetJavascriptIndent()
     return ind
   endif
 
-  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
   " If line starts with an operator...
   if (line =~ s:operator_first)
@@ -376,16 +367,17 @@ function GetJavascriptIndent()
       return indent(lnum)
     end
     let counts = s:LineHasOpeningBrackets(lnum)
-    if counts[0] == '2' || counts[1] == '2' || counts[2] == '2'
+    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) ? indent(lnum) + s:sw() : indent(parlnum)
+        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 line !~ s:line_pre . ',\s*\%(\%(\([''"]\).*\1\)\|\%(\h\w*\)\)\s*:.*' . s:line_term &&
-          \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsbracket\|jsparen'
-      " otherwise, indent 1 level
+    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
 
@@ -400,7 +392,7 @@ function GetJavascriptIndent()
         return indent(mnum) - s:sw()
       end
     elseif s:Match(lnum, s:operator_first)
-      if counts[0] != '1' && counts[1] != '1' && counts[2] != '1'
+      if counts !~ '1'
         return indent(lnum) - s:sw()
       end
     end
@@ -412,7 +404,8 @@ function GetJavascriptIndent()
   " 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*$' && s:IsInMultilineComment(prevline, 1)
+  if line =~ '^\s*$' && getline(prevline) !~ '\%(\%(^\s*\/\/\|\/\*\).*\)\@<!\*\/' &&
+        \ s:IsInComment(prevline, 1)
     return indent(prevline) - 1
   endif
 
@@ -441,15 +434,14 @@ function GetJavascriptIndent()
   " add indent depending on the bracket type.
   if s:Match(lnum, '[[({})\]]')
     let counts = s:LineHasOpeningBrackets(lnum)
-    if counts[0] == '2' || (counts[1] == '2' && !s:Match(lnum, s:line_pre . '}')) ||
-          \ (counts[2] == '2' && !s:Match(lnum, s:line_pre . ']'))
+    if counts =~ '2'
       call cursor(lnum, 1)
       " Search for the opening tag
       let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if parlnum > 0
+      if parlnum > 0 && !s:InMultiVarStatement(parlnum,0,0)
         return indent(s:GetMSL(parlnum, 0)) 
       end
-    elseif counts[1] == '1' || counts[2] == '1' || counts[0] == '1' || s:Onescope(lnum)
+    elseif counts =~ '1' || s:Onescope(lnum)
       return ind + s:sw()
     else
       call cursor(v:lnum, vcol)
@@ -502,7 +494,7 @@ function! Fixedgq(lnum, count)
     endif
 
     " This gq is only meant to do code with strings, not comments
-    if s:IsLineComment(a:lnum, l:first_char) || s:IsInMultilineComment(a:lnum, l:first_char)
+    if s:IsInComment(a:lnum, l:first_char)
         return 1
     endif
 

From 9e5b60a4fd270432ad56699a26b703abf78aa2b2 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 13 Jun 2016 17:43:20 -0700
Subject: [PATCH 0290/1043] Pulling version number out of README

Versions should be tracked on git anyways
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 87bca234..005ae786 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vim-javascript v1.0.0
+# vim-javascript
 
 JavaScript bundle for vim, this bundle provides syntax highlighting and
 improved indentation.

From 51c16139c15183aea30ccf0b7f3482a2b83e895e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 14 Jun 2016 11:13:18 -0700
Subject: [PATCH 0291/1043] Adds support for string func names in objs classes

---
 syntax/javascript.vim | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c82f950a..04179088 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -83,6 +83,8 @@ syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contai
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
 syntax match   jsObjectGetSet      contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
+syntax region  jsFunctionStringKey contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsFunctionStringKey contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
 
 exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
 exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '')
@@ -132,11 +134,11 @@ syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/
 syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
 syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsNoise extend fold
+syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsFunctionStringKey,jsNoise extend fold
 syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
-syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator extend fold
+syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsFunctionStringKey extend fold
 syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
@@ -229,6 +231,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsString               String
   HiLink jsObjectKeyString      String
   HiLink jsTemplateString       String
+  HiLink jsFunctionStringKey    String
   HiLink jsTaggedTemplate       StorageClass
   HiLink jsTernaryIfOperator    Operator
   HiLink jsRegexpString         String

From 233b6c32c941559377134a04db9c0a178708bf83 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 15 Jun 2016 09:02:26 -0700
Subject: [PATCH 0292/1043] paren matching (#474)

https://github.com/pangloss/vim-javascript/issues/469#issuecomment-225765624
---
 indent/javascript.vim | 56 +++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 84d69690..806f079b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -45,7 +45,7 @@ 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\s\+[^\:]*\|default\)\s*:\s*\C'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(string\|regex\|special\|comment\|template\)\c'
+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'
@@ -347,22 +347,29 @@ function GetJavascriptIndent()
   endif
 
   " If we got a closing bracket on an empty line, find its match and indent
-  " according to it.  For parentheses we indent to its column - 1, for the
-  " others we indent to the containing line's MSL's level.  Return -1 if fail.
-  let col = matchend(line, s:line_pre . '[]})]')
-  if col > 0 && !s:IsInStringOrComment(v:lnum, col)
-    call cursor(v:lnum, col)
-    let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-    if parlnum > 0
-      let ind = s:InMultiVarStatement(parlnum, 0, 0) ? indent(parlnum) : indent(s:GetMSL(parlnum, 0))
-    endif
+  " according to it.
+  let col = s:Match(v:lnum,  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
     return ind
   endif
 
 
   " If line starts with an operator...
   if (line =~ s:operator_first)
-    if (s:Match(lnum, s:operator_first))
+    if (s:Match(lnum, s:operator_first) || s:Match(lnum, s:line_pre . '[])}]'))
       " and so does previous line, don't indent
       return indent(lnum)
     end
@@ -421,10 +428,20 @@ function GetJavascriptIndent()
     return 0
   endif
 
+" foo('foo',
+"   bar('bar', function() {
+"     hi();
+"   })
+" );
 
+" function (a, b, c, d,
+"     e, f, g) {
+"       console.log('inner');
+" }
   " 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) ? indent(lnum) + s:sw() : indent(s:GetMSL(lnum, 0)) + s:sw()
+    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.
@@ -432,19 +449,18 @@ function GetJavascriptIndent()
   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, '[[({})\]]')
+  if s:Match(lnum, '\%([[({]\)\|\%([^\t \])}][})\]]\)')
     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 && !s:InMultiVarStatement(parlnum,0,0)
-        return indent(s:GetMSL(parlnum, 0)) 
+      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
+      if line('.') < lnum && !s:InMultiVarStatement(line('.'),0,0)
+        return indent(s:GetMSL(line('.'), 0))
       end
     elseif counts =~ '1' || s:Onescope(lnum)
       return ind + s:sw()
-    else
-      call cursor(v:lnum, vcol)
     end
   end
 

From ecae87560ccf3001cca2b3f0ec48c4b18abee101 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 15 Jun 2016 19:04:22 -0700
Subject: [PATCH 0293/1043] Fixing object string keys

---
 syntax/javascript.vim | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 04179088..3086c39d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -83,8 +83,8 @@ syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contai
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
 syntax match   jsObjectGetSet      contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
-syntax region  jsFunctionStringKey contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
-syntax region  jsFunctionStringKey contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsObjectStringKey   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
+syntax region  jsObjectStringKey   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
 exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
 exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '')
@@ -134,11 +134,11 @@ syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/
 syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
 syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsFunctionStringKey,jsNoise extend fold
+syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
-syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsFunctionStringKey extend fold
+syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
 syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
@@ -168,6 +168,8 @@ syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
 syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsClassStringKey         contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsClassStringKey         contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
@@ -231,7 +233,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsString               String
   HiLink jsObjectKeyString      String
   HiLink jsTemplateString       String
-  HiLink jsFunctionStringKey    String
+  HiLink jsObjectStringKey      String
+  HiLink jsClassStringKey       String
   HiLink jsTaggedTemplate       StorageClass
   HiLink jsTernaryIfOperator    Operator
   HiLink jsRegexpString         String

From d3d09b9c584f2e59334fe2fd74f00cbfce0ad3c8 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 16 Jun 2016 11:08:42 -0700
Subject: [PATCH 0294/1043] First pass at fixing Promise catch methods.

Made the scoping of catch statements dependent on try.
---
 syntax/javascript.vim | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3086c39d..5e17a502 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -101,8 +101,9 @@ syntax keyword jsConditional            switch       skipwhite skipempty nextgro
 syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat
 syntax keyword jsRepeat                 do           skipwhite skipempty nextgroup=jsBlock
 syntax keyword jsLabel        contained case default
-syntax keyword jsException              try finally  skipwhite skipempty nextgroup=jsBlock
-syntax keyword jsException              catch        skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsTry                    try          skipwhite skipempty nextgroup=jsTryCatchBlock
+syntax keyword jsFinally      contained finally      skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsCatch        contained catch        skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
 
@@ -128,18 +129,19 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 "" Code blocks
-syntax region  jsBracket               matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression extend fold
-syntax region  jsParen                 matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsParenRepeat contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsParenSwitch contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
-syntax region  jsParenCatch  contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsClassBlock  contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
-syntax region  jsFuncBlock   contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsBlock       contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsSwitchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
-syntax region  jsObject                matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
-syntax region  jsTernaryIf             matchgroup=jsTernaryIfOperator start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
+syntax region  jsBracket                 matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression extend fold
+syntax region  jsParen                   matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll extend fold
+syntax region  jsParenIfElse   contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsParenRepeat   contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsParenSwitch   contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
+syntax region  jsParenCatch    contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
+syntax region  jsClassBlock    contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
+syntax region  jsFuncBlock     contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsBlock         contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsTryCatchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
+syntax region  jsSwitchBlock   contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
+syntax region  jsObject                  matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
+syntax region  jsTernaryIf               matchgroup=jsTernaryIfOperator start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs
@@ -206,7 +208,7 @@ if !exists("javascript_ignore_javaScriptdoc")
 endif   "" JSDoc end
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsSpreadOperator
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsAsyncKeyword
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -254,6 +256,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRepeat               Repeat
   HiLink jsStatement            Statement
   HiLink jsException            Exception
+  HiLink jsTry                  Exception
+  HiLink jsFinally              Exception
+  HiLink jsCatch                Exception
   HiLink jsAsyncKeyword         Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type

From ea5803348e3ec88a1762b4f044b585d216d1974f Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 16 Jun 2016 21:00:35 -0700
Subject: [PATCH 0295/1043] a solution for 486 (#488)

this just makes the indentation increase with an initial dot chained method
---
 indent/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 806f079b..9cb3048b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -369,7 +369,8 @@ function GetJavascriptIndent()
 
   " If line starts with an operator...
   if (line =~ s:operator_first)
-    if (s:Match(lnum, s:operator_first) || s:Match(lnum, s:line_pre . '[])}]'))
+    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)
     end

From 52e8f90e22e7dabd1fae70e65de98af97af80274 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 17 Jun 2016 10:30:03 -0700
Subject: [PATCH 0296/1043] incorrect change in cursor pos (#489)

* incorrect change in cursor pos

some bizarre problem which made me invent a buggy fix. also reindented the file
---
 indent/javascript.vim | 120 +++++++++++++++++++++---------------------
 1 file changed, 61 insertions(+), 59 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9cb3048b..4b8b1f94 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -312,6 +312,7 @@ 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
@@ -334,7 +335,7 @@ function GetJavascriptIndent()
   if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
-  
+
   " single opening bracket will assume you want a c style of indenting
   if s:Match(v:lnum, s:line_pre . '{' . s:line_term) && !s:Match(lnum,s:block_regex) &&
         \ !s:Match(lnum,s:comma_last)
@@ -429,16 +430,16 @@ function GetJavascriptIndent()
     return 0
   endif
 
-" foo('foo',
-"   bar('bar', function() {
-"     hi();
-"   })
-" );
+  " foo('foo',
+  "   bar('bar', function() {
+  "     hi();
+  "   })
+  " );
 
-" function (a, b, c, d,
-"     e, f, g) {
-"       console.log('inner');
-" }
+  " function (a, b, c, d,
+  "     e, f, g) {
+  "       console.log('inner');
+  " }
   " 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' ?
@@ -450,15 +451,16 @@ function GetJavascriptIndent()
   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, '\%([[({]\)\|\%([^\t \])}][})\]]\)')
+  if s:Match(lnum, '[[({})\]]')
     let counts = s:LineHasOpeningBrackets(lnum)
     if counts =~ '2'
-      call cursor(lnum,matchend(s:RemoveTrailingComments(line), '.\+\zs[])}]'))
+      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
-      if line('.') < lnum && !s:InMultiVarStatement(line('.'),0,0)
-        return indent(s:GetMSL(line('.'), 0))
+      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()
@@ -501,64 +503,64 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 " gq{{{2
 function! Fixedgq(lnum, count)
-    let l:tw = &tw ? &tw : 80;
+  let l:tw = &tw ? &tw : 80;
 
-    let l:count = a:count
-    let l:first_char = indent(a:lnum) + 1
+  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
+  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
+  " 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
+  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
+  " 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()
+  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)
+  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
+  " 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
+  " 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
+  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
+  " run gq on new lines
+  if l:count == 1
+    call feedkeys("gqq")
+  endif
 
-    return 0
+  return 0
 endfunction
 "}}}
 " vim: foldmethod=marker:foldlevel=1

From 939f478f65b3b0281a01bd3372ad36577d992efd Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 13 Jun 2016 22:36:28 -0700
Subject: [PATCH 0297/1043] Improvements to destructuring

This PR should add far more complete support for destructuring, both in
var/let/const statements and also within function argument definitions.

There may be some cases I have not tested and are broken, therefore more
testing is for sure needed.
---
 syntax/javascript.vim | 55 ++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5e17a502..94d2756b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -24,12 +24,12 @@ syntax sync fromstart
 " syntax case ignore
 syntax case match
 
-syntax match   jsNoise           /[:,\;\.]\{1}/
-syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
-syntax match   jsParensError    /\%()\|}\|\]\)/
+syntax match   jsNoise          /[:,\;\.]\{1}/
+syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
+syntax match   jsParensError    /[)}\]]/
 
 " Program Keywords
-syntax keyword jsStorageClass   const var let
+syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock
 syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax match   jsSpreadOperator /\.\.\./ skipwhite skipempty nextgroup=@jsExpression
@@ -45,7 +45,7 @@ syntax region  jsModuleGroup     contained matchgroup=jsBraces start=/{/ end=/}/
 syntax match   jsModuleAsterisk  contained /*/
 syntax keyword jsModuleDefault   contained default skipwhite skipempty nextgroup=@jsExpression
 syntax region jsImportContainer  start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
-syntax match  jsExportContainer   /\<export\> / contains=jsModuleKeywords skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
+syntax match  jsExportContainer  /\<export\> / contains=jsModuleKeywords skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
 syntax region jsExportBlock      contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
 
 " Strings, Templates, Numbers
@@ -129,24 +129,25 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 "" Code blocks
-syntax region  jsBracket                 matchgroup=jsBrackets          start="\[" end="\]" contains=@jsExpression extend fold
-syntax region  jsParen                   matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse   contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsParenRepeat   contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsParenSwitch   contained matchgroup=jsParens            start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
-syntax region  jsParenCatch    contained matchgroup=jsParens            start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsClassBlock    contained matchgroup=jsClassBraces       start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
-syntax region  jsFuncBlock     contained matchgroup=jsFuncBraces        start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsBlock         contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsTryCatchBlock contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
-syntax region  jsSwitchBlock   contained matchgroup=jsBraces            start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
-syntax region  jsObject                  matchgroup=jsObjectBraces      start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
-syntax region  jsTernaryIf               matchgroup=jsTernaryIfOperator start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
+syntax region  jsBracket                      matchgroup=jsBrackets            start="\[" end="\]" contains=@jsExpression extend fold
+syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
+syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start='('  end=')'  contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsFuncArgExpression,jsDestructuringBlock skipwhite skipempty nextgroup=jsFuncBlock extend fold
+syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
+syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
+syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed extend fold
+syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
+syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs
-syntax match   jsFuncArgDestructuring contained /\({\|}\|=\|:\|\[\|\]\)/ extend
-syntax region  jsFuncArgs             contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsString,jsNumber,jsFuncArgDestructuring,jsArrowFunction,jsParen,jsArrowFuncArgs skipwhite skipempty nextgroup=jsFuncBlock extend
+syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
 syntax match   jsFuncArgRest          contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
 syntax match   jsFuncArgRestDots      contained /\.\.\./
@@ -173,6 +174,13 @@ syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\
 syntax region  jsClassStringKey         contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsClassStringKey         contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
 
+" Destructuring
+syntax match   jsDestructuringProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
+syntax match   jsDestructuringAssignment        contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
+syntax region  jsDestructuringValue             contained start=/=/ start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
+syntax match   jsDestructuringNoise             contained /[,]/
+syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpresslon skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringNoise extend fold
+
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
 syntax region  jsComment        start=+\/\/+ end=+$+ contains=jsCommentTodo,@Spell extend keepend
@@ -305,11 +313,16 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDecorator            Special
   HiLink jsDecoratorFunction    Special
   HiLink jsFuncArgRestDots      Noise
-  HiLink jsFuncArgDestructuring Noise
+  HiLink jsFuncArgOperator      jsFuncArgs
   HiLink jsModuleAsterisk       Noise
   HiLink jsClassProperty        jsObjectKey
   HiLink jsSpreadOperator       Operator
 
+  HiLink jsDestructuringBraces     Noise
+  HiLink jsDestructuringProperty   jsObjectKey
+  HiLink jsDestructuringAssignment jsObjectKey
+  HiLink jsDestructuringNoise      Noise
+
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant
   HiLink jsDomElemAttrs         Label

From 47951eec6ae9294c0244275efe6fe09c7c166606 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 13 Jun 2016 22:59:09 -0700
Subject: [PATCH 0298/1043] Refinements to destructuring

---
 syntax/javascript.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 94d2756b..6cb18fe5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -177,8 +177,10 @@ syntax region  jsClassStringKey         contained start=+'+  skip=+\\\('\|$\)+
 " Destructuring
 syntax match   jsDestructuringProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
 syntax match   jsDestructuringAssignment        contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
-syntax region  jsDestructuringValue             contained start=/=/ start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
-syntax match   jsDestructuringNoise             contained /[,]/
+syntax match   jsDestructuringPropertyValue     contained /\<[0-9a-zA-Z_$]*\>/
+syntax region  jsDestructuringValue             contained start=/=/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
+syntax region  jsDestructuringValue             contained start=/:/ end=/\%(,\|}\)\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise extend
+syntax match   jsDestructuringNoise             contained /[,\[\]]/
 syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpresslon skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringNoise extend fold
 
 " Comments
@@ -319,7 +321,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsSpreadOperator       Operator
 
   HiLink jsDestructuringBraces     Noise
-  HiLink jsDestructuringProperty   jsObjectKey
+  HiLink jsDestructuringProperty   jsFuncArgs
   HiLink jsDestructuringAssignment jsObjectKey
   HiLink jsDestructuringNoise      Noise
 

From afe61796a152421ef4596da531f7eb097ee354bc Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 13 Jun 2016 23:11:14 -0700
Subject: [PATCH 0299/1043] Improved array destructuring

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6cb18fe5..ef07a113 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -29,7 +29,7 @@ syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
 syntax match   jsParensError    /[)}\]]/
 
 " Program Keywords
-syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock
+syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray
 syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax match   jsSpreadOperator /\.\.\./ skipwhite skipempty nextgroup=@jsExpression
@@ -142,6 +142,8 @@ syntax region  jsBlock              contained matchgroup=jsBraces              s
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
 syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise extend fold
+syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
 syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 

From 9d816e3985b259c07b7a6bef7b2ab4eb8780f34f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 13 Jun 2016 23:21:40 -0700
Subject: [PATCH 0300/1043] Fixes to array destructuring

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ef07a113..7dc5cdc6 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -142,8 +142,7 @@ syntax region  jsBlock              contained matchgroup=jsBraces              s
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
 syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise extend fold
-syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty extend fold
 syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
@@ -177,11 +176,11 @@ syntax region  jsClassStringKey         contained start=+"+  skip=+\\\("\|$\)+
 syntax region  jsClassStringKey         contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
 
 " Destructuring
-syntax match   jsDestructuringProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
-syntax match   jsDestructuringAssignment        contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
 syntax match   jsDestructuringPropertyValue     contained /\<[0-9a-zA-Z_$]*\>/
-syntax region  jsDestructuringValue             contained start=/=/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
-syntax region  jsDestructuringValue             contained start=/:/ end=/\%(,\|}\)\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise extend
+syntax match   jsDestructuringProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
+syntax match   jsDestructuringAssignment        contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValueAssignment
+syntax region  jsDestructuringValue             contained start=/=/ end=/[,}\]]\@=/ contains=@jsExpression extend
+syntax region  jsDestructuringValueAssignment   contained start=/:/ end=/[,}]\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise extend
 syntax match   jsDestructuringNoise             contained /[,\[\]]/
 syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpresslon skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringNoise extend fold
 

From 7d41c3c63a02e885f12623b6a0cfe820deb5dfee Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 17 Jun 2016 20:42:03 -0700
Subject: [PATCH 0301/1043] Improvements to Spread and Rest

Rest and spread operators are now clearly different, and also create
real regions that match more accurately.
---
 syntax/javascript.vim | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7dc5cdc6..7dfe6d34 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -32,7 +32,6 @@ syntax match   jsParensError    /[)}\]]/
 syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray
 syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
-syntax match   jsSpreadOperator /\.\.\./ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
@@ -129,29 +128,29 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 "" Code blocks
-syntax region  jsBracket                      matchgroup=jsBrackets            start="\[" end="\]" contains=@jsExpression extend fold
+syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
 syntax region  jsParenIfElse        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
 syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start='('  end=')'  contains=jsFuncArgCommas,jsFuncArgRest,jsComment,jsFuncArgExpression,jsDestructuringBlock skipwhite skipempty nextgroup=jsFuncBlock extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression skipwhite skipempty nextgroup=jsFuncBlock extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
 syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
-syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty extend fold
-syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsSpreadOperator,jsObjectStringKey extend fold
+syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
+syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression extend fold
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
+syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
+syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
-syntax match   jsFuncArgRest          contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/ contains=jsFuncArgRestDots
-syntax match   jsFuncArgRestDots      contained /\.\.\./
 syntax keyword jsArguments            contained arguments
 
 " Matches a single keyword argument with no parens
@@ -218,7 +217,7 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 endif   "" JSDoc end
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsSpreadOperator
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 
 " Define the default highlighting.
@@ -231,7 +230,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   else
     command -nargs=+ HiLink hi def link <args>
   endif
-  HiLink jsFuncArgRest          Special
   HiLink jsComment              Comment
   HiLink jsEnvComment           PreProc
   HiLink jsCommentTodo          Todo
@@ -315,11 +313,12 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsModuleDefault        Include
   HiLink jsDecorator            Special
   HiLink jsDecoratorFunction    Special
-  HiLink jsFuncArgRestDots      Noise
   HiLink jsFuncArgOperator      jsFuncArgs
   HiLink jsModuleAsterisk       Noise
   HiLink jsClassProperty        jsObjectKey
   HiLink jsSpreadOperator       Operator
+  HiLink jsRestOperator         Operator
+  HiLink jsRestExpression       jsFuncArgs
 
   HiLink jsDestructuringBraces     Noise
   HiLink jsDestructuringProperty   jsFuncArgs

From 6bb633fb74cafb3e9d45ad41b6c5dc52829dbdf9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 18 Jun 2016 09:04:57 -0700
Subject: [PATCH 0302/1043] comment misalignment (#495)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4b8b1f94..d683d961 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -17,7 +17,7 @@ setlocal nosmartindent
 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
+setlocal cinoptions+=j1,J1,c1
 
 " Only define the function once.
 if exists("*GetJavascriptIndent")
@@ -413,7 +413,7 @@ function GetJavascriptIndent()
   " 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*\/\/\|\/\*\).*\)\@<!\*\/' &&
+  if line =~ '^\s*$' && getline(prevline) =~ '\%(\%(^\s*\/\/\|\/\*\).*\)\@<!\*\/' &&
         \ s:IsInComment(prevline, 1)
     return indent(prevline) - 1
   endif

From 420f98cc2e2e4fea2cfa199ca3dea3b3e9dd9444 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 18 Jun 2016 09:14:51 -0700
Subject: [PATCH 0303/1043] let a continuation be determined with block close
 (#496)

seems to fix #491, may be necessary to look for a more complex solution if this causes regressions
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d683d961..9a0f16e9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -140,7 +140,7 @@ 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
+  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)
@@ -360,8 +360,8 @@ function GetJavascriptIndent()
         continue
       end
       if parlnum > 0
-        let ind = s:InMultiVarStatement(parlnum, 0, 0)|| s:LineHasOpeningBrackets(parlnum) !~ '2'
-              \ ? indent(parlnum) : indent(s:GetMSL(parlnum, 0))
+        let ind = s:InMultiVarStatement(parlnum, 0, 0)|| s:LineHasOpeningBrackets(parlnum) !~ '2' ?
+              \ indent(parlnum) : indent(s:GetMSL(parlnum, 0))
       endif
     endwhile
     return ind

From 01150776b5d9d08a24567684f387029b3fa29080 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 19 Jun 2016 21:30:35 -0700
Subject: [PATCH 0304/1043] accurate switch indenting (#499)

since cindent considers single quotes as delimiting a single char string, cindent will break in situations like : https://github.com/sanctuary-js/sanctuary-def/blob/master/index.js#L222

http://stackoverflow.com/questions/3683602/single-quotes-vs-double-quotes-in-c
---
 indent/javascript.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9a0f16e9..f4676358 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -344,7 +344,11 @@ function GetJavascriptIndent()
 
   " cindent each line which has a switch label
   if (line =~ s:expr_case)
-    return cindent(v:lnum)
+    let s: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

From 82fb8b9742e896146496e951a0538fcd23f4ea76 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 11 Jun 2016 14:25:04 -0700
Subject: [PATCH 0305/1043] Adding some basic Flow support

This is by no means complete, and so far has only been to fix major
syntax highlighting issues I've found.
---
 syntax/javascript.vim | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7dfe6d34..674d439a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -134,7 +134,7 @@ syntax region  jsParenIfElse        contained matchgroup=jsParens              s
 syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression skipwhite skipempty nextgroup=jsFuncBlock extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression skipwhite skipempty nextgroup=jsFuncBlock,jsFlow extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
@@ -217,6 +217,13 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 endif   "" JSDoc end
 
+" FIXME: Will need to mask this behind an if statement, or make it a separate
+" file that gets source separately.
+syntax region  jsFlow              contained start=/:/ end=/[={),]\@=/ contains=jsFlowType skipwhite skipempty nextgroup=jsFuncBlock
+syntax keyword jsFlowType          contained boolean number string null void any mixed JSON array function object
+syntax region  jsFlowStatement               start=/type/ end=/=/ skipwhite skipempty nextgroup=jsFlowObject
+syntax region  jsFlowObject        contained start=/{/ end=/}/
+
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 
@@ -339,6 +346,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsClassMethodDefinitions Type
   HiLink jsObjectGetSet           Type
 
+  HiLink jsFlow                   PreProc
+  HiLink jsFlowType               Type
+
   delcommand HiLink
 endif
 

From ef37a147ce7ae4ce2af6f5d9c8b7996748f6168e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 11 Jun 2016 18:01:54 -0700
Subject: [PATCH 0306/1043] Adds a ton of support for various parts of jsFlow

---
 syntax/javascript.vim | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 674d439a..05066190 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -134,8 +134,8 @@ syntax region  jsParenIfElse        contained matchgroup=jsParens              s
 syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression skipwhite skipempty nextgroup=jsFuncBlock,jsFlow extend fold
-syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlow skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend fold
+syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise,jsFlowClassProperty extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
@@ -146,6 +146,7 @@ syntax region  jsObject                       matchgroup=jsObjectBraces        s
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
+syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs
@@ -217,15 +218,22 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 endif   "" JSDoc end
 
-" FIXME: Will need to mask this behind an if statement, or make it a separate
-" file that gets source separately.
-syntax region  jsFlow              contained start=/:/ end=/[={),]\@=/ contains=jsFlowType skipwhite skipempty nextgroup=jsFuncBlock
-syntax keyword jsFlowType          contained boolean number string null void any mixed JSON array function object
-syntax region  jsFlowStatement               start=/type/ end=/=/ skipwhite skipempty nextgroup=jsFlowObject
-syntax region  jsFlowObject        contained start=/{/ end=/}/
+" FIXME: Will need to mask this behind an if statement, or make it a separate file that gets source separately.
+syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsStorageClass
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/     skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax keyword jsFlowDeclareKeyword contained declare
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax match   jsFlowNoise          contained /[:;,]/
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsFlow
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -347,7 +355,12 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsObjectGetSet           Type
 
   HiLink jsFlow                   PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowDeclareBlock       PreProc
+  HiLink jsFlowObject             PreProc
   HiLink jsFlowType               Type
+  HiLink jsFlowDeclareKeyword     Type
 
   delcommand HiLink
 endif

From 926b7f935a7ad7049f2a76adc79e57984ce62da2 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 11 Jun 2016 18:13:40 -0700
Subject: [PATCH 0307/1043] Adding < and > to jsFlowNoise

Also linked jsFlowNoise to Noise
---
 syntax/javascript.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 05066190..d092154b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -220,7 +220,7 @@ endif   "" JSDoc end
 
 " FIXME: Will need to mask this behind an if statement, or make it a separate file that gets source separately.
 syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsStorageClass
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
 syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
 syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
 syntax region  jsFlowTypeObject     contained start=/{/       end=/}/     skipwhite skipempty nextgroup=jsFunctionBlock extend
@@ -229,8 +229,9 @@ syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/
 syntax keyword jsFlowDeclareKeyword contained declare
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
 syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
-syntax match   jsFlowNoise          contained /[:;,]/
+syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise
+syntax keyword jsFlowStorageClass   contained const var let
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsFlow
@@ -361,6 +362,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObject             PreProc
   HiLink jsFlowType               Type
   HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowNoise              Noise
 
   delcommand HiLink
 endif

From 5f839a225adfdfeff5ff2035563599069514f50a Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 17 Jun 2016 20:55:20 -0700
Subject: [PATCH 0308/1043] Removing jsFlow from jsAll cluster

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d092154b..163f05d0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -234,7 +234,7 @@ syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject
 syntax keyword jsFlowStorageClass   contained const var let
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsFlow
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From 9d0bea5615dc92d79b2e1484ae35e871e03af5ee Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 17 Jun 2016 21:23:01 -0700
Subject: [PATCH 0309/1043] Masking Flow support behind a global var

---
 extras/flow.vim       | 31 +++++++++++++++++++++++++++++++
 syntax/javascript.vim | 26 +++-----------------------
 2 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 extras/flow.vim

diff --git a/extras/flow.vim b/extras/flow.vim
new file mode 100644
index 00000000..cc204a96
--- /dev/null
+++ b/extras/flow.vim
@@ -0,0 +1,31 @@
+syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/     skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax keyword jsFlowDeclareKeyword contained declare
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax match   jsFlowNoise          contained /[:;,<>]/
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise
+syntax keyword jsFlowStorageClass   contained const var let
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsFlow                   PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowDeclareBlock       PreProc
+  HiLink jsFlowObject             PreProc
+  HiLink jsFlowType               Type
+  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowNoise              Noise
+  delcommand HiLink
+endif
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 163f05d0..b14f0e56 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -218,20 +218,9 @@ if !exists("javascript_ignore_javaScriptdoc")
   syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 endif   "" JSDoc end
 
-" FIXME: Will need to mask this behind an if statement, or make it a separate file that gets source separately.
-syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/     skipwhite skipempty nextgroup=jsFunctionBlock extend
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
-syntax keyword jsFlowDeclareKeyword contained declare
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
-syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise
-syntax keyword jsFlowStorageClass   contained const var let
+if exists("javascript_plugin_flow")
+  syntax include extras/flow.vim
+endif
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
@@ -355,15 +344,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsClassMethodDefinitions Type
   HiLink jsObjectGetSet           Type
 
-  HiLink jsFlow                   PreProc
-  HiLink jsFlowReturn             PreProc
-  HiLink jsFlowArray              PreProc
-  HiLink jsFlowDeclareBlock       PreProc
-  HiLink jsFlowObject             PreProc
-  HiLink jsFlowType               Type
-  HiLink jsFlowDeclareKeyword     Type
-  HiLink jsFlowNoise              Noise
-
   delcommand HiLink
 endif
 

From 752cee263ef2ccd6641bdb6c7e0f5b9138663c90 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 17 Jun 2016 21:27:48 -0700
Subject: [PATCH 0310/1043] Moving jsdoc support into a separate file.

---
 extras/jsdocs.vim     | 39 +++++++++++++++++++++++++++++++++++++++
 syntax/javascript.vim | 33 ++-------------------------------
 2 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 extras/jsdocs.vim

diff --git a/extras/jsdocs.vim b/extras/jsdocs.vim
new file mode 100644
index 00000000..fff64f89
--- /dev/null
+++ b/extras/jsdocs.vim
@@ -0,0 +1,39 @@
+"" syntax coloring for javadoc comments (HTML)
+syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+" tags containing a param
+syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
+" tags containing type and param
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
+" tags containing type but no param
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+" tags containing references
+syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
+" other tags (no extra syntax)
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  delcommand HiLink
+endif
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b14f0e56..218e7e91 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -192,31 +192,9 @@ syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,js
 syntax region  jsEnvComment     start="\%^#!" end="$" display
 syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
 
-"" JSDoc / JSDoc Toolkit
 if !exists("javascript_ignore_javaScriptdoc")
-  "" syntax coloring for javadoc comments (HTML)
-  syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
-
-  " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
-  " tags containing type and param
-  syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
-  " tags containing type but no param
-  syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
-  " tags containing references
-  syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
-  " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
-
-  syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
-  syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
-  syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
-  syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
-  syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
-  syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
-  syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
-endif   "" JSDoc end
+  syntax include extras/jsdocs.vim
+endif
 
 if exists("javascript_plugin_flow")
   syntax include extras/flow.vim
@@ -239,13 +217,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsEnvComment           PreProc
   HiLink jsCommentTodo          Todo
   HiLink jsCvsTag               Function
-  HiLink jsDocTags              Special
-  HiLink jsDocSeeTag            Function
-  HiLink jsDocType              Type
-  HiLink jsDocTypeBrackets      jsDocType
-  HiLink jsDocTypeRecord        jsDocType
-  HiLink jsDocTypeNoParam       Type
-  HiLink jsDocParam             Label
   HiLink jsString               String
   HiLink jsObjectKeyString      String
   HiLink jsTemplateString       String

From b6eccf90bb6ae0df22291091f7fcdddb20bd0dff Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 17 Jun 2016 21:31:12 -0700
Subject: [PATCH 0311/1043] Adding NGDoc support

Fixes #288
---
 extras/ngdocs.vim     | 3 +++
 syntax/javascript.vim | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 extras/ngdocs.vim

diff --git a/extras/ngdocs.vim b/extras/ngdocs.vim
new file mode 100644
index 00000000..c513d875
--- /dev/null
+++ b/extras/ngdocs.vim
@@ -0,0 +1,3 @@
+syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
+syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 218e7e91..310f375c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -200,6 +200,10 @@ if exists("javascript_plugin_flow")
   syntax include extras/flow.vim
 endif
 
+if exists("javascript_plugin_ngdocs")
+  syntax include extras/ngdocs.vim
+endif
+
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 

From be5207068c2d0166c0abc3c9ac4656679481c2ab Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 17 Jun 2016 22:25:27 -0700
Subject: [PATCH 0312/1043] Using runtime over syntax include

syntax include has a sort of sugar to it that forces all sourced
highlighting to be contained, this will break certain more general
highlighting for jsFlow.

runtime on the other hand, works exactly as you'd expect.
---
 syntax/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 310f375c..43a4061c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -193,15 +193,15 @@ syntax region  jsEnvComment     start="\%^#!" end="$" display
 syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
 
 if !exists("javascript_ignore_javaScriptdoc")
-  syntax include extras/jsdocs.vim
+  runtime extras/jsdocs.vim
 endif
 
 if exists("javascript_plugin_flow")
-  syntax include extras/flow.vim
+  runtime extras/flow.vim
 endif
 
 if exists("javascript_plugin_ngdocs")
-  syntax include extras/ngdocs.vim
+  runtime extras/ngdocs.vim
 endif
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper

From af791ed194a2967410c1308e46292d3a0d608e28 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 19 Jun 2016 12:05:30 -0700
Subject: [PATCH 0313/1043] Adding object key flow support

---
 extras/flow.vim       | 2 ++
 syntax/javascript.vim | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index cc204a96..7d981a80 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -11,6 +11,7 @@ syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise
 syntax keyword jsFlowStorageClass   contained const var let
+syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -24,6 +25,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowArray              PreProc
   HiLink jsFlowDeclareBlock       PreProc
   HiLink jsFlowObject             PreProc
+  HiLink jsFlowParenRegion        PreProc
   HiLink jsFlowType               Type
   HiLink jsFlowDeclareKeyword     Type
   HiLink jsFlowNoise              Noise
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 43a4061c..a92ccde1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -73,7 +73,7 @@ else
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
-syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
+syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue,jsFlowParenRegion
 syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend

From 37bfc8ccf096642c14e1ee8b5d7a349b3b5eeea6 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 19 Jun 2016 22:48:56 -0700
Subject: [PATCH 0314/1043] Plugin usage tweaks

* JSDocs are now hidden behind a variable for consistency with other
  plugins
* NGDoc plugin can now only be enabled if JSDoc is enabled.
* Added README documentation for the new global booleans
---
 README.md             | 25 +++++++++++++++++++------
 syntax/javascript.vim | 10 +++++-----
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 005ae786..bc1eeb2a 100644
--- a/README.md
+++ b/README.md
@@ -35,24 +35,37 @@ And install it:
 
 ## Configuration Variables
 
-The following variables control certain syntax highlighting features. You can
-add them to your `.vimrc` to enable/disable their features.
+The following variables control certain syntax highlighting plugins. You can
+add them to your `.vimrc` to enable their features.
+
+-----------------
+
+```
+let g:javascript_plugin_jsdocs = 1
+```
+
+Enables syntax highlighting for [JSDocs](http://usejsdoc.org/).
+
+Default Value: 0
+
+-----------------
 
 ```
-let g:javascript_enable_domhtmlcss = 1
+let g:javascript_plugin_ngdocs = 1
 ```
 
-Enables HTML/CSS syntax highlighting in your JavaScript file.
+Enables some additional syntax highlighting for NGDocs. Requires JSDoc plugin
+to be enabled as well.
 
 Default Value: 0
 
 -----------------
 
 ```
-let g:javascript_ignore_javaScriptdoc = 1
+let g:javascript_plugin_flow = 1
 ```
 
-Disables JSDoc syntax highlighting
+Enables syntax highlighting for [Flow](https://flowtype.org/).
 
 Default Value: 0
 
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a92ccde1..6465c977 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -192,18 +192,18 @@ syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,js
 syntax region  jsEnvComment     start="\%^#!" end="$" display
 syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
 
-if !exists("javascript_ignore_javaScriptdoc")
+if exists("javascript_plugin_jsdocs")
   runtime extras/jsdocs.vim
+  " NGDoc requires JSDoc
+  if exists("javascript_plugin_ngdocs")
+    runtime extras/ngdocs.vim
+  endif
 endif
 
 if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-if exists("javascript_plugin_ngdocs")
-  runtime extras/ngdocs.vim
-endif
-
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 

From 5cefcff315cf101e83e699c3f92967bdcd7404b2 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 19 Jun 2016 22:50:28 -0700
Subject: [PATCH 0315/1043] Unpluralizing files and variable names

---
 README.md                        | 4 ++--
 extras/{jsdocs.vim => jsdoc.vim} | 0
 extras/{ngdocs.vim => ngdoc.vim} | 0
 syntax/javascript.vim            | 8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename extras/{jsdocs.vim => jsdoc.vim} (100%)
 rename extras/{ngdocs.vim => ngdoc.vim} (100%)

diff --git a/README.md b/README.md
index bc1eeb2a..bcefe6c6 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ add them to your `.vimrc` to enable their features.
 -----------------
 
 ```
-let g:javascript_plugin_jsdocs = 1
+let g:javascript_plugin_jsdoc = 1
 ```
 
 Enables syntax highlighting for [JSDocs](http://usejsdoc.org/).
@@ -51,7 +51,7 @@ Default Value: 0
 -----------------
 
 ```
-let g:javascript_plugin_ngdocs = 1
+let g:javascript_plugin_ngdoc = 1
 ```
 
 Enables some additional syntax highlighting for NGDocs. Requires JSDoc plugin
diff --git a/extras/jsdocs.vim b/extras/jsdoc.vim
similarity index 100%
rename from extras/jsdocs.vim
rename to extras/jsdoc.vim
diff --git a/extras/ngdocs.vim b/extras/ngdoc.vim
similarity index 100%
rename from extras/ngdocs.vim
rename to extras/ngdoc.vim
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6465c977..7b874df6 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -192,11 +192,11 @@ syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,js
 syntax region  jsEnvComment     start="\%^#!" end="$" display
 syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
 
-if exists("javascript_plugin_jsdocs")
-  runtime extras/jsdocs.vim
+if exists("javascript_plugin_jsdoc")
+  runtime extras/jsdoc.vim
   " NGDoc requires JSDoc
-  if exists("javascript_plugin_ngdocs")
-    runtime extras/ngdocs.vim
+  if exists("javascript_plugin_ngdoc")
+    runtime extras/ngdoc.vim
   endif
 endif
 

From 4eab47d676608b4df0cf071dd59ec755b39f118c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 19 Jun 2016 11:56:09 -0700
Subject: [PATCH 0316/1043] First pass at improved export support

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7b874df6..54c72096 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -37,14 +37,14 @@ syntax keyword jsBooleanFalse   false
 
 " Modules
 syntax keyword jsModuleKeywords  contained import
-syntax keyword jsModuleKeywords  contained export skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsModuleKeywords  contained export skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
 syntax keyword jsModuleOperators contained from
 syntax keyword jsModuleOperators contained as
 syntax region  jsModuleGroup     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
 syntax match   jsModuleAsterisk  contained /*/
-syntax keyword jsModuleDefault   contained default skipwhite skipempty nextgroup=@jsExpression
-syntax region jsImportContainer  start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
-syntax match  jsExportContainer  /\<export\> / contains=jsModuleKeywords skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
+syntax keyword jsModuleDefault   contained default skipwhite kipempty nextgroup=@jsExpression
+syntax region  jsImportContainer start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
+syntax region  jsExportContainer start=/\<export\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsStorageClass,jsModuleDefault,@jsExpression
 syntax region jsExportBlock      contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
 
 " Strings, Templates, Numbers

From fb1c662ccb6b4665828471a336749605416c57c4 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 20 Jun 2016 10:56:28 -0700
Subject: [PATCH 0317/1043] Support destructuring values following assignment

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 54c72096..ed94846c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -180,9 +180,9 @@ syntax match   jsDestructuringPropertyValue     contained /\<[0-9a-zA-Z_$]*\>/
 syntax match   jsDestructuringProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
 syntax match   jsDestructuringAssignment        contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValueAssignment
 syntax region  jsDestructuringValue             contained start=/=/ end=/[,}\]]\@=/ contains=@jsExpression extend
-syntax region  jsDestructuringValueAssignment   contained start=/:/ end=/[,}]\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise extend
+syntax region  jsDestructuringValueAssignment   contained start=/:/ end=/[,}=]\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise skipwhite skipempty nextgroup=jsDestructuringValue extend
 syntax match   jsDestructuringNoise             contained /[,\[\]]/
-syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpresslon skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringNoise extend fold
+syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringNoise extend fold
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD

From 8a972d317965d2f1364d155c5b53b67dfccea099 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 20 Jun 2016 10:56:38 -0700
Subject: [PATCH 0318/1043] Whitespace

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ed94846c..d8fb2067 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -45,7 +45,7 @@ syntax match   jsModuleAsterisk  contained /*/
 syntax keyword jsModuleDefault   contained default skipwhite kipempty nextgroup=@jsExpression
 syntax region  jsImportContainer start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
 syntax region  jsExportContainer start=/\<export\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsStorageClass,jsModuleDefault,@jsExpression
-syntax region jsExportBlock      contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
+syntax region  jsExportBlock     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
 
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend

From 5b4233850328eba5f866726e0b0893a6d36cef11 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 20 Jun 2016 13:52:00 -0700
Subject: [PATCH 0319/1043] Fixes for Flow on Classes

---
 extras/flow.vim       | 3 +++
 syntax/javascript.vim | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 7d981a80..6ae9b901 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -12,6 +12,7 @@ syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise
 syntax keyword jsFlowStorageClass   contained const var let
 syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -26,6 +27,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowDeclareBlock       PreProc
   HiLink jsFlowObject             PreProc
   HiLink jsFlowParenRegion        PreProc
+  HiLink jsFlowClass              PreProc
+  HiLink jsFlowClassProperty      jsClassProperty
   HiLink jsFlowType               Type
   HiLink jsFlowDeclareKeyword     Type
   HiLink jsFlowNoise              Noise
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d8fb2067..8486cce0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -165,7 +165,7 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
-syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock
+syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue

From 3306f636541ad561d7166be566efe1f917bcba23 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 21 Jun 2016 11:13:36 -0700
Subject: [PATCH 0320/1043] jsComment updates

Removed some seemingly needless regexes, updated to match consistency
---
 syntax/javascript.vim | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 8486cce0..72fc0221 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -186,11 +186,9 @@ syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
-syntax region  jsComment        start=+\/\/+ end=+$+ contains=jsCommentTodo,@Spell extend keepend
-syntax region  jsComment        start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ contains=jsCommentTodo,@Spell fold extend keepend
-syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold extend keepend
-syntax region  jsEnvComment     start="\%^#!" end="$" display
-syntax region  jsCvsTag         contained start="\$\cid:" end="\$" oneline
+syntax region  jsComment        start=/\/\// end=/$/ contains=jsCommentTodo,@Spell extend keepend
+syntax region  jsComment        start=/\/\*/  end=/\*\// contains=jsCommentTodo,@Spell fold extend keepend
+syntax region  jsEnvComment     start=/\%^#!/ end=/$/ display
 
 if exists("javascript_plugin_jsdoc")
   runtime extras/jsdoc.vim
@@ -220,7 +218,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsComment              Comment
   HiLink jsEnvComment           PreProc
   HiLink jsCommentTodo          Todo
-  HiLink jsCvsTag               Function
   HiLink jsString               String
   HiLink jsObjectKeyString      String
   HiLink jsTemplateString       String

From 1586f7230bdb6bb690f251ba59ce5825a51068f8 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 22 Jun 2016 10:45:27 -0700
Subject: [PATCH 0321/1043] Added async to jsClassMethodDefinitions

It's an ES7 feature, fixes #506
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 72fc0221..4ccaecd9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -164,7 +164,7 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
+syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"

From e8a6f93e5abde9a8f4d5d9ee0e954e21b40fc3b3 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 22 Jun 2016 10:58:05 -0700
Subject: [PATCH 0322/1043] Adding support for switch blocks

Fixes #505
---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4ccaecd9..9d883276 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -105,6 +105,7 @@ syntax keyword jsFinally      contained finally      skipwhite skipempty nextgro
 syntax keyword jsCatch        contained catch        skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
+syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsBlock
 
 " Keywords
 syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
@@ -139,7 +140,7 @@ syntax region  jsClassBlock         contained matchgroup=jsClassBraces         s
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
-syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel,jsSwitchColon extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
 syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression extend fold
@@ -296,6 +297,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsSpreadOperator       Operator
   HiLink jsRestOperator         Operator
   HiLink jsRestExpression       jsFuncArgs
+  HiLink jsSwitchColon          Noise
 
   HiLink jsDestructuringBraces     Noise
   HiLink jsDestructuringProperty   jsFuncArgs

From d6a96994283d87a06b690fbe99f73b069893b508 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 22 Jun 2016 11:27:00 -0700
Subject: [PATCH 0323/1043] Added async to jsObjectMethodTypes

---
 syntax/javascript.vim | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 9d883276..78505ee4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -81,7 +81,7 @@ syntax match   jsObjectSeparator   contained /,/
 syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
-syntax match   jsObjectGetSet      contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
+syntax match   jsObjectMethodType  contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
 syntax region  jsObjectStringKey   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 syntax region  jsObjectStringKey   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
@@ -136,14 +136,14 @@ syntax region  jsParenRepeat        contained matchgroup=jsParens              s
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlow skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend fold
-syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodDefinitions,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise,jsFlowClassProperty extend fold
+syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise,jsFlowClassProperty extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
 syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel,jsSwitchColon extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
-syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectGetSet,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression extend fold
+syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression extend fold
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
@@ -165,7 +165,7 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodDefinitions contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
+syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
@@ -298,6 +298,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRestOperator         Operator
   HiLink jsRestExpression       jsFuncArgs
   HiLink jsSwitchColon          Noise
+  HiLink jsClassMethodType      Type
+  HiLink jsObjectMethodType     Type
 
   HiLink jsDestructuringBraces     Noise
   HiLink jsDestructuringProperty   jsFuncArgs
@@ -315,9 +317,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 
   HiLink jsCssStyles            Label
 
-  HiLink jsClassMethodDefinitions Type
-  HiLink jsObjectGetSet           Type
-
   delcommand HiLink
 endif
 

From 29e1e0561eeb33f8be89de739f58ca9c19398a0a Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 23 Jun 2016 14:38:31 -0700
Subject: [PATCH 0324/1043] minor indentation cleaning (#508)

also a fix for case labels containing [\:]
---
 indent/javascript.vim | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f4676358..1f3ab039 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -43,7 +43,7 @@ endif
 
 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\s\+[^\:]*\|default\)\s*:\s*\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'
 
@@ -337,7 +337,7 @@ function GetJavascriptIndent()
   endif
 
   " single opening bracket will assume you want a c style of indenting
-  if s:Match(v:lnum, s:line_pre . '{' . s:line_term) && !s:Match(lnum,s:block_regex) &&
+  if line =~ s:line_pre . '{' . s:line_term && !s:Match(lnum,s:block_regex) &&
         \ !s:Match(lnum,s:comma_last)
     return cindent(v:lnum)
   endif
@@ -353,7 +353,7 @@ function GetJavascriptIndent()
 
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.
-  let col = s:Match(v:lnum,  s:line_pre . '[]})]')
+  let col = line =~ s:line_pre . '[]})]'
   if col > 0
     let parlnum = v:lnum
     while col
@@ -395,12 +395,12 @@ function GetJavascriptIndent()
     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
+  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[0] == '2' && !s:Match(lnum, s:operator_first)
+    if counts =~ '2' && !s:Match(lnum, s:operator_first)
       call cursor(lnum, 1)
       " Search for the opening tag
-      let mnum = s:lookForParens('(', ')', 'nbW', 0)
+      let mnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
       if mnum > 0 && s:Match(mnum, s:operator_first)
         return indent(mnum) - s:sw()
       end
@@ -434,16 +434,6 @@ function GetJavascriptIndent()
     return 0
   endif
 
-  " foo('foo',
-  "   bar('bar', function() {
-  "     hi();
-  "   })
-  " );
-
-  " function (a, b, c, d,
-  "     e, f, g) {
-  "       console.log('inner');
-  " }
   " 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' ?
@@ -463,7 +453,8 @@ function GetJavascriptIndent()
         call cursor(lnum, matchend(s:RemoveTrailingComments(strpart(line,0,col('.'))), '.*\zs[])}]'))
       endwhile
       let cur = line('.')
-      if cur < lnum && !s:InMultiVarStatement(cur,0,0)
+      if cur < lnum && !s:InMultiVarStatement(cur,0,0) &&
+            \ !s:Onescope(s:PrevNonBlankNonString(cur - 1))
         return indent(s:GetMSL(cur, 0))
       end
     elseif counts =~ '1' || s:Onescope(lnum)

From 560b4fde6bf9e24585643f9635ededae2907ccf2 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 25 Jun 2016 09:25:25 -0700
Subject: [PATCH 0325/1043] Improvements for one line scope (#509)

* Improvements for one line scope
* possibly not a good idea

everything seems to work well though
---
 indent/javascript.vim | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1f3ab039..b35a05be 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -77,7 +77,7 @@ function s:Onescope(lnum)
   end
   let mypos = col('.')
   call cursor(a:lnum, 1)
-  if search('\<\%(while\|for\|if\)\>\s*(\C', 'ce', a:lnum) > 0 &&
+  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)
@@ -337,7 +337,7 @@ function GetJavascriptIndent()
   endif
 
   " single opening bracket will assume you want a c style of indenting
-  if line =~ s:line_pre . '{' . s:line_term && !s:Match(lnum,s:block_regex) &&
+  if line =~ s:line_pre . '{' && !s:Match(lnum,s:block_regex) &&
         \ !s:Match(lnum,s:comma_last)
     return cindent(v:lnum)
   endif
@@ -395,13 +395,15 @@ function GetJavascriptIndent()
     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
+  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)
+      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)
@@ -453,8 +455,7 @@ function GetJavascriptIndent()
         call cursor(lnum, matchend(s:RemoveTrailingComments(strpart(line,0,col('.'))), '.*\zs[])}]'))
       endwhile
       let cur = line('.')
-      if cur < lnum && !s:InMultiVarStatement(cur,0,0) &&
-            \ !s:Onescope(s:PrevNonBlankNonString(cur - 1))
+      if cur < lnum && !s:InMultiVarStatement(cur,0,0)
         return indent(s:GetMSL(cur, 0))
       end
     elseif counts =~ '1' || s:Onescope(lnum)

From ebda7fee040dcac1a09a006e7aeb6f35c85d58eb Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 25 Jun 2016 17:04:32 -0700
Subject: [PATCH 0326/1043] Adding jsComment to import/export blocks

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 78505ee4..256fe746 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -40,12 +40,12 @@ syntax keyword jsModuleKeywords  contained import
 syntax keyword jsModuleKeywords  contained export skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
 syntax keyword jsModuleOperators contained from
 syntax keyword jsModuleOperators contained as
-syntax region  jsModuleGroup     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
+syntax region  jsModuleGroup     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
 syntax match   jsModuleAsterisk  contained /*/
 syntax keyword jsModuleDefault   contained default skipwhite kipempty nextgroup=@jsExpression
 syntax region  jsImportContainer start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
 syntax region  jsExportContainer start=/\<export\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsStorageClass,jsModuleDefault,@jsExpression
-syntax region  jsExportBlock     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise
+syntax region  jsExportBlock     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
 
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend

From bf53654d6b77e1dddcb585d1c69523a605c18500 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 22 Jun 2016 15:31:27 -0700
Subject: [PATCH 0327/1043] A fix for jsFlowReturn

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 6ae9b901..9f568491 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,7 +1,7 @@
 syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
 syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
 syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
 syntax region  jsFlowTypeObject     contained start=/{/       end=/}/     skipwhite skipempty nextgroup=jsFunctionBlock extend
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster

From fdc96c469d35224764cb73d3098ea8dfbf3ba4d8 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 23 Jun 2016 17:07:49 -0700
Subject: [PATCH 0328/1043] More misc fixes for various flow things

---
 extras/flow.vim | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 9f568491..3b4036da 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -2,14 +2,17 @@ syntax region  jsFlowTypeStatement            start=/type/    end=/=/     onelin
 syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
 syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
 syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/     skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
 syntax keyword jsFlowDeclareKeyword contained declare
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
 syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
 syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
 syntax keyword jsFlowStorageClass   contained const var let
 syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
@@ -28,6 +31,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObject             PreProc
   HiLink jsFlowParenRegion        PreProc
   HiLink jsFlowClass              PreProc
+  HiLink jsFlowTypeObject         PreProc
+  HiLink jsFlowTypeKey            PreProc
+  HiLink jsFlowTypeValue          PreProc
   HiLink jsFlowClassProperty      jsClassProperty
   HiLink jsFlowType               Type
   HiLink jsFlowDeclareKeyword     Type

From bfbc10d2fe9ffd39d9e38251aaa4a0404b1acedd Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 27 Jun 2016 15:26:35 -0700
Subject: [PATCH 0329/1043] Fixed jsFlowTypeObjects not being closed

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

diff --git a/extras/flow.vim b/extras/flow.vim
index 3b4036da..8aa19e96 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -2,9 +2,9 @@ syntax region  jsFlowTypeStatement            start=/type/    end=/=/     onelin
 syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
 syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
 syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax region  jsFlowTypeObject     contained matchgroup=jsFlowNoise start=/{/       end=/}/ contains=jsFlowTypeKey,jsFlowNoise skipwhite skipempty nextgroup=jsFunctionBlock extend
 syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]\@=/ contains=@jsFlowCluster
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
 syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster

From 4670d4fcabb3caf96e2115705d59d77dff8bb932 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 28 Jun 2016 11:41:52 -0700
Subject: [PATCH 0330/1043] Fix for jsFlowTypeValue

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 8aa19e96..1548b9c2 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -4,7 +4,7 @@ syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n
 syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
 syntax region  jsFlowTypeObject     contained matchgroup=jsFlowNoise start=/{/       end=/}/ contains=jsFlowTypeKey,jsFlowNoise skipwhite skipempty nextgroup=jsFunctionBlock extend
 syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]\@=/ contains=@jsFlowCluster
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,};]\@=/ contains=@jsFlowCluster
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
 syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster

From 583a4948d28f22e6d078ef13db2d65005f081e65 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 28 Jun 2016 11:42:10 -0700
Subject: [PATCH 0331/1043] Including jsFlow in other contexts

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 1548b9c2..a5bf8b56 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,6 +1,6 @@
 syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
 syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster containedin=jsBlock,jsClassBlock,jsFuncBlock,jsBlock,jsTryCatchBlock,jsSwitchBlock,jsParen oneline skipwhite skipempty nextgroup=jsFuncBlock
 syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
 syntax region  jsFlowTypeObject     contained matchgroup=jsFlowNoise start=/{/       end=/}/ contains=jsFlowTypeKey,jsFlowNoise skipwhite skipempty nextgroup=jsFunctionBlock extend
 syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue

From 5a699857eddb988d27cb1a74acdcc873a8b9c384 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 28 Jun 2016 11:47:28 -0700
Subject: [PATCH 0332/1043] Adding bool to jsFlowType

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index a5bf8b56..759d7548 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -9,7 +9,7 @@ syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
 syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
 syntax keyword jsFlowDeclareKeyword contained declare
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array bool
 syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow

From 4133fcad01ad6593d17fa77c5bd9b86d9e336887 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 29 Jun 2016 20:32:34 -0700
Subject: [PATCH 0333/1043] Linking jsClassDefinition to jsFuncName

They really should be linked, because jsClassDefinition is really just a
function
---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 256fe746..b8a3b422 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -300,6 +300,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsSwitchColon          Noise
   HiLink jsClassMethodType      Type
   HiLink jsObjectMethodType     Type
+  HiLink jsClassDefinition      jsFuncName
 
   HiLink jsDestructuringBraces     Noise
   HiLink jsDestructuringProperty   jsFuncArgs

From ac92e1b2856ac887ff358bb64c1f9ce7caa56896 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 7 Jul 2016 21:38:09 -0700
Subject: [PATCH 0334/1043] Adding do expression support

---
 syntax/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b8a3b422..0349f5e4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -98,7 +98,7 @@ syntax keyword jsStatement    contained break continue with yield debugger
 syntax keyword jsConditional            if else      skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
 syntax keyword jsConditional            switch       skipwhite skipempty nextgroup=jsParenSwitch
 syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat
-syntax keyword jsRepeat                 do           skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsDo                     do           skipwhite skipempty nextgroup=jsBlock
 syntax keyword jsLabel        contained case default
 syntax keyword jsTry                    try          skipwhite skipempty nextgroup=jsTryCatchBlock
 syntax keyword jsFinally      contained finally      skipwhite skipempty nextgroup=jsBlock
@@ -203,7 +203,7 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
 syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 
 " Define the default highlighting.
@@ -241,6 +241,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsLabel                Label
   HiLink jsReturn               Statement
   HiLink jsRepeat               Repeat
+  HiLink jsDo                   Repeat
   HiLink jsStatement            Statement
   HiLink jsException            Exception
   HiLink jsTry                  Exception

From 3b8017ef647e181567f25964dff0cdf6a6427d01 Mon Sep 17 00:00:00 2001
From: Justin Ridgewell <jridgewell@users.noreply.github.com>
Date: Sun, 10 Jul 2016 21:28:55 -0400
Subject: [PATCH 0335/1043] Remove jsOperator from jsClassBlock

It screws up highlighting of the operators when they are used as method names:

![`delete` keyword as class method](https://dl.dropboxusercontent.com/content_link/hJYRBOhHwrBDjhoAesh3LuRS2eFPlaTSLSHLsKTq8CnfKur0FwNQ3GGo7cobYdLq/file).

This doesn't happen if you're inside a normal object:

![`delete` keyword as obj method](https://dl.dropboxusercontent.com/content_link/hJYRBOhHwrBDjhoAesh3LuRS2eFPlaTSLSHLsKTq8CnfKur0FwNQ3GGo7cobYdLq/file)
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0349f5e4..eb64354b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -136,7 +136,7 @@ syntax region  jsParenRepeat        contained matchgroup=jsParens              s
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlow skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend fold
-syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsOperator,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise,jsFlowClassProperty extend fold
+syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise,jsFlowClassProperty extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold

From ac813c03a4085fe1ce3b9296a08681c888a274f3 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 10 Jul 2016 22:02:54 -0700
Subject: [PATCH 0336/1043] Adding support for oddly placed comments

* Functions
* Classes
* Conditionals
* Repeat statements
---
 syntax/javascript.vim | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index eb64354b..dc85953d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -95,7 +95,8 @@ exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal
 
 " Statement Keywords
 syntax keyword jsStatement    contained break continue with yield debugger
-syntax keyword jsConditional            if else      skipwhite skipempty nextgroup=jsParenIfElse,jsBlock
+syntax keyword jsConditional            if           skipwhite skipempty nextgroup=jsParenIfElse
+syntax keyword jsConditional            else         skipwhite skipempty nextgroup=jsCommentMisc,jsBlock
 syntax keyword jsConditional            switch       skipwhite skipempty nextgroup=jsParenSwitch
 syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat
 syntax keyword jsDo                     do           skipwhite skipempty nextgroup=jsBlock
@@ -131,11 +132,11 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 "" Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsBlock extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
+syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlow skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlow skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise,jsFlowClassProperty extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
@@ -166,7 +167,7 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
-syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass
+syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClass
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
@@ -191,6 +192,16 @@ syntax region  jsComment        start=/\/\// end=/$/ contains=jsCommentTodo,@Spe
 syntax region  jsComment        start=/\/\*/  end=/\*\// contains=jsCommentTodo,@Spell fold extend keepend
 syntax region  jsEnvComment     start=/\%^#!/ end=/$/ display
 
+" Specialized Comments - These are special comment regexes that are used in
+" odd places that maintain the proper nextgroup functionality. It sucks we
+" can't make jsComment a skippable type of group for nextgroup
+syntax region  jsCommentFunction    contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend keepend
+syntax region  jsCommentFunction    contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn fold extend keepend
+syntax region  jsCommentClass       contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass extend keepend
+syntax region  jsCommentClass       contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass fold extend keepend
+syntax region  jsCommentMisc        contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock extend keepend
+syntax region  jsCommentMisc        contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock fold extend keepend
+
 if exists("javascript_plugin_jsdoc")
   runtime extras/jsdoc.vim
   " NGDoc requires JSDoc
@@ -308,6 +319,10 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDestructuringAssignment jsObjectKey
   HiLink jsDestructuringNoise      Noise
 
+  HiLink jsCommentFunction      jsComment
+  HiLink jsCommentClass         jsComment
+  HiLink jsCommentMisc          jsComment
+
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant
   HiLink jsDomElemAttrs         Label

From 7982ec46fb6c16f68d6c11657950336689836ba0 Mon Sep 17 00:00:00 2001
From: Rom Grk <romgrk@users.noreply.github.com>
Date: Tue, 12 Jul 2016 20:00:22 -0400
Subject: [PATCH 0337/1043] typo

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index dc85953d..49fa5b86 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -42,7 +42,7 @@ syntax keyword jsModuleOperators contained from
 syntax keyword jsModuleOperators contained as
 syntax region  jsModuleGroup     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
 syntax match   jsModuleAsterisk  contained /*/
-syntax keyword jsModuleDefault   contained default skipwhite kipempty nextgroup=@jsExpression
+syntax keyword jsModuleDefault   contained default skipwhite skipempty nextgroup=@jsExpression
 syntax region  jsImportContainer start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
 syntax region  jsExportContainer start=/\<export\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsStorageClass,jsModuleDefault,@jsExpression
 syntax region  jsExportBlock     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment

From ed40c9cb625b8b679fbec4c5b55fde60ec27f58e Mon Sep 17 00:00:00 2001
From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Fri, 15 Jul 2016 00:41:49 +0300
Subject: [PATCH 0338/1043] Tweak highlighting of numeric literals

- Add highlighting for binary and octal number syntax
- Highlight unary minus as operator regardless of 'iskeyword' option
- Remove L from integer literals
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 49fa5b86..5ab10be7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -52,9 +52,9 @@ syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  cont
 syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend
 syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial extend
 syntax match   jsTaggedTemplate   /\k\+\%(`\)\@=/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
+syntax match   jsNumber           /\<\d\+\%([eE][+-]\=\d\+\)\=\>\|\<0[bB][01]\+\>\|\<0[oO]\o\+\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
-syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+syntax match   jsFloat            /\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 
 " Regular Expressions
 syntax match   jsSpecial          contained "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"

From 550e1e8e8375f529b039a1a81a66d8ad43421cac Mon Sep 17 00:00:00 2001
From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Fri, 15 Jul 2016 01:12:07 +0300
Subject: [PATCH 0339/1043] Make use of syntax specific iskeyword setting

It's better not to touch 'iskeyword' option from a syntax file
if possible.
---
 syntax/javascript.vim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 49fa5b86..73b00c9e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -16,8 +16,12 @@ if !exists('g:javascript_conceal')
   let g:javascript_conceal = 0
 endif
 
-" Dollar sign is permittd anywhere in an identifier
-setlocal iskeyword+=$
+" Dollar sign is permitted anywhere in an identifier
+if v:version > 704 || v:version == 704 && has('patch1142')
+  syntax iskeyword @,48-57,_,192-255,$
+else
+  setlocal iskeyword+=$
+endif
 
 syntax sync fromstart
 " TODO: Figure out what type of casing I need

From 8cf97bdc74ef1c774aaa5a67e2626dcc6d40b66a Mon Sep 17 00:00:00 2001
From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Fri, 15 Jul 2016 02:13:53 +0300
Subject: [PATCH 0340/1043] Update filetype plugin

- Add header
- Replace 're' with 'regexpengine'
- Simplify patch check
---
 ftplugin/javascript.vim | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim
index 58755a4a..e11ea2e0 100644
--- a/ftplugin/javascript.vim
+++ b/ftplugin/javascript.vim
@@ -1,4 +1,10 @@
+" Vim filetype plugin file
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
+
 setlocal suffixesadd+=.js
-if (v:version < 704 || (v:version == 704 && !has('patch002'))) && exists('&regexpengine')
-  set re=1
-end
+
+if v:version == 703 && exists('&regexpengine') || v:version == 704 && !has('patch2')
+  set regexpengine=1
+endif

From 653858c18057c4f2e25494a0286933a1fe3bec77 Mon Sep 17 00:00:00 2001
From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Fri, 15 Jul 2016 08:06:11 +0400
Subject: [PATCH 0341/1043] Make use of b:undo_indent variable (#542)

It's better when effect of indent script can be undone.
---
 indent/javascript.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b35a05be..8a544459 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -19,6 +19,8 @@ setlocal formatexpr=Fixedgq(v:lnum,v:count)
 setlocal indentkeys=0{,0},0),0],0\,*<Return>,:,!^F,o,O,e
 setlocal cinoptions+=j1,J1,c1
 
+let b:undo_indent = 'setlocal smartindent< indentexpr< formatexpr< indentkeys< cinoptions<'
+
 " Only define the function once.
 if exists("*GetJavascriptIndent")
   finish

From 32e7c78716ec72f60c7962af22a8eadc287b579c Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 15 Jul 2016 00:48:31 -0700
Subject: [PATCH 0342/1043] indentation refactoring (#515)

simplistic, accurate, possibly slow refactor
switch case, code reduction & removing needless if's
make search pair result local to buffer
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for_each...in
do while fix
case sensitivity
---
 indent/javascript.vim | 422 +++++++-----------------------------------
 1 file changed, 66 insertions(+), 356 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8a544459..a6dc1a74 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,9 +2,6 @@
 " Language: 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
@@ -16,7 +13,7 @@ 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 indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1,c1
 
 let b:undo_indent = 'setlocal smartindent< indentexpr< formatexpr< indentkeys< cinoptions<'
@@ -40,66 +37,44 @@ 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."'"
 
-func s:lookForParens(start,end,flags,stop)
+func s:lookForParens(start,end,flags,time)
   try 
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,a:stop,300)
+    return searchpair(a:start,'',a:end,a:flags,
+	  \ "line('.') < " . (prevnonblank(v:lnum) - 2000) . " ? dummy :" . 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*\)*\)$'
+let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([*.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
-
-let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
+let s:continuation_regex = '\%([*,.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
 
 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
+  return getline(a:lnum) =~ '\%(\<else\|\<do\|=>\)\C' . s:line_term ||
+        \ (cursor(a:lnum, match(getline(a:lnum),')' . s:line_term)) > -1 &&
+        \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
+        \ cursor(line('.'),match(strpart(getline(line('.')),0,col('.') - 1),
+        \ '\<\%(catch\|else\|finally\|for\%(\s+each\)\=\|if\|let\|try\|while\|with\)\C' . s:line_term) + 1) > -1) && 
+        \ (expand("<cword>") =~ 'while\C' ? !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.
@@ -107,11 +82,6 @@ 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
@@ -121,15 +91,7 @@ endfunction
 function s:PrevNonBlankNonString(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:IsInStringOrComment(lnum, matchend(getline(lnum), '^\s*[^''"]'))
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -137,94 +99,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
@@ -245,82 +119,14 @@ function s:LineHasOpeningBrackets(lnum)
   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
-endfunction
-
-" 3. GetJavascriptIndent Function {{{1
+" GetJavascriptIndent Function
 " =========================
-
 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]
+  end
   " Get the current line.
   let line = getline(v:lnum)
   " previous nonblank line number
@@ -328,174 +134,78 @@ function GetJavascriptIndent()
   " previous line of code
   let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
-  " to not change multiline string values 
+  " start with strings,comments,etc.{{{2
   if line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template'
     return -1
   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)
   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)
-    return cindent(v:lnum)
-  endif
-
-  " cindent each line which has a switch label
-  if (line =~ s:expr_case)
-    let s: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
-    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)
-    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
-    end
-  end
-
-  " 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()
+  if (line =~ s:expr_case)
+    let s:cpo_switch = &cpo
+    set cpo+=%
+    let ind = cindent(v:lnum)
+    let &cpo = s:cpo_switch
+    let b:js_cache = [v:lnum, search('\<switch\s*(','nbw')]
+    return ind
   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))
+  " 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] !~ '2')
+    let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
+  else
+    call cursor(v:lnum,1)
+    let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
+    if line[1] =~ '\s'
+      if syns != ''
+        let pattern = syns =~? 'funcblock' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : syns =~? 'jsbracket'? ['\[','\]'] :
+              \ ['(\|{\|\[',')\|}\|\]']
+        let num = s:lookForParens(pattern[0],pattern[1],'nbw',2000)
+      else
+        let num = 0
       end
-    elseif counts =~ '1' || s:Onescope(lnum)
-      return ind + s:sw()
+    else
+      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
     end
   end
+  let b:js_cache = [v:lnum, num]
 
-  " 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
+  " most significant part
+  if line =~ s:line_pre . '[])}]'
+    return indent(num)
   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
+  let switch_offset = 0
+  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'switch'
+    let num = search('\<switch\s*(','nbw')
+    let switch_offset = &cino !~ ':' ?  s:sw() :
+          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(num),'^\s*')))
+    let b:js_cache[1] = num
   endif
+  if (line =~ s:operator_first ||
+        \ (getline(lnum) =~ s:continuation_regex && getline(lnum) !~ s:expr_case) ||
+        \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
+        \ (num != lnum &&
+        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
+    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+  elseif num > 0
+    return indent(num) + s:sw() + switch_offset
+  end
 
-  return ind
 endfunction
 
-" }}}1
 
 let &cpo = s:cpo_save
 unlet s:cpo_save

From 352bcc283c90db635321faa7ee789fd2c24327d9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 15 Jul 2016 01:58:44 -0700
Subject: [PATCH 0343/1043] try ..catch (#546)

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch
these need block statements
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a6dc1a74..6b7a0b50 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -68,7 +68,7 @@ function s:Onescope(lnum)
         \ (cursor(a:lnum, match(getline(a:lnum),')' . s:line_term)) > -1 &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
         \ cursor(line('.'),match(strpart(getline(line('.')),0,col('.') - 1),
-        \ '\<\%(catch\|else\|finally\|for\%(\s+each\)\=\|if\|let\|try\|while\|with\)\C' . s:line_term) + 1) > -1) && 
+        \ '\<\%(else\|for\%(\s+each\)\=\|if\|let\|while\|with\)\C' . s:line_term) + 1) > -1) &&
         \ (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bw',100) : 1)
 endfunction
 

From 25ff93778999562b69a32c092ef8f1a3beffa3ce Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 15 Jul 2016 11:03:43 -0700
Subject: [PATCH 0344/1043] Adding some common NodeJS globals

---
 syntax/javascript.vim | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 73b00c9e..a2acaa65 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -114,6 +114,8 @@ syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgro
 
 " Keywords
 syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
+syntax keyword jsGlobalNodeObjects module exports global process
+syntax match   jsGlobalNodeObjects /require/ contains=jsFuncCall
 syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 " DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
@@ -278,7 +280,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsStorageClass         StorageClass
   HiLink jsClassKeywords        Structure
   HiLink jsThis                 Special
-  HiLink jsSuper                Special
+  HiLink jsSuper                Constant
   HiLink jsNan                  Number
   HiLink jsNull                 Type
   HiLink jsUndefined            Type
@@ -299,9 +301,10 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
   HiLink jsTemplateBraces       jsBraces
-  HiLink jsGlobalObjects        Special
-  HiLink jsExceptions           Special
-  HiLink jsBuiltins             Special
+  HiLink jsGlobalObjects        Constant
+  HiLink jsGlobalNodeObjects    Constant
+  HiLink jsExceptions           Constant
+  HiLink jsBuiltins             Constant
   HiLink jsModuleKeywords       Include
   HiLink jsModuleOperators      Include
   HiLink jsModuleDefault        Include

From e41dbaaccf463dca0ea059a4b65fd6b0ad8be6b9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 15 Jul 2016 12:35:43 -0700
Subject: [PATCH 0345/1043] for 194 (#548)

* for 194
---
 indent/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6b7a0b50..d2874d4d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -135,7 +135,8 @@ function GetJavascriptIndent()
   let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
   " start with strings,comments,etc.{{{2
-  if line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template'
+  if (line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template') ||
+        \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'comment')
     return -1
   endif
   if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)

From 2792e632433cff574805cc5f6998cdbc1bc0c75b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 15 Jul 2016 22:08:56 -0700
Subject: [PATCH 0346/1043] switch offset always calculated when inside switch

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d2874d4d..d6c163f5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -189,10 +189,10 @@ function GetJavascriptIndent()
     return indent(num)
   end
   let switch_offset = 0
-  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'switch'
-    let num = search('\<switch\s*(','nbw')
-    let switch_offset = &cino !~ ':' ?  s:sw() :
-          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(num),'^\s*')))
+  if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
+    let bnum = search('\<switch\s*(','nbw')
+    let switch_offset = bnum < num ? 0 : &cino !~ ':' ?  s:sw() :
+          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(bnum),'^\s*')))
     let b:js_cache[1] = num
   endif
   if (line =~ s:operator_first ||

From 61aea7bcb3cf6617837c7886397ac6f1bdf563e4 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 15 Jul 2016 22:34:06 -0700
Subject: [PATCH 0347/1043] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d6c163f5..18fe546f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -157,7 +157,7 @@ function GetJavascriptIndent()
     set cpo+=%
     let ind = cindent(v:lnum)
     let &cpo = s:cpo_switch
-    let b:js_cache = [v:lnum, search('\<switch\s*(','nbw')]
+    let b:js_cache[1] =  search('\<switch\s*(','nbw')
     return ind
   endif
   "}}}
@@ -193,6 +193,7 @@ function GetJavascriptIndent()
     let bnum = search('\<switch\s*(','nbw')
     let switch_offset = bnum < num ? 0 : &cino !~ ':' ?  s:sw() :
           \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(bnum),'^\s*')))
+    let num = max([num,bnum])
     let b:js_cache[1] = num
   endif
   if (line =~ s:operator_first ||

From aadffc04e57b3b04c8d44b82736b0bfcc0a857c0 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 15 Jul 2016 22:47:38 -0700
Subject: [PATCH 0348/1043] 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 18fe546f..0c24d937 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -157,7 +157,7 @@ function GetJavascriptIndent()
     set cpo+=%
     let ind = cindent(v:lnum)
     let &cpo = s:cpo_switch
-    let b:js_cache[1] =  search('\<switch\s*(','nbw')
+    let b:js_cache = [v:lnum, search('\<switch\s*(','nbw')]
     return ind
   endif
   "}}}

From b884680566628d85265a174f6339ca36825cb829 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 16 Jul 2016 12:05:10 -0700
Subject: [PATCH 0349/1043] possible indent revert(dev branch) (#550)

I want to include whatever improvements made in the refactor attempt though
---
 indent/javascript.vim | 424 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 356 insertions(+), 68 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d2874d4d..d2911c5b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,6 +2,9 @@
 " Language: 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
@@ -13,11 +16,9 @@ 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],:,!^F,o,O,e
+setlocal indentkeys=0{,0},0),0],0\,*<Return>,:,!^F,o,O,e
 setlocal cinoptions+=j1,J1,c1
 
-let b:undo_indent = 'setlocal smartindent< indentexpr< formatexpr< indentkeys< cinoptions<'
-
 " Only define the function once.
 if exists("*GetJavascriptIndent")
   finish
@@ -37,44 +38,66 @@ 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."'"
 
-func s:lookForParens(start,end,flags,time)
+func s:lookForParens(start,end,flags,stop)
   try 
-    return searchpair(a:start,'',a:end,a:flags,
-	  \ "line('.') < " . (prevnonblank(v:lnum) - 2000) . " ? dummy :" . s:skip_expr
-          \ ,0,a:time)
+    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,a:stop,300)
   catch /E118/
-    return searchpair(a:start,'',a:end,a:flags,0,0)
+    return searchpair(a:start,'',a:end,a:flags,0,a:stop)
   endtry
 endfunc
 
-let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
+let s:line_term = '\s*\%(\%(\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([*,.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
+let s:continuation_regex = '\%([*.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
+
+let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
 
 function s:Onescope(lnum)
-  return getline(a:lnum) =~ '\%(\<else\|\<do\|=>\)\C' . s:line_term ||
-        \ (cursor(a:lnum, match(getline(a:lnum),')' . s:line_term)) > -1 &&
-        \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
-        \ cursor(line('.'),match(strpart(getline(line('.')),0,col('.') - 1),
-        \ '\<\%(else\|for\%(\s+each\)\=\|if\|let\|while\|with\)\C' . s:line_term) + 1) > -1) &&
-        \ (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bw',100) : 1)
+  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
 endfunction
 
+" Regex that defines blocks.
+let s:block_regex = '[{([]' . s:line_term
+
 let s:operator_first = s:line_pre . '\%([,:?]\|\([-/.+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
 
-" Auxiliary Functions {{{2
+let s:var_stmt = s:line_pre . '\%(const\|let\|var\)\s\+\C'
+
+let s:comma_last = ',' . s:line_term
+
+" 2. Auxiliary Functions {{{1
 " ======================
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
@@ -82,6 +105,11 @@ 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
@@ -91,7 +119,15 @@ endfunction
 function s:PrevNonBlankNonString(lnum)
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
-    if !s:IsInStringOrComment(lnum, matchend(getline(lnum), '^\s*[^''"]'))
+    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)
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -99,6 +135,94 @@ 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
@@ -119,14 +243,82 @@ function s:LineHasOpeningBrackets(lnum)
   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
-" }}}
 
-" GetJavascriptIndent Function
+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
+endfunction
+
+" 3. GetJavascriptIndent Function {{{1
 " =========================
+
 function GetJavascriptIndent()
-  if !exists('b:js_cache')
-    let b:js_cache = [0,0]
-  end
+  " 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
   " Get the current line.
   let line = getline(v:lnum)
   " previous nonblank line number
@@ -134,79 +326,175 @@ function GetJavascriptIndent()
   " previous line of code
   let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
-  " start with strings,comments,etc.{{{2
+  " to not change multiline string values 
   if (line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template') ||
         \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'comment')
     return -1
   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)
   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)
+    return cindent(v:lnum)
+  endif
+
+  " cindent each line which has a switch label
+  if (line =~ s:expr_case)
+    let s: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
+    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)
+    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
+    end
+  end
+
+  " 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 (line =~ s:expr_case)
-    let s:cpo_switch = &cpo
-    set cpo+=%
-    let ind = cindent(v:lnum)
-    let &cpo = s:cpo_switch
-    let b:js_cache = [v:lnum, search('\<switch\s*(','nbw')]
-    return ind
+
+  " 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
-  "}}}
 
-  " 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] !~ '2')
-    let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
-  else
-    call cursor(v:lnum,1)
-    let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
-    if line[1] =~ '\s'
-      if syns != ''
-        let pattern = syns =~? 'funcblock' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : syns =~? 'jsbracket'? ['\[','\]'] :
-              \ ['(\|{\|\[',')\|}\|\]']
-        let num = s:lookForParens(pattern[0],pattern[1],'nbw',2000)
-      else
-        let num = 0
+  " 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
-    else
-      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
+    elseif counts =~ '1' || s:Onescope(lnum)
+      return ind + s:sw()
     end
   end
-  let b:js_cache = [v:lnum, num]
 
-  " most significant part
-  if line =~ s:line_pre . '[])}]'
-    return indent(num)
+  " 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
   end
-  let switch_offset = 0
-  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'switch'
-    let num = search('\<switch\s*(','nbw')
-    let switch_offset = &cino !~ ':' ?  s:sw() :
-          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(num),'^\s*')))
-    let b:js_cache[1] = num
+  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
-  if (line =~ s:operator_first ||
-        \ (getline(lnum) =~ s:continuation_regex && getline(lnum) !~ s:expr_case) ||
-        \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
-        \ (num != lnum &&
-        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
-    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
-  elseif num > 0
-    return indent(num) + s:sw() + switch_offset
-  end
 
+  return ind
 endfunction
 
+" }}}1
 
 let &cpo = s:cpo_save
 unlet s:cpo_save

From 1c9a3dc4f058642c8c167293dc4d753d9f505a60 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 16 Jul 2016 12:07:02 -0700
Subject: [PATCH 0350/1043] undo_indent

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d2911c5b..d9a194c6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -19,6 +19,8 @@ setlocal formatexpr=Fixedgq(v:lnum,v:count)
 setlocal indentkeys=0{,0},0),0],0\,*<Return>,:,!^F,o,O,e
 setlocal cinoptions+=j1,J1,c1
 
+let b:undo_indent = 'setlocal smartindent< indentexpr< formatexpr< indentkeys< cinoptions<'
+
 " Only define the function once.
 if exists("*GetJavascriptIndent")
   finish

From 2efcfa3abd12b9b21f053d3c20eadd6e0755b8c1 Mon Sep 17 00:00:00 2001
From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Sun, 17 Jul 2016 05:49:14 +0400
Subject: [PATCH 0351/1043] Remove 'smartindent' from indent plugin (#551)

When 'indentexpr' is set, setting 'smartindent' has no effect.
---
 indent/javascript.vim | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d9a194c6..d5375d9e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -11,15 +11,13 @@ if exists("b:did_indent")
 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
 
-let b:undo_indent = 'setlocal smartindent< indentexpr< formatexpr< indentkeys< cinoptions<'
+let b:undo_indent = 'setlocal indentexpr< formatexpr< indentkeys< cinoptions<'
 
 " Only define the function once.
 if exists("*GetJavascriptIndent")

From 6f82a0cec6cca718766dd88161aa62a48d35e309 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 17 Jul 2016 00:25:11 -0700
Subject: [PATCH 0352/1043] Re revert (#554)

* Revert "possible indent revert(dev branch) (#550)"

This reverts commit b884680566628d85265a174f6339ca36825cb829.

* fixed major issue

* try ..catch and timeout
---
 indent/javascript.vim | 422 +++++++-----------------------------------
 1 file changed, 66 insertions(+), 356 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d5375d9e..7bd4aef2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,9 +2,6 @@
 " Language: 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
@@ -14,7 +11,7 @@ let b:did_indent = 1
 " 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 indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1,c1
 
 let b:undo_indent = 'setlocal indentexpr< formatexpr< indentkeys< cinoptions<'
@@ -38,66 +35,44 @@ 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."'"
 
-func s:lookForParens(start,end,flags,stop)
+func s:lookForParens(start,end,flags,time)
   try 
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,a:stop,300)
+    return searchpair(a:start,'',a:end,a:flags,
+	  \ "line('.') < " . (prevnonblank(v:lnum) - 2000) . " ? dummy :" . 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*\)*\)$'
+let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([*.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
-
-let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
+let s:continuation_regex = '\%([*,.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
 
 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
+  return getline(a:lnum) =~ '\%(\<else\|\<do\|=>\)\C' . s:line_term ||
+        \ (cursor(a:lnum, match(getline(a:lnum),')' . s:line_term)) > -1 &&
+        \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
+        \ cursor(line('.'),match( ' ' . strpart(getline(line('.')),0,col('.') - 1),
+        \ '\<\%(else\|for\%(\s+each\)\=\|if\|let\|while\|with\)\C' . s:line_term)) > -1) && 
+        \ (expand("<cword>") =~ 'while\C' ? !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.
@@ -105,11 +80,6 @@ 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
@@ -119,15 +89,7 @@ endfunction
 function s:PrevNonBlankNonString(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:IsInStringOrComment(lnum, matchend(getline(lnum), '^\s*[^''"]'))
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -135,94 +97,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
@@ -243,82 +117,14 @@ function s:LineHasOpeningBrackets(lnum)
   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
-endfunction
-
-" 3. GetJavascriptIndent Function {{{1
+" GetJavascriptIndent Function
 " =========================
-
 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]
+  end
   " Get the current line.
   let line = getline(v:lnum)
   " previous nonblank line number
@@ -326,175 +132,79 @@ function GetJavascriptIndent()
   " previous line of code
   let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
-  " to not change multiline string values 
+  " start with strings,comments,etc.{{{2
   if (line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template') ||
         \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'comment')
     return -1
   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)
   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)
-    return cindent(v:lnum)
-  endif
-
-  " cindent each line which has a switch label
-  if (line =~ s:expr_case)
-    let s: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
-    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)
-    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
-    end
-  end
-
-  " 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()
+  if (line =~ s:expr_case)
+    let s:cpo_switch = &cpo
+    set cpo+=%
+    let ind = cindent(v:lnum)
+    let &cpo = s:cpo_switch
+    let b:js_cache = [v:lnum, search('\<switch\s*(','nbw')]
+    return ind
   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))
+  " 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] !~ '2')
+    let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
+  else
+    call cursor(v:lnum,1)
+    let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
+    if line[1] =~ '\s'
+      if syns != ''
+        let pattern = syns =~? 'funcblock' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : syns =~? 'jsbracket'? ['\[','\]'] :
+              \ ['(\|{\|\[',')\|}\|\]']
+        let num = s:lookForParens(pattern[0],pattern[1],'nbw',2000)
+      else
+        let num = 0
       end
-    elseif counts =~ '1' || s:Onescope(lnum)
-      return ind + s:sw()
+    else
+      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
     end
   end
+  let b:js_cache = [v:lnum, num]
 
-  " 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
+  " most significant part
+  if line =~ s:line_pre . '[])}]'
+    return indent(num)
   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
+  let switch_offset = 0
+  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'switch'
+    let num = search('\<switch\s*(','nbw')
+    let switch_offset = &cino !~ ':' ?  s:sw() :
+          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(num),'^\s*')))
+    let b:js_cache[1] = num
   endif
+  if (line =~ s:operator_first ||
+        \ (getline(lnum) =~ s:continuation_regex && getline(lnum) !~ s:expr_case) ||
+        \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
+        \ (num != lnum &&
+        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
+    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+  elseif num > 0
+    return indent(num) + s:sw() + switch_offset
+  end
 
-  return ind
 endfunction
 
-" }}}1
 
 let &cpo = s:cpo_save
 unlet s:cpo_save

From c2b7c0550be2d1c6b6d79b23cb54edf4d691bf34 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 17 Jul 2016 17:09:34 -0700
Subject: [PATCH 0353/1043] JS Flow refactor

This commit rehauls a bunch of the JS Flow features. While still not
feature complete, a lot of weird edge cases should now not destroy an
entire file, like it used too.
---
 extras/flow.vim       | 85 +++++++++++++++++++++++++++++--------------
 syntax/javascript.vim | 17 +++++----
 2 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 759d7548..fc36fdbb 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,21 +1,41 @@
-syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster containedin=jsBlock,jsClassBlock,jsFuncBlock,jsBlock,jsTryCatchBlock,jsSwitchBlock,jsParen oneline skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
-syntax region  jsFlowTypeObject     contained matchgroup=jsFlowNoise start=/{/       end=/}/ contains=jsFlowTypeKey,jsFlowNoise skipwhite skipempty nextgroup=jsFunctionBlock extend
-syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,};]\@=/ contains=@jsFlowCluster
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
-syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
-syntax keyword jsFlowDeclareKeyword contained declare
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array bool
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/    end=/)/         contains=@jsFlowCluster
 syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
-syntax keyword jsFlowStorageClass   contained const var let
-syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object array bool class
+syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
+syntax match   jsFlowTypeCustom     contained /\k*/ skipwhite skipempty nextgroup=jsFlowGroup
+syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
+syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
+syntax match   jsFlowMaybe          contained /?/
+
+syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/   end=/)/   contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
+syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock
+syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
+
+syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+
+syntax region  jsFlowTypeStatement                                   start=/type/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsExpression
+syntax match   jsFlowTypeOperator   contained /=/
+syntax keyword jsFlowTypeKeyword    contained type
+
+syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgroup=jsFlowTypeStatement,jsClassDefinition,jsStorageClass,jsFlowModule,jsFlowInterface
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowDefinition containedin=jsClassBlock
+
+syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
+syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
+syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise
+
+syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
+
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrow,jsFlowMaybe,jsFlowParens
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -24,19 +44,30 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   else
     command -nargs=+ HiLink hi def link <args>
   endif
-  HiLink jsFlow                   PreProc
-  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowDefinition         PreProc
+  HiLink jsFlowType               Type
+  HiLink jsFlowTypeCustom         PreProc
+  HiLink jsFlowTypeof             PreProc
   HiLink jsFlowArray              PreProc
-  HiLink jsFlowDeclareBlock       PreProc
   HiLink jsFlowObject             PreProc
-  HiLink jsFlowParenRegion        PreProc
-  HiLink jsFlowClass              PreProc
-  HiLink jsFlowTypeObject         PreProc
-  HiLink jsFlowTypeKey            PreProc
-  HiLink jsFlowTypeValue          PreProc
+  HiLink jsFlowParens             PreProc
+  HiLink jsFlowGroup              PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowReturnObject       jsFlowReturn
+  HiLink jsFlowReturnArray        jsFlowArray
+  HiLink jsFlowReturnParens       jsFlowParens
+  HiLink jsFlowReturnGroup        jsFlowGroup
+  HiLink jsFlowFunctionGroup      PreProc
+  HiLink jsFlowClassGroup         PreProc
+  HiLink jsFlowArrow              PreProc
+  HiLink jsFlowTypeStatement      PreProc
+  HiLink jsFlowTypeKeyword        PreProc
+  HiLink jsFlowTypeOperator       PreProc
+  HiLink jsFlowMaybe              PreProc
   HiLink jsFlowClassProperty      jsClassProperty
-  HiLink jsFlowType               Type
-  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowDeclare            PreProc
+  HiLink jsFlowModule             PreProc
+  HiLink jsFlowInterface          PreProc
   HiLink jsFlowNoise              Noise
   delcommand HiLink
 endif
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4af11275..e5d819a5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -33,7 +33,8 @@ syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
 syntax match   jsParensError    /[)}\]]/
 
 " Program Keywords
-syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray
+syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
+syntax match   jsVariableDef    contained /\k\+/ nextgroup=jsFlowDefinition
 syntax keyword jsOperator       delete instanceof typeof void new in of
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
 syntax keyword jsBooleanTrue    true
@@ -77,7 +78,7 @@ else
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
-syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue,jsFlowParenRegion
+syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
@@ -142,8 +143,8 @@ syntax region  jsParenIfElse        contained matchgroup=jsParens              s
 syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlow skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
-syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise,jsFlowClassProperty extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlowDefinition skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
+syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
@@ -157,7 +158,7 @@ syntax region  jsRestExpression     contained matchgroup=jsRestOperator        s
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
-syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup
 syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
 syntax keyword jsArguments            contained arguments
@@ -173,7 +174,7 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
-syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClass
+syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
@@ -203,8 +204,8 @@ syntax region  jsEnvComment     start=/\%^#!/ end=/$/ display
 " can't make jsComment a skippable type of group for nextgroup
 syntax region  jsCommentFunction    contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend keepend
 syntax region  jsCommentFunction    contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn fold extend keepend
-syntax region  jsCommentClass       contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass extend keepend
-syntax region  jsCommentClass       contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClass fold extend keepend
+syntax region  jsCommentClass       contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup extend keepend
+syntax region  jsCommentClass       contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup fold extend keepend
 syntax region  jsCommentMisc        contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock extend keepend
 syntax region  jsCommentMisc        contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock fold extend keepend
 

From 023f02c8dfcfca5de93289a748fbb1f8c765b609 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 17 Jul 2016 19:46:53 -0700
Subject: [PATCH 0354/1043] 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 0c24d937..434a9353 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -203,7 +203,7 @@ function GetJavascriptIndent()
         \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
-    return indent(num) + s:sw() + switch_offset
+    return indent(num) + s:sw() + (num == lnum ? 0 : switch_offset)
   end
 
 endfunction

From e6a4f2f2d9b4f16e5f1426aa8d996ac1be8e0558 Mon Sep 17 00:00:00 2001
From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Tue, 19 Jul 2016 22:12:42 +0400
Subject: [PATCH 0355/1043] Update ftplugin (#553)

* Revert setting 'regexpengine' from filetype plugin

Setting 'regexpengine' from filetype plugin without reenabling syntax
doesn't fix problems described in #88 and #93.  Seems like those
problems are reproducible only in versions 7.4 and 7.4.1.  Those few
unfortunates who encounter it today will be able to find workaround
by reading project issues.

* Move filetype plugin to after directory

- Add dollar sign to 'iskeyword'
- Make use of b:undo_ftplugin variable
---
 {ftplugin => after/ftplugin}/javascript.vim | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename {ftplugin => after/ftplugin}/javascript.vim (53%)

diff --git a/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
similarity index 53%
rename from ftplugin/javascript.vim
rename to after/ftplugin/javascript.vim
index e11ea2e0..e2d471dd 100644
--- a/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -3,8 +3,6 @@
 " Maintainer:   vim-javascript community
 " URL:          https://github.com/pangloss/vim-javascript
 
-setlocal suffixesadd+=.js
+setlocal iskeyword+=$ suffixesadd+=.js
 
-if v:version == 703 && exists('&regexpengine') || v:version == 704 && !has('patch2')
-  set regexpengine=1
-endif
+let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'

From 35ac627aa6884db976979f6b2ba8a527a3f1d0ab Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 19 Jul 2016 15:57:15 -0700
Subject: [PATCH 0356/1043] 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 434a9353..f5b11b37 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -191,7 +191,7 @@ function GetJavascriptIndent()
   let switch_offset = 0
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
     let bnum = search('\<switch\s*(','nbw')
-    let switch_offset = bnum < num ? 0 : &cino !~ ':' ?  s:sw() :
+    let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' ?  s:sw() :
           \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(bnum),'^\s*')))
     let num = max([num,bnum])
     let b:js_cache[1] = num
@@ -203,7 +203,7 @@ function GetJavascriptIndent()
         \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
-    return indent(num) + s:sw() + (num == lnum ? 0 : switch_offset)
+    return indent(num) + s:sw() + switch_offset
   end
 
 endfunction

From 995007aea69e646016f621aafb4a2f548e27101a Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 19 Jul 2016 19:18:08 -0700
Subject: [PATCH 0357/1043] Switch (#555)

* switch offset always calculated when inside switch
---
 indent/javascript.vim | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7bd4aef2..e89a692d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -187,10 +187,11 @@ function GetJavascriptIndent()
     return indent(num)
   end
   let switch_offset = 0
-  if synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'switch'
-    let num = search('\<switch\s*(','nbw')
-    let switch_offset = &cino !~ ':' ?  s:sw() :
-          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(num),'^\s*')))
+  if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
+    let bnum = search('\<switch\s*(','nbw')
+    let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' ?  s:sw() :
+          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(bnum),'^\s*')))
+    let num = max([num,bnum])
     let b:js_cache[1] = num
   endif
   if (line =~ s:operator_first ||

From f2b8aeb4c08aae9c12ea04e45f34653f7ad0b449 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 19 Jul 2016 19:24:47 -0700
Subject: [PATCH 0358/1043] 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 f5b11b37..8433edb3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -192,7 +192,7 @@ function GetJavascriptIndent()
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
     let bnum = search('\<switch\s*(','nbw')
     let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' ?  s:sw() :
-          \ (strlen(matchstr(getline(search(s:expr_case,'nbw')),'^\s*')) - strlen(matchstr(getline(bnum),'^\s*')))
+          \ indent(search(s:expr_case,'nbw')) - indent(bnum)
     let num = max([num,bnum])
     let b:js_cache[1] = num
   endif

From 19b1d4fcc96e42fb2cbe7a64e51ea9cb9c84aa18 Mon Sep 17 00:00:00 2001
From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Wed, 20 Jul 2016 10:03:44 +0300
Subject: [PATCH 0359/1043] Remove unused g:javascript_conceal variable

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e5d819a5..116285cc 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -12,10 +12,6 @@ if !exists("main_syntax")
   let main_syntax = 'javascript'
 endif
 
-if !exists('g:javascript_conceal')
-  let g:javascript_conceal = 0
-endif
-
 " Dollar sign is permitted anywhere in an identifier
 if v:version > 704 || v:version == 704 && has('patch1142')
   syntax iskeyword @,48-57,_,192-255,$

From c1d8d3766789024931f4353889bcac6e8fbed064 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 18 Jul 2016 14:18:53 -0700
Subject: [PATCH 0360/1043] Add jsFlowReturnMaybe

---
 extras/flow.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index fc36fdbb..288c2568 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -15,6 +15,7 @@ syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/
 syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
 syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/   end=/)/   contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
 syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock
+syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
 
 syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
@@ -34,7 +35,7 @@ syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ e
 
 syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
 
-syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe
 syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrow,jsFlowMaybe,jsFlowParens
 
 if version >= 508 || !exists("did_javascript_syn_inits")
@@ -64,6 +65,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowTypeKeyword        PreProc
   HiLink jsFlowTypeOperator       PreProc
   HiLink jsFlowMaybe              PreProc
+  HiLink jsFlowReturnMaybe        PreProc
   HiLink jsFlowClassProperty      jsClassProperty
   HiLink jsFlowDeclare            PreProc
   HiLink jsFlowModule             PreProc

From 215e9572b8324c713f09626b51f4a7fdc0b69232 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 20 Jul 2016 00:45:12 -0700
Subject: [PATCH 0361/1043] Fix jsFlowClassDefinitions

---
 extras/flow.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 288c2568..3a30874d 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -27,7 +27,8 @@ syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type
 
 syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgroup=jsFlowTypeStatement,jsClassDefinition,jsStorageClass,jsFlowModule,jsFlowInterface
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowDefinition containedin=jsClassBlock
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowClassDef containedin=jsClassBlock
+syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen skipwhite skipempty nextgroup=jsClassValue
 
 syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
 syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
@@ -46,6 +47,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
     command -nargs=+ HiLink hi def link <args>
   endif
   HiLink jsFlowDefinition         PreProc
+  HiLink jsFlowClassDef           jsFlowDefinition
   HiLink jsFlowType               Type
   HiLink jsFlowTypeCustom         PreProc
   HiLink jsFlowTypeof             PreProc

From 125337c11897f162c749128bdd804040c76943a0 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 20 Jul 2016 13:02:20 -0700
Subject: [PATCH 0362/1043] More flow improvements

* Fixed a couple funky maybe cases
* Improved argument definitions
* Misc tweaks
---
 extras/flow.vim       | 16 ++++++++++------
 syntax/javascript.vim |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 3a30874d..dce98244 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,14 +1,16 @@
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
+syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\)\@=/ contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
-syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/    end=/)/         contains=@jsFlowCluster
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object array bool class
 syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
 syntax match   jsFlowTypeCustom     contained /\k*/ skipwhite skipempty nextgroup=jsFlowGroup
 syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
-syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
-syntax match   jsFlowMaybe          contained /?/
+syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
+syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
+syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
@@ -22,13 +24,13 @@ syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ e
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
 syntax region  jsFlowTypeStatement                                   start=/type/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsExpression
+syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsExpression,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type
 
 syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgroup=jsFlowTypeStatement,jsClassDefinition,jsStorageClass,jsFlowModule,jsFlowInterface
 syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowClassDef containedin=jsClassBlock
-syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen skipwhite skipempty nextgroup=jsClassValue
+syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassValue
 
 syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
 syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
@@ -37,7 +39,7 @@ syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ e
 syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
 
 syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe
-syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrow,jsFlowMaybe,jsFlowParens
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -48,6 +50,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   endif
   HiLink jsFlowDefinition         PreProc
   HiLink jsFlowClassDef           jsFlowDefinition
+  HiLink jsFlowArgumentDef        jsFlowDefinition
   HiLink jsFlowType               Type
   HiLink jsFlowTypeCustom         PreProc
   HiLink jsFlowTypeof             PreProc
@@ -62,6 +65,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowReturnGroup        jsFlowGroup
   HiLink jsFlowFunctionGroup      PreProc
   HiLink jsFlowClassGroup         PreProc
+  HiLink jsFlowArrowArguments     PreProc
   HiLink jsFlowArrow              PreProc
   HiLink jsFlowTypeStatement      PreProc
   HiLink jsFlowTypeKeyword        PreProc
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 116285cc..8cf3e627 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -139,7 +139,7 @@ syntax region  jsParenIfElse        contained matchgroup=jsParens              s
 syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlowDefinition skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold

From 178566475fdff317840365beb9271f66030f7bcd Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 20 Jul 2016 14:06:21 -0700
Subject: [PATCH 0363/1043] Fixed another maybe case

---
 extras/flow.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extras/flow.vim b/extras/flow.vim
index dce98244..505ab26a 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -11,6 +11,7 @@ syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ e
 syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
 syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments
+syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
@@ -77,5 +78,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowModule             PreProc
   HiLink jsFlowInterface          PreProc
   HiLink jsFlowNoise              Noise
+  HiLink jsFlowObjectKey          jsObjectKey
   delcommand HiLink
 endif

From c68ecbe99aa5f20a76f31fcb09b85cdf2d64015c Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 20 Jul 2016 19:50:46 -0700
Subject: [PATCH 0364/1043] removing custom formatting (#565)

also adds `nolisp` setting
---
 indent/javascript.vim | 63 +------------------------------------------
 1 file changed, 1 insertion(+), 62 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c372262c..e0dac792 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -10,7 +10,7 @@ let b:did_indent = 1
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal formatexpr=Fixedgq(v:lnum,v:count)
+setlocal nolisp
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1,c1
 
@@ -209,66 +209,5 @@ endfunction
 
 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

From 005928682d137c049d2a9829f4be12d8b4ceb9d5 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 20 Jul 2016 20:13:32 -0700
Subject: [PATCH 0365/1043] operators & continuation (#566)

* operators & continuation
---
 indent/javascript.vim | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e0dac792..ec278b50 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -58,8 +58,16 @@ endfunc
 
 let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
-" Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([*,.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
+" configurable regexes that define continuation lines, not including (, {, or [.
+if !exists('g:javascript_opfirst')
+  let g:javascript_opfirst = '\%([,:?]\|\([-/.+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
+endif
+let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
+
+if !exists('g:javascript_continuation')
+  let g:javascript_continuation = '\%([*,.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)'
+endif
+let g:javascript_continuation .= s:line_term
 
 function s:Onescope(lnum)
   return getline(a:lnum) =~ '\%(\<else\|\<do\|=>\)\C' . s:line_term ||
@@ -70,8 +78,6 @@ function s:Onescope(lnum)
         \ (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bw',100) : 1)
 endfunction
 
-let s:operator_first = s:line_pre . '\%([,:?]\|\([-/.+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
-
 " Auxiliary Functions {{{2
 " ======================
 
@@ -194,8 +200,8 @@ function GetJavascriptIndent()
     let num = max([num,bnum])
     let b:js_cache[1] = num
   endif
-  if (line =~ s:operator_first ||
-        \ (getline(lnum) =~ s:continuation_regex && getline(lnum) !~ s:expr_case) ||
+  if (line =~ g:javascript_opfirst ||
+        \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||
         \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
         \ (num != lnum &&
         \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')

From 31d8b39f2640e5cbb1114455e2ee76cfab3921c7 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 20 Jul 2016 23:55:30 -0700
Subject: [PATCH 0366/1043] switch enhanced (#568)

this is more accurate and allows for nested switches
---
 indent/javascript.vim | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ec278b50..f5242906 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -161,7 +161,6 @@ function GetJavascriptIndent()
     set cpo+=%
     let ind = cindent(v:lnum)
     let &cpo = s:cpo_switch
-    let b:js_cache = [v:lnum, search('\<switch\s*(','nbw')]
     return ind
   endif
   "}}}
@@ -196,9 +195,7 @@ function GetJavascriptIndent()
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
     let bnum = search('\<switch\s*(','nbw')
     let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' ?  s:sw() :
-          \ indent(search(s:expr_case,'nbw')) - indent(bnum)
-    let num = max([num,bnum])
-    let b:js_cache[1] = num
+          \ matchstr(&cino,'.*:\zs[0-9.]*\ze') * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1)
   endif
   if (line =~ g:javascript_opfirst ||
         \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||

From df6c7ef9c109becef524e1f9e313cf1ed9ac5bbc Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 00:12:06 -0700
Subject: [PATCH 0367/1043] remove whitespace and regex mistake

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f5242906..0323b81d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -47,7 +47,7 @@ let s:syng_comment = '\%(comment\|doc\)\c'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
 
 func s:lookForParens(start,end,flags,time)
-  try 
+  try
     return searchpair(a:start,'',a:end,a:flags,
 	  \ "line('.') < " . (prevnonblank(v:lnum) - 2000) . " ? dummy :" . s:skip_expr
           \ ,0,a:time)
@@ -74,7 +74,7 @@ function s:Onescope(lnum)
         \ (cursor(a:lnum, match(getline(a:lnum),')' . s:line_term)) > -1 &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
         \ cursor(line('.'),match( ' ' . strpart(getline(line('.')),0,col('.') - 1),
-        \ '\<\%(else\|for\%(\s+each\)\=\|if\|let\|while\|with\)\C' . s:line_term)) > -1) && 
+        \ '\<\%(else\|for\%(\s+each\)\=\|if\|let\|while\|with\)\C' . s:line_term)) > -1) &&
         \ (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bw',100) : 1)
 endfunction
 
@@ -195,7 +195,7 @@ function GetJavascriptIndent()
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
     let bnum = search('\<switch\s*(','nbw')
     let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' ?  s:sw() :
-          \ matchstr(&cino,'.*:\zs[0-9.]*\ze') * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1)
+          \ matchstr(&cino,'.*:\zs[0-9.]*') * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1)
   endif
   if (line =~ g:javascript_opfirst ||
         \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||

From 71c9fc8255acdbac11d7315d01a677871b63b2e2 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 01:02:56 -0700
Subject: [PATCH 0368/1043] negative and decimal switch label values (#569)

allows for every possible option including:
`set cino+=:-0.5s`
`set cino+=:-.5s`
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0323b81d..f9fe9ea9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -195,7 +195,7 @@ function GetJavascriptIndent()
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
     let bnum = search('\<switch\s*(','nbw')
     let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' ?  s:sw() :
-          \ matchstr(&cino,'.*:\zs[0-9.]*') * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1)
+          \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))
   endif
   if (line =~ g:javascript_opfirst ||
         \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||

From 84e1cc1c0463640a4b25ec4312b88061a48de378 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 09:37:32 -0700
Subject: [PATCH 0369/1043] cleaning

making a very bright sheen
---
 indent/javascript.vim | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f9fe9ea9..9b944556 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -12,7 +12,7 @@ let b:did_indent = 1
 setlocal indentexpr=GetJavascriptIndent()
 setlocal nolisp
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
-setlocal cinoptions+=j1,J1,c1
+setlocal cinoptions+=j1,J1
 
 let b:undo_indent = 'setlocal indentexpr< formatexpr< indentkeys< cinoptions<'
 
@@ -146,21 +146,14 @@ function GetJavascriptIndent()
   if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
-  if line =~ '^\s*$' && getline(prevline) =~ '\%(\%(^\s*\/\/\|\/\*\).*\)\@<!\*\/' &&
-        \ s:IsInComment(prevline, 1)
-    return indent(prevline) - 1
-  endif
-  if line =~ '^\s*$' && lnum != prevline
-    return indent(prevnonblank(v:lnum))
-  endif
   if lnum == 0
     return 0
   endif
   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
+    let &cpo = cpo_switch
     return ind
   endif
   "}}}
@@ -194,7 +187,7 @@ function GetJavascriptIndent()
   let switch_offset = 0
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
     let bnum = search('\<switch\s*(','nbw')
-    let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' ?  s:sw() :
+    let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
           \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))
   endif
   if (line =~ g:javascript_opfirst ||

From f25397549b878454c55819ec0deb59a68944eac7 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 09:44:10 -0700
Subject: [PATCH 0370/1043] more cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9b944556..73d3b1a8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -14,7 +14,7 @@ setlocal nolisp
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
 
-let b:undo_indent = 'setlocal indentexpr< formatexpr< indentkeys< cinoptions<'
+let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<'
 
 " Only define the function once.
 if exists("*GetJavascriptIndent")
@@ -137,6 +137,9 @@ function GetJavascriptIndent()
   let prevline = prevnonblank(v:lnum - 1)
   " previous line of code
   let lnum = s:PrevNonBlankNonString(v:lnum - 1)
+  if lnum == 0
+    return 0
+  endif
 
   " start with strings,comments,etc.{{{2
   if (line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template') ||
@@ -146,9 +149,7 @@ function GetJavascriptIndent()
   if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
-  if lnum == 0
-    return 0
-  endif
+
   if (line =~ s:expr_case)
     let cpo_switch = &cpo
     set cpo+=%

From 0c3a3509ebcdf4710c09cfb2fd2a4a9867c93794 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 20:10:38 -0700
Subject: [PATCH 0371/1043] add jsfunccall to not indent args

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 73d3b1a8..6cbee1fd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -195,7 +195,7 @@ function GetJavascriptIndent()
         \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||
         \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
         \ (num != lnum &&
-        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
+        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsfunccall\|jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
     return indent(num) + s:sw() + switch_offset

From 96885ca809e9d579435e86d4a5d00a22b23f5a61 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 21:35:25 -0700
Subject: [PATCH 0372/1043] small perf gain

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6cbee1fd..8ed3f135 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -166,17 +166,17 @@ function GetJavascriptIndent()
     let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
   else
     call cursor(v:lnum,1)
-    let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
-    if line[1] =~ '\s'
+    if line[0] =~ '\s'
+      let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
       if syns != ''
         let pattern = syns =~? 'funcblock' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : syns =~? 'jsbracket'? ['\[','\]'] :
               \ ['(\|{\|\[',')\|}\|\]']
         let num = s:lookForParens(pattern[0],pattern[1],'nbw',2000)
       else
-        let num = 0
+        let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
       end
     else
-      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
+      let num = 0
     end
   end
   let b:js_cache = [v:lnum, num]

From 6c440b3ecb13abed60a6f0083764673e80a01b8f Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 21:41:10 -0700
Subject: [PATCH 0373/1043] perf continued

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8ed3f135..7ac67b24 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -173,7 +173,7 @@ function GetJavascriptIndent()
               \ ['(\|{\|\[',')\|}\|\]']
         let num = s:lookForParens(pattern[0],pattern[1],'nbw',2000)
       else
-        let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
+        let num = 0
       end
     else
       let num = 0

From b4038a26c937524d00c75f3bbe75b46acad5e2df Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 22:24:06 -0700
Subject: [PATCH 0374/1043] addresses unindented code

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7ac67b24..7dc16964 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -176,7 +176,7 @@ function GetJavascriptIndent()
         let num = 0
       end
     else
-      let num = 0
+      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
     end
   end
   let b:js_cache = [v:lnum, num]

From 9a6c48548eb0ce54399b69959dd27ad2fd46a41b Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 21 Jul 2016 22:29:22 -0700
Subject: [PATCH 0375/1043] minor refactor

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7dc16964..65cd6132 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -166,17 +166,15 @@ function GetJavascriptIndent()
     let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
   else
     call cursor(v:lnum,1)
-    if line[0] =~ '\s'
-      let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
-      if syns != ''
-        let pattern = syns =~? 'funcblock' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] : syns =~? 'jsbracket'? ['\[','\]'] :
-              \ ['(\|{\|\[',')\|}\|\]']
-        let num = s:lookForParens(pattern[0],pattern[1],'nbw',2000)
-      else
-        let num = 0
-      end
-    else
+    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],'nbw',2000)
+    elseif syns != ''
       let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
+    else
+      let num = 0
     end
   end
   let b:js_cache = [v:lnum, num]

From e895bd1629bca407721043756f5b110fa50442cb Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 22 Jul 2016 00:18:53 -0700
Subject: [PATCH 0376/1043] fix syn-indent issue

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 65cd6132..4cb129ff 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -193,7 +193,7 @@ function GetJavascriptIndent()
         \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||
         \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
         \ (num != lnum &&
-        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsfunccall\|jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
+        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
     return indent(num) + s:sw() + switch_offset

From ab5d96bbb7c0cb4cb03a65c49264527f12a34a3d Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 23 Jul 2016 22:24:17 -0700
Subject: [PATCH 0377/1043] possible reuse of logic (simple lexing) (#570)

reusing  of logic
---
 indent/javascript.vim | 57 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4cb129ff..4863cb1f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -44,7 +44,7 @@ let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
 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 = "s:IsInStringOrComment(line('.'),col('.'))"
 
 func s:lookForParens(start,end,flags,time)
   try
@@ -69,13 +69,14 @@ if !exists('g:javascript_continuation')
 endif
 let g:javascript_continuation .= s:line_term
 
-function s:Onescope(lnum)
-  return getline(a:lnum) =~ '\%(\<else\|\<do\|=>\)\C' . s:line_term ||
-        \ (cursor(a:lnum, match(getline(a:lnum),')' . s:line_term)) > -1 &&
+function s:Onescope(lnum,text,add)
+  return a:text =~ '\%(\<else\|\<do\|=>' . (a:add ? '\|try\|finally' : '' ) . '\)\C' . s:line_term ||
+        \ (cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1 &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
         \ cursor(line('.'),match( ' ' . strpart(getline(line('.')),0,col('.') - 1),
-        \ '\<\%(else\|for\%(\s+each\)\=\|if\|let\|while\|with\)\C' . s:line_term)) > -1) &&
-        \ (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bw',100) : 1)
+        \ (a:add ? '\K\k*' :
+        \ '\<\%(else\|for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') . s:line_term)) > -1) &&
+        \ (a:add || (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -86,11 +87,6 @@ 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 multi-line comment.
-function s:IsInComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_comment
-endfunction
-
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevNonBlankNonString(lnum)
   let lnum = prevnonblank(a:lnum)
@@ -110,18 +106,21 @@ 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)
       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))
+  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
 " }}}
 
@@ -129,7 +128,7 @@ endfunction
 " =========================
 function GetJavascriptIndent()
   if !exists('b:js_cache')
-    let b:js_cache = [0,0]
+    let b:js_cache = [0,0,0]
   end
   " Get the current line.
   let line = getline(v:lnum)
@@ -143,10 +142,10 @@ function GetJavascriptIndent()
 
   " start with strings,comments,etc.{{{2
   if (line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template') ||
-        \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'comment')
+        \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? s:syng_comment)
     return -1
   endif
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
+  if line !~ '^\%(\/\*\|\s*\/\/\)' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? s:syng_comment)
     return cindent(v:lnum)
   endif
 
@@ -161,23 +160,24 @@ function GetJavascriptIndent()
 
   " 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] !~ '2')
-    let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
+  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
   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],'nbw',2000)
-    elseif syns != ''
-      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','nbW',2000)
+      let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
     else
-      let num = 0
+      let num = s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000)
     end
   end
-  let b:js_cache = [v:lnum, num]
+  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   " most significant part
   if line =~ s:line_pre . '[])}]'
@@ -185,15 +185,14 @@ function GetJavascriptIndent()
   end
   let switch_offset = 0
   if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
-    let bnum = search('\<switch\s*(','nbw')
+    let bnum = search('\<switch\s*(','nbW')
     let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
           \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))
   endif
-  if (line =~ g:javascript_opfirst ||
-        \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case) ||
-        \ (s:Onescope(lnum) && line !~ s:line_pre . '{')) &&
-        \ (num != lnum &&
-        \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsdestructuringblock\|args\|jsbracket\|jsparen\|jsobject')
+  if ((line =~ g:javascript_opfirst ||
+        \ (getline(lnum) =~ g:javascript_continuation && getline(lnum) !~ s:expr_case)) &&
+        \ (num == 0 || s:Onescope(num, strpart(getline(num),0,b:js_cache[2] - 1),1))) ||
+        \ (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

From bf7d4b663c743e1a5852080823e9b61f74cab249 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 24 Jul 2016 10:34:39 -0700
Subject: [PATCH 0378/1043] remove switch syn check (#571)

* remove switch syn check

https://github.com/pangloss/vim-javascript/issues/177#issuecomment-234758932
---
 indent/javascript.vim | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4863cb1f..e366cece 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -76,7 +76,7 @@ function s:Onescope(lnum,text,add)
         \ cursor(line('.'),match( ' ' . strpart(getline(line('.')),0,col('.') - 1),
         \ (a:add ? '\K\k*' :
         \ '\<\%(else\|for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') . s:line_term)) > -1) &&
-        \ (a:add || (expand("<cword>") =~ 'while\C' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
+        \ (a:add || (expand("<cword>") == 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -183,16 +183,12 @@ function GetJavascriptIndent()
   if line =~ s:line_pre . '[])}]'
     return indent(num)
   end
-  let switch_offset = 0
-  if index(map(synstack(v:lnum, 1), 'synIDattr( v:val, "name")'),'jsSwitchBlock') > -1
-    let bnum = search('\<switch\s*(','nbW')
-    let switch_offset = bnum < num || bnum == lnum ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
-          \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))
-  endif
+  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)) &&
-        \ (num == 0 || s:Onescope(num, strpart(getline(num),0,b:js_cache[2] - 1),1))) ||
-        \ (s:Onescope(lnum,getline(lnum),0) && line !~ s:line_pre . '{')
+        \ 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

From ad8d72ad4c0d1dad9c2012b2eead9ed7d5ec07c2 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 24 Jul 2016 11:00:35 -0700
Subject: [PATCH 0379/1043] cleaning indent

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e366cece..611ed1ea 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -44,7 +44,7 @@ let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
 let s:syng_comment = '\%(comment\|doc\)\c'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "s:IsInStringOrComment(line('.'),col('.'))"
+let s:skip_expr = "s:IsSyn(line('.'),col('.'),0)"
 
 func s:lookForParens(start,end,flags,time)
   try
@@ -83,15 +83,15 @@ endfunction
 " ======================
 
 " 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
+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)
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
-    if !s:IsInStringOrComment(lnum, matchend(getline(lnum), '^\s*[^''"]'))
+    if !s:IsSyn(lnum, matchend(getline(lnum), '^\s*[^''"]'),0)
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -108,7 +108,7 @@ function s:LineHasOpeningBrackets(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, 0)
       let idx = stridx('(){}[]', line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1
@@ -141,8 +141,8 @@ function GetJavascriptIndent()
   endif
 
   " start with strings,comments,etc.{{{2
-  if (line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template') ||
-        \ (line !~ '^\s*[/*]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? s:syng_comment)
+  if (line !~ '^[''"`]' && s:IsSyn(v:lnum,1,'string\|template')) ||
+        \ (line !~ '^\s*[/*]' && s:IsSyn(v:lnum,1,s:syng_comment))
     return -1
   endif
   if line !~ '^\%(\/\*\|\s*\/\/\)' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? s:syng_comment)

From f90b8c85e0a510c3e35fd3b10c53127e61bffb26 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 24 Jul 2016 11:06:15 -0700
Subject: [PATCH 0380/1043] more cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 611ed1ea..b46573ee 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -145,7 +145,7 @@ function GetJavascriptIndent()
         \ (line !~ '^\s*[/*]' && s:IsSyn(v:lnum,1,s:syng_comment))
     return -1
   endif
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? s:syng_comment)
+  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsSyn(v:lnum,1,s:syng_comment)
     return cindent(v:lnum)
   endif
 

From 57470573a9fe7caf60c95d1582fafb412ba6d333 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 24 Jul 2016 17:02:29 -0700
Subject: [PATCH 0381/1043] remove obvious comment

the folding is enough for separating content
---
 indent/javascript.vim | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b46573ee..09a0674c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -124,8 +124,6 @@ function s:LineHasOpeningBrackets(lnum)
 endfunction
 " }}}
 
-" GetJavascriptIndent Function
-" =========================
 function GetJavascriptIndent()
   if !exists('b:js_cache')
     let b:js_cache = [0,0,0]

From 506783bc16a9ffed9a1fb1360891ced486b697be Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 24 Jul 2016 22:20:24 -0700
Subject: [PATCH 0382/1043] move lines from search pair function

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 09a0674c..806da210 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -44,13 +44,11 @@ let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
 let s:syng_comment = '\%(comment\|doc\)\c'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "s:IsSyn(line('.'),col('.'),0)"
+let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),0)"
 
 func s:lookForParens(start,end,flags,time)
   try
-    return searchpair(a:start,'',a:end,a:flags,
-	  \ "line('.') < " . (prevnonblank(v:lnum) - 2000) . " ? dummy :" . s:skip_expr
-          \ ,0,a:time)
+    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,0)
   endtry

From acb4f00324c84c175d93804b39efad76ee66442a Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 25 Jul 2016 01:50:02 -0700
Subject: [PATCH 0383/1043] fix syn function

vimscript is strange
---
 indent/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 806da210..8a1e4b63 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -44,7 +44,7 @@ let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
 let s:syng_comment = '\%(comment\|doc\)\c'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),0)"
+let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),'')"
 
 func s:lookForParens(start,end,flags,time)
   try
@@ -82,14 +82,14 @@ endfunction
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
 function s:IsSyn(lnum, col, reg)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~? (a:reg ? a:reg : s:syng_strcom)
+  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)
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
-    if !s:IsSyn(lnum, matchend(getline(lnum), '^\s*[^''"]'),0)
+    if !s:IsSyn(lnum, matchend(getline(lnum), '^\s*[^''"]'),'')
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -106,7 +106,7 @@ function s:LineHasOpeningBrackets(lnum)
   let pos = match(line, '[][(){}]', 0)
   let last = 0
   while pos != -1
-    if !s:IsSyn(a:lnum, pos + 1, 0)
+    if !s:IsSyn(a:lnum, pos + 1, '')
       let idx = stridx('(){}[]', line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1

From 2905f34d829f62478fe7755a6cf49d593645a15f Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 25 Jul 2016 10:26:51 -0700
Subject: [PATCH 0384/1043] removing mode-line

the file is no longer long enough to require automatic folding!
---
 indent/javascript.vim | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8a1e4b63..568b7570 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -195,5 +195,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-" vim: foldmethod=marker:foldlevel=1

From cbcfaaf09f1ce37170b20507ba5f95ebc13d9c5e Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 26 Jul 2016 13:25:47 -0700
Subject: [PATCH 0385/1043] adding more operators (#573)

* adding more operators

I think adding `<>` could mess with xml type things so i've not included them
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 568b7570..441f1b97 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -58,12 +58,12 @@ let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([,:?]\|\([-/.+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
+  let g:javascript_opfirst = '\%([,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)\C'
 endif
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([*,.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)'
+  let g:javascript_continuation = '\%([*,.?:^%]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)\C'
 endif
 let g:javascript_continuation .= s:line_term
 

From d17aee51bdc5cfce14243719abb205cb92532e57 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 27 Jul 2016 11:28:46 -0700
Subject: [PATCH 0386/1043] Flow tweaks

* Improved OR operator
* Various fixes for arguments
---
 extras/flow.vim | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 505ab26a..a1848830 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,5 +1,5 @@
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
-syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\)\@=/ contains=@jsFlowCluster
+syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
 syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster
@@ -12,14 +12,16 @@ syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
 syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
+syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
-syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/   end=/)/   contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
-syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock
+syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
-syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 
 syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
@@ -39,8 +41,8 @@ syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ e
 
 syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
 
-syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe
-syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -79,5 +81,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowInterface          PreProc
   HiLink jsFlowNoise              Noise
   HiLink jsFlowObjectKey          jsObjectKey
+  HiLink jsFlowOrOperator         PreProc
+  HiLink jsFlowReturnOrOp         jsFlowOrOperator
   delcommand HiLink
 endif

From 13610e67c47529e3745c76e4b963cc97fdec9486 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 27 Jul 2016 11:35:24 -0700
Subject: [PATCH 0387/1043] Updating indent top comments

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 441f1b97..18ad9630 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,5 +1,7 @@
 " 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
 
 " Only load this indent file when no other was loaded.
@@ -179,7 +181,7 @@ function GetJavascriptIndent()
   if line =~ s:line_pre . '[])}]'
     return indent(num)
   end
-  let inb = num == 0 ? 1 : s:Onescope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) 
+  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 ||

From 33833cc48f67540632a2654cab36efc205cf76ac Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 27 Jul 2016 19:06:40 -0700
Subject: [PATCH 0388/1043] allow for line breaks before blocks (#575)

```
if
()
  a=b
```
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 18ad9630..1b3706b6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,9 +73,9 @@ function s:Onescope(lnum,text,add)
   return a:text =~ '\%(\<else\|\<do\|=>' . (a:add ? '\|try\|finally' : '' ) . '\)\C' . s:line_term ||
         \ (cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1 &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
-        \ cursor(line('.'),match( ' ' . strpart(getline(line('.')),0,col('.') - 1),
-        \ (a:add ? '\K\k*' :
-        \ '\<\%(else\|for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') . s:line_term)) > -1) &&
+        \ search((a:add ? '\K\k*' :
+        \ '\<\%(else\|for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') .
+        \ '\_s*\%#','bW')) &&
         \ (a:add || (expand("<cword>") == 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 

From 9e2c10e32e8fada2019a27f34ce494f1b36d3862 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 27 Jul 2016 20:11:43 -0700
Subject: [PATCH 0389/1043] remove else

not supposed to be there
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1b3706b6..78e96026 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,7 +74,7 @@ function s:Onescope(lnum,text,add)
         \ (cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1 &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
         \ search((a:add ? '\K\k*' :
-        \ '\<\%(else\|for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') .
+        \ '\<\%(for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') .
         \ '\_s*\%#','bW')) &&
         \ (a:add || (expand("<cword>") == 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction

From 1d32e38b0a875263a9fb4cbe60787df48f2b6b12 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 27 Jul 2016 21:34:07 -0700
Subject: [PATCH 0390/1043] regex for word boundary

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 78e96026..eab6dbd5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -70,7 +70,7 @@ 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 ||
+  return a:text =~ '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)\C' . s:line_term ||
         \ (cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1 &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 &&
         \ search((a:add ? '\K\k*' :

From 6d70fab417009adb22062962c853fb8648d044b0 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 28 Jul 2016 00:24:25 -0700
Subject: [PATCH 0391/1043] fix c-style continuation (#576)

* fix c-style continuation
---
 indent/javascript.vim | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index eab6dbd5..6844dc2f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,16 +71,15 @@ 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 ? '\K\k*' :
-        \ '\<\%(for\%(\s+each\)\=\|function\*\=\%(\s\+\K\k*\)\=\|if\|let\|switch\|while\|with\)\C') .
-        \ '\_s*\%#','bW')) &&
+        \ 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
 
 " Auxiliary Functions {{{2
-" ======================
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
 function s:IsSyn(lnum, col, reg)
@@ -88,7 +87,7 @@ function s:IsSyn(lnum, col, reg)
 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
     if !s:IsSyn(lnum, matchend(getline(lnum), '^\s*[^''"]'),'')
@@ -133,7 +132,7 @@ function GetJavascriptIndent()
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
   " previous line of code
-  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
+  let lnum = s:PrevCodeLine(v:lnum - 1)
   if lnum == 0
     return 0
   endif

From 924a6456ccff5783d9f8811bf901882282bd0c6e Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 29 Jul 2016 00:00:51 -0700
Subject: [PATCH 0392/1043] misc fixes (#578)

make sure to calculate switch_offset even when using 'c-style' and fix block comments at the very top of a file
---
 indent/javascript.vim | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6844dc2f..dde72676 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,11 +71,11 @@ 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 &&
+        \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . 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')) &&
+        \ '\<\%(for\%(\s+each\)\=\|if\|let\|while\|with\)\C') . '\_s*\%#','bW') &&
         \ (a:add || (expand("<cword>") == 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
@@ -132,10 +132,6 @@ function GetJavascriptIndent()
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
   " previous line of code
-  let lnum = s:PrevCodeLine(v:lnum - 1)
-  if lnum == 0
-    return 0
-  endif
 
   " start with strings,comments,etc.{{{2
   if (line !~ '^[''"`]' && s:IsSyn(v:lnum,1,'string\|template')) ||
@@ -145,6 +141,10 @@ function GetJavascriptIndent()
   if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsSyn(v:lnum,1,s:syng_comment)
     return cindent(v:lnum)
   endif
+  let lnum = s:PrevCodeLine(v:lnum - 1)
+  if lnum == 0
+    return 0
+  endif
 
   if (line =~ s:expr_case)
     let cpo_switch = &cpo

From ee3183e7f2773a82c17cd1f819cc2da9374b2206 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 29 Jul 2016 21:12:49 -0700
Subject: [PATCH 0393/1043] fix ftplugin var and clean indent (#580)

* fix ftplugin var and clean indent
---
 after/ftplugin/javascript.vim | 6 +++++-
 indent/javascript.vim         | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index e2d471dd..c6c42d60 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -5,4 +5,8 @@
 
 setlocal iskeyword+=$ suffixesadd+=.js
 
-let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
+else
+  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
+endif
diff --git a/indent/javascript.vim b/indent/javascript.vim
index dde72676..9121c81e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -3,6 +3,7 @@
 " 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
+" Last Change: July 29, 2016
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -56,7 +57,7 @@ func s:lookForParens(start,end,flags,time)
   endtry
 endfunc
 
-let s:line_term = '\s*\%(\%(:\@<!\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
+let s:line_term = '\s*\%(\/\*.*\*\/\s*\)*\%(:\@<!\/\/.*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
@@ -131,7 +132,6 @@ function GetJavascriptIndent()
   let line = getline(v:lnum)
   " previous nonblank line number
   let prevline = prevnonblank(v:lnum - 1)
-  " previous line of code
 
   " start with strings,comments,etc.{{{2
   if (line !~ '^[''"`]' && s:IsSyn(v:lnum,1,'string\|template')) ||

From 5923f8092b009852253ea4dfa00e3690039deecd Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 30 Jul 2016 01:04:45 -0700
Subject: [PATCH 0394/1043] comment on performance, angle brackets

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9121c81e..618105f4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -61,12 +61,12 @@ let s:line_term = '\s*\%(\/\*.*\*\/\s*\)*\%(:\@<!\/\/.*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)\C'
+  let g:javascript_opfirst = '\%([<>,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)\C'
 endif
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([*,.?:^%]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)\C'
+  let g:javascript_continuation = '\%([<*,.?:^%]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)\C'
 endif
 let g:javascript_continuation .= s:line_term
 
@@ -155,7 +155,8 @@ function GetJavascriptIndent()
   endif
   "}}}
 
-  " the containing paren, bracket, curly
+  " the containing paren, bracket, curly. Memoize, last lineNr either has the
+  " same scope or starts a new one, unless if it closed a scope.
   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')

From e8bb2bad78296f06e7945960c72b45ac9022f145 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 30 Jul 2016 21:32:45 -0700
Subject: [PATCH 0395/1043] remove line comment appended to code (#581)

* remove line comment appended to code
---
 indent/javascript.vim | 52 +++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 618105f4..6d063669 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,9 +1,9 @@
 " Vim indent file
 " Language: Javascript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-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
-" Last Change: July 29, 2016
+" Last Change: July 30, 2016
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -29,13 +29,13 @@ set cpo&vim
 
 " Get shiftwidth value
 if exists('*shiftwidth')
-  func s:sw()
+  function s:sw()
     return shiftwidth()
-  endfunc
+  endfunction
 else
-  func s:sw()
+  function s:sw()
     return &sw
-  endfunc
+  endfunction
 endif
 
 let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
@@ -49,15 +49,15 @@ let s:syng_comment = '\%(comment\|doc\)\c'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),'')"
 
-func s:lookForParens(start,end,flags,time)
+function 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,0)
   endtry
-endfunc
+endfunction
 
-let s:line_term = '\s*\%(\/\*.*\*\/\s*\)*\%(:\@<!\/\/.*\)\=$'
+let s:line_term = '\s*\%(\/\*.*\*\/\s*\)*$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
@@ -72,7 +72,8 @@ 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 && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
+        \ ((a:add && a:text =~ s:line_pre . s:line_term && cursor(s:PrevCodeLine(a:lnum - 1),1) > -1 &&
+        \ cursor(line('.'),match(s:Stripline(getline(line('.'))), ')' . s:line_term))>-1) ||
         \ 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' :
@@ -82,6 +83,11 @@ endfunction
 
 " Auxiliary Functions {{{2
 
+" strip line of comment
+function s:StripLine(c)
+  return substitute(a:c, '\%(:\@<!\/\/.*\)$', '','')
+endfunction
+
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
 function s:IsSyn(lnum, col, reg)
   return synIDattr(synID(a:lnum, a:col, 1), 'name') =~? (a:reg != '' ? a:reg : s:syng_strcom)
@@ -96,7 +102,7 @@ function s:PrevCodeLine(lnum)
     endif
     let lnum = prevnonblank(lnum - 1)
   endwhile
-  return lnum
+  return lnum > 0 ? lnum : -1
 endfunction
 
 " Check if line 'lnum' has more opening brackets than closing ones.
@@ -127,7 +133,7 @@ endfunction
 function GetJavascriptIndent()
   if !exists('b:js_cache')
     let b:js_cache = [0,0,0]
-  end
+  endif
   " Get the current line.
   let line = getline(v:lnum)
   " previous nonblank line number
@@ -142,7 +148,9 @@ function GetJavascriptIndent()
     return cindent(v:lnum)
   endif
   let lnum = s:PrevCodeLine(v:lnum - 1)
-  if lnum == 0
+  let pline = s:StripLine(getline(lnum))
+  let line = s:StripLine(line)
+  if lnum <= 0
     return 0
   endif
 
@@ -163,7 +171,7 @@ function GetJavascriptIndent()
     let num = pcounts[0][0] =~ '1' ? lnum : b:js_cache[1]
     if pcounts[0][0] =~'1'
       call cursor(lnum,pcounts[0][1])
-    end
+    endif
   else
     call cursor(v:lnum,1)
     let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
@@ -173,24 +181,24 @@ function GetJavascriptIndent()
       let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
     else
       let num = s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000)
-    end
-  end
+    endif
+  endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   " most significant part
   if line =~ s:line_pre . '[])}]'
     return indent(num)
-  end
-  let inb = num == 0 ? 1 : s:Onescope(num, strpart(getline(num),0,b:js_cache[2] - 1),1)
+  endif
+  let inb = num == 0 ? 1 : s:Onescope(num, s:StripLine(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 . '{')
+        \ (pline =~ g:javascript_continuation && pline !~ s:expr_case)) &&
+        \ inb) || (s:Onescope(lnum,pline,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
+  endif
 
 endfunction
 

From bc6422b5a452d707e0c8c737196a83e5ac1a5163 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 30 Jul 2016 22:02:11 -0700
Subject: [PATCH 0396/1043] had a problem with some of the changes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6d063669..e5b9c8a6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -72,8 +72,7 @@ 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 && cursor(s:PrevCodeLine(a:lnum - 1),1) > -1 &&
-        \ cursor(line('.'),match(s:Stripline(getline(line('.'))), ')' . s:line_term))>-1) ||
+        \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . 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' :

From 60eaba7be5f5ac1ec69d7ce04e8e5b5c3accce8a Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 30 Jul 2016 22:21:06 -0700
Subject: [PATCH 0397/1043] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e5b9c8a6..67f99951 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,6 @@
 " 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
 " Last Change: July 30, 2016
 
 " Only load this indent file when no other was loaded.
@@ -147,11 +146,10 @@ function GetJavascriptIndent()
     return cindent(v:lnum)
   endif
   let lnum = s:PrevCodeLine(v:lnum - 1)
-  let pline = s:StripLine(getline(lnum))
-  let line = s:StripLine(line)
   if lnum <= 0
     return 0
   endif
+  let line = s:StripLine(line)
 
   if (line =~ s:expr_case)
     let cpo_switch = &cpo
@@ -191,6 +189,7 @@ function GetJavascriptIndent()
   let inb = num == 0 ? 1 : s:Onescope(num, s:StripLine(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))
+  let pline = s:StripLine(getline(lnum))
   if ((line =~ g:javascript_opfirst ||
         \ (pline =~ g:javascript_continuation && pline !~ s:expr_case)) &&
         \ inb) || (s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')

From 6706a2442b757ecc631b220b4a2cbcd7e1d9f8a1 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 30 Jul 2016 22:35:09 -0700
Subject: [PATCH 0398/1043] few remaining touches

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 67f99951..3f273ea1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -100,7 +100,7 @@ function s:PrevCodeLine(lnum)
     endif
     let lnum = prevnonblank(lnum - 1)
   endwhile
-  return lnum > 0 ? lnum : -1
+  return lnum
 endfunction
 
 " Check if line 'lnum' has more opening brackets than closing ones.
@@ -146,7 +146,7 @@ function GetJavascriptIndent()
     return cindent(v:lnum)
   endif
   let lnum = s:PrevCodeLine(v:lnum - 1)
-  if lnum <= 0
+  if lnum == 0
     return 0
   endif
   let line = s:StripLine(line)

From a328e8175f4763a4221bbb86047f5a4d615caffd Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 31 Jul 2016 10:07:25 -0700
Subject: [PATCH 0399/1043] add label support (#582)

* add label support
---
 indent/javascript.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3f273ea1..f9d64664 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: July 30, 2016
+" Last Change: July 31, 2016
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -191,7 +191,9 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (match(&cino,'.*:\zs[^,]*s') ? s:sw() : 1))
   let pline = s:StripLine(getline(lnum))
   if ((line =~ g:javascript_opfirst ||
-        \ (pline =~ g:javascript_continuation && pline !~ s:expr_case)) &&
+        \ (pline =~ g:javascript_continuation && pline !~ s:expr_case &&
+        \ (pline !~ ':' . s:line_term || line !~# s:line_pre .
+        \ '\%(debugger\|do\|else\|finally\|for\|if\|let\|switch\|throw\|try\|while\|with\)'))) &&
         \ inb) || (s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0

From 5ba6eab7648c705535b494b79bbcc9850b9e37df Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 31 Jul 2016 11:01:36 -0700
Subject: [PATCH 0400/1043] case-sensitivity (#583)

* case-sensitivity
---
 indent/javascript.vim | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f9d64664..64ca942f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -38,12 +38,12 @@ else
 endif
 
 let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
-let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:\C'
+let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
+let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)'
 
 " Regex of syntax group names that are strings or documentation.
-let s:syng_comment = '\%(comment\|doc\)\c'
+let s:syng_comment = '\%(comment\|doc\)'
 
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),'')"
@@ -60,23 +60,23 @@ let s:line_term = '\s*\%(\/\*.*\*\/\s*\)*$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)\C'
+  let g:javascript_opfirst = '\%([<>,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)'
 endif
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<*,.?:^%]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)\C'
+  let g:javascript_continuation = '\%([<*,.?:^%]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)'
 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 ||
+  return a:text =~# '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)' . s:line_term ||
         \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . 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\|while\|with\)\C') . '\_s*\%#','bW') &&
-        \ (a:add || (expand("<cword>") == 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
+        \ search((a:add ? '\%(function\*\|[A-Za-z_$][0-9A-Za-z_$]*\)' :
+        \ '\<\%(for\%(\s+each\)\=\|if\|let\|while\|with\)') . '\_s*\%#\C','bW') &&
+        \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -151,7 +151,7 @@ function GetJavascriptIndent()
   endif
   let line = s:StripLine(line)
 
-  if (line =~ s:expr_case)
+  if (line =~# s:expr_case)
     let cpo_switch = &cpo
     set cpo+=%
     let ind = cindent(v:lnum)
@@ -187,13 +187,13 @@ function GetJavascriptIndent()
     return indent(num)
   endif
   let inb = num == 0 ? 1 : s:Onescope(num, s:StripLine(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() :
+  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))
   let pline = s:StripLine(getline(lnum))
-  if ((line =~ g:javascript_opfirst ||
-        \ (pline =~ g:javascript_continuation && pline !~ s:expr_case &&
+  if ((line =~# g:javascript_opfirst ||
+        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case &&
         \ (pline !~ ':' . s:line_term || line !~# s:line_pre .
-        \ '\%(debugger\|do\|else\|finally\|for\|if\|let\|switch\|throw\|try\|while\|with\)'))) &&
+        \ '\%(debugger\|do\|else\|finally\|for\|if\|let\|switch\|throw\|try\|while\|with\)\>'))) &&
         \ inb) || (s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0

From 86413728b55e1ffb7a31521339c5c851114fa582 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 31 Jul 2016 12:26:39 -0700
Subject: [PATCH 0401/1043] Don't join strings in multiple lines

easier to read in one line
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 64ca942f..56ad87e1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -192,8 +192,8 @@ function GetJavascriptIndent()
   let pline = s:StripLine(getline(lnum))
   if ((line =~# g:javascript_opfirst ||
         \ (pline =~# g:javascript_continuation && pline !~# s:expr_case &&
-        \ (pline !~ ':' . s:line_term || line !~# s:line_pre .
-        \ '\%(debugger\|do\|else\|finally\|for\|if\|let\|switch\|throw\|try\|while\|with\)\>'))) &&
+        \ (pline !~ ':' . s:line_term || line !~#
+        \ s:line_pre . '\%(debugger\|do\|else\|finally\|for\|if\|let\|switch\|throw\|try\|while\|with\)\>'))) &&
         \ inb) || (s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0

From c003d8b9745c897de819d05ac39bd0674db14df2 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 31 Jul 2016 12:53:10 -0700
Subject: [PATCH 0402/1043] join lines

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 56ad87e1..90d9dc4e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,9 +73,8 @@ function s:Onescope(lnum,text,add)
   return a:text =~# '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)' . s:line_term ||
         \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . 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_$]*\)' :
-        \ '\<\%(for\%(\s+each\)\=\|if\|let\|while\|with\)') . '\_s*\%#\C','bW') &&
+        \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
+        \ '\%(function\*\|[A-Za-z_$][0-9A-Za-z_$]*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|while\|with\)') . '\_s*\%#\C','bW') &&
         \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 

From 58095d8647aaaaa50478c3a19b52c7ee5bb32f01 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 31 Jul 2016 22:00:25 -0700
Subject: [PATCH 0403/1043] regex char classes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 90d9dc4e..035e30e9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,7 +74,7 @@ function s:Onescope(lnum,text,add)
         \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . 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_$]*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|while\|with\)') . '\_s*\%#\C','bW') &&
+        \ '\%(function\*\|\%(\h\|\$\)\%(\w\|\$\)*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|while\|with\)') . '\_s*\%#\C','bW') &&
         \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 

From bd4c5270e72a198b544f8a8a56faec6d17e4bb77 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 1 Aug 2016 12:08:00 -0700
Subject: [PATCH 0404/1043] limit regex lookbehind

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 035e30e9..1be39302 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -40,7 +40,7 @@ endif
 let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
 let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)'
+let s:syng_strcom = '\%(s\%(tring\|pecial\)\|regex\|doc\|comment\|template\)'
 
 " Regex of syntax group names that are strings or documentation.
 let s:syng_comment = '\%(comment\|doc\)'
@@ -74,7 +74,7 @@ function s:Onescope(lnum,text,add)
         \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
         \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
-        \ '\%(function\*\|\%(\h\|\$\)\%(\w\|\$\)*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|while\|with\)') . '\_s*\%#\C','bW') &&
+        \ '\%(function\*\|\%(\h\|\$\)\%(\w\|\$\)*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
         \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
@@ -192,7 +192,7 @@ function GetJavascriptIndent()
   if ((line =~# g:javascript_opfirst ||
         \ (pline =~# g:javascript_continuation && pline !~# s:expr_case &&
         \ (pline !~ ':' . s:line_term || line !~#
-        \ s:line_pre . '\%(debugger\|do\|else\|finally\|for\|if\|let\|switch\|throw\|try\|while\|with\)\>'))) &&
+        \ s:line_pre . '\%(d\%(ebugger\|o\)\|else\|f\%(inally\|or\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>'))) &&
         \ inb) || (s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0

From 4278caa2757940d581117a325e118004a21a517f Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 1 Aug 2016 19:46:33 -0700
Subject: [PATCH 0405/1043] unicode identifiers

javascript allows for much more than just [A-Za-z] for identifiers. this is also faster on more recent versions of vim.
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1be39302..a8276802 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,7 +74,7 @@ function s:Onescope(lnum,text,add)
         \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
         \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
-        \ '\%(function\*\|\%(\h\|\$\)\%(\w\|\$\)*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
+        \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
         \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 

From 6de8f62f669952941e6ea57da854d579486ca2db Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 2 Aug 2016 09:41:48 -0700
Subject: [PATCH 0406/1043] more regex

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a8276802..a23a4c4f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,10 +37,10 @@ else
   endfunction
 endif
 
-let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
+let s:line_pre = '^\s*\%(\/\*.\{-}\*\/\s*\)*'
 let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(s\%(tring\|pecial\)\|regex\|doc\|comment\|template\)'
+let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 
 " Regex of syntax group names that are strings or documentation.
 let s:syng_comment = '\%(comment\|doc\)'
@@ -56,7 +56,7 @@ function s:lookForParens(start,end,flags,time)
   endtry
 endfunction
 
-let s:line_term = '\s*\%(\/\*.*\*\/\s*\)*$'
+let s:line_term = '\s*\%(\/\*.\{-}\*\/\s*\)*$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
@@ -74,7 +74,8 @@ function s:Onescope(lnum,text,add)
         \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
         \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
-        \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' : '\<\%(for\%(\s+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
+        \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :
+        \ '\<\%(for\%(\s+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
         \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
@@ -192,7 +193,7 @@ function GetJavascriptIndent()
   if ((line =~# g:javascript_opfirst ||
         \ (pline =~# g:javascript_continuation && pline !~# s:expr_case &&
         \ (pline !~ ':' . s:line_term || line !~#
-        \ s:line_pre . '\%(d\%(ebugger\|o\)\|else\|f\%(inally\|or\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>'))) &&
+        \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>'))) &&
         \ inb) || (s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0

From 27a37b4a77783628cf988fbbffa8e8e0be29288a Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 2 Aug 2016 19:32:37 -0700
Subject: [PATCH 0407/1043] for 585 (#586)

changes operator behavior inside of invoking parens, object literals, and arrays.
---
 indent/javascript.vim | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a23a4c4f..c47d7223 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -186,15 +186,17 @@ function GetJavascriptIndent()
   if line =~ s:line_pre . '[])}]'
     return indent(num)
   endif
-  let inb = num == 0 ? 1 : s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1)
+
+  let pline = s:StripLine(getline(lnum))
+  let inb = num == 0 ? 1 : s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
+        \ (num < lnum && (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term))
   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))
-  let pline = s:StripLine(getline(lnum))
-  if ((line =~# g:javascript_opfirst ||
-        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case &&
-        \ (pline !~ ':' . s:line_term || line !~#
-        \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>'))) &&
-        \ inb) || (s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
+
+  if (inb && (line =~# g:javascript_opfirst ||
+        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || line !~#
+        \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>')))) ||
+        \ (num < lnum && s:Onescope(lnum,pline,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

From b65cd1447236c3ee5fdec81f7bd601ab5fb08dcb Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 2 Aug 2016 20:00:54 -0700
Subject: [PATCH 0408/1043] update comments

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c47d7223..d598b1db 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: July 31, 2016
+" Last Change: August 2, 2016
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -182,7 +182,6 @@ function GetJavascriptIndent()
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
-  " most significant part
   if line =~ s:line_pre . '[])}]'
     return indent(num)
   endif
@@ -193,6 +192,7 @@ function GetJavascriptIndent()
   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))
 
+  " most significant, find the indent amount
   if (inb && (line =~# g:javascript_opfirst ||
         \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || line !~#
         \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>')))) ||

From 97e5fcab6693fa006d6552ece9b72c60e7f04373 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 2 Aug 2016 21:16:25 -0700
Subject: [PATCH 0409/1043] last commit extended to blocks

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d598b1db..419e5ce5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -187,8 +187,8 @@ function GetJavascriptIndent()
   endif
 
   let pline = s:StripLine(getline(lnum))
-  let inb = num == 0 ? 1 : s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
-        \ (num < lnum && (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term))
+  let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
+        \ (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < lnum
   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))
 

From 23b4639fc6038e15c1a01c1d8e3126d801f3c1fb Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 2 Aug 2016 21:35:05 -0700
Subject: [PATCH 0410/1043] accuracy and speed increase for line_term regex

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 419e5ce5..ecec5257 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -56,7 +56,7 @@ function s:lookForParens(start,end,flags,time)
   endtry
 endfunction
 
-let s:line_term = '\s*\%(\/\*.\{-}\*\/\s*\)*$'
+let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')

From 73c85a3f7e0749edad7c6c10e946b2d4ac73e1b9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 3 Aug 2016 01:22:47 -0700
Subject: [PATCH 0411/1043] awful off-by-one bug

so it appears that my testing didn't reveal this because I use (and apparently most people use):
```
function a() {
  var i = 1,
    c = 2
}
```
instead of:
```
function a(){
  var i = 1,
    c = 2
}
```
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ecec5257..4e2568a5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -116,7 +116,7 @@ function s:LineHasOpeningBrackets(lnum)
       let idx = stridx('(){}[]', line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1
-        let last = pos
+        let last = pos + 1
       else
         let open_{idx - 1} = open_{idx - 1} - 1
       endif

From b8762e8af610cf98d42e4b8ff610060953a5a3a9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 3 Aug 2016 09:15:02 -0700
Subject: [PATCH 0412/1043] remove buggy linehasopeningbracket trick

---
 indent/javascript.vim | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4e2568a5..aea64c43 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -110,21 +110,19 @@ 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:IsSyn(a:lnum, pos + 1, '')
       let idx = stridx('(){}[]', line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1
-        let last = pos + 1
       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)), last]
+  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
 " }}}
 
@@ -162,15 +160,15 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
+  call cursor(v:lnum,1)
   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])
+        \ (b:js_cache[0] > lnum || map(pcounts,'s:LineHasOpeningBrackets(lnum)')[0] !~ '2')
+    let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
+    if pcounts[0] =~'1'
+      call s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000)
     endif
   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'? ['\[','\]'] :

From 6a3fac49aa8d6a9e6d2a62b8f7f9eddf4aee74be Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 3 Aug 2016 12:07:45 -0700
Subject: [PATCH 0413/1043] cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index aea64c43..cf99f00a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -164,10 +164,7 @@ function GetJavascriptIndent()
   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] !~ '2')
-    let num = pcounts[0] =~ '1' ? lnum : b:js_cache[1]
-    if pcounts[0] =~'1'
-      call s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000)
-    endif
+    let num = pcounts[0] =~ '1' ? s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000) : b:js_cache[1]
   else
     let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
     if line[0] =~ '\s' && syns != ''

From 336d4351cea47c820e4c67af4e7afa6e822cc0fb Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 4 Aug 2016 19:48:39 -0700
Subject: [PATCH 0414/1043] more cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cf99f00a..11bd91e2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 
 " strip line of comment
 function s:StripLine(c)
-  return substitute(a:c, '\%(:\@<!\/\/.*\)$', '','')
+  return a:c !~ s:expr_case ? substitute(a:c, '\%(:\@<!\/\/.*\)$', '','') : a:c
 endfunction
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
@@ -147,7 +147,6 @@ function GetJavascriptIndent()
   if lnum == 0
     return 0
   endif
-  let line = s:StripLine(line)
 
   if (line =~# s:expr_case)
     let cpo_switch = &cpo
@@ -164,15 +163,15 @@ function GetJavascriptIndent()
   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] !~ '2')
-    let num = pcounts[0] =~ '1' ? s:lookForParens('(\|{\|\[',')\|}\|\]','bW',2000) : b:js_cache[1]
+    let num = pcounts[0] =~ '1' ? s:lookForParens('[({[]','[])}]','bW',2000) : b:js_cache[1]
   else
     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)
+      let num = s:lookForParens('[({[]','[])}]','bW',2000)
     endif
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]

From fc43554f2a5d16762451c385f21b3ab754ffc567 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 4 Aug 2016 21:05:27 -0700
Subject: [PATCH 0415/1043] case-sensitivity

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 11bd91e2..9fa3dbbf 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 
 " strip line of comment
 function s:StripLine(c)
-  return a:c !~ s:expr_case ? substitute(a:c, '\%(:\@<!\/\/.*\)$', '','') : a:c
+  return a:c !~# s:expr_case ? substitute(a:c, '\%(:\@<!\/\/.*\)$', '','') : a:c
 endfunction
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.

From 5632438f0865a7a4fc9920936230eea56a94f59c Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 4 Aug 2016 22:20:36 -0700
Subject: [PATCH 0416/1043] simplify regex

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9fa3dbbf..f591a0f1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,7 +71,7 @@ let g:javascript_continuation .= s:line_term
 
 function s:Onescope(lnum,text,add)
   return a:text =~# '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)' . s:line_term ||
-        \ ((a:add && a:text =~ s:line_pre . s:line_term && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
+        \ ((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:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
         \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :

From 2a85b3c34ca6032e1949a50ffe15a2a491e783d9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 6 Aug 2016 11:35:07 -0700
Subject: [PATCH 0417/1043] ind updates (#593)

---
 indent/javascript.vim | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f591a0f1..e30e272a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 2, 2016
+" Last Change: August 6, 2016
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -88,7 +88,7 @@ endfunction
 
 " Check if the character at lnum:col is inside a string, comment, or is ascii.
 function s:IsSyn(lnum, col, reg)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~? (a:reg != '' ? a:reg : s:syng_strcom)
+  return synIDattr(synID(a:lnum, a:col, 0), 'name') =~? (a:reg != '' ? a:reg : s:syng_strcom)
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
@@ -104,7 +104,7 @@ function s:PrevCodeLine(lnum)
 endfunction
 
 " Check if line 'lnum' has more opening brackets than closing ones.
-function s:LineHasOpeningBrackets(lnum)
+function s:Balanced(lnum)
   let open_0 = 0
   let open_2 = 0
   let open_4 = 0
@@ -121,8 +121,7 @@ function s:LineHasOpeningBrackets(lnum)
     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))
+  return (!open_4 + !open_2 + !open_0) - 2
 endfunction
 " }}}
 
@@ -160,19 +159,16 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  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] !~ '2')
-    let num = pcounts[0] =~ '1' ? s:lookForParens('[({[]','[])}]','bW',2000) : b:js_cache[1]
-  else
+        \ (b:js_cache[0] > lnum || s:Balanced(lnum) > 0)
+    let num = b:js_cache[1]
+  elseif line[0] =~ '\s'
     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)
-    endif
+    let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
+          \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
+    let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
+  else
+    let num = s:lookForParens('[({[]','[])}]','bW',2000)
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 

From 4a126ee6aa2ac113f6315e6d97e03035cee049cf Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 6 Aug 2016 15:48:39 -0700
Subject: [PATCH 0418/1043] negatives are truthy in vimscript

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e30e272a..ec4b07b4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -180,7 +180,7 @@ function GetJavascriptIndent()
   let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
         \ (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < lnum
   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))
+        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~ '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
   if (inb && (line =~# g:javascript_opfirst ||

From 29519c62a56e54934b7ae4887cc2ae2ecedb2331 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 6 Aug 2016 17:06:12 -0700
Subject: [PATCH 0419/1043] case sensitive

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ec4b07b4..00a4206a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -180,7 +180,7 @@ function GetJavascriptIndent()
   let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
         \ (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < lnum
   let switch_offset = (!inb || num == 0) || expand("<cword>") !=# 'switch' ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
-        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~ '.*:[^,]*s' ? s:sw() : 1))
+        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
   if (inb && (line =~# g:javascript_opfirst ||

From 0a7432f3e1afaf02becba648fdc62ea80bf489c8 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 6 Aug 2016 19:39:07 -0700
Subject: [PATCH 0420/1043] remove transparent syntax check

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 00a4206a..bca66262 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -163,7 +163,7 @@ function GetJavascriptIndent()
         \ (b:js_cache[0] > lnum || s:Balanced(lnum) > 0)
     let num = b:js_cache[1]
   elseif line[0] =~ '\s'
-    let syns = synIDattr(synID(v:lnum, 1, 1), 'name')
+    let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
           \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
     let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)

From a7e60bbe490215c3983c871bfd16de146d140fa1 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 7 Aug 2016 08:18:53 -0700
Subject: [PATCH 0421/1043] remove repeated syn checking

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bca66262..74ffa97d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -132,14 +132,14 @@ function GetJavascriptIndent()
   " Get the current line.
   let line = getline(v:lnum)
   " previous nonblank line number
-  let prevline = prevnonblank(v:lnum - 1)
+  let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " 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))
+  if (line !~ '^[''"`]' && syns =~? 'string\|template') ||
+        \ (line !~ '^\s*[/*]' && syns =~? s:syng_comment)
     return -1
   endif
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsSyn(v:lnum,1,s:syng_comment)
+  if line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
     return cindent(v:lnum)
   endif
   let lnum = s:PrevCodeLine(v:lnum - 1)
@@ -162,8 +162,7 @@ function GetJavascriptIndent()
   if b:js_cache[0] >= lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
         \ (b:js_cache[0] > lnum || s:Balanced(lnum) > 0)
     let num = b:js_cache[1]
-  elseif line[0] =~ '\s'
-    let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
+  elseif syns != '' && line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
           \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
     let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)

From b59dfbc8717f47be84b1a3633bb3a6af4cc70225 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 7 Aug 2016 08:32:00 -0700
Subject: [PATCH 0422/1043] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 74ffa97d..4cf644fd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 6, 2016
+" Last Change: August 7, 2016
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -103,7 +103,7 @@ function s:PrevCodeLine(lnum)
   return lnum
 endfunction
 
-" Check if line 'lnum' has more opening brackets than closing ones.
+" Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
   let open_0 = 0
   let open_2 = 0
@@ -131,7 +131,6 @@ function GetJavascriptIndent()
   endif
   " Get the current line.
   let line = getline(v:lnum)
-  " previous nonblank line number
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.{{{2

From 9703a61af908ec223fe7fd64ad0d3766aa2693d9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 9 Aug 2016 12:04:14 -0700
Subject: [PATCH 0423/1043] cleaning, minor performance improvements

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4cf644fd..32857609 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -46,14 +46,14 @@ let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 let s:syng_comment = '\%(comment\|doc\)'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : s:IsSyn(line('.'),col('.'),'')"
+let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:lookForParens(start,end,flags,time)
-  try
+  if has('reltime')
     return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time)
-  catch /E118/
+  else
     return searchpair(a:start,'',a:end,a:flags,0,0)
-  endtry
+  endif
 endfunction
 
 let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
@@ -86,16 +86,11 @@ function s:StripLine(c)
   return a:c !~# s:expr_case ? substitute(a:c, '\%(:\@<!\/\/.*\)$', '','') : a:c
 endfunction
 
-" Check if the character at lnum:col is inside a string, comment, or is ascii.
-function s:IsSyn(lnum, col, reg)
-  return synIDattr(synID(a:lnum, a:col, 0), '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:PrevCodeLine(lnum)
   let lnum = prevnonblank(a:lnum)
   while lnum > 0
-    if !s:IsSyn(lnum, matchend(getline(lnum), '^\s*[^''"]'),'')
+    if synIDattr(synID(lnum,matchend(getline(lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
       break
     endif
     let lnum = prevnonblank(lnum - 1)
@@ -111,7 +106,7 @@ function s:Balanced(lnum)
   let line = getline(a:lnum)
   let pos = match(line, '[][(){}]', 0)
   while pos != -1
-    if !s:IsSyn(a:lnum, pos + 1, '')
+    if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
       let idx = stridx('(){}[]', line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1

From 6f31d721380443c808ce04403363a70d9f6f07ac Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 12 Aug 2016 01:09:54 -0700
Subject: [PATCH 0424/1043] fix regex

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 32857609..222028bd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -38,7 +38,7 @@ else
 endif
 
 let s:line_pre = '^\s*\%(\/\*.\{-}\*\/\s*\)*'
-let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:'
+let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 
@@ -75,7 +75,7 @@ function s:Onescope(lnum,text,add)
         \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
         \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :
-        \ '\<\%(for\%(\s+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
+        \ '\<\%(for\%(\s\+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
         \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 

From 898a536e024b840e68f2efc09679e79ead823453 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 12 Aug 2016 01:39:24 -0700
Subject: [PATCH 0425/1043] disambiguate vars

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 222028bd..f40cf605 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -5,7 +5,7 @@
 " Last Change: August 7, 2016
 
 " Only load this indent file when no other was loaded.
-if exists("b:did_indent")
+if exists('b:did_indent')
   finish
 endif
 let b:did_indent = 1
@@ -19,7 +19,7 @@ setlocal cinoptions+=j1,J1
 let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<'
 
 " Only define the function once.
-if exists("*GetJavascriptIndent")
+if exists('*GetJavascriptIndent')
   finish
 endif
 
@@ -76,7 +76,7 @@ function s:Onescope(lnum,text,add)
         \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
         \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :
         \ '\<\%(for\%(\s\+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
-        \ (a:add || (expand("<cword>") ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
+        \ (a:add || (expand('<cword>') ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -88,14 +88,14 @@ endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevCodeLine(lnum)
-  let lnum = prevnonblank(a:lnum)
-  while lnum > 0
-    if synIDattr(synID(lnum,matchend(getline(lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
+  let l:lnum = prevnonblank(a:lnum)
+  while l:lnum > 0
+    if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
       break
     endif
-    let lnum = prevnonblank(lnum - 1)
+    let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
-  return lnum
+  return l:lnum
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
@@ -103,18 +103,18 @@ function s:Balanced(lnum)
   let open_0 = 0
   let open_2 = 0
   let open_4 = 0
-  let line = getline(a:lnum)
-  let pos = match(line, '[][(){}]', 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('(){}[]', line[pos])
+      let idx = stridx('(){}[]', l:line[pos])
       if idx % 2 == 0
         let open_{idx} = open_{idx} + 1
       else
         let open_{idx - 1} = open_{idx - 1} - 1
       endif
     endif
-    let pos = match(line, '[][(){}]', pos + 1)
+    let pos = match(l:line, '[][(){}]', pos + 1)
   endwhile
   return (!open_4 + !open_2 + !open_0) - 2
 endfunction
@@ -125,23 +125,23 @@ function GetJavascriptIndent()
     let b:js_cache = [0,0,0]
   endif
   " Get the current line.
-  let line = getline(v:lnum)
+  let l:line = getline(v:lnum)
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.{{{2
-  if (line !~ '^[''"`]' && syns =~? 'string\|template') ||
-        \ (line !~ '^\s*[/*]' && syns =~? s:syng_comment)
+  if (l:line !~ '^[''"`]' && syns =~? 'string\|template') ||
+        \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
     return -1
   endif
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
+  if l:line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
     return cindent(v:lnum)
   endif
-  let lnum = s:PrevCodeLine(v:lnum - 1)
-  if lnum == 0
+  let l:lnum = s:PrevCodeLine(v:lnum - 1)
+  if l:lnum == 0
     return 0
   endif
 
-  if (line =~# s:expr_case)
+  if (l:line =~# s:expr_case)
     let cpo_switch = &cpo
     set cpo+=%
     let ind = cindent(v:lnum)
@@ -153,10 +153,10 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if b:js_cache[0] >= lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
-        \ (b:js_cache[0] > lnum || s:Balanced(lnum) > 0)
+  if b:js_cache[0] >= l:lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
+        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
     let num = b:js_cache[1]
-  elseif syns != '' && line[0] =~ '\s'
+  elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
           \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
     let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
@@ -165,21 +165,21 @@ function GetJavascriptIndent()
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
-  if line =~ s:line_pre . '[])}]'
+  if l:line =~ s:line_pre . '[])}]'
     return indent(num)
   endif
 
-  let pline = s:StripLine(getline(lnum))
+  let pline = s:StripLine(getline(l:lnum))
   let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
-        \ (line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < lnum
+        \ (l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < l:lnum
   let switch_offset = (!inb || num == 0) || expand("<cword>") !=# 'switch' ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if (inb && (line =~# g:javascript_opfirst ||
-        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || line !~#
+  if (inb && (l:line =~# g:javascript_opfirst ||
+        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || l:line !~#
         \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>')))) ||
-        \ (num < lnum && s:Onescope(lnum,pline,0) && line !~ s:line_pre . '{')
+        \ (num < l:lnum && s:Onescope(l:lnum,pline,0) && l: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

From debb9bf72249cc3290fa9e8f54709f609b1cf0e9 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 13 Aug 2016 19:47:18 -0700
Subject: [PATCH 0426/1043] Readme Updates (#599)

* Readme Updates

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index bcefe6c6..662a2006 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,11 @@ variables:
     let g:javascript_conceal_super          = "Ω"
     let g:javascript_conceal_arrow_function = "⇒"
 
+## Indentation Specific
+
+* `:h cino-:`
+* End-of-line continuations : `g:javascript_continuation` ( slightly complicated, look at the source code )
+* Start-of-line continuations : `g:javascript_opfirst` ( same as above )
 
 ## Contributing
 

From 0cab45687178cb67c4bf19173e24ab010cd6fa26 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 14 Aug 2016 13:00:18 -0700
Subject: [PATCH 0427/1043] regex improvements

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f40cf605..1a6eedde 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -60,12 +60,12 @@ let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,:?^%|&]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<*,.?:^%]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)'
+  let g:javascript_continuation = '\%([<=*,.?:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|\<in\%(stanceof\)\=\)'
 endif
 let g:javascript_continuation .= s:line_term
 

From 28b5a87684d5ecc9927d07a3072f93d27fb266b8 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 15 Aug 2016 18:44:52 -0700
Subject: [PATCH 0428/1043] block statement (#596)

this uses the same algorithm from https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader which the acorn parser also uses. it actually is basically the same as what i had originally but with support for labeled block statements and plain block statements.
---
 indent/javascript.vim | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1a6eedde..38acae0d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 7, 2016
+" Last Change: August 15, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -70,13 +70,19 @@ endif
 let g:javascript_continuation .= s:line_term
 
 function s:Onescope(lnum,text,add)
-  return a:text =~# '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)' . s:line_term ||
+  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:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
-        \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :
-        \ '\<\%(for\%(\s\+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
-        \ (a:add || (expand('<cword>') ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
+        \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
+        \ (a:add || ((expand('<cword>') !=# 'while' || !s:lookForParens('\C\<do\>', '\C\<while\>','nbW',100)) &&
+        \ 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
+function s:isBlock()
+  return getline(line('.'))[col('.')-1] == '{' && !search(
+        \ '\C\%(\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\|\<return\s*\)\%#','bnW') &&
+        \ (!search(':\_s*\%#','bW') || (!s:lookForParens('[({[]','[])}]','bW',200) || s:isBlock()))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -170,16 +176,17 @@ function GetJavascriptIndent()
   endif
 
   let pline = s:StripLine(getline(l:lnum))
-  let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
-        \ (l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < l:lnum
-  let switch_offset = (!inb || num == 0) || expand("<cword>") !=# 'switch' ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
+  call cursor(b:js_cache[1:])
+  let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:isBlock())
+  let switch_offset = num == 0 || s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) !=# 'switch' ? 0 :
+        \ &cino !~ ':' || !has('float') ?  s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
   if (inb && (l:line =~# g:javascript_opfirst ||
-        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || l:line !~#
-        \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>')))) ||
-        \ (num < l:lnum && s:Onescope(l:lnum,pline,0) && l:line !~ s:line_pre . '{')
+        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case))) ||
+        \ (num < l:lnum && s:Onescope(l:lnum,pline,0) =~# '\%(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
     return indent(num) + s:sw() + switch_offset

From 3a20412d264f369dc09d2f29dd6e5f95614c0a22 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Tue, 16 Aug 2016 19:21:52 -0700
Subject: [PATCH 0429/1043] cleaning (#601)

cleaning and improving readability
---
 indent/javascript.vim | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 38acae0d..882fe48a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 15, 2016
+" Last Change: August 16, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -46,15 +46,17 @@ let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 let s:syng_comment = '\%(comment\|doc\)'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
+let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
-function s:lookForParens(start,end,flags,time)
-  if has('reltime')
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time)
-  else
-    return searchpair(a:start,'',a:end,a:flags,0,0)
-  endif
-endfunction
+if has('reltime')
+  function s:lookForParens(start,end,flags,time)
+    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,max([prevnonblank(v:lnum) - 2000,0]),a:time)
+  endfunction
+else
+  function s:lookForParens(start,end,flags,n)
+    return searchpair(a:start,'',a:end,a:flags,0,max([prevnonblank(v:lnum) - 2000,0]))
+  endfunction
+endif
 
 let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
 
@@ -62,11 +64,11 @@ let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
 if !exists('g:javascript_opfirst')
   let g:javascript_opfirst = '\%([<>,:?^%|&]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
-let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
-
 if !exists('g:javascript_continuation')
   let g:javascript_continuation = '\%([<=*,.?:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|\<in\%(stanceof\)\=\)'
 endif
+
+let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 let g:javascript_continuation .= s:line_term
 
 function s:Onescope(lnum,text,add)
@@ -95,13 +97,12 @@ endfunction
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevCodeLine(lnum)
   let l:lnum = prevnonblank(a:lnum)
-  while l:lnum > 0
+  while l:lnum
     if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
-      break
+      return l:lnum
     endif
     let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
-  return l:lnum
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
@@ -176,7 +177,7 @@ function GetJavascriptIndent()
   endif
 
   let pline = s:StripLine(getline(l:lnum))
-  call cursor(b:js_cache[1:])
+  call cursor(b:js_cache[1],b:js_cache[2])
   let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:isBlock())
   let switch_offset = num == 0 || s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) !=# 'switch' ? 0 :
         \ &cino !~ ':' || !has('float') ?  s:sw() :

From cef306faf8ae064fed37590c03d4ffbca15e7836 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 17 Aug 2016 13:23:43 -0700
Subject: [PATCH 0430/1043] settings (#603)

these don't seem to be very relevant when using indentexprs, and may override the indentation script,

opinions on this are welcomed, and honestly I don't know exactly what effect these have. the clojure indent file and a few others included with vim has these options set to off
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 882fe48a..21fdf3aa 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -12,11 +12,11 @@ let b:did_indent = 1
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal nolisp
+setlocal nolisp noautoindent nosmartindent
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
 
-let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<'
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< cinoptions<'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')

From aadf36b731716105d0b63454f508c7272b67a69e Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 17 Aug 2016 19:11:37 -0700
Subject: [PATCH 0431/1043] cache can be invalid for he current line

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 21fdf3aa..ec756641 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -160,7 +160,7 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if b:js_cache[0] >= l:lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
+  if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'

From f16fe69f0f6fee588c96ce4131dd4c93860cbb04 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 18 Aug 2016 11:50:57 -0700
Subject: [PATCH 0432/1043] Change function names

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ec756641..bae12128 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -49,11 +49,11 @@ let s:syng_comment = '\%(comment\|doc\)'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 if has('reltime')
-  function s:lookForParens(start,end,flags,time)
+  function s:GetPair(start,end,flags,time)
     return searchpair(a:start,'',a:end,a:flags,s:skip_expr,max([prevnonblank(v:lnum) - 2000,0]),a:time)
   endfunction
 else
-  function s:lookForParens(start,end,flags,n)
+  function s:GetPair(start,end,flags,n)
     return searchpair(a:start,'',a:end,a:flags,0,max([prevnonblank(v:lnum) - 2000,0]))
   endfunction
 endif
@@ -75,16 +75,16 @@ 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:lookForParens('(', ')', 'cbW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
-        \ (a:add || ((expand('<cword>') !=# 'while' || !s:lookForParens('\C\<do\>', '\C\<while\>','nbW',100)) &&
+        \ s:GetPair('(', ')', 'cbW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
+        \ (a:add || ((expand('<cword>') !=# 'while' || !s:GetPair('\C\<do\>', '\C\<while\>','nbW',100)) &&
         \ 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
-function s:isBlock()
+function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
         \ '\C\%(\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\|\<return\s*\)\%#','bnW') &&
-        \ (!search(':\_s*\%#','bW') || (!s:lookForParens('[({[]','[])}]','bW',200) || s:isBlock()))
+        \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
 endfunction
 
 " Auxiliary Functions {{{2
@@ -166,9 +166,9 @@ function GetJavascriptIndent()
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
           \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
-    let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
+    let num = s:GetPair(pattern[0],pattern[1],'bW',2000)
   else
-    let num = s:lookForParens('[({[]','[])}]','bW',2000)
+    let num = s:GetPair('[({[]','[])}]','bW',2000)
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
@@ -178,7 +178,7 @@ function GetJavascriptIndent()
 
   let pline = s:StripLine(getline(l:lnum))
   call cursor(b:js_cache[1],b:js_cache[2])
-  let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:isBlock())
+  let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
   let switch_offset = num == 0 || s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) !=# 'switch' ? 0 :
         \ &cino !~ ':' || !has('float') ?  s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))

From ba6dce3cb9cb0b388fbfcb7b9f9f914824591778 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 18 Aug 2016 11:54:00 -0700
Subject: [PATCH 0433/1043] Rename function

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bae12128..4b11fdd3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,7 +71,7 @@ endif
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 let g:javascript_continuation .= s:line_term
 
-function s:Onescope(lnum,text,add)
+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) &&
@@ -179,14 +179,14 @@ function GetJavascriptIndent()
   let pline = s:StripLine(getline(l:lnum))
   call cursor(b:js_cache[1],b:js_cache[2])
   let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
-  let switch_offset = num == 0 || s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) !=# 'switch' ? 0 :
+  let switch_offset = num == 0 || s:OneScope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) !=# 'switch' ? 0 :
         \ &cino !~ ':' || !has('float') ?  s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
   if (inb && (l:line =~# g:javascript_opfirst ||
         \ (pline =~# g:javascript_continuation && pline !~# s:expr_case))) ||
-        \ (num < l:lnum && s:Onescope(l:lnum,pline,0) =~# '\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)' &&
+        \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\%(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 67f2990a8b74d8e72387fced7a8b6d09b9c62e22 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 18 Aug 2016 17:41:47 -0700
Subject: [PATCH 0434/1043] regex improvements (#607)

small regex improvements
---
 indent/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4b11fdd3..321d56f1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,7 +37,7 @@ else
   endfunction
 endif
 
-let s:line_pre = '^\s*\%(\/\*.\{-}\*\/\s*\)*'
+let s:line_pre = '^\s*\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\='
 let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
@@ -58,14 +58,14 @@ else
   endfunction
 endif
 
-let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
+let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%|&]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\([-/.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<=*,.?:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|\<in\%(stanceof\)\=\)'
+  let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
 endif
 
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst

From d0a4aa401317f19757986035edb1aacd0f3dda44 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 18 Aug 2016 21:03:43 -0700
Subject: [PATCH 0435/1043] more regex (#608)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 321d56f1..214d83d5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,7 +37,7 @@ else
   endfunction
 endif
 
-let s:line_pre = '^\s*\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\='
+let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>'
 let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
@@ -83,7 +83,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
-        \ '\C\%(\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\|\<return\s*\)\%#','bnW') &&
+        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
         \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
 endfunction
 

From 0a955ee44587c71ae97a1a8a796b61150c7d83cb Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 19 Aug 2016 14:58:34 -0700
Subject: [PATCH 0436/1043] function removed,cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 214d83d5..b7b463ec 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -89,11 +89,6 @@ endfunction
 
 " Auxiliary Functions {{{2
 
-" strip line of comment
-function s:StripLine(c)
-  return a:c !~# s:expr_case ? substitute(a:c, '\%(:\@<!\/\/.*\)$', '','') : a:c
-endfunction
-
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevCodeLine(lnum)
   let l:lnum = prevnonblank(a:lnum)
@@ -176,16 +171,17 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-  let pline = s:StripLine(getline(l:lnum))
   call cursor(b:js_cache[1],b:js_cache[2])
+
+  let swcase = getline(l:lnum) =~# s:expr_case
+  let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
   let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
-  let switch_offset = num == 0 || s:OneScope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) !=# 'switch' ? 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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if (inb && (l:line =~# g:javascript_opfirst ||
-        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case))) ||
+  if (inb && (l:line =~# g:javascript_opfirst || (!swcase && pline =~# g:javascript_continuation))) ||
         \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\%(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

From 8eea63270067ca03cadbd0548866684729a986ac Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 19 Aug 2016 18:53:03 -0700
Subject: [PATCH 0437/1043] fix foreach method calls

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b7b463ec..5a16f2ac 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -182,7 +182,7 @@ function GetJavascriptIndent()
 
   " most significant, find the indent amount
   if (inb && (l:line =~# g:javascript_opfirst || (!swcase && pline =~# g:javascript_continuation))) ||
-        \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)' &&
+        \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\%(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 efab7db0bb6ee2898b716962c69b10697c04822c Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 19 Aug 2016 19:15:43 -0700
Subject: [PATCH 0438/1043] date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5a16f2ac..d68b3971 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 16, 2016
+" Last Change: August 19, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -182,7 +182,7 @@ function GetJavascriptIndent()
 
   " most significant, find the indent amount
   if (inb && (l:line =~# g:javascript_opfirst || (!swcase && pline =~# g:javascript_continuation))) ||
-        \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
+        \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(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 055ce0ca67955c4d457b08ec3fe6f84a619ed951 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Fri, 19 Aug 2016 21:02:33 -0700
Subject: [PATCH 0439/1043] switch stuff

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d68b3971..18c5dae9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -181,7 +181,7 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if (inb && (l:line =~# g:javascript_opfirst || (!swcase && pline =~# g:javascript_continuation))) ||
+  if (inb && (!swcase && (l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation))) ||
         \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(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

From 95161928410806a14974284195304364f4557547 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 20 Aug 2016 00:39:34 -0700
Subject: [PATCH 0440/1043] case statements update

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 18c5dae9..02e332a9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 19, 2016
+" Last Change: August 20, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -181,8 +181,8 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if (inb && (!swcase && (l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation))) ||
-        \ (num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
+  if inb && !swcase && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
+        \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(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 34a070cc3d8a3c71812f82bceb6b559e41dffff1 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 20 Aug 2016 11:57:11 -0700
Subject: [PATCH 0441/1043] minor style changes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 02e332a9..51881d16 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -102,9 +102,7 @@ endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
-  let open_0 = 0
-  let open_2 = 0
-  let open_4 = 0
+  let [open_0,open_2,open_4] = [0,0,0]
   let l:line = getline(a:lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
@@ -131,7 +129,7 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.{{{2
-  if (l:line !~ '^[''"`]' && syns =~? 'string\|template') ||
+  if (l:line !~ '^[''"`]' && syns =~? '\%(string\|template\)') ||
         \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
     return -1
   endif

From 6787729dca38a1e4be5c13586b1e94e2624f5762 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 20 Aug 2016 21:28:58 -0700
Subject: [PATCH 0442/1043] remove ugly function call

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 51881d16..612771f9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -174,7 +174,7 @@ function GetJavascriptIndent()
   let swcase = getline(l:lnum) =~# s:expr_case
   let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
   let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
-  let switch_offset = num == 0 || s:OneScope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) !=# 'switch' ? 0 :
+  let switch_offset = num == 0 || s:OneScope(num, getline(num)[: b:js_cache[2] - 2],1) !=# 'switch' ? 0 :
         \ &cino !~ ':' || !has('float') ?  s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 

From 5900fce5a3df8626468be1afc10c8a872b8e198a Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sat, 20 Aug 2016 21:36:24 -0700
Subject: [PATCH 0443/1043] last commit revert

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 612771f9..51881d16 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -174,7 +174,7 @@ function GetJavascriptIndent()
   let swcase = getline(l:lnum) =~# s:expr_case
   let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
   let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
-  let switch_offset = num == 0 || s:OneScope(num, getline(num)[: b:js_cache[2] - 2],1) !=# 'switch' ? 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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 

From faf8bda63459b9205c7973117dc6ca426172a2c3 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Sun, 21 Aug 2016 15:03:06 -0700
Subject: [PATCH 0444/1043] containing braces which aren't blocks

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 51881d16..55065c6a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
-        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
+        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
         \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
 endfunction
 

From cd0fc28224d9e760eccde144f3ef8977ff849d84 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 22 Aug 2016 11:38:07 -0700
Subject: [PATCH 0445/1043] comment fix

for multiline comments which were being considered operator first lines in some cases. may be getting some bug reports for this on master
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 55065c6a..e1601515 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,7 +62,7 @@ let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\([-/.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\([-/.+]\)\%(\1\|\*\)\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 if !exists('g:javascript_continuation')
   let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'

From 2e3ab0a8bc499d179eefdd80b501c77c01d7d11a Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 22 Aug 2016 12:11:57 -0700
Subject: [PATCH 0446/1043] improve regex

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e1601515..b0588e13 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,7 +62,7 @@ let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\([-/.+]\)\%(\1\|\*\)\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\/[^/*]\|\([-.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 if !exists('g:javascript_continuation')
   let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'

From fd6c2b756b626d1bd72eea68e3b6bc53fccf1ee7 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 24 Aug 2016 16:21:45 -0700
Subject: [PATCH 0447/1043] Fix export default style indents

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b0588e13..dccf1b8d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
-        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
+        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\|default\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
         \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
 endfunction
 

From af43741159988cce5015b7bcb128a59e05b58305 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Wed, 24 Aug 2016 21:42:34 -0700
Subject: [PATCH 0448/1043] regex update

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index dccf1b8d..af8e5d1c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search(
-        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\|default\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|\<in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
+        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
         \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
 endfunction
 

From f1bd983c6419a0bb47f7548be1b7f7f5e9bf9ce6 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Thu, 25 Aug 2016 00:21:44 -0700
Subject: [PATCH 0449/1043] allow nl in export default

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index af8e5d1c..524cada2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 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') &&
+        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
         \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
 endfunction
 

From aa5586ce1f400d811cca0f793c80155f676c1140 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 26 Aug 2016 19:56:52 -0700
Subject: [PATCH 0450/1043] small bugfixes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 524cada2..c9a89556 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -77,7 +77,7 @@ function s:OneScope(lnum,text,add)
         \ 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)) &&
-        \ expand('cword') !=# 'each' || search('\C\<for\_s\+\%#','nbW'))) ? expand('<cword>') : ''
+        \ (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 51035b51a04d52156401baac5e8af6dc8b889a09 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 31 Aug 2016 19:30:32 -0700
Subject: [PATCH 0451/1043] react property expressions

fixes #618 elegantly (hopefully)
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c9a89556..694403af 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -84,7 +84,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*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
+        \ (!search('[:{]\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','cbW',200) || s:IsBlock()))
 endfunction
 
 " Auxiliary Functions {{{2

From 6aba384572e9d9d247169b3f4e3bbee68fac1e0f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Sep 2016 15:10:06 -0700
Subject: [PATCH 0452/1043] adjustable indent (experimental)

https://github.com/mxw/vim-jsx/issues/116#issuecomment-244400990
thanks to @mxw for the suggestion
---
 indent/javascript.vim | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 694403af..c13f4f59 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -122,7 +122,7 @@ endfunction
 
 function GetJavascriptIndent()
   if !exists('b:js_cache')
-    let b:js_cache = [0,0,0]
+    let b:js_cache = [0,0,0,0]
   endif
   " Get the current line.
   let l:line = getline(v:lnum)
@@ -152,9 +152,11 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
+  let known = 0
   call cursor(v:lnum,1)
   if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
+    let known = 1
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -163,7 +165,11 @@ function GetJavascriptIndent()
   else
     let num = s:GetPair('[({[]','[])}]','bW',2000)
   endif
-  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
+
+  if known && b:js_cache[3]
+    let known = indent(b:js_cache[0]) - b:js_cache[3]
+  endif
+  let b:js_cache[:3] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   if l:line =~ s:line_pre . '[])}]'
     return indent(num)
@@ -182,9 +188,13 @@ function GetJavascriptIndent()
   if inb && !swcase && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
         \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(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
+    let ind = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+    let b:js_cache[3] = ind
+    return ind + known
   elseif num > 0
-    return indent(num) + s:sw() + switch_offset
+    let ind = indent(num) + s:sw() + switch_offset
+    let b:js_cache[3] = ind
+    return ind + known
   endif
 
 endfunction

From d6616d5fd6f87633856d96abbbd7931f3a3db468 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Sep 2016 15:28:28 -0700
Subject: [PATCH 0453/1043] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c13f4f59..7190dc38 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -169,7 +169,7 @@ function GetJavascriptIndent()
   if known && b:js_cache[3]
     let known = indent(b:js_cache[0]) - b:js_cache[3]
   endif
-  let b:js_cache[:3] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
+  let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   if l:line =~ s:line_pre . '[])}]'
     return indent(num)
@@ -177,15 +177,14 @@ function GetJavascriptIndent()
 
   call cursor(b:js_cache[1],b:js_cache[2])
 
-  let swcase = getline(l:lnum) =~# s:expr_case
-  let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
-  let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
+  let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
+  let inb = num == 0 || ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
   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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if inb && !swcase && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
+  if inb && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
         \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
         \ l:line !~ s:line_pre . '{')
     let ind = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset

From 0bba857641759969cca990c815ec7a830fcbee60 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Sep 2016 19:38:52 -0700
Subject: [PATCH 0454/1043] bugfixes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7190dc38..ec08fb62 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -156,7 +156,9 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
-    let known = 1
+    if b:js_cache[1] == num
+      let known = 1
+    end
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -184,7 +186,7 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if inb && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
+  if inb && ((l:line =~# g:javascript_opfirst || pline !~# s:expr_case . s:line_term && pline =~# g:javascript_continuation) ||
         \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
         \ l:line !~ s:line_pre . '{')
     let ind = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset

From f8a4a45f3d52bf42a28868c3f1b2d727522d7d8e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Sep 2016 19:50:44 -0700
Subject: [PATCH 0455/1043] fixes for the bugfixes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ec08fb62..5cba356a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -112,6 +112,9 @@ function s:Balanced(lnum)
         let open_{idx} = open_{idx} + 1
       else
         let open_{idx - 1} = open_{idx - 1} - 1
+        if open_{idx - 1} < 0
+          return 0
+        end
       endif
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)
@@ -150,15 +153,13 @@ function GetJavascriptIndent()
   endif
   "}}}
 
+  let known = 0
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
-  let known = 0
   call cursor(v:lnum,1)
   if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
-    if b:js_cache[1] == num
-      let known = 1
-    end
+    let known = 1
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -171,6 +172,7 @@ function GetJavascriptIndent()
   if known && b:js_cache[3]
     let known = indent(b:js_cache[0]) - b:js_cache[3]
   endif
+
   let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   if l:line =~ s:line_pre . '[])}]'

From 174d94e6f097851d495ba5cf0f8f537a9bcade62 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 00:04:25 -0700
Subject: [PATCH 0456/1043] produce cindent-like

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5cba356a..100f8b9e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -182,7 +182,7 @@ function GetJavascriptIndent()
   call cursor(b:js_cache[1],b:js_cache[2])
 
   let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
-  let inb = num == 0 || ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
+  let inb = num == 0 || s:IsBlock()
   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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))

From c9f6fadbd5be1c2d3245d010cfd5f391251d5143 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 12:18:56 -0700
Subject: [PATCH 0457/1043] performance refactor

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 100f8b9e..f3c37eca 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -179,25 +179,21 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-  call cursor(b:js_cache[1],b:js_cache[2])
 
   let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
-  let inb = num == 0 || s:IsBlock()
   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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if inb && ((l:line =~# g:javascript_opfirst || pline !~# s:expr_case . s:line_term && pline =~# g:javascript_continuation) ||
-        \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
-        \ l:line !~ s:line_pre . '{')
-    let ind = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
-    let b:js_cache[3] = ind
-    return ind + known
+  if ((l:line =~# g:javascript_opfirst || pline !~# s:expr_case . s:line_term && pline =~# g:javascript_continuation) ||
+        \ s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
+        \ l:line !~ s:line_pre . '{') && cursor(b:js_cache[1],b:js_cache[2]) + 2 && (num == 0 || s:IsBlock())
+    let b:js_cache[3] = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+    return b:js_cache[3] + known
   elseif num > 0
-    let ind = indent(num) + s:sw() + switch_offset
-    let b:js_cache[3] = ind
-    return ind + known
+    let b:js_cache[3] = indent(num) + s:sw() + switch_offset
+    return b:js_cache[3] + known
   endif
 
 endfunction

From 0a3bb524283eb4777cbd86322f03b5a2ee266e91 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 13:07:30 -0700
Subject: [PATCH 0458/1043] 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 f3c37eca..b5231e44 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -188,7 +188,7 @@ function GetJavascriptIndent()
   " most significant, find the indent amount
   if ((l:line =~# g:javascript_opfirst || pline !~# s:expr_case . s:line_term && pline =~# g:javascript_continuation) ||
         \ s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
-        \ l:line !~ s:line_pre . '{') && cursor(b:js_cache[1],b:js_cache[2]) + 2 && (num == 0 || s:IsBlock())
+        \ l:line !~ s:line_pre . '{') && (num == 0 || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
     let b:js_cache[3] = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
     return b:js_cache[3] + known
   elseif num > 0

From cc9bd56e8f857fbc7a4e59c73dbeec7481182b51 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 13:29:16 -0700
Subject: [PATCH 0459/1043] 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 b5231e44..07800524 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,10 +62,10 @@ let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\/[^/*]\|\([-.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,?^%|*&]\|\/[^/*]\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
+  let g:javascript_continuation = '\%([<=,.?/*^%|&]\|:\@<!:\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
 endif
 
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst

From 2f5937e0ce0793861aee2e337aacbb106e2c0978 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 16:43:43 -0700
Subject: [PATCH 0460/1043] deprecate options

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 662a2006..d2a81dd5 100644
--- a/README.md
+++ b/README.md
@@ -100,8 +100,8 @@ variables:
 ## Indentation Specific
 
 * `:h cino-:`
-* End-of-line continuations : `g:javascript_continuation` ( slightly complicated, look at the source code )
-* Start-of-line continuations : `g:javascript_opfirst` ( same as above )
+* End-of-line continuations : `g:javascript_continuation` ( deprecated )
+* Start-of-line continuations : `g:javascript_opfirst` ( deprecated )
 
 ## Contributing
 

From 8711b66df9014f6032f8f77a0b825ce669aa181c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 17:16:28 -0700
Subject: [PATCH 0461/1043] remove variables from readme

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index d2a81dd5..1cd79f4c 100644
--- a/README.md
+++ b/README.md
@@ -100,8 +100,6 @@ variables:
 ## Indentation Specific
 
 * `:h cino-:`
-* End-of-line continuations : `g:javascript_continuation` ( deprecated )
-* Start-of-line continuations : `g:javascript_opfirst` ( deprecated )
 
 ## Contributing
 

From bf74844aa2b3a79e9f86139363f267efd1a6fdb5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 22:02:43 -0700
Subject: [PATCH 0462/1043] fix cached blank line problem

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 07800524..d74eed5b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -170,7 +170,7 @@ function GetJavascriptIndent()
   endif
 
   if known && b:js_cache[3]
-    let known = indent(b:js_cache[0]) - b:js_cache[3]
+    let known = prevnonblank(b:js_cache[0]) == b:js_cache[0] ? indent(b:js_cache[0]) - b:js_cache[3] : 0
   endif
 
   let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]

From 0586678395b756da7e554d62df872757fe3c1778 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Sep 2016 22:34:48 -0700
Subject: [PATCH 0463/1043] far better version of last commit

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d74eed5b..6155c5cd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -170,7 +170,7 @@ function GetJavascriptIndent()
   endif
 
   if known && b:js_cache[3]
-    let known = prevnonblank(b:js_cache[0]) == b:js_cache[0] ? indent(b:js_cache[0]) - b:js_cache[3] : 0
+    let known = indent(lnum) - b:js_cache[3]
   endif
 
   let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]

From 22d0e64ee15c906685cab631309e83882d692e38 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 00:04:33 -0700
Subject: [PATCH 0464/1043] more performance and bugfixes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6155c5cd..ec6dda4e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -154,12 +154,15 @@ function GetJavascriptIndent()
   "}}}
 
   let known = 0
+  let pcounts = [0]
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
-        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
-    let known = 1
+  if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
+        \ (b:js_cache[0] > l:lnum || map(pcounts,'s:Balanced(l:lnum)')[0] > 0)
+    if pcounts[0] > 0
+      let known = 1
+    end
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -170,12 +173,13 @@ function GetJavascriptIndent()
   endif
 
   if known && b:js_cache[3]
-    let known = indent(lnum) - b:js_cache[3]
+    let known = indent(l:lnum) - b:js_cache[3]
   endif
 
   let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   if l:line =~ s:line_pre . '[])}]'
+    let b:js_cache[0] = 0
     return indent(num)
   endif
 

From 023e1d851e8eb4e94cb62a791660fd0b7ab59dd2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 00:20:37 -0700
Subject: [PATCH 0465/1043] other fixes with cache

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ec6dda4e..ba41a99a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -159,10 +159,10 @@ function GetJavascriptIndent()
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
   if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (b:js_cache[0] > l:lnum || map(pcounts,'s:Balanced(l:lnum)')[0] > 0)
+        \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
     if pcounts[0] > 0
       let known = 1
-    end
+    endif
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :

From 5f7e36a4a69723aee7824e051c8a4e2b166b180d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 00:34:57 -0700
Subject: [PATCH 0466/1043] formatting,date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ba41a99a..71ba0dea 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 20, 2016
+" Last Change: September 4, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -114,7 +114,7 @@ function s:Balanced(lnum)
         let open_{idx - 1} = open_{idx - 1} - 1
         if open_{idx - 1} < 0
           return 0
-        end
+        endif
       endif
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)
@@ -160,9 +160,7 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
         \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
-    if pcounts[0] > 0
-      let known = 1
-    endif
+    let known = pcounts[0] > 0
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -183,7 +181,6 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-
   let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
   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() :

From 224fcee54dd5dcb6c47e21f5885f63e048a21372 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 09:47:48 -0700
Subject: [PATCH 0467/1043] small changes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 71ba0dea..58b06c53 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -143,6 +143,7 @@ function GetJavascriptIndent()
   if l:lnum == 0
     return 0
   endif
+  let pline = getline(l:lnum)
 
   if (l:line =~# s:expr_case)
     let cpo_switch = &cpo
@@ -158,7 +159,7 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
+  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum && b:js_cache[0] && pline !~ '}'
         \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
     let known = pcounts[0] > 0
     let num = b:js_cache[1]
@@ -177,11 +178,10 @@ function GetJavascriptIndent()
   let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   if l:line =~ s:line_pre . '[])}]'
-    let b:js_cache[0] = 0
     return indent(num)
   endif
 
-  let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
+  let pline = pline =~# s:expr_case ? pline : substitute(pline, '\%(:\@<!\/\/.*\)$', '','')
   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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))

From c36a91b784e95dac257b7e94f78b94751a22bdf3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 10:02:44 -0700
Subject: [PATCH 0468/1043] fix

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 58b06c53..409a02f3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -143,7 +143,6 @@ function GetJavascriptIndent()
   if l:lnum == 0
     return 0
   endif
-  let pline = getline(l:lnum)
 
   if (l:line =~# s:expr_case)
     let cpo_switch = &cpo
@@ -159,8 +158,8 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum && b:js_cache[0] && pline !~ '}'
-        \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
+  if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
+        \ (getline(l:lnum) !~ s:line_pre . '}' && map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
     let known = pcounts[0] > 0
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
@@ -181,7 +180,7 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-  let pline = pline =~# s:expr_case ? pline : substitute(pline, '\%(:\@<!\/\/.*\)$', '','')
+  let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
   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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))

From 172aae6590f04e8b6777a47aa63eb2b076dbcece Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 10:10:33 -0700
Subject: [PATCH 0469/1043] cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 409a02f3..fe4f6766 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -143,6 +143,7 @@ function GetJavascriptIndent()
   if l:lnum == 0
     return 0
   endif
+  let pline = getline(l:lnum)
 
   if (l:line =~# s:expr_case)
     let cpo_switch = &cpo
@@ -159,7 +160,7 @@ function GetJavascriptIndent()
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
   if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (getline(l:lnum) !~ s:line_pre . '}' && map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
+        \ (pline !~ s:line_pre . '}' && map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
     let known = pcounts[0] > 0
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
@@ -180,7 +181,7 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-  let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
+  let pline = pline =~# s:expr_case ? pline : substitute(pline, '\%(:\@<!\/\/.*\)$', '','')
   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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))

From 2dd5dff8fa8e8a46b600663b124a81313009606c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 10:47:56 -0700
Subject: [PATCH 0470/1043] cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index fe4f6766..abcb2f3d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -143,7 +143,6 @@ function GetJavascriptIndent()
   if l:lnum == 0
     return 0
   endif
-  let pline = getline(l:lnum)
 
   if (l:line =~# s:expr_case)
     let cpo_switch = &cpo
@@ -160,7 +159,7 @@ function GetJavascriptIndent()
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
   if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (pline !~ s:line_pre . '}' && map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
+        \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
     let known = pcounts[0] > 0
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
@@ -181,7 +180,7 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-  let pline = pline =~# s:expr_case ? pline : substitute(pline, '\%(:\@<!\/\/.*\)$', '','')
+  let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
   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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))

From d51ef6ab2be107a3144ed22d8f45db90c7aa1e30 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 13:15:48 -0700
Subject: [PATCH 0471/1043] small change

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index abcb2f3d..b603af8f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -160,7 +160,7 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
         \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
-    let known = pcounts[0] > 0
+    let known = l:lnum == b:js_cache[0] && pcounts[0] > 0
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :

From 46b6dd514bc8092225dcb43d3807b5ccab28a462 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 13:24:07 -0700
Subject: [PATCH 0472/1043] allow blank line in adjustment calc

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b603af8f..ebd218cd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -160,7 +160,7 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
         \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
-    let known = l:lnum == b:js_cache[0] && pcounts[0] > 0
+    let known = l:lnum == prevnonblank(b:js_cache[0]) && pcounts[0] > 0
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :

From 4d7a4227e874af6d6ff738dbcc38acc6141e9e6b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 16:50:47 -0700
Subject: [PATCH 0473/1043] superfluous condition

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ebd218cd..eb8db924 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -158,7 +158,7 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if b:js_cache[0] && b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
+  if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
         \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
     let known = l:lnum == prevnonblank(b:js_cache[0]) && pcounts[0] > 0
     let num = b:js_cache[1]

From 39f09ee50941f6373fa66a06de42751411d4c2a7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Sep 2016 17:07:00 -0700
Subject: [PATCH 0474/1043] simplify assignment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index eb8db924..f0cca94d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -109,9 +109,9 @@ function s:Balanced(lnum)
     if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
       let idx = stridx('(){}[]', l:line[pos])
       if idx % 2 == 0
-        let open_{idx} = open_{idx} + 1
+        let open_{idx} += 1
       else
-        let open_{idx - 1} = open_{idx - 1} - 1
+        let open_{idx - 1} -= 1
         if open_{idx - 1} < 0
           return 0
         endif

From 0134b36de5dc7f8154f64a38647951e3f9e68cc2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 7 Sep 2016 19:06:00 -0700
Subject: [PATCH 0475/1043] little optimizations (#627)

* little optimizations

* extra parens
---
 indent/javascript.vim | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f0cca94d..d214f29b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -38,7 +38,7 @@ else
 endif
 
 let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>'
-let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:'
+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 = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 
@@ -180,15 +180,16 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-  let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
+  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() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if ((l:line =~# g:javascript_opfirst || pline !~# s:expr_case . s:line_term && pline =~# g:javascript_continuation) ||
+  if (l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) &&
+        \ (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\)\)\>' &&
-        \ l:line !~ s:line_pre . '{') && (num == 0 || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
+        \ l:line !~ s:line_pre . '{'
     let b:js_cache[3] = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
     return b:js_cache[3] + known
   elseif num > 0

From e69cc169119e0779b6edaf03e0f0dd4faa9fa074 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 7 Sep 2016 21:43:48 -0700
Subject: [PATCH 0476/1043] no adjustment in block statements

This wasn't working due to the fluctuating indent possible in blocks.
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d214f29b..ae211c7a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -191,7 +191,7 @@ function GetJavascriptIndent()
         \ s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
         \ l:line !~ s:line_pre . '{'
     let b:js_cache[3] = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
-    return b:js_cache[3] + known
+    return b:js_cache[3]
   elseif num > 0
     let b:js_cache[3] = indent(num) + s:sw() + switch_offset
     return b:js_cache[3] + known

From a7e64a92ad196e09f03722fab942e0a13273df2a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 7 Sep 2016 22:00:58 -0700
Subject: [PATCH 0477/1043] don't let variable in block

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ae211c7a..a6d84d1d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -190,8 +190,7 @@ function GetJavascriptIndent()
         \ (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\)\)\>' &&
         \ l:line !~ s:line_pre . '{'
-    let b:js_cache[3] = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
-    return b:js_cache[3]
+    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
     let b:js_cache[3] = indent(num) + s:sw() + switch_offset
     return b:js_cache[3] + known

From 89b5505ab2485cd6c84b68af582a84b3d5825322 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 7 Sep 2016 22:10:00 -0700
Subject: [PATCH 0478/1043] Allow any comment or empty in adjustment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a6d84d1d..6bf22c8a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -160,7 +160,7 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
         \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
-    let known = l:lnum == prevnonblank(b:js_cache[0]) && pcounts[0] > 0
+    let known = pcounts[0] > 0
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :

From 0ab4b1d1838badea13314c5919f2897706ae4e70 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 7 Sep 2016 22:27:14 -0700
Subject: [PATCH 0479/1043] small fix

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6bf22c8a..da2e6733 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -186,14 +186,14 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if (l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) &&
-        \ (num == 0 || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock()) ||
+  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\)\)\>' &&
         \ l:line !~ s:line_pre . '{'
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
     let b:js_cache[3] = indent(num) + s:sw() + switch_offset
-    return b:js_cache[3] + known
+    return b:js_cache[3] + (isOp ? known : 0)
   endif
 
 endfunction

From 81d85029ae43bf7cd831ae8d8d772f2be31206b8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 8 Sep 2016 00:00:16 -0700
Subject: [PATCH 0480/1043] refactor adjustment and simplify

since the adjustment wasn't working well in blocks with blanks or comments, and there is never a continuation in !blocks this is far more simple
---
 indent/javascript.vim | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index da2e6733..f64f80c0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -125,7 +125,7 @@ endfunction
 
 function GetJavascriptIndent()
   if !exists('b:js_cache')
-    let b:js_cache = [0,0,0,0]
+    let b:js_cache = [0,0,0]
   endif
   " Get the current line.
   let l:line = getline(v:lnum)
@@ -153,14 +153,11 @@ function GetJavascriptIndent()
   endif
   "}}}
 
-  let known = 0
-  let pcounts = [0]
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
   if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (map(pcounts,'s:Balanced(l:lnum)')[0] > 0 || b:js_cache[0] > l:lnum)
-    let known = pcounts[0] > 0
+        \ (s:Balanced(l:lnum) > 0 || b:js_cache[0] > l:lnum)
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -170,11 +167,7 @@ function GetJavascriptIndent()
     let num = s:GetPair('[({[]','[])}]','bW',2000)
   endif
 
-  if known && b:js_cache[3]
-    let known = indent(l:lnum) - b:js_cache[3]
-  endif
-
-  let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
+  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   if l:line =~ s:line_pre . '[])}]'
     return indent(num)
@@ -192,8 +185,7 @@ function GetJavascriptIndent()
         \ l:line !~ s:line_pre . '{'
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
-    let b:js_cache[3] = indent(num) + s:sw() + switch_offset
-    return b:js_cache[3] + (isOp ? known : 0)
+    return isOp && num < l:lnum ? indent(l:lnum) : indent(num) + s:sw() + switch_offset
   endif
 
 endfunction

From b53274d98e7a16d492b07b23786279e390ec2376 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 8 Sep 2016 16:52:58 -0700
Subject: [PATCH 0481/1043] more small improvements

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f64f80c0..b98d9f00 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -157,7 +157,7 @@ function GetJavascriptIndent()
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
   if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (s:Balanced(l:lnum) > 0 || b:js_cache[0] > l:lnum)
+        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -174,13 +174,13 @@ 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 :
+  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() :
         \ 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()) ||
+  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\)\)\>' &&
         \ l:line !~ s:line_pre . '{'
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset

From 91314f3f30a48618ca0ff5dd575cbc17c9199d40 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 8 Sep 2016 17:24:09 -0700
Subject: [PATCH 0482/1043] fix objects after ternary ':'

this will not be an issue since nobody uses labels for simple blocks, and if they do it is adjustable
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b98d9f00..ea6cf2d7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,8 +83,8 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 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*\%#','bW') || (!s:GetPair('[({[]','[])}]','cbW',200) || s:IsBlock()))
+        \ '\C\%(\<return\s*\|\%([-=~!<*+,.:?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
+        \ (!search('{\_s*\%#','bW') || s:IsBlock())
 endfunction
 
 " Auxiliary Functions {{{2

From fce8e771ed1e060272e9e1fddfbfb43cdfe1d030 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 8 Sep 2016 19:31:56 -0700
Subject: [PATCH 0483/1043] fix blocks after case statement

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ea6cf2d7..0ec7c944 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -84,7 +84,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*\%#','bW') || s:IsBlock())
+        \ (!search('\%({\|:\zs\)\_s*\%#','bW') || search(s:expr_case . '\%#' ,'nbW') || s:IsBlock())
 endfunction
 
 " Auxiliary Functions {{{2

From 5a5cdf03fae81835049562406f798a73e00992b9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 8 Sep 2016 19:33:33 -0700
Subject: [PATCH 0484/1043] remove 1 char

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0ec7c944..f90e1217 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -83,7 +83,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 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') &&
+        \ '\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())
 endfunction
 

From c15142cf30936b33fe649b9b7c4046d7f6805d95 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 8 Sep 2016 22:51:18 -0700
Subject: [PATCH 0485/1043] allow bind op as line end continuation

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f90e1217..4dbf5d88 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -65,7 +65,7 @@ if !exists('g:javascript_opfirst')
   let g:javascript_opfirst = '\%([<>,?^%|*&]\|\/[^/*]\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<=,.?/*^%|&]\|:\@<!:\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
+  let g:javascript_continuation = '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
 endif
 
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst

From 81e4e6f6156f734e77d2c16a7d455cebf788bb01 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Sep 2016 21:11:19 -0700
Subject: [PATCH 0486/1043] small script function changes (#628)

the code is now much less embarassing
---
 indent/javascript.vim | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4dbf5d88..faf592b3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,20 +71,19 @@ endif
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 let g:javascript_continuation .= s:line_term
 
-function s:OneScope(lnum,text,add)
+function s:OneScope(lnum,text)
   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)) &&
-        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')))) ? expand('<cword>') : ''
+        \ 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>') : ''
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 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
@@ -174,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 0b6aad4c4051a4a4a9c2efe6499cd3adbc6dc3ba Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 11 Sep 2016 13:43:32 -0700
Subject: [PATCH 0487/1043] speed increase attempt (#629)

---
 indent/javascript.vim | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index faf592b3..d7c5f208 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -47,13 +47,23 @@ let s:syng_comment = '\%(comment\|doc\)'
 
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
+function s:skip_func(lnum)
+  if !s:free || getline(line('.')) =~ '[''/"\\]'
+    return eval(s:skip_expr)
+  endif
+  if search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
+    let s:free = !eval(s:skip_expr)
+  endif
+  let s:looksyn = s:free ? line('.') : s:looksyn
+  return !s:free
+endfunction
 
 if has('reltime')
-  function s:GetPair(start,end,flags,time)
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,max([prevnonblank(v:lnum) - 2000,0]),a:time)
+  function s:GetPair(start,end,flags,skip,time)
+    return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0]),a:time)
   endfunction
 else
-  function s:GetPair(start,end,flags,n)
+  function s:GetPair(start,end,flags,...)
     return searchpair(a:start,'',a:end,a:flags,0,max([prevnonblank(v:lnum) - 2000,0]))
   endfunction
 endif
@@ -74,8 +84,8 @@ let g:javascript_continuation .= s:line_term
 function s:OneScope(lnum,text)
   return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
         \ 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) &&
+        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
+        \ (expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',s:skip_expr,100) <= 0) &&
         \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')) ? expand('<cword>') : ''
 endfunction
 
@@ -131,7 +141,7 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.{{{2
-  if (l:line !~ '^[''"`]' && syns =~? '\%(string\|template\)') ||
+  if (l:line !~ '^[''"]' && syns =~? '\%(string\|template\)') ||
         \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
     return -1
   endif
@@ -154,6 +164,7 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
+  let [s:looksyn,s:free] = [v:lnum - 1,1]
   call cursor(v:lnum,1)
   if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
@@ -161,9 +172,9 @@ function GetJavascriptIndent()
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
           \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
-    let num = s:GetPair(pattern[0],pattern[1],'bW',2000)
+    let num = s:GetPair(pattern[0],pattern[1],'bW','s:skip_func(s:looksyn)',2000)
   else
-    let num = s:GetPair('[({[]','[])}]','bW',2000)
+    let num = s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
   endif
 
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
@@ -175,7 +186,7 @@ function GetJavascriptIndent()
   let pline = substitute(substitute(getline(l:lnum),s:expr_case,'\=repeat(" ",strlen(submatch(0)))',''), '\%(:\@<!\/\/.*\)$', '','')
   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 :
+        \ s:GetPair('(', ')', 'bW', s:skip_expr, 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))
 

From 14198ab628f51481957fac6ca97dfd71ab5b5e7a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 13 Sep 2016 11:14:42 -0700
Subject: [PATCH 0488/1043] copy indent if in same scope only

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d7c5f208..10ae987d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -164,10 +164,10 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
-  let [s:looksyn,s:free] = [v:lnum - 1,1]
+  let [s:looksyn,s:free,pcounts] = [v:lnum - 1,1,[0]]
   call cursor(v:lnum,1)
   if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
+        \ (b:js_cache[0] > l:lnum || map(pcounts,'s:Balanced(l:lnum)')[0] > 0)
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -197,7 +197,7 @@ function GetJavascriptIndent()
         \ l:line !~ s:line_pre . '{'
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
-    return isOp && num < l:lnum ? indent(l:lnum) : indent(num) + s:sw() + switch_offset
+    return isOp && num < l:lnum && pcounts[0] > 0 ? indent(l:lnum) : indent(num) + s:sw() + switch_offset
   endif
 
 endfunction

From faf6f67efe6eacc772c6d52617b48e7ac0d8523f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 13 Sep 2016 12:05:38 -0700
Subject: [PATCH 0489/1043] remove indent copy

I can improve it in the future, but it isn't that great now
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 10ae987d..04670498 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -164,10 +164,10 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
-  let [s:looksyn,s:free,pcounts] = [v:lnum - 1,1,[0]]
+  let [s:looksyn,s:free] = [v:lnum - 1,1]
   call cursor(v:lnum,1)
   if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (b:js_cache[0] > l:lnum || map(pcounts,'s:Balanced(l:lnum)')[0] > 0)
+        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -197,7 +197,7 @@ function GetJavascriptIndent()
         \ l:line !~ s:line_pre . '{'
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
-    return isOp && num < l:lnum && pcounts[0] > 0 ? indent(l:lnum) : indent(num) + s:sw() + switch_offset
+    return indent(num) + s:sw() + switch_offset
   endif
 
 endfunction

From 4e2e37755a0393fae9b7844056958eb969527d28 Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Mon, 12 Sep 2016 15:09:22 -0500
Subject: [PATCH 0490/1043] Add highlight group specifically for object colons

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 8cf3e627..cbe8d339 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -75,11 +75,12 @@ endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
 syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
+syntax match   jsObjectColon       contained /:/ skipwhite skipempty
 syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
 syntax match   jsObjectSeparator   contained /,/
-syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
+syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=jsObjectColon,@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
 syntax match   jsObjectMethodType  contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
@@ -285,6 +286,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFloat                Float
   HiLink jsBooleanTrue          Boolean
   HiLink jsBooleanFalse         Boolean
+  HiLink jsObjectColon          jsNoise
   HiLink jsNoise                Noise
   HiLink jsBrackets             Noise
   HiLink jsParens               Noise

From 355d6650d825849a3d43b3a102c0d92b4fb0765d Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 02:14:43 -0500
Subject: [PATCH 0491/1043] Add individual syntax groups for various
 parenthesis

Many of these are noise, but I don't consider function parenthesis to be so.
Rather than creating a non-function parens group, I just created a group for
each type and then linked them all to `jsParens` so that everything will
behave as it currently does for users who are using `jsParens`.
---
 syntax/javascript.vim | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index cbe8d339..8070d488 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -136,10 +136,10 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 "" Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
-syntax region  jsParenSwitch        contained matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
-syntax region  jsParenCatch         contained matchgroup=jsParens              start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
+syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
+syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
+syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
@@ -233,6 +233,10 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   endif
   HiLink jsComment              Comment
   HiLink jsEnvComment           PreProc
+  HiLink jsParensIfElse         jsParens
+  HiLink jsParensRepeat         jsParens
+  HiLink jsParensSwitch         jsParens
+  HiLink jsParensCatch          jsParens
   HiLink jsCommentTodo          Todo
   HiLink jsString               String
   HiLink jsObjectKeyString      String

From 615f83754490c72f93eeac29f86b31c3b77f4b01 Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 02:33:19 -0500
Subject: [PATCH 0492/1043] Add more specialized groups for the various braces

Similar to the parens from the previous commit, this will allow users to
customize the look of various types of braces rather than having to go all-in
on non-function braces.

------------------------------------------------------------------------------
Actions:
  * Fix #589
---
 syntax/javascript.vim | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 8070d488..3f9cb9b5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -41,12 +41,12 @@ syntax keyword jsModuleKeywords  contained import
 syntax keyword jsModuleKeywords  contained export skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
 syntax keyword jsModuleOperators contained from
 syntax keyword jsModuleOperators contained as
-syntax region  jsModuleGroup     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
+syntax region  jsModuleGroup     contained matchgroup=jsModuleBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
 syntax match   jsModuleAsterisk  contained /*/
 syntax keyword jsModuleDefault   contained default skipwhite skipempty nextgroup=@jsExpression
 syntax region  jsImportContainer start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
 syntax region  jsExportContainer start=/\<export\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsStorageClass,jsModuleDefault,@jsExpression
-syntax region  jsExportBlock     contained matchgroup=jsBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
+syntax region  jsExportBlock     contained matchgroup=jsExportBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
 
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
@@ -98,17 +98,17 @@ exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal
 " Statement Keywords
 syntax keyword jsStatement    contained break continue with yield debugger
 syntax keyword jsConditional            if           skipwhite skipempty nextgroup=jsParenIfElse
-syntax keyword jsConditional            else         skipwhite skipempty nextgroup=jsCommentMisc,jsBlock
+syntax keyword jsConditional            else         skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock
 syntax keyword jsConditional            switch       skipwhite skipempty nextgroup=jsParenSwitch
 syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat
-syntax keyword jsDo                     do           skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsDo                     do           skipwhite skipempty nextgroup=jsRepeatBlock
 syntax keyword jsLabel        contained case default
 syntax keyword jsTry                    try          skipwhite skipempty nextgroup=jsTryCatchBlock
-syntax keyword jsFinally      contained finally      skipwhite skipempty nextgroup=jsBlock
+syntax keyword jsFinally      contained finally      skipwhite skipempty nextgroup=jsFinallyBlock
 syntax keyword jsCatch        contained catch        skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
-syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsBlock
+syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
 syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
@@ -136,16 +136,19 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 "" Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsBlock extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock extend fold
+syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsRepeatBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsTryCatchBlock      contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
-syntax region  jsSwitchBlock        contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsLabel,jsSwitchColon extend fold
+syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
+syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsLabel,jsSwitchColon extend fold
+syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
 syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression extend fold
@@ -299,8 +302,15 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncParens           Noise
   HiLink jsClassBraces          Noise
   HiLink jsClassNoise           Noise
+  HiLink jsIfElseBraces         jsBraces
+  HiLink jsTryCatchBraces       jsBraces
+  HiLink jsModuleBraces         jsBraces
   HiLink jsObjectBraces         Noise
   HiLink jsObjectSeparator      Noise
+  HiLink jsFinallyBraces        jsBraces
+  HiLink jsRepeatBraces         jsBraces
+  HiLink jsSwitchBraces         jsBraces
+  HiLink jsExportBraces         jsBraces
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
   HiLink jsTemplateBraces       jsBraces

From 430b5284ff69e07977ead013a3caf7b66ee0414c Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 02:58:24 -0500
Subject: [PATCH 0493/1043] Removed 'contained' constraint from 'this' keyword
 highlight

`this` can be used outside of any other block and thus needs to be highlighted
there.

------------------------------------------------------------------------------
Actions:
  * Fix #610
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3f9cb9b5..69311f69 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -92,7 +92,7 @@ exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal
 exe 'syntax keyword jsUndefined undefined        '.(exists('g:javascript_conceal_undefined') ? 'conceal cchar='.g:javascript_conceal_undefined  : '')
 exe 'syntax keyword jsNan       NaN              '.(exists('g:javascript_conceal_NaN')       ? 'conceal cchar='.g:javascript_conceal_NaN        : '')
 exe 'syntax keyword jsPrototype prototype        '.(exists('g:javascript_conceal_prototype') ? 'conceal cchar='.g:javascript_conceal_prototype  : '')
-exe 'syntax keyword jsThis      this   contained '.(exists('g:javascript_conceal_this')      ? 'conceal cchar='.g:javascript_conceal_this       : '')
+exe 'syntax keyword jsThis      this             '.(exists('g:javascript_conceal_this')      ? 'conceal cchar='.g:javascript_conceal_this       : '')
 exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
 
 " Statement Keywords

From aa2fb9015918eae56e9a11b44e281ee016b12c63 Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 03:05:21 -0500
Subject: [PATCH 0494/1043] Add section comments

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 69311f69..6c58163b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -74,6 +74,7 @@ else
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
+" Objects
 syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
 syntax match   jsObjectColon       contained /:/ skipwhite skipempty
 syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
@@ -133,7 +134,7 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 " HTML events and internal variables
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
-"" Code blocks
+" Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
 syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock extend fold
@@ -171,6 +172,7 @@ syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipe
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock contains=jsFuncBraces           '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
+" Classes
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty

From 20bb09ae6cdade7bb973539e9fa40e35280baff0 Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 03:19:04 -0500
Subject: [PATCH 0495/1043] Fix decorator syntax highlighting

There were a few issues here:

* Class decorators weren't being highlighted since they exist outside of any
  other group
* Decorators which take a parameter didn't have their parameters property
  highlighted
* Decorators which decorated a function within an object weren't being
  highlighted

--------------------------------------------------------------------------------
Actions:
  * Fixes #590
  * Fixes #572
---
 syntax/javascript.vim | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6c58163b..d0f88abf 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -137,6 +137,7 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 " Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
+syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc extend fold
 syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock extend fold
 syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsRepeatBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
@@ -152,7 +153,7 @@ syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        s
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
-syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression extend fold
+syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator extend fold
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
@@ -177,8 +178,6 @@ syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
-syntax match   jsDecorator              contained "@" nextgroup=jsDecoratorFunction
-syntax match   jsDecoratorFunction      contained "[a-zA-Z_][a-zA-Z0-9_.]*"
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
@@ -211,6 +210,10 @@ syntax region  jsCommentClass       contained start=/\/\*/ end=/\*\// contains=j
 syntax region  jsCommentMisc        contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock extend keepend
 syntax region  jsCommentMisc        contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock fold extend keepend
 
+" Decorators
+syntax match   jsDecorator                    /^\s*@/ nextgroup=jsDecoratorFunction
+syntax match   jsDecoratorFunction  contained /[a-zA-Z_][a-zA-Z0-9_.]*/ nextgroup=jsParenDecorator
+
 if exists("javascript_plugin_jsdoc")
   runtime extras/jsdoc.vim
   " NGDoc requires JSDoc

From 801aad41bd9a52015fff99ebcc92c9db9c3baef8 Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 03:21:26 -0500
Subject: [PATCH 0496/1043] Change highlight link for decorators to 'Tag'

This makes quite a bit more sense to me since decorators are a type of
annotation to the function below.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d0f88abf..c4ee3394 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -326,8 +326,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsModuleKeywords       Include
   HiLink jsModuleOperators      Include
   HiLink jsModuleDefault        Include
-  HiLink jsDecorator            Special
-  HiLink jsDecoratorFunction    Special
+  HiLink jsDecorator            Tag
+  HiLink jsDecoratorFunction    Tag
   HiLink jsFuncArgOperator      jsFuncArgs
   HiLink jsModuleAsterisk       Noise
   HiLink jsClassProperty        jsObjectKey

From 6c78b77ad48b76b10d9054c7b65aba79acec58f4 Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 03:28:59 -0500
Subject: [PATCH 0497/1043] Whitespace

---
 syntax/javascript.vim | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c4ee3394..e3e2373d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -112,13 +112,13 @@ syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects  Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
-syntax keyword jsGlobalNodeObjects module exports global process
-syntax match   jsGlobalNodeObjects /require/ contains=jsFuncCall
-syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
-syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
+syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
+syntax keyword jsGlobalNodeObjects  module exports global process
+syntax match   jsGlobalNodeObjects  /require/ contains=jsFuncCall
+syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
+syntax keyword jsBuiltins           decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 " DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
-syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient implements protected volatile double public
+syntax keyword jsFutureKeys         abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient implements protected volatile double public
 
 " DISCUSS: Should we really be matching stuff like this?
 " DOM2 Objects

From 0cb2e1134d397b9a06d57ef8a1bae4f666630a25 Mon Sep 17 00:00:00 2001
From: Jeff Felchner <accounts+git@thekompanee.com>
Date: Tue, 13 Sep 2016 03:52:14 -0500
Subject: [PATCH 0498/1043] Change ClassKeywords to Keywords instead of Define

It's right there in the name: "Keyword" and should be highlighted as such.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e3e2373d..b6b1ba51 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -288,7 +288,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsOperator             Operator
   HiLink jsOf                   Operator
   HiLink jsStorageClass         StorageClass
-  HiLink jsClassKeywords        Structure
+  HiLink jsClassKeywords        Keyword
   HiLink jsThis                 Special
   HiLink jsSuper                Constant
   HiLink jsNan                  Number

From 5c4de0c43d23a98cf382f045aff270977c3bb12c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 13 Sep 2016 16:05:06 -0700
Subject: [PATCH 0499/1043] slight changes to the skip_func (#632)

This is what I was initially intending to do. this version works mostly the same
---
 indent/javascript.vim | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 04670498..1591dac0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -48,10 +48,7 @@ let s:syng_comment = '\%(comment\|doc\)'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
-  if !s:free || getline(line('.')) =~ '[''/"\\]'
-    return eval(s:skip_expr)
-  endif
-  if search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
+  if !s:free || getline(line('.')) =~ '[''/"\\]' || search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
     let s:free = !eval(s:skip_expr)
   endif
   let s:looksyn = s:free ? line('.') : s:looksyn

From d5dbecb6e9084052573c9eb7d6de9536b9f2034e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 14 Sep 2016 15:21:10 -0700
Subject: [PATCH 0500/1043] Group link fixes

---
 syntax/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b6b1ba51..56e7c6d3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -326,8 +326,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsModuleKeywords       Include
   HiLink jsModuleOperators      Include
   HiLink jsModuleDefault        Include
-  HiLink jsDecorator            Tag
-  HiLink jsDecoratorFunction    Tag
+  HiLink jsDecorator            Special
+  HiLink jsDecoratorFunction    Function
+  HiLink jsParensDecorator      jsParens
   HiLink jsFuncArgOperator      jsFuncArgs
   HiLink jsModuleAsterisk       Noise
   HiLink jsClassProperty        jsObjectKey

From a59f5cb991954dbe4d094dfe1f67bedcc27ea549 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 14 Sep 2016 15:41:53 -0700
Subject: [PATCH 0501/1043] First pass at improved async/await support

---
 syntax/javascript.vim | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 56e7c6d3..e6503357 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -84,7 +84,7 @@ syntax match   jsObjectSeparator   contained /,/
 syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=jsObjectColon,@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
-syntax match   jsObjectMethodType  contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
+syntax match   jsObjectMethodType  contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ contains=jsAsyncKeyword skipwhite skipempty nextgroup=jsObjectFuncName
 syntax region  jsObjectStringKey   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 syntax region  jsObjectStringKey   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
@@ -108,7 +108,8 @@ syntax keyword jsTry                    try          skipwhite skipempty nextgro
 syntax keyword jsFinally      contained finally      skipwhite skipempty nextgroup=jsFinallyBlock
 syntax keyword jsCatch        contained catch        skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
-syntax keyword jsAsyncKeyword           async await
+syntax keyword jsAsyncKeyword           async        skipwhite skipempty nextgroup=jsFunction,jsFuncName
+syntax keyword jsAwaitKeyword           await
 syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
@@ -176,7 +177,7 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 " Classes
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
+syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ contains=jsAsyncKeyword skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
@@ -226,8 +227,8 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsAsyncKeyword,jsAwaitKeyword
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -275,6 +276,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFinally              Exception
   HiLink jsCatch                Exception
   HiLink jsAsyncKeyword         Keyword
+  HiLink jsAwaitKeyword         Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
   HiLink jsGenerator            jsFunction

From d3e952cf8ddb556233638915c79be57c752cda7d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 01:41:39 -0700
Subject: [PATCH 0502/1043] multi-braceless statements (#636)

* multi-braceless statements

This changes:
```
if (1)
  for (;;)
  i +=
  l
```
to:
```
if (1)
  for (;;)
    i +=
      l
```
---
 indent/javascript.vim | 60 +++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1591dac0..b890a43a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -75,15 +75,38 @@ if !exists('g:javascript_continuation')
   let g:javascript_continuation = '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
 endif
 
-let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
+let g:javascript_opfirst = '^' . g:javascript_opfirst
 let g:javascript_continuation .= s:line_term
 
 function s:OneScope(lnum,text)
-  return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
+  return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)' . s:line_term)) > -1 ||
         \ cursor(a:lnum, match(' ' . a:text, ')' . s:line_term)) > -1 &&
-        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
-        \ (expand('<cword>') !=# 'while' || s:GetPair('\C\<do\>', '\C\<while\>','nbW',s:skip_expr,100) <= 0) &&
-        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')) ? expand('<cword>') : ''
+        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 &&
+        \ search('\C\<\%(for\%(\_s\+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 > 0 ? a:num : 1]
+  let pind = a:num > 0 ? indent(l:num) : -s:sw()
+  let ind = indent(l:i) + (!l:cont ? s:sw() : 0)
+  let bL = 0
+  while l:i >= l:num && (!l:cont || ind > pind + s:sw())
+    if indent(l:i) < ind " first line always true for !cont, false for !!cont
+      if s:OneScope(l:i,substitute(getline(l:i),':\@<!\/\/.*','',''))
+        if expand('<cword>') ==# 'while' && searchpair(s:line_pre . '\C\<do\>','','\C\<while\>','bW',s:skip_expr,l:num,100) > 0
+          return 0
+        endif
+        let bL += 1
+        let l:cont = 0
+        let l:i = line('.')
+      elseif !l:cont
+        break
+      endif
+      let ind = indent(l:i)
+    endif
+    let l:i = s:PrevCodeLine(l:i - 1)
+  endwhile
+  return bL * s:sw()
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -138,8 +161,8 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.{{{2
-  if (l:line !~ '^[''"]' && syns =~? '\%(string\|template\)') ||
-        \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
+  if l:line !~ '^[''"]' && syns =~? '\%(string\|template\)' ||
+        \ l:line !~ '^\s*[/*]' && syns =~? s:syng_comment
     return -1
   endif
   if l:line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
@@ -150,7 +173,7 @@ function GetJavascriptIndent()
     return 0
   endif
 
-  if (l:line =~# s:expr_case)
+  if l:line =~# s:expr_case
     let cpo_switch = &cpo
     set cpo+=%
     let ind = cindent(v:lnum)
@@ -176,11 +199,16 @@ function GetJavascriptIndent()
 
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
-  if l:line =~ s:line_pre . '[])}]'
+  let l:line = substitute(l:line,s:line_pre,'','')
+  if l:line =~ '^[])}]'
     return indent(num)
   endif
+  call cursor(v:lnum,1)
+  if l:line =~# '^while\>' && searchpair(s:line_pre . '\C\<do\>','','\C\<while\>','bW',s:skip_expr,num,100) > 0
+    return indent(line('.'))
+  endif
 
-  let pline = substitute(substitute(getline(l:lnum),s:expr_case,'\=repeat(" ",strlen(submatch(0)))',''), '\%(:\@<!\/\/.*\)$', '','')
+  let pline = substitute(substitute(getline(l:lnum),s:expr_case,'\=repeat(" ",strlen(submatch(0)))',''), ':\@<!\/\/.*', '','')
   call cursor(b:js_cache[1],b:js_cache[2])
   let switch_offset = num <= 0 || !(search(')\_s*\%#','bW') &&
         \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')) ? 0 :
@@ -189,14 +217,14 @@ function GetJavascriptIndent()
 
   " 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) =~# '\<\%(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
+  let bL = s:iscontOne(l:lnum,num,isOp)
+  let bL = bL ? bL - (l:line =~ '^{') * s:sw() : bL
+  if isOp && (num <= 0 || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
+    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset + bL
   elseif num > 0
-    return indent(num) + s:sw() + switch_offset
+    return indent(num) + s:sw() + switch_offset + bL
   endif
-
+  return bL
 endfunction
 
 

From ebd222b3dfd05878145be3488573745aa160de70 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 04:00:10 -0700
Subject: [PATCH 0503/1043] date,format

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b890a43a..42eb0882 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: vim-javascript community
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: September 4, 2016
+" Last Change: September 18, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -112,12 +112,10 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 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())
+        \ '\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())
 endfunction
 
-" Auxiliary Functions {{{2
-
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevCodeLine(lnum)
   let l:lnum = prevnonblank(a:lnum)
@@ -180,7 +178,6 @@ function GetJavascriptIndent()
     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.

From 48567e03b06d8e30fef7e1db44936a449a1f0203 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 04:06:48 -0700
Subject: [PATCH 0504/1043] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 42eb0882..836fc6d6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -97,8 +97,7 @@ function s:iscontOne(i,num,cont)
           return 0
         endif
         let bL += 1
-        let l:cont = 0
-        let l:i = line('.')
+        let [l:cont, l:i] = [0, line('.')]
       elseif !l:cont
         break
       endif
@@ -148,7 +147,6 @@ function s:Balanced(lnum)
   endwhile
   return (!open_4 + !open_2 + !open_0) - 2
 endfunction
-" }}}
 
 function GetJavascriptIndent()
   if !exists('b:js_cache')

From 6426110f831bd2ab6459e87c5bffad99d18697e1 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 14:49:38 -0700
Subject: [PATCH 0505/1043] 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 836fc6d6..646954f2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -156,7 +156,7 @@ function GetJavascriptIndent()
   let l:line = getline(v:lnum)
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
-  " start with strings,comments,etc.{{{2
+  " start with strings,comments,etc.
   if l:line !~ '^[''"]' && syns =~? '\%(string\|template\)' ||
         \ l:line !~ '^\s*[/*]' && syns =~? s:syng_comment
     return -1

From aa37199ecf040b7003f2d523b83f9ef0f04d25e3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 15:41:46 -0700
Subject: [PATCH 0506/1043] change to searchpair helper

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 646954f2..8d5ced26 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -93,7 +93,7 @@ function s:iscontOne(i,num,cont)
   while l:i >= l:num && (!l:cont || ind > pind + s:sw())
     if indent(l:i) < ind " first line always true for !cont, false for !!cont
       if s:OneScope(l:i,substitute(getline(l:i),':\@<!\/\/.*','',''))
-        if expand('<cword>') ==# 'while' && searchpair(s:line_pre . '\C\<do\>','','\C\<while\>','bW',s:skip_expr,l:num,100) > 0
+        if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>\%>'.l:num-1.'l','\C\<while\>','bW',s:skip_expr,100) > 0
           return 0
         endif
         let bL += 1
@@ -199,7 +199,7 @@ function GetJavascriptIndent()
     return indent(num)
   endif
   call cursor(v:lnum,1)
-  if l:line =~# '^while\>' && searchpair(s:line_pre . '\C\<do\>','','\C\<while\>','bW',s:skip_expr,num,100) > 0
+  if l:line =~# '^while\>' && s:GetPair(s:line_pre . '\C\<do\>\%>'.num-1.'l','\C\<while\>','bW',s:skip_expr,100) > 0
     return indent(line('.'))
   endif
 

From b2ded12588b35aa551240ec33e637f7ef04d52eb Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 16:02:55 -0700
Subject: [PATCH 0507/1043] change num <= 0 to 0

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8d5ced26..83e889b6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -192,6 +192,7 @@ function GetJavascriptIndent()
     let num = s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
   endif
 
+  let num = num > 0 ? num : 0
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   let l:line = substitute(l:line,s:line_pre,'','')
@@ -199,13 +200,13 @@ function GetJavascriptIndent()
     return indent(num)
   endif
   call cursor(v:lnum,1)
-  if l:line =~# '^while\>' && s:GetPair(s:line_pre . '\C\<do\>\%>'.num-1.'l','\C\<while\>','bW',s:skip_expr,100) > 0
+  if l:line =~# '^while\>' && s:GetPair(s:line_pre . '\C\<do\>\%>'.(num-!!num).'l','\C\<while\>','bW',s:skip_expr,100) > 0
     return indent(line('.'))
   endif
 
   let pline = substitute(substitute(getline(l:lnum),s:expr_case,'\=repeat(" ",strlen(submatch(0)))',''), ':\@<!\/\/.*', '','')
   call cursor(b:js_cache[1],b:js_cache[2])
-  let switch_offset = num <= 0 || !(search(')\_s*\%#','bW') &&
+  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:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
@@ -214,9 +215,9 @@ function GetJavascriptIndent()
   let isOp = l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation
   let bL = s:iscontOne(l:lnum,num,isOp)
   let bL = bL ? bL - (l:line =~ '^{') * s:sw() : bL
-  if isOp && (num <= 0 || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
-    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset + bL
-  elseif num > 0
+  if isOp && (!num || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
+    return (num ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset + bL
+  elseif num
     return indent(num) + s:sw() + switch_offset + bL
   endif
   return bL

From 5df8b344a49c54be1bfe133a62f4fc00fc313bd7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 16:15:26 -0700
Subject: [PATCH 0508/1043] more number conversion

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 83e889b6..2f09133a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -86,7 +86,7 @@ function s:OneScope(lnum,text)
 endfunction
 
 function s:iscontOne(i,num,cont)
-  let [l:i, l:cont, l:num] = [a:i, a:cont, a:num > 0 ? a:num : 1]
+  let [l:i, l:cont, l:num] = [a:i, a:cont, a:num ? a:num : 1]
   let pind = a:num > 0 ? indent(l:num) : -s:sw()
   let ind = indent(l:i) + (!l:cont ? s:sw() : 0)
   let bL = 0

From 3b38947f2f90d8bfa1522ecb67856238f305e606 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 18 Sep 2016 16:19:47 -0700
Subject: [PATCH 0509/1043] prev

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2f09133a..30e64eb1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -87,7 +87,7 @@ endfunction
 
 function s:iscontOne(i,num,cont)
   let [l:i, l:cont, l:num] = [a:i, a:cont, a:num ? a:num : 1]
-  let pind = a:num > 0 ? indent(l:num) : -s:sw()
+  let pind = a:num ? indent(l:num) : -s:sw()
   let ind = indent(l:i) + (!l:cont ? s:sw() : 0)
   let bL = 0
   while l:i >= l:num && (!l:cont || ind > pind + s:sw())

From ff5f3f14418765b487a9071db8f7ff72946f1fe1 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 19 Sep 2016 01:17:29 -0700
Subject: [PATCH 0510/1043] fix concat bug

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 30e64eb1..aee8e2c3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -93,7 +93,7 @@ function s:iscontOne(i,num,cont)
   while l:i >= l:num && (!l:cont || ind > pind + s:sw())
     if indent(l:i) < ind " first line always true for !cont, false for !!cont
       if s:OneScope(l:i,substitute(getline(l:i),':\@<!\/\/.*','',''))
-        if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>\%>'.l:num-1.'l','\C\<while\>','bW',s:skip_expr,100) > 0
+        if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>\%>'.(l:num-1).'l','\C\<while\>','bW',s:skip_expr,100) > 0
           return 0
         endif
         let bL += 1

From 1219b150b063df8979ab48a4a2e6f3bb6e502840 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 20 Sep 2016 19:20:01 -0700
Subject: [PATCH 0511/1043] small skip_func improvements (#637)

this will improve performance depending on the file. I will try and clean it a little
---
 indent/javascript.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index aee8e2c3..3ec4abe6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -48,11 +48,13 @@ let s:syng_comment = '\%(comment\|doc\)'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
-  if !s:free || getline(line('.')) =~ '[''/"\\]' || search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
+  if !s:free || search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
     let s:free = !eval(s:skip_expr)
+    let s:looksyn = s:free ? line('.') : s:looksyn
+    return !s:free
   endif
-  let s:looksyn = s:free ? line('.') : s:looksyn
-  return !s:free
+  let s:looksyn = line('.')
+  return getline(line('.')) =~ '[''/"\\]' && eval(s:skip_expr)
 endfunction
 
 if has('reltime')

From afbe2844ee39d0c01a7b27214262d817550ea0c8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 20 Sep 2016 22:41:36 -0700
Subject: [PATCH 0512/1043] more minor optimizations (#638)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3ec4abe6..67006e35 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -54,7 +54,7 @@ function s:skip_func(lnum)
     return !s:free
   endif
   let s:looksyn = line('.')
-  return getline(line('.')) =~ '[''/"\\]' && eval(s:skip_expr)
+  return (search('\/','nbW',line('.')) || search('[''"\\]','nW',line('.'))) && eval(s:skip_expr)
 endfunction
 
 if has('reltime')

From a7225e4bd1882236c5a7db10aadcdfca1de3b352 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 22 Sep 2016 02:07:40 -0700
Subject: [PATCH 0513/1043] Fix jsGlobalNodeObjects and jsFuncCall priority

Give jsGlobalNodeObjects a higher priority that can therefore be
targeted if desired.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 56e7c6d3..20b131b2 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -114,7 +114,7 @@ syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgro
 " Keywords
 syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
 syntax keyword jsGlobalNodeObjects  module exports global process
-syntax match   jsGlobalNodeObjects  /require/ contains=jsFuncCall
+syntax match   jsGlobalNodeObjects  /require/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 syntax keyword jsBuiltins           decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 " DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?

From d94ab71e2230896f0d5a30c3c812dcd4058cef3d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 22 Sep 2016 21:28:57 -0700
Subject: [PATCH 0514/1043] optimize top scope indentation speed (#640)

makes a huge difference when not in a 'scope'. avoids checking the whole file
* improve helper
---
 indent/javascript.vim | 61 +++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 67006e35..fb500d7d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -58,12 +58,12 @@ function s:skip_func(lnum)
 endfunction
 
 if has('reltime')
-  function s:GetPair(start,end,flags,skip,time)
-    return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0]),a:time)
+  function s:GetPair(start,end,flags,skip,time,...)
+    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,0,max([prevnonblank(v:lnum) - 2000,0]))
+    return searchpair(a:start,'',a:end,a:flags,"line('.') < prevnonblank(v:lnum) - 2000 ? dummy : 0")
   endfunction
 endif
 
@@ -88,14 +88,14 @@ function s:OneScope(lnum,text)
 endfunction
 
 function s:iscontOne(i,num,cont)
-  let [l:i, l:cont, l:num] = [a:i, a:cont, a:num ? a:num : 1]
-  let pind = a:num ? indent(l:num) : -s:sw()
-  let ind = indent(l:i) + (!l:cont ? s:sw() : 0)
+  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 bL = 0
-  while l:i >= l:num && (!l:cont || ind > pind + s:sw())
+  while l:i >= l:num && (!l:cont || ind > pind + s:W)
     if indent(l:i) < ind " first line always true for !cont, false for !!cont
       if s:OneScope(l:i,substitute(getline(l:i),':\@<!\/\/.*','',''))
-        if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>\%>'.(l:num-1).'l','\C\<while\>','bW',s:skip_expr,100) > 0
+        if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num) > 0
           return 0
         endif
         let bL += 1
@@ -107,7 +107,7 @@ function s:iscontOne(i,num,cont)
     endif
     let l:i = s:PrevCodeLine(l:i - 1)
   endwhile
-  return bL * s:sw()
+  return bL * s:W
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -136,7 +136,7 @@ function s:Balanced(lnum)
   while pos != -1
     if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
       let idx = stridx('(){}[]', l:line[pos])
-      if idx % 2 == 0
+      if !(idx % 2)
         let open_{idx} += 1
       else
         let open_{idx - 1} -= 1
@@ -147,7 +147,7 @@ function s:Balanced(lnum)
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)
   endwhile
-  return (!open_4 + !open_2 + !open_0) - 2
+  return !(open_4 || open_2 || open_0)
 endfunction
 
 function GetJavascriptIndent()
@@ -181,46 +181,51 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
-  let [s:looksyn,s:free] = [v:lnum - 1,1]
   call cursor(v:lnum,1)
-  if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
-        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
-    let num = b:js_cache[1]
-  elseif syns != '' && l:line[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)
+  if getline(l:lnum) !~ '^\S'
+    let [s:looksyn,s:free] = [v:lnum - 1,1]
+    if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
+          \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
+      let num = b:js_cache[1]
+    elseif syns != '' && l:line[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)
+    else
+      let num = s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
+    endif
   else
-    let num = s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
+    let num = s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
   endif
 
-  let num = num > 0 ? num : 0
+  let num = (num > 0) * num
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   let l:line = substitute(l:line,s:line_pre,'','')
   if l:line =~ '^[])}]'
-    return indent(num)
+    return !!num * indent(num)
   endif
   call cursor(v:lnum,1)
-  if l:line =~# '^while\>' && s:GetPair(s:line_pre . '\C\<do\>\%>'.(num-!!num).'l','\C\<while\>','bW',s:skip_expr,100) > 0
+  if l:line =~# '^while\>' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,num) > 0
     return indent(line('.'))
   endif
 
+  let s:W = s:sw()
   let pline = substitute(substitute(getline(l:lnum),s:expr_case,'\=repeat(" ",strlen(submatch(0)))',''), ':\@<!\/\/.*', '','')
   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:sw() :
-        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
+        \ &cino !~ ':' || !has('float') ? s:W :
+        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
 
   " most significant, find the indent amount
   let isOp = l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation
   let bL = s:iscontOne(l:lnum,num,isOp)
-  let bL = bL ? bL - (l:line =~ '^{') * s:sw() : bL
+  let bL -= (bL && l:line =~ '^{') * s:W
   if isOp && (!num || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
-    return (num ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset + bL
+    return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
-    return indent(num) + s:sw() + switch_offset + bL
+    return indent(num) + s:W + switch_offset + bL
   endif
   return bL
 endfunction

From 3bb395c39f41b78735987460693c657d49bc6ed6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 23 Sep 2016 20:03:19 -0700
Subject: [PATCH 0515/1043] normalize header in vim and current, date (#642)

Any issues with this? It doesn't rlly mean anything, just something to satisfy vim/dev
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index fb500d7d..ff4851ab 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,8 +1,8 @@
 " Vim indent file
 " Language: Javascript
-" Maintainer: vim-javascript community
+" Maintainer: Chris Paul ( https://github.com/bounceme )
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: September 18, 2016
+" Last Change: September 23, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')

From fcdc1dcdb5256932330eb7bae16febbd43fb88d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Pr=C3=A9vost?= <remi@exomel.com>
Date: Sat, 24 Sep 2016 19:29:46 -0400
Subject: [PATCH 0516/1043] Fix jsFlowTypeCustom regex to allow dots

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index a1848830..028ea3fc 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -6,7 +6,7 @@ syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object array bool class
 syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
-syntax match   jsFlowTypeCustom     contained /\k*/ skipwhite skipempty nextgroup=jsFlowGroup
+syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
 syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
 syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens

From ce7c06c390a1ec6b8b770d2813232b3fe41c02dd Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 25 Sep 2016 00:04:30 -0700
Subject: [PATCH 0517/1043] simplify comments

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ff4851ab..d649c087 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -163,7 +163,7 @@ function GetJavascriptIndent()
         \ l:line !~ '^\s*[/*]' && syns =~? s:syng_comment
     return -1
   endif
-  if l:line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
+  if l:line =~ '^\s*\*' && syns =~? s:syng_comment
     return cindent(v:lnum)
   endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)

From 5453eb09dc7f79ca1aa49fd8dc9451d068a7e345 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 25 Sep 2016 00:27:20 -0700
Subject: [PATCH 0518/1043] more string/comment cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d649c087..a092d9cf 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -159,13 +159,15 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.
-  if l:line !~ '^[''"]' && syns =~? '\%(string\|template\)' ||
-        \ l:line !~ '^\s*[/*]' && syns =~? s:syng_comment
+  if syns =~? s:syng_comment
+    if l:line =~ '^\s*\*'
+      return cindent(v:lnum)
+    elseif l:line !~ '^\s*\/'
+      return -1
+    endif
+  elseif syns =~? '\%(string\|template\)' && l:line !~ '^[''"]'
     return -1
   endif
-  if l:line =~ '^\s*\*' && syns =~? s:syng_comment
-    return cindent(v:lnum)
-  endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)
   if l:lnum == 0
     return 0

From 02c8c644c306eb3675fdf9d0b556babd39e84d65 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 25 Sep 2016 00:50:34 -0700
Subject: [PATCH 0519/1043] remove rar

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a092d9cf..665a558b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -42,9 +42,6 @@ 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 = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 
-" Regex of syntax group names that are strings or documentation.
-let s:syng_comment = '\%(comment\|doc\)'
-
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
@@ -159,7 +156,7 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.
-  if syns =~? s:syng_comment
+  if syns =~? '\%(comment\|doc\)'
     if l:line =~ '^\s*\*'
       return cindent(v:lnum)
     elseif l:line !~ '^\s*\/'

From dc678406de4352fd03c49dfb2b0dc32733bd1ce9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 25 Sep 2016 13:37:41 -0700
Subject: [PATCH 0520/1043] more optimization (#646)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 665a558b..c6d5e110 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -178,6 +178,8 @@ function GetJavascriptIndent()
     return ind
   endif
 
+  let l:line = substitute(l:line,s:line_pre,'','')
+
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
@@ -186,7 +188,10 @@ function GetJavascriptIndent()
     if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
           \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
       let num = b:js_cache[1]
-    elseif syns != '' && l:line[0] =~ '\s'
+    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)
@@ -200,7 +205,6 @@ function GetJavascriptIndent()
   let num = (num > 0) * num
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
-  let l:line = substitute(l:line,s:line_pre,'','')
   if l:line =~ '^[])}]'
     return !!num * indent(num)
   endif

From 92f1d98dbe740bdbb26b9595dab32b16320c641a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 25 Sep 2016 20:09:43 -0700
Subject: [PATCH 0521/1043] switch accuracy and performance (#647)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c6d5e110..e89e493d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -38,7 +38,7 @@ else
 endif
 
 let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>'
-let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:\C'
+let s:expr_case = '\<\%(\%(case\>.\+\)\|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\)'
 
@@ -170,7 +170,9 @@ function GetJavascriptIndent()
     return 0
   endif
 
-  if l:line =~# s:expr_case
+  let l:line = substitute(l:line,s:line_pre,'','')
+
+  if l:line =~# '^' . s:expr_case
     let cpo_switch = &cpo
     set cpo+=%
     let ind = cindent(v:lnum)
@@ -178,8 +180,6 @@ function GetJavascriptIndent()
     return ind
   endif
 
-  let l:line = substitute(l:line,s:line_pre,'','')
-
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)

From 6ecbda3b318f1e7178a4a59f4702af1fa9ce05e4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 26 Sep 2016 18:46:05 -0700
Subject: [PATCH 0522/1043] clean isBlock (#648)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e89e493d..f38b7183 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -109,9 +109,10 @@ endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 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())
+  return getline(line('.'))[col('.')-1] == '{' && !search('\<return\s*\%#','nbW') && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
+        \ '\<\%(var\|const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
+        \ : !search('\C\%([-=~!<*+,./?^%|&\[(]\|=\@<!>\)\_s*\%#','nbW') &&
+        \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.

From d6b2fd599fd7e03952e854acfc1c4cee0c0b1da3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 26 Sep 2016 19:20:31 -0700
Subject: [PATCH 0523/1043] change regex case

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f38b7183..d3e17d10 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: September 23, 2016
+" Last Change: September 26, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -109,9 +109,9 @@ endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
-  return getline(line('.'))[col('.')-1] == '{' && !search('\<return\s*\%#','nbW') && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
+  return getline(line('.'))[col('.')-1] == '{' && !search('\C\<return\s*\%#','nbW') && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
         \ '\<\%(var\|const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
-        \ : !search('\C\%([-=~!<*+,./?^%|&\[(]\|=\@<!>\)\_s*\%#','nbW') &&
+        \ : !search('\%([-=~!<*+,./?^%|&\[(]\|=\@<!>\)\_s*\%#','nbW') &&
         \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))
 endfunction
 

From 77c4ae620420a3e9f88667b7df334ebdde2485ea Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 27 Sep 2016 16:28:14 -0700
Subject: [PATCH 0524/1043] better line cleaning (#649)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d3e17d10..b8679f68 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -75,7 +75,7 @@ if !exists('g:javascript_continuation')
 endif
 
 let g:javascript_opfirst = '^' . g:javascript_opfirst
-let g:javascript_continuation .= s:line_term
+let g:javascript_continuation .= '$'
 
 function s:OneScope(lnum,text)
   return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)' . s:line_term)) > -1 ||
@@ -215,7 +215,7 @@ function GetJavascriptIndent()
   endif
 
   let s:W = s:sw()
-  let pline = substitute(substitute(getline(l:lnum),s:expr_case,'\=repeat(" ",strlen(submatch(0)))',''), ':\@<!\/\/.*', '','')
+  let pline = substitute(substitute(getline(l:lnum),':\@<!\/\/.*','',''), s:line_term, '','')
   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 :
@@ -223,7 +223,7 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
 
   " most significant, find the indent amount
-  let isOp = l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation
+  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())

From 840f12917363d7689e8179924b4164a38981ffc2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 27 Sep 2016 17:20:38 -0700
Subject: [PATCH 0525/1043] more regex line endings

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b8679f68..cc084535 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -78,8 +78,8 @@ let g:javascript_opfirst = '^' . g:javascript_opfirst
 let g:javascript_continuation .= '$'
 
 function s:OneScope(lnum,text)
-  return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)' . s:line_term)) > -1 ||
-        \ cursor(a:lnum, match(' ' . a:text, ')' . s:line_term)) > -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\+each\)\=\|if\|let\|w\%(hile\|ith\)\)\_s*\%#','bW')
 endfunction
@@ -91,7 +91,7 @@ function s:iscontOne(i,num,cont)
   let bL = 0
   while l:i >= l:num && (!l:cont || ind > pind + s:W)
     if indent(l:i) < ind " first line always true for !cont, false for !!cont
-      if s:OneScope(l:i,substitute(getline(l:i),':\@<!\/\/.*','',''))
+      if s:OneScope(l:i,substitute(substitute(getline(l:i),':\@<!\/\/.*','',''), s:line_term, '',''))
         if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num) > 0
           return 0
         endif

From 88111be6a7c50c63b36e3dbe8c110df0951ec473 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 27 Sep 2016 17:30:28 -0700
Subject: [PATCH 0526/1043] factor out

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cc084535..e9373299 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -66,6 +66,10 @@ endif
 
 let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
 
+function s:Trimline(ln)
+  return substitute(substitute(getline(a:ln),':\@<!\/\/.*','',''), s:line_term,'','')
+endfunction
+
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
   let g:javascript_opfirst = '\%([<>,?^%|*&]\|\/[^/*]\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
@@ -91,7 +95,7 @@ function s:iscontOne(i,num,cont)
   let bL = 0
   while l:i >= l:num && (!l:cont || ind > pind + s:W)
     if indent(l:i) < ind " first line always true for !cont, false for !!cont
-      if s:OneScope(l:i,substitute(substitute(getline(l:i),':\@<!\/\/.*','',''), s:line_term, '',''))
+      if s:OneScope(l:i,s:Trimline(l:i))
         if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num) > 0
           return 0
         endif
@@ -215,7 +219,7 @@ function GetJavascriptIndent()
   endif
 
   let s:W = s:sw()
-  let pline = substitute(substitute(getline(l:lnum),':\@<!\/\/.*','',''), s:line_term, '','')
+  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 :

From 6656f37bff90c4e1d491a7242bf7142cabb52110 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 27 Sep 2016 19:29:41 -0700
Subject: [PATCH 0527/1043] small regex changes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e9373299..acecc6c6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -82,8 +82,8 @@ let g:javascript_opfirst = '^' . g:javascript_opfirst
 let g:javascript_continuation .= '$'
 
 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\+each\)\=\|if\|let\|w\%(hile\|ith\)\)\_s*\%#','bW')
 endfunction
@@ -114,7 +114,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search('\C\<return\s*\%#','nbW') && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
-        \ '\<\%(var\|const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
+        \ '\<\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
         \ : !search('\%([-=~!<*+,./?^%|&\[(]\|=\@<!>\)\_s*\%#','nbW') &&
         \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))
 endfunction

From 833d6ec12724633c323d5d1dab0a4a8fc2e25393 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 27 Sep 2016 21:42:04 -0700
Subject: [PATCH 0528/1043] short circuit cache check

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index acecc6c6..60f89efa 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -208,11 +208,11 @@ function GetJavascriptIndent()
   endif
 
   let num = (num > 0) * num
-  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
-
   if l:line =~ '^[])}]'
     return !!num * indent(num)
   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) > 0
     return indent(line('.'))

From c76d65bd50907fe76a0008371792b821408c1bff Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 27 Sep 2016 22:41:07 -0700
Subject: [PATCH 0529/1043] fail earlier

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 60f89efa..8da6c6a1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -190,7 +190,7 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   if getline(l:lnum) !~ '^\S'
     let [s:looksyn,s:free] = [v:lnum - 1,1]
-    if b:js_cache[0] < v:lnum && b:js_cache[0] >= l:lnum &&
+    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 =~ '^[])}]'

From cd4ace412688995e6c6eddc95c3ee3ed5b7dd495 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 28 Sep 2016 08:10:30 -0700
Subject: [PATCH 0530/1043] wrap for magic (#651)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8da6c6a1..7bbee713 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -153,6 +153,9 @@ function s:Balanced(lnum)
 endfunction
 
 function GetJavascriptIndent()
+  try
+  let save_magic = &magic
+  set magic
   if !exists('b:js_cache')
     let b:js_cache = [0,0,0]
   endif
@@ -236,6 +239,9 @@ function GetJavascriptIndent()
     return indent(num) + s:W + switch_offset + bL
   endif
   return bL
+  finally
+    let &magic = save_magic
+  endtry
 endfunction
 
 

From 572b98d12b97b126a739bac539f4ba4be3365578 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 28 Sep 2016 11:11:41 -0700
Subject: [PATCH 0531/1043] Fixing another funky comment situation

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 20b131b2..b4ce555b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -171,7 +171,7 @@ syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArg
 syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
-exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock contains=jsFuncBraces           '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction               '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 " Classes
 syntax keyword jsClassKeywords          contained extends class

From ecc674fc517e1286b023e2dad1112f37b0fcfb99 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 30 Sep 2016 21:59:19 -0700
Subject: [PATCH 0532/1043] flow generic classes (#652)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7bbee713..e64b454e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -115,8 +115,9 @@ endfunction
 function s:IsBlock()
   return getline(line('.'))[col('.')-1] == '{' && !search('\C\<return\s*\%#','nbW') && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
         \ '\<\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
-        \ : !search('\%([-=~!<*+,./?^%|&\[(]\|=\@<!>\)\_s*\%#','nbW') &&
-        \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))
+        \ : !search('[-=~!<*+,./?^%|&\[(]\_s*\%#','nbW') && (search('>\_s*\%#','bW') ? search('=\%#','bW') ||
+        \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise' :
+        \ search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.

From b0d7c153a83f796465aeba6fc430be6e0c39a9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Zugmeyer?= <bzugmeyer@gmail.com>
Date: Sun, 2 Oct 2016 16:41:22 +0200
Subject: [PATCH 0533/1043] add support for "for await" (asynchronous
 iteration)

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b4ce555b..74b619b1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -101,7 +101,7 @@ syntax keyword jsStatement    contained break continue with yield debugger
 syntax keyword jsConditional            if           skipwhite skipempty nextgroup=jsParenIfElse
 syntax keyword jsConditional            else         skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock
 syntax keyword jsConditional            switch       skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat
+syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
 syntax keyword jsDo                     do           skipwhite skipempty nextgroup=jsRepeatBlock
 syntax keyword jsLabel        contained case default
 syntax keyword jsTry                    try          skipwhite skipempty nextgroup=jsTryCatchBlock
@@ -164,6 +164,7 @@ syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ s
 syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
 syntax keyword jsArguments            contained arguments
+syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenRepeat
 
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
@@ -275,6 +276,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFinally              Exception
   HiLink jsCatch                Exception
   HiLink jsAsyncKeyword         Keyword
+  HiLink jsForAwait             Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
   HiLink jsGenerator            jsFunction

From f64dae7106df808f4654c5f88ea019d274197b0e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 3 Oct 2016 13:57:35 -0700
Subject: [PATCH 0534/1043] for await indent (#656)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e64b454e..984e8957 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -85,7 +85,7 @@ function s:OneScope(lnum,text)
   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\+each\)\=\|if\|let\|w\%(hile\|ith\)\)\_s*\%#','bW')
+        \ search('\C\<\%(for\%(\_s\+\%(await\|each\)\)\=\|if\|let\|w\%(hile\|ith\)\)\_s*\%#','bW')
 endfunction
 
 function s:iscontOne(i,num,cont)

From f674cbab548f1f8a05c1654f441b13fefc282d80 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 4 Oct 2016 21:04:00 -0700
Subject: [PATCH 0535/1043] case label needs non whitespace- (#658)

can otherwise be a object key
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 984e8957..1f1786c3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -38,7 +38,7 @@ else
 endif
 
 let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>'
-let s:expr_case = '\<\%(\%(case\>.\+\)\|default\)\s*:\C'
+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\)'
 

From 292d90161b225ce726fe6ab0d5e3f2cb1c4ea6aa Mon Sep 17 00:00:00 2001
From: "Tom X. Tobin" <tomxtobin@tomxtobin.com>
Date: Wed, 5 Oct 2016 16:44:55 -0400
Subject: [PATCH 0536/1043] Fix JSDoc highlighting for optional parameters

Fixes #574.
---
 extras/jsdoc.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index fff64f89..645d55a3 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -18,7 +18,7 @@ syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRe
 syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
 syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
 syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
 syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
 if version >= 508 || !exists("did_javascript_syn_inits")

From ba2245fbe7384a4dc9de6f0d1c120dad977d0406 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 6 Oct 2016 21:17:20 -0700
Subject: [PATCH 0537/1043] Misc improvements (#661)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1f1786c3..e5c57496 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -72,7 +72,7 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,?^%|*&]\|\/[^/*]\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,?^%|*&]\|\/[/*]\@!\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 if !exists('g:javascript_continuation')
   let g:javascript_continuation = '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
@@ -94,9 +94,9 @@ function s:iscontOne(i,num,cont)
   let ind = indent(l:i) + (!l:cont * s:W)
   let bL = 0
   while l:i >= l:num && (!l:cont || ind > pind + s:W)
-    if indent(l:i) < ind " first line always true for !cont, false for !!cont
+    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 expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num) > 0
+        if expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num + !!a:num) > 0
           return 0
         endif
         let bL += 1
@@ -155,8 +155,8 @@ endfunction
 
 function GetJavascriptIndent()
   try
-  let save_magic = &magic
-  set magic
+    let save_magic = &magic
+    set magic
   if !exists('b:js_cache')
     let b:js_cache = [0,0,0]
   endif
@@ -218,7 +218,7 @@ function GetJavascriptIndent()
   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) > 0
+  if l:line =~# '^while\>' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,num + 1) > 0
     return indent(line('.'))
   endif
 

From 8d904f65f575e5d081ae740d19a2409b69118576 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 8 Oct 2016 12:28:01 -0700
Subject: [PATCH 0538/1043] improve end of line trim (#662)

* improve end of line trim

* Date
---
 indent/javascript.vim | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e5c57496..a6eefba0 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: September 26, 2016
+" Last Change: October 8, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -38,6 +38,8 @@ else
 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\)'
@@ -64,10 +66,23 @@ else
   endfunction
 endif
 
-let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
-
+" indent/python.vim
 function s:Trimline(ln)
-  return substitute(substitute(getline(a:ln),':\@<!\/\/.*','',''), s:line_term,'','')
+  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*$','','')
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -179,7 +194,7 @@ function GetJavascriptIndent()
     return 0
   endif
 
-  let l:line = substitute(l:line,s:line_pre,'','')
+  let l:line = substitute(l:line,'^\s*\%(\/\*.\{-}\*\/\s*\)*','','')
 
   if l:line =~# '^' . s:expr_case
     let cpo_switch = &cpo

From 67ebe06ed95d0bd1530ede834ac76b1ad24238f6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 9 Oct 2016 18:31:13 -0700
Subject: [PATCH 0539/1043] skip comment (#665)

* skip comment

https://github.com/pangloss/vim-javascript/issues/664#issuecomment-252492671
---
 indent/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a6eefba0..0a527b2e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -128,7 +128,9 @@ endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
-  return getline(line('.'))[col('.')-1] == '{' && !search('\C\<return\s*\%#','nbW') && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
+  return getline(line('.'))[col('.')-1] == '{' && !search('\C\<return\s*\%#','nbW') &&
+        \ (!search('\*\/\_s*\%#','bW') || synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' &&
+        \ searchpair('\/\*','','\*\/','bW')) && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
         \ '\<\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
         \ : !search('[-=~!<*+,./?^%|&\[(]\_s*\%#','nbW') && (search('>\_s*\%#','bW') ? search('=\%#','bW') ||
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise' :

From 214450913faa965be8579910bcd64390c3c59bcd Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 9 Oct 2016 19:58:54 -0700
Subject: [PATCH 0540/1043] shorten long line,date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0a527b2e..f883d241 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 8, 2016
+" Last Change: October 9, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -111,7 +111,9 @@ function s:iscontOne(i,num,cont)
   while l:i >= l:num && (!l:cont || ind > pind + s:W)
     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 expand('<cword>') ==# 'while' && s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num + !!a:num) > 0
+        if expand('<cword>') ==# 'while' &&
+              \ s:GetPair(s:line_pre . '\C\<do\>','\C\<while\>','bW',s:skip_expr,100,l:num + !!a:num) > 0
+
           return 0
         endif
         let bL += 1

From ba0ae275cb95f8c4b2363d923a5fa42cec6019fc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 9 Oct 2016 19:59:38 -0700
Subject: [PATCH 0541/1043] remove random nl

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f883d241..e6af48a8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -113,7 +113,6 @@ function s:iscontOne(i,num,cont)
       if s:OneScope(l:i,s:Trimline(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
-
           return 0
         endif
         let bL += 1

From da65c0cdd3cb8b0aa6c5676ef38c0ec6ac0e3744 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 10 Oct 2016 17:09:36 -0700
Subject: [PATCH 0542/1043] massive expression to if chain (#667)

---
 indent/javascript.vim | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e6af48a8..4f0301da 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -129,13 +129,31 @@ endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
-  return getline(line('.'))[col('.')-1] == '{' && !search('\C\<return\s*\%#','nbW') &&
-        \ (!search('\*\/\_s*\%#','bW') || synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' &&
-        \ searchpair('\/\*','','\*\/','bW')) && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
-        \ '\<\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
-        \ : !search('[-=~!<*+,./?^%|&\[(]\_s*\%#','nbW') && (search('>\_s*\%#','bW') ? search('=\%#','bW') ||
-        \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise' :
-        \ search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || 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')
+    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 !~# '[-=~!<*+,./?^%|&\[(]'
+      endif
+    else
+      return 1
+    endif
+  endif
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.

From 7e9aeb30fe657bb15dc9653b9b15858235f957ab Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 11 Oct 2016 00:41:31 -0700
Subject: [PATCH 0543/1043] word boundary to start/end

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4f0301da..9720c7f8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -140,7 +140,7 @@ function s:IsBlock()
       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\)\=\)\>'
+              \ '^\%(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 == ':'

From 7d30463e18181302d1134899b635ef84a9c7d84a Mon Sep 17 00:00:00 2001
From: bounceme <mac@Macs-MacBook-Pro.local>
Date: Tue, 11 Oct 2016 11:57:46 -0700
Subject: [PATCH 0544/1043] Revert "Merge branch 'master' into develop"

This reverts commit 822dfe5f919a938682b4a0ad386f9d2909627e17, reversing
changes made to da65c0cdd3cb8b0aa6c5676ef38c0ec6ac0e3744.
---
 syntax/javascript.vim | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4a37bb7f..74b619b1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -84,7 +84,7 @@ syntax match   jsObjectSeparator   contained /,/
 syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=jsObjectColon,@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
-syntax match   jsObjectMethodType  contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ contains=jsAsyncKeyword skipwhite skipempty nextgroup=jsObjectFuncName
+syntax match   jsObjectMethodType  contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
 syntax region  jsObjectStringKey   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 syntax region  jsObjectStringKey   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
@@ -108,8 +108,7 @@ syntax keyword jsTry                    try          skipwhite skipempty nextgro
 syntax keyword jsFinally      contained finally      skipwhite skipempty nextgroup=jsFinallyBlock
 syntax keyword jsCatch        contained catch        skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
-syntax keyword jsAsyncKeyword           async        skipwhite skipempty nextgroup=jsFunction,jsFuncName
-syntax keyword jsAwaitKeyword           await
+syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
@@ -178,7 +177,7 @@ exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFunc
 " Classes
 syntax keyword jsClassKeywords          contained extends class
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ contains=jsAsyncKeyword skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
+syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
 syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
@@ -228,8 +227,8 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsAsyncKeyword,jsAwaitKeyword
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
+syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -277,7 +276,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFinally              Exception
   HiLink jsCatch                Exception
   HiLink jsAsyncKeyword         Keyword
-  HiLink jsAwaitKeyword         Keyword
+  HiLink jsForAwait             Keyword
   HiLink jsArrowFunction        Type
   HiLink jsFunction             Type
   HiLink jsGenerator            jsFunction

From baa07dd0d5bf521cf88419d00d2a5d7672dd8e60 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 12 Oct 2016 21:20:29 -0700
Subject: [PATCH 0545/1043] refactor isblock for jsx (#668)

* react/jsx interpolated expressions

* refactor isBlock
---
 indent/javascript.vim | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9720c7f8..446b4343 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 12, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -38,7 +38,6 @@ else
 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.
@@ -130,25 +129,32 @@ 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')
-    endif
+    let l:ln = line('.')
     if search('\S','bW')
       let char = getline(line('.'))[col('.')-1]
-      if char =~# '\l'
+      let prechar = getline(line('.'))[col('.')-2]
+      if char == '/' && prechar == '*' && synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment'
+        if !(search('\/\*','bW') && search('\S','bW'))
+          return 1
+        endif
+        let char = getline(line('.'))[col('.')-1]
+        let prechar = getline(line('.'))[col('.')-2]
+      endif
+      let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
+      if syn =~? '\%(xml\|jsx\)'
+        return char != '{'
+      elseif char =~# '\l'
+        if line('.') == l:ln && expand('<cword>') ==# 'return'
+          return 0
+        endif
         return expand('<cword>') !~#
-              \ '^\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$'
+              \ '^\%(var\|const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$'
       elseif char == '>'
-        return search('=\%#','bW') || synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise'
+        return prechar == '=' || syn =~? '^jsflow'
       elseif char == ':'
         return strpart(getline(line('.')),0,col('.')) =~# s:expr_case . '$'
-      elseif char == '{'
-        return s:IsBlock()
       else
-        return char !~# '[-=~!<*+,./?^%|&\[(]'
+        return char !~# '[-=~!<*+,/?^%|&([]'
       endif
     else
       return 1

From 1811b3e925d712847d4d294d67f6b2ec4b776cbb Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 13 Oct 2016 02:51:19 -0700
Subject: [PATCH 0546/1043] various little updates (#670)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 446b4343..4e651613 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -132,15 +132,16 @@ function s:IsBlock()
     let l:ln = line('.')
     if search('\S','bW')
       let char = getline(line('.'))[col('.')-1]
-      let prechar = getline(line('.'))[col('.')-2]
-      if char == '/' && prechar == '*' && synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment'
+      let pchar = getline(line('.'))[col('.')-2]
+      let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
+      if char == '/' && pchar == '*' && syn =~? 'comment'
         if !(search('\/\*','bW') && search('\S','bW'))
           return 1
         endif
         let char = getline(line('.'))[col('.')-1]
-        let prechar = getline(line('.'))[col('.')-2]
+        let pchar = getline(line('.'))[col('.')-2]
+        let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
       endif
-      let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
       if syn =~? '\%(xml\|jsx\)'
         return char != '{'
       elseif char =~# '\l'
@@ -148,9 +149,9 @@ function s:IsBlock()
           return 0
         endif
         return expand('<cword>') !~#
-              \ '^\%(var\|const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$'
+              \ '^\%(const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|v\%(ar\|oid\)\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$'
       elseif char == '>'
-        return prechar == '=' || syn =~? '^jsflow'
+        return pchar == '=' || syn =~? '^jsflow'
       elseif char == ':'
         return strpart(getline(line('.')),0,col('.')) =~# s:expr_case . '$'
       else

From 31b2fff3eec03303ea6cdea23a88bdbaee2afb92 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 13 Oct 2016 16:48:38 -0700
Subject: [PATCH 0547/1043] cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4e651613..9fb4f8e6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -134,8 +134,8 @@ function s:IsBlock()
       let char = getline(line('.'))[col('.')-1]
       let pchar = getline(line('.'))[col('.')-2]
       let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
-      if char == '/' && pchar == '*' && syn =~? 'comment'
-        if !(search('\/\*','bW') && search('\S','bW'))
+      if pchar . char == '*/' && syn =~? 'comment'
+        if !search('\/\*','bW') || !search('\S','bW')
           return 1
         endif
         let char = getline(line('.'))[col('.')-1]

From 3a3cae8a659cea07561c42dfe9831bbe16f3d1ec Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 14 Oct 2016 21:38:17 -0700
Subject: [PATCH 0548/1043] do while made accurate (#671)

Oval loop
---
 indent/javascript.vim | 64 +++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9fb4f8e6..0de83559 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,8 +37,6 @@ else
   endfunction
 endif
 
-let s:line_pre = '^\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\)'
@@ -111,7 +109,9 @@ function s:iscontOne(i,num,cont)
     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 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
@@ -128,38 +128,36 @@ endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
-  if getline(line('.'))[col('.')-1] == '{'
-    let l:ln = line('.')
-    if search('\S','bW')
+  let l:ln = line('.')
+  if search('\S','bW')
+    let char = getline(line('.'))[col('.')-1]
+    let pchar = getline(line('.'))[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(line('.'))[col('.')-1]
       let pchar = getline(line('.'))[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(line('.'))[col('.')-1]
-        let pchar = getline(line('.'))[col('.')-2]
-        let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
-      endif
-      if syn =~? '\%(xml\|jsx\)'
-        return char != '{'
-      elseif char =~# '\l'
-        if line('.') == l:ln && expand('<cword>') ==# 'return'
-          return 0
-        endif
-        return expand('<cword>') !~#
-              \ '^\%(const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|v\%(ar\|oid\)\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$'
-      elseif char == '>'
-        return pchar == '=' || syn =~? '^jsflow'
-      elseif char == ':'
-        return strpart(getline(line('.')),0,col('.')) =~# s:expr_case . '$'
-      else
-        return char !~# '[-=~!<*+,/?^%|&([]'
+    endif
+    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(line('.')),0,col('.')) =~# s:expr_case . '$'
     else
-      return 1
+      return char !~# '[-=~!<*+,/?^%|&([]'
     endif
+  else
+    return 1
   endif
 endfunction
 
@@ -254,14 +252,14 @@ function GetJavascriptIndent()
     let num = s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
   endif
 
-  let num = (num > 0) * num
+  let num = max([num,0])
   if l:line =~ '^[])}]'
     return !!num * indent(num)
   endif
-  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
+  let b:js_cache = [v:lnum,num,line('.') == v:lnum && num ? 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
+  if l:line =~# '^while\>' && s:GetPair('\C\<do\>','\C\<while\>','bW',s:skip_expr . '|| !s:IsBlock()',100,num + 1) > 0
     return indent(line('.'))
   endif
 
@@ -277,7 +275,7 @@ function GetJavascriptIndent()
   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())
+  if isOp && (!num || cursor(b:js_cache[1],b:js_cache[2]) || (getline(line('.'))[col('.')-1] == '{' && s:IsBlock()))
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL

From 8df58fec268b66e6800168f7676bfe063c41b2e2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 15 Oct 2016 00:47:11 -0700
Subject: [PATCH 0549/1043] cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0de83559..93c3f9d2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -241,10 +241,8 @@ function GetJavascriptIndent()
     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)
+    elseif getline(v:lnum)[0] =~ '\s' && syns =~? 'block'
+      let num = s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
     else
       let num = s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
     endif

From 3d59c74c7c66d5064757042d2f7994721ee47b80 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 15 Oct 2016 00:57:16 -0700
Subject: [PATCH 0550/1043] date, first char whitespace

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 93c3f9d2..120cc1c1 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 12, 2016
+" Last Change: October 15, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -241,7 +241,7 @@ function GetJavascriptIndent()
     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 getline(v:lnum)[0] =~ '\s' && syns =~? 'block'
+    elseif indent(v:lnum) && syns =~? 'block'
       let num = s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
     else
       let num = s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)

From d55813b142406b649786bc8caf23253d421fbddc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 15 Oct 2016 01:02:09 -0700
Subject: [PATCH 0551/1043] ws start, again

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 120cc1c1..5f55ee9a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -233,7 +233,7 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if getline(l:lnum) !~ '^\S'
+  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))

From 371a71aae9198e4a4d3f304f1122fffce8ccb025 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 15 Oct 2016 09:46:20 -0700
Subject: [PATCH 0552/1043] template pline

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5f55ee9a..d68c0107 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -165,7 +165,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)

From e4452cf879c665c521ddc6c3b67e37c1715465d6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 15 Oct 2016 14:49:24 -0700
Subject: [PATCH 0553/1043] remove identical

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d68c0107..4dc1077b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -233,12 +233,13 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
+  let fclose = l:line =~ '^[])}]'
   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 =~ '^[])}]'
+    elseif fclose
       let id = stridx('])}',l:line[0])
       let num = s:GetPair(escape('[({'[id],'['), escape('])}'[id],']'),'bW','s:skip_func(s:looksyn)',2000)
     elseif indent(v:lnum) && syns =~? 'block'
@@ -251,7 +252,7 @@ function GetJavascriptIndent()
   endif
 
   let num = max([num,0])
-  if l:line =~ '^[])}]'
+  if fclose
     return !!num * indent(num)
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum && num ? b:js_cache[2] : col('.')]

From c516241246cd634d8da30561fb6a8b6c90f34f30 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 16 Oct 2016 00:05:55 -0700
Subject: [PATCH 0554/1043] more variables

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4dc1077b..71cc03f0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -265,7 +265,8 @@ function GetJavascriptIndent()
   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') &&
+  let bchar = getline(b:js_cache[1])[b:js_cache[2]-1] == '{'
+  let switch_offset = !num || !bchar || !(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))
@@ -274,7 +275,7 @@ function GetJavascriptIndent()
   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]) || (getline(line('.'))[col('.')-1] == '{' && s:IsBlock()))
+  if isOp && (!num || cursor(b:js_cache[1],b:js_cache[2]) || (bchar && s:IsBlock()))
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL

From 920873e911db5fe2c32a78843f4b72f68e0aa9ca Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 17 Oct 2016 00:38:22 -0700
Subject: [PATCH 0555/1043] simplify balance func (#672)

---
 indent/javascript.vim | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 71cc03f0..91e0d6a1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -174,24 +174,23 @@ 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 l:line[pos] =~ '[{([]'
+        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()
@@ -230,18 +229,17 @@ function GetJavascriptIndent()
     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)
   let fclose = l:line =~ '^[])}]'
   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))
+          \ (b:js_cache[0] > l:lnum || !fclose && s:Balanced(l:lnum))
       let num = b:js_cache[1]
     elseif fclose
       let id = stridx('])}',l:line[0])
-      let num = s:GetPair(escape('[({'[id],'['), escape('])}'[id],']'),'bW','s:skip_func(s:looksyn)',2000)
+      return indent(s:GetPair(escape('[({'[id],'['), '])}'[id],'bW','s:skip_func(s:looksyn)',2000))
     elseif indent(v:lnum) && syns =~? 'block'
       let num = s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
     else
@@ -251,10 +249,10 @@ function GetJavascriptIndent()
     let num = s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
   endif
 
-  let num = max([num,0])
   if fclose
-    return !!num * indent(num)
+    return indent(num)
   endif
+  let num = max([num,0])
   let b:js_cache = [v:lnum,num,line('.') == v:lnum && num ? b:js_cache[2] : col('.')]
 
   call cursor(v:lnum,1)
@@ -281,11 +279,11 @@ function GetJavascriptIndent()
     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

From e643047f4da62b3ae394fcc4a415c3a4f08654d6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 18 Oct 2016 14:29:31 -0700
Subject: [PATCH 0556/1043] simplify trimline (#673)

remove janky binary search
---
 indent/javascript.vim | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 91e0d6a1..9d2d25e2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -63,23 +63,14 @@ else
   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*$','','')
+  let pline = substitute(getline(a:ln),'\s*$','','')
+  let max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
+  while max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? '\%(comment\|doc\)'
+    let pline = substitute(strpart(pline, 0, max),'\s*$','','')
+    let max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
+  endwhile
+  return pline
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.

From 69f2c87dce41a904faa21c05b3dda8dc5322055f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 19 Oct 2016 19:36:27 -0700
Subject: [PATCH 0557/1043] small minification and perf (#675)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9d2d25e2..097b3bbb 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 15, 2016
+" Last Change: October 19, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -50,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')
@@ -65,10 +65,10 @@ endif
 
 function s:Trimline(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
-  let max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
-  while max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? '\%(comment\|doc\)'
-    let pline = substitute(strpart(pline, 0, max),'\s*$','','')
-    let max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
+  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
@@ -85,8 +85,8 @@ let g:javascript_opfirst = '^' . g:javascript_opfirst
 let g:javascript_continuation .= '$'
 
 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
@@ -121,15 +121,15 @@ endfunction
 function s:IsBlock()
   let l:ln = line('.')
   if search('\S','bW')
-    let char = getline(line('.'))[col('.')-1]
-    let pchar = getline(line('.'))[col('.')-2]
+    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(line('.'))[col('.')-1]
-      let pchar = getline(line('.'))[col('.')-2]
+      let char = getline('.')[col('.')-1]
+      let pchar = getline('.')[col('.')-2]
       let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
     endif
     if syn =~? '\%(xml\|jsx\)'
@@ -143,7 +143,7 @@ function s:IsBlock()
     elseif char == '>'
       return pchar == '=' || syn =~? '^jsflow'
     elseif char == ':'
-      return strpart(getline(line('.')),0,col('.')) =~# s:expr_case . '$'
+      return strpart(getline('.'),0,col('.')) =~# s:expr_case . '$'
     else
       return char !~# '[-=~!<*+,/?^%|&([]'
     endif
@@ -254,7 +254,7 @@ function GetJavascriptIndent()
   let s:W = s:sw()
   let pline = s:Trimline(l:lnum)
   call cursor(b:js_cache[1],b:js_cache[2])
-  let bchar = getline(b:js_cache[1])[b:js_cache[2]-1] == '{'
+  let bchar = getline('.')[col('.')-1] == '{'
   let switch_offset = !num || !bchar || !(search(')\_s*\%#','bW') &&
         \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')) ? 0 :
         \ &cino !~ ':' || !has('float') ? s:W :
@@ -264,7 +264,7 @@ function GetJavascriptIndent()
   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]) || (bchar && s:IsBlock()))
+  if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL

From 4ee476b451dba4dc19f0f4b7697e5e6026996838 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 20 Oct 2016 17:47:59 -0700
Subject: [PATCH 0558/1043] init (#676)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 097b3bbb..abd02a66 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,15 +74,10 @@ function s:Trimline(ln)
 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:javascript_opfirst = '^' . get(g:,'javascript_opfirst',
+      \ '\%([<>,?^%|*&]\|\/[/*]\@!\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)')
+let s:javascript_continuation = get(g:,'javascript_continuation',
+      \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)') . '$'
 
 function s:OneScope(lnum,text)
   return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)$')) + 1 ||
@@ -188,9 +183,7 @@ 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')
@@ -261,7 +254,7 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
 
   " most significant, find the indent amount
-  let isOp = l:line =~# g:javascript_opfirst || pline !~# s:expr_case . '$' && pline =~# g:javascript_continuation
+  let isOp = l:line =~# s:javascript_opfirst || pline !~# s:expr_case . '$' && pline =~# s:javascript_continuation
   let bL = s:iscontOne(l:lnum,num,isOp)
   let bL -= (bL && l:line =~ '^{') * s:W
   if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())

From 53f843b646eb5a677d3ea9f03c51010b1f3ffd96 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 20 Oct 2016 21:34:53 -0700
Subject: [PATCH 0559/1043] shorten s:var names

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index abd02a66..560653ac 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,9 +74,9 @@ function s:Trimline(ln)
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
-let s:javascript_opfirst = '^' . get(g:,'javascript_opfirst',
+let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>,?^%|*&]\|\/[/*]\@!\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)')
-let s:javascript_continuation = get(g:,'javascript_continuation',
+let s:continuation = get(g:,'javascript_continuation',
       \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)') . '$'
 
 function s:OneScope(lnum,text)
@@ -254,7 +254,7 @@ function GetJavascriptIndent()
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
 
   " most significant, find the indent amount
-  let isOp = l:line =~# s:javascript_opfirst || pline !~# s:expr_case . '$' && pline =~# s:javascript_continuation
+  let isOp = l:line =~# s:opfirst || pline !~# s:expr_case . '$' && pline =~# s:continuation
   let bL = s:iscontOne(l:lnum,num,isOp)
   let bL -= (bL && l:line =~ '^{') * s:W
   if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())

From b0237b039ff799724ae227344cb0a920d3b1b222 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 21 Oct 2016 01:32:41 -0700
Subject: [PATCH 0560/1043] other small touches (#677)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 560653ac..6717e79e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -199,7 +199,7 @@ function GetJavascriptIndent()
     return -1
   endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)
-  if l:lnum == 0
+  if !l:lnum
     return 0
   endif
 
@@ -215,15 +215,14 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Many hacks for performance
   call cursor(v:lnum,1)
-  let fclose = l:line =~ '^[])}]'
+  let idx = stridx('])}',l:line[0])
   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 || !fclose && s:Balanced(l:lnum))
+          \ (b:js_cache[0] > l:lnum || idx < 0 && s:Balanced(l:lnum))
       let num = b:js_cache[1]
-    elseif fclose
-      let id = stridx('])}',l:line[0])
-      return indent(s:GetPair(escape('[({'[id],'['), '])}'[id],'bW','s:skip_func(s:looksyn)',2000))
+    elseif idx + 1
+      return indent(s:GetPair(escape('[({'[idx],'['), '])}'[idx],'bW','s:skip_func(s:looksyn)',2000))
     elseif indent(v:lnum) && syns =~? 'block'
       let num = s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
     else
@@ -233,7 +232,7 @@ function GetJavascriptIndent()
     let num = s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
   endif
 
-  if fclose
+  if idx + 1
     return indent(num)
   endif
   let num = max([num,0])

From da8ac5b8e8464a0ed0a55f9117fe4b9e8d2de286 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 21 Oct 2016 14:55:59 -0700
Subject: [PATCH 0561/1043] remove pattern match

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6717e79e..7d8de736 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -140,7 +140,7 @@ function s:IsBlock()
     elseif char == ':'
       return strpart(getline('.'),0,col('.')) =~# s:expr_case . '$'
     else
-      return char !~# '[-=~!<*+,/?^%|&([]'
+      return stridx('-=~!<*+,/?^%|&([',char) < 0
     endif
   else
     return 1

From dc34b2461d2b70bbb74fee0e73c931c426556f91 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 21 Oct 2016 21:44:02 -0700
Subject: [PATCH 0562/1043] small fixes (#678)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7d8de736..f24afc2f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -165,7 +165,7 @@ function s:Balanced(lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
     if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
-      if l:line[pos] =~ '[{([]'
+      if stridx('[({',l:line[pos]) + 1
         let l:open += 1
       else
         let l:open -= 1
@@ -215,14 +215,14 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, curly. Many hacks for performance
   call cursor(v:lnum,1)
-  let idx = stridx('])}',l:line[0])
+  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 || idx < 0 && s:Balanced(l:lnum))
       let num = b:js_cache[1]
     elseif idx + 1
-      return indent(s:GetPair(escape('[({'[idx],'['), '])}'[idx],'bW','s:skip_func(s:looksyn)',2000))
+      return indent(s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000))
     elseif indent(v:lnum) && syns =~? 'block'
       let num = s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
     else
@@ -255,7 +255,7 @@ function GetJavascriptIndent()
   " most significant, find the indent amount
   let isOp = l:line =~# s:opfirst || pline !~# s:expr_case . '$' && pline =~# s:continuation
   let bL = s:iscontOne(l:lnum,num,isOp)
-  let bL -= (bL && l:line =~ '^{') * s:W
+  let bL -= (bL && strridx(l:line,'{',0) + 1) * s:W
   if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num

From 5d8153eec0b3de21b6fc03253b2c0f76e451610e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 21 Oct 2016 22:10:54 -0700
Subject: [PATCH 0563/1043] string match

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f24afc2f..543f6806 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -255,7 +255,7 @@ function GetJavascriptIndent()
   " most significant, find the indent amount
   let isOp = l:line =~# s:opfirst || pline !~# s:expr_case . '$' && pline =~# s:continuation
   let bL = s:iscontOne(l:lnum,num,isOp)
-  let bL -= (bL && strridx(l:line,'{',0) + 1) * s:W
+  let bL -= (bL && l:line[0] == '{') * s:W
   if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num

From c746dbc7f17148e2148339ce116d531326387831 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 22 Oct 2016 00:04:48 -0700
Subject: [PATCH 0564/1043] reltime search

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 543f6806..f2c1e123 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -58,8 +58,8 @@ 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
 

From b3edf7f9e59cbf5d70c00ee42af7b6e874c452f4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 22 Oct 2016 12:13:33 -0700
Subject: [PATCH 0565/1043] cleaner cursor call

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f2c1e123..07f4bc1f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -245,7 +245,7 @@ function GetJavascriptIndent()
 
   let s:W = s:sw()
   let pline = s:Trimline(l:lnum)
-  call cursor(b:js_cache[1],b:js_cache[2])
+  call call('cursor',b:js_cache[1:])
   let bchar = getline('.')[col('.')-1] == '{'
   let switch_offset = !num || !bchar || !(search(')\_s*\%#','bW') &&
         \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')) ? 0 :
@@ -256,7 +256,7 @@ function GetJavascriptIndent()
   let isOp = l:line =~# s:opfirst || pline !~# s:expr_case . '$' && pline =~# s:continuation
   let bL = s:iscontOne(l:lnum,num,isOp)
   let bL -= (bL && l:line[0] == '{') * s:W
-  if isOp && (!num || bchar && cursor(b:js_cache[1],b:js_cache[2])+1 && s:IsBlock())
+  if isOp && (!num || bchar && call('cursor',b:js_cache[1:])+1 && s:IsBlock())
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL

From 3b9a45627acfb96edea96bd9ccf6e7082340181a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 23 Oct 2016 00:24:00 -0700
Subject: [PATCH 0566/1043] check for case statement in switch (#682)

---
 indent/javascript.vim | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 07f4bc1f..4aeeb6da 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -205,14 +205,6 @@ function GetJavascriptIndent()
 
   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. Many hacks for performance
   call cursor(v:lnum,1)
   let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
@@ -243,20 +235,27 @@ function GetJavascriptIndent()
     return indent(line('.'))
   endif
 
+  call call('cursor',b:js_cache[1:])
   let s:W = s:sw()
   let pline = s:Trimline(l:lnum)
-  call call('cursor',b:js_cache[1:])
   let bchar = getline('.')[col('.')-1] == '{'
-  let switch_offset = !num || !bchar || !(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))
+  let switch_offset = 0
+  let in_switch = 0
+  if num && bchar && search(')\_s*\%#','bW') &&
+        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')
+    let in_switch = 1
+    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
+  endif
 
   " most significant, find the indent amount
-  let isOp = l:line =~# s:opfirst || pline !~# s:expr_case . '$' && pline =~# s:continuation
+  let isOp = l:line =~# s:opfirst || (in_switch && pline =~# s:expr_case . '$' ? 0 : pline =~# s:continuation)
   let bL = s:iscontOne(l:lnum,num,isOp)
   let bL -= (bL && l:line[0] == '{') * s:W
-  if isOp && (!num || bchar && call('cursor',b:js_cache[1:])+1 && s:IsBlock())
+  if isOp && (!num || in_switch || bchar && call('cursor',b:js_cache[1:])+1 && s:IsBlock())
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL

From ead360d5ac1877aeb35a853af92cd68d5822b16f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 23 Oct 2016 15:47:21 -0700
Subject: [PATCH 0567/1043] refactor

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4aeeb6da..be178758 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -212,23 +212,27 @@ function GetJavascriptIndent()
     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 || idx < 0 && s:Balanced(l:lnum))
-      let num = b:js_cache[1]
+      call call('cursor',b:js_cache[1:])
     elseif idx + 1
-      return indent(s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000))
+      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000)
     elseif indent(v:lnum) && syns =~? 'block'
-      let num = s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
+      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
 
   if idx + 1
-    return indent(num)
+    if idx == 2 && search('\S','bW',line('.')) && getline('.')[col('.')-1] == ')'
+      call s:GetPair('(',')','bW',s:skip_expr,200)
+    endif
+    return indent(line('.'))
   endif
-  let num = max([num,0])
-  let b:js_cache = [v:lnum,num,line('.') == v:lnum && num ? b:js_cache[2] : col('.')]
+
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : [line('.'),col('.')])
+  let num = b:js_cache[1]
 
   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

From 4b435ebb41211e4b1038944e6ad25fd1404c20e6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 23 Oct 2016 22:29:43 -0700
Subject: [PATCH 0568/1043] small fix

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index be178758..3aaef6f3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -211,7 +211,7 @@ function GetJavascriptIndent()
   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 || idx < 0 && s:Balanced(l:lnum))
+          \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
       call call('cursor',b:js_cache[1:])
     elseif idx + 1
       call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000)

From 2676ca045307cece4c5d2542a76b2eaaedf36236 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 24 Oct 2016 15:53:34 -0700
Subject: [PATCH 0569/1043] Prevent giant loop, refactor

---
 indent/javascript.vim | 62 +++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3aaef6f3..da5f3061 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 19, 2016
+" Last Change: October 24, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -63,7 +63,7 @@ else
   endfunction
 endif
 
-function s:Trimline(ln)
+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\)'
@@ -88,12 +88,12 @@ 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('\C\<do\>','\C\<while\>','bW','line2byte(line(".")) + col(".") <'
               \ . (line2byte(l:num) + b:js_cache[2]) . '||'
@@ -106,6 +106,8 @@ function s:iscontOne(i,num,cont)
         break
       endif
       let ind = indent(l:i)
+    elseif !a:cont
+      break
     endif
     let l:i = s:PrevCodeLine(l:i - 1)
   endwhile
@@ -234,32 +236,40 @@ function GetJavascriptIndent()
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : [line('.'),col('.')])
   let num = b:js_cache[1]
 
-  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('.'))
+  call call('cursor',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
 
-  call call('cursor',b:js_cache[1:])
-  let s:W = s:sw()
-  let pline = s:Trimline(l:lnum)
-  let bchar = getline('.')[col('.')-1] == '{'
-  let switch_offset = 0
-  let in_switch = 0
-  if num && bchar && search(')\_s*\%#','bW') &&
-        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')
-    let in_switch = 1
-    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
+  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 =~# s:opfirst || (in_switch && pline =~# s:expr_case . '$' ? 0 : pline =~# s:continuation)
-  let bL = s:iscontOne(l:lnum,num,isOp)
-  let bL -= (bL && l:line[0] == '{') * s:W
-  if isOp && (!num || in_switch || bchar && call('cursor',b:js_cache[1:])+1 && s:IsBlock())
+  if isOp
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL

From 672c379b18e3147ba8a2e7c687e02f7ee8fb64b8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 24 Oct 2016 21:17:18 -0700
Subject: [PATCH 0570/1043] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index da5f3061..31c7bc9f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -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 nolisp autoindent nosmartindent
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
 
@@ -236,7 +236,6 @@ function GetJavascriptIndent()
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : [line('.'),col('.')])
   let num = b:js_cache[1]
 
-  call call('cursor',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] == '{'
@@ -268,7 +267,7 @@ function GetJavascriptIndent()
     let bL -= (bL && l:line[0] == '{') * s:W
   endif
 
-  " most significant, find the indent amount
+  " main return
   if isOp
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num

From 88b068088dac712b4ab587ee346e806757edac18 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 24 Oct 2016 21:28:25 -0700
Subject: [PATCH 0571/1043] cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 31c7bc9f..a74e53c3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -100,7 +100,7 @@ function s:iscontOne(i,num,cont)
               \ . 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
@@ -111,7 +111,7 @@ function s:iscontOne(i,num,cont)
     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

From 23bb9c3e1e7bcdc8e63c1ca23bfdeff22d664a1a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 24 Oct 2016 21:34:36 -0700
Subject: [PATCH 0572/1043] last cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a74e53c3..5191a2c2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -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 autoindent nosmartindent
+setlocal autoindent nolisp nosmartindent
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
 

From 4456229dd73ce3672b35be60afeb9021033e0375 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 26 Oct 2016 15:15:23 -0700
Subject: [PATCH 0573/1043] non whitespace non : after case statement

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5191a2c2..67f50b30 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,7 +37,7 @@ else
   endfunction
 endif
 
-let s:expr_case = '\<\%(\%(case\>\s*\S.\{-}\)\|default\)\s*:\C'
+let s:expr_case = '\<\%(\%(case\>\s*[^[:blank:]:].\{-}\)\|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\)'
 

From 460598f32fda138d45960f5becfd627efcc2a074 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 27 Oct 2016 19:14:27 -0700
Subject: [PATCH 0574/1043] fix 'default' property identifier (#689)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 67f50b30..0a448395 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -140,7 +140,8 @@ function s:IsBlock()
     elseif char == '>'
       return pchar == '=' || syn =~? '^jsflow'
     elseif char == ':'
-      return strpart(getline('.'),0,col('.')) =~# s:expr_case . '$'
+      return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),s:expr_case . '$')) + 1 &&
+            \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
     else
       return stridx('-=~!<*+,/?^%|&([',char) < 0
     endif

From bf2a1b42f2724658b9d62dbe0dfb5acacd316ef0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 27 Oct 2016 22:40:13 -0700
Subject: [PATCH 0575/1043] last case statement

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0a448395..8551cce7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -140,7 +140,7 @@ function s:IsBlock()
     elseif char == '>'
       return pchar == '=' || syn =~? '^jsflow'
     elseif char == ':'
-      return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),s:expr_case . '$')) + 1 &&
+      return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
             \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
     else
       return stridx('-=~!<*+,/?^%|&([',char) < 0

From 2d33a9e11a1496c38aa4949caa240c3a1feefcee Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 29 Oct 2016 11:46:32 -0700
Subject: [PATCH 0576/1043] code cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8551cce7..e4a380fb 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -132,11 +132,8 @@ function s:IsBlock()
     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
+      return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
+            \ , expand('<cword>')) < (0 + (line('.') != l:ln))
     elseif char == '>'
       return pchar == '=' || syn =~? '^jsflow'
     elseif char == ':'

From b4517ac35479dc07eb9c6a853835556b231c500a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Rodr=C3=ADguez?=
 <andres.rodriguez@lithersoft.com>
Date: Sat, 29 Oct 2016 17:28:02 -0300
Subject: [PATCH 0577/1043] Add fetch keyword to list of globals

Closes #688.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 74b619b1..22733c78 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -112,7 +112,7 @@ syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat
+syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
 syntax keyword jsGlobalNodeObjects  module exports global process
 syntax match   jsGlobalNodeObjects  /require/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From 579997a82c4e9009675bf295b69ed28b34cff541 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 29 Oct 2016 14:16:34 -0700
Subject: [PATCH 0578/1043] isBlock cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e4a380fb..c565af8c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -142,9 +142,8 @@ function s:IsBlock()
     else
       return stridx('-=~!<*+,/?^%|&([',char) < 0
     endif
-  else
-    return 1
   endif
+  return 1
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.

From 8996ec59311978869c254bbd614e1168a6152e78 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 29 Oct 2016 14:21:18 -0700
Subject: [PATCH 0579/1043] date, cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c565af8c..335eacde 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 24, 2016
+" Last Change: October 29, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -139,9 +139,8 @@ function s:IsBlock()
     elseif char == ':'
       return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
             \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
-    else
-      return stridx('-=~!<*+,/?^%|&([',char) < 0
     endif
+    return stridx('-=~!<*+,/?^%|&([',char) < 0
   endif
   return 1
 endfunction

From afb03f5eb638187cba6d175b3f60ff07188b4b81 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 29 Oct 2016 17:28:51 -0700
Subject: [PATCH 0580/1043] cleaning,skip_func

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 335eacde..d945200a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -50,7 +50,7 @@ function s:skip_func(lnum)
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (strridx(getline('.'),'/',col('.')-1) + 1 || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
+  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
 endfunction
 
 if has('reltime')

From 187b1d6a0ee5513db105bdf34e07663d13923993 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 30 Oct 2016 16:58:11 -0700
Subject: [PATCH 0581/1043] recursion in isBlock: comment skip (#692)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d945200a..c8195ac4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -115,21 +115,15 @@ function s:iscontOne(i,num,cont)
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
-function s:IsBlock()
-  let l:ln = line('.')
+function s:IsBlock(...)
+  let l:ln = get(a:000,0,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 syn =~? '\%(xml\|jsx\)'
+    if syn =~? 'comment'
+      return search('\/[/*]','bW') && s:IsBlock(l:ln)
+    elseif syn =~? '\%(xml\|jsx\)'
       return char != '{'
     elseif char =~# '\l'
       return index(split('return const let import export yield default delete var void typeof throw new in instanceof')

From f8fc08c8d3e1726ee3e9eba61a965a294e584343 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 30 Oct 2016 20:01:47 -0700
Subject: [PATCH 0582/1043] small comment fix

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c8195ac4..69f24107 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -120,7 +120,7 @@ function s:IsBlock(...)
   if search('\S','bW')
     let char = getline('.')[col('.')-1]
     let pchar = getline('.')[col('.')-2]
-    let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
+    let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
     if syn =~? 'comment'
       return search('\/[/*]','bW') && s:IsBlock(l:ln)
     elseif syn =~? '\%(xml\|jsx\)'

From dcf820b2a401bdbfff7d54feeef0e1ecceb1d581 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 30 Oct 2016 21:17:22 -0700
Subject: [PATCH 0583/1043] adjust precedence of comment/jsx

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 69f24107..1fe371ff 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -121,10 +121,10 @@ function s:IsBlock(...)
     let char = getline('.')[col('.')-1]
     let pchar = getline('.')[col('.')-2]
     let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
-    if syn =~? 'comment'
-      return search('\/[/*]','bW') && s:IsBlock(l:ln)
-    elseif syn =~? '\%(xml\|jsx\)'
+    if syn =~? '\%(xml\|jsx\)'
       return char != '{'
+    elseif syn =~? 'comment'
+      return search('\/[/*]','bW') && s:IsBlock(l:ln)
     elseif char =~# '\l'
       return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
             \ , expand('<cword>')) < (0 + (line('.') != l:ln))

From 1e52ed9bcd2d5f89c062d34afeeac4bcfbad831e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 31 Oct 2016 00:11:43 -0700
Subject: [PATCH 0584/1043] remove var

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1fe371ff..105d4862 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -119,7 +119,6 @@ function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
   if search('\S','bW')
     let char = getline('.')[col('.')-1]
-    let pchar = getline('.')[col('.')-2]
     let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
     if syn =~? '\%(xml\|jsx\)'
       return char != '{'
@@ -129,7 +128,7 @@ function s:IsBlock(...)
       return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
             \ , expand('<cword>')) < (0 + (line('.') != l:ln))
     elseif char == '>'
-      return pchar == '=' || syn =~? '^jsflow'
+      return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
     elseif char == ':'
       return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
             \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')

From 918202964ff67c1d242573e0146ff35fcf468495 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 31 Oct 2016 01:47:20 -0700
Subject: [PATCH 0585/1043] clearer char checking

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 105d4862..4db372d4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -118,22 +118,22 @@ endfunction
 function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
   if search('\S','bW')
-    let char = getline('.')[col('.')-1]
-    let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
+    let char = strpart(getline('.'),col('.')-2,2)
+    let syn = synIDattr(synID(line('.'),col('.')-(char[1] == '{'),0),'name')
     if syn =~? '\%(xml\|jsx\)'
-      return char != '{'
+      return char[1] != '{'
     elseif syn =~? 'comment'
       return search('\/[/*]','bW') && s:IsBlock(l:ln)
-    elseif char =~# '\l'
+    elseif char[1] =~# '\l'
       return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
             \ , expand('<cword>')) < (0 + (line('.') != l:ln))
-    elseif char == '>'
-      return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
-    elseif char == ':'
+    elseif char[1] == '>'
+      return char[0] == '=' || syn =~? '^jsflow'
+    elseif char[1] == ':'
       return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
             \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
     endif
-    return stridx('-=~!<*+,/?^%|&([',char) < 0
+    return stridx('-=~!<*+,/?^%|&([',char[1]) < 0
   endif
   return 1
 endfunction

From cdb44a869cfebec30d5933d1a3b66bc7f5b0b936 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 31 Oct 2016 10:38:24 -0700
Subject: [PATCH 0586/1043] last index string

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4db372d4..7ccc3d6e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -119,17 +119,17 @@ function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
   if search('\S','bW')
     let char = strpart(getline('.'),col('.')-2,2)
-    let syn = synIDattr(synID(line('.'),col('.')-(char[1] == '{'),0),'name')
+    let syn = synIDattr(synID(line('.'),col('.')-(char[-1:] == '{'),0),'name')
     if syn =~? '\%(xml\|jsx\)'
-      return char[1] != '{'
+      return char[-1:] != '{'
     elseif syn =~? 'comment'
       return search('\/[/*]','bW') && s:IsBlock(l:ln)
-    elseif char[1] =~# '\l'
+    elseif char[-1:] =~# '\l'
       return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
             \ , expand('<cword>')) < (0 + (line('.') != l:ln))
-    elseif char[1] == '>'
+    elseif char[-1:] == '>'
       return char[0] == '=' || syn =~? '^jsflow'
-    elseif char[1] == ':'
+    elseif char[-1:] == ':'
       return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
             \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
     endif

From 01193be9e98f8a673adb6ed069b63b16303accdb Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 31 Oct 2016 10:41:20 -0700
Subject: [PATCH 0587/1043] date, str char

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7ccc3d6e..625720e8 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 29, 2016
+" Last Change: Octember 31, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -133,7 +133,7 @@ function s:IsBlock(...)
       return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
             \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
     endif
-    return stridx('-=~!<*+,/?^%|&([',char[1]) < 0
+    return stridx('-=~!<*+,/?^%|&([',char[-1:]) < 0
   endif
   return 1
 endfunction

From 65e68f563e154da2069b2aaa671560e4fef7a6a0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 31 Oct 2016 14:31:49 -0700
Subject: [PATCH 0588/1043] revert char check

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 625720e8..311ec08f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -118,22 +118,22 @@ endfunction
 function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
   if search('\S','bW')
-    let char = strpart(getline('.'),col('.')-2,2)
-    let syn = synIDattr(synID(line('.'),col('.')-(char[-1:] == '{'),0),'name')
+    let char = getline('.')[col('.')-1]
+    let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
     if syn =~? '\%(xml\|jsx\)'
-      return char[-1:] != '{'
+      return char != '{'
     elseif syn =~? 'comment'
       return search('\/[/*]','bW') && s:IsBlock(l:ln)
-    elseif char[-1:] =~# '\l'
+    elseif char =~# '\l'
       return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
             \ , expand('<cword>')) < (0 + (line('.') != l:ln))
-    elseif char[-1:] == '>'
-      return char[0] == '=' || syn =~? '^jsflow'
-    elseif char[-1:] == ':'
+    elseif char == '>'
+      return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
+    elseif char == ':'
       return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
             \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
     endif
-    return stridx('-=~!<*+,/?^%|&([',char[-1:]) < 0
+    return stridx('-=~!<*+,/?^%|&([',char) < 0
   endif
   return 1
 endfunction

From 12a6f46c4bb323e970252c9d4b5fb9c7aadcfa3a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 31 Oct 2016 19:42:33 -0700
Subject: [PATCH 0589/1043] alpha short circuiting

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 311ec08f..42e13644 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -124,7 +124,7 @@ function s:IsBlock(...)
       return char != '{'
     elseif syn =~? 'comment'
       return search('\/[/*]','bW') && s:IsBlock(l:ln)
-    elseif char =~# '\l'
+    elseif char =~# '\a'
       return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
             \ , expand('<cword>')) < (0 + (line('.') != l:ln))
     elseif char == '>'

From b5a21109be91d35e1dccc53ba8046c3d5e329d15 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 31 Oct 2016 23:53:17 -0700
Subject: [PATCH 0590/1043] code minify

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 42e13644..bd679ee7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -156,13 +156,9 @@ function s:Balanced(lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
     if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
-      if stridx('[({',l:line[pos]) + 1
-        let l:open += 1
-      else
-        let l:open -= 1
-        if l:open < 0
-          return 0
-        endif
+      let l:open += match(' ' . l:line[pos],'[[({]')
+      if l:open < 0
+        return 0
       endif
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)

From 4d60216106f9c170e0e75325d8611931fc10e6c6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 1 Nov 2016 15:18:28 -0700
Subject: [PATCH 0591/1043] prevline = 0 at html

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bd679ee7..a1283a37 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -142,7 +142,10 @@ 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
+    let syn = synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"`]'),0),'name')
+    if syn =~? 'html'
+      return
+    elseif syn !~? s:syng_strcom
       return l:lnum
     endif
     let l:lnum = prevnonblank(l:lnum - 1)

From 396829c383395178db37871b432c0768806919e4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 2 Nov 2016 00:48:35 -0700
Subject: [PATCH 0592/1043] comment handling

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a1283a37..875b7799 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -75,7 +75,7 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\%([<>,?^%|*&]\|\/[/*]\@!\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)')
+      \ '\%([<>,?^%|*/&]\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
       \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)') . '$'
 
@@ -193,7 +193,7 @@ function GetJavascriptIndent()
     return 0
   endif
 
-  let l:line = substitute(l:line,'^\s*\%(\/\*.\{-}\*\/\s*\)*','','')
+  let l:line = substitute(substitute(l:line,'^\s*\%(\/\*.\{-}\*\/\s*\)*','',''),'^\/[/*].*','','')
 
   " the containing paren, bracket, curly. Many hacks for performance
   call cursor(v:lnum,1)

From 7835f3dc60b59e337a56dbae4cb4e63127856a18 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 3 Nov 2016 11:27:43 -0700
Subject: [PATCH 0593/1043] Refactoring (#693)

---
 indent/javascript.vim | 46 +++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 875b7799..54869dbc 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -63,6 +63,19 @@ else
   endfunction
 endif
 
+function s:current_char()
+  return getline('.')[col('.')-1]
+endfunction
+
+function s:token()
+  return s:current_char() =~ '\w' ? expand('<cword>') : s:current_char()
+endfunction
+
+" NOTE: moves the cursor
+function s:previous_token()
+  return search('\<\|[^[:alnum:]_$[:space:]]','bW') ? s:token() : ''
+endfunction
+
 function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
   let l:max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
@@ -80,10 +93,15 @@ 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 &&
-        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 &&
-        \ search('\C\<\%(for\%(\_s\+\%(await\|each\)\)\=\|if\|let\|w\%(hile\|ith\)\)\_s*\%#','bW')
+  if cursor(a:lnum, match(' ' . a:text, ')$')) + 1 &&
+        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+    let token = s:previous_token()
+    if index(split('await each'),token) + 1
+      return s:previous_token() ==# 'for'
+    endif
+    return index(split('for if let while with'),token) + 1
+  endif
+  return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)$\C')) + 1
 endfunction
 
 function s:iscontOne(i,num,cont)
@@ -94,7 +112,7 @@ 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 expand('<cword>') ==# 'while' &&
+        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
@@ -105,10 +123,10 @@ function s:iscontOne(i,num,cont)
       elseif !l:cont
         break
       endif
-      let ind = indent(l:i)
     elseif !a:cont
       break
     endif
+    let ind = min([ind, indent(l:i)])
     let l:i = s:PrevCodeLine(l:i - 1)
   endwhile
   return bL
@@ -118,22 +136,20 @@ endfunction
 function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
   if search('\S','bW')
-    let char = getline('.')[col('.')-1]
+    let char = s:token()
     let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
     if syn =~? '\%(xml\|jsx\)'
       return char != '{'
     elseif syn =~? 'comment'
       return search('\/[/*]','bW') && s:IsBlock(l:ln)
-    elseif char =~# '\a'
-      return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
-            \ , expand('<cword>')) < (0 + (line('.') != l:ln))
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
     elseif char == ':'
       return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
-            \ (expand('<cword>') !=# 'default' || !search('\S','bW') || getline('.')[col('.')-1] !~ '[,{]')
+            \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
     endif
-    return stridx('-=~!<*+,/?^%|&([',char) < 0
+    return index(split('return const let import export yield default delete var void typeof throw new in instanceof'
+          \ . ' - = ~ ! < * + , / ? ^ % | & ( ['), char) < (0 + (line('.') != l:ln))
   endif
   return 1
 endfunction
@@ -215,7 +231,7 @@ function GetJavascriptIndent()
   endif
 
   if idx + 1
-    if idx == 2 && search('\S','bW',line('.')) && getline('.')[col('.')-1] == ')'
+    if idx == 2 && search('\S','bW',line('.')) && s:current_char() == ')'
       call s:GetPair('(',')','bW',s:skip_expr,200)
     endif
     return indent(line('.'))
@@ -226,10 +242,10 @@ function GetJavascriptIndent()
 
   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 s:current_char() == '{'
       if search(')\_s*\%#','bW')
         let stmt = 1
-        if s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && search('\C\<switch\_s*\%#','bW')
+        if s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
           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

From 01f7804267feb134f3b884b7a4612b126e6b6bb3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 4 Nov 2016 15:04:53 -0700
Subject: [PATCH 0594/1043] keyword atom

This is used by `\<` and `expand('<cword>')`
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 54869dbc..f4df091c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -68,7 +68,7 @@ function s:current_char()
 endfunction
 
 function s:token()
-  return s:current_char() =~ '\w' ? expand('<cword>') : s:current_char()
+  return s:current_char() =~ '\k' ? expand('<cword>') : s:current_char()
 endfunction
 
 " NOTE: moves the cursor

From 2ef9a9ca375f37c233000972f0c9e926db828417 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 5 Nov 2016 14:43:40 -0700
Subject: [PATCH 0595/1043] refactoring block conditions (#695)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f4df091c..c2e4af60 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: Octember 31, 2016
+" Last Change: November 5, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -137,7 +137,7 @@ function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
   if search('\S','bW')
     let char = s:token()
-    let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
+    let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
     if syn =~? '\%(xml\|jsx\)'
       return char != '{'
     elseif syn =~? 'comment'
@@ -241,20 +241,16 @@ function GetJavascriptIndent()
   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 s:current_char() == '{'
-      if search(')\_s*\%#','bW')
-        let stmt = 1
-        if s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
-          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 . '$'
+  if num
+    if s:current_char() == '{' && s:IsBlock()
+      let stmt = 1
+      if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
+        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
-      elseif s:IsBlock()
-        let stmt = 1
+        let stmt = pline !~# s:expr_case . '$'
       endif
     endif
   else

From 817215be5cdec9bee35ed1f1089bab32c46c4664 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 6 Nov 2016 13:51:08 -0800
Subject: [PATCH 0596/1043] more code cleaning

---
 indent/javascript.vim | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c2e4af60..67c1df6b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -241,23 +241,19 @@ function GetJavascriptIndent()
   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 s:current_char() == '{' && s:IsBlock()
-      let stmt = 1
-      if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
-        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 . '$'
+  if num && s:current_char() == '{' && s:IsBlock()
+    let stmt = 1
+    if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
+      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
-  else
-    let stmt = 1
   endif
 
-  if stmt
+  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('.'))

From d23050e3061ecd1836165c38027245d0d17cb8a9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 6 Nov 2016 14:08:08 -0800
Subject: [PATCH 0597/1043] return redundancies

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 67c1df6b..bf1e7fbb 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -177,7 +177,7 @@ function s:Balanced(lnum)
     if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
       let l:open += match(' ' . l:line[pos],'[[({]')
       if l:open < 0
-        return 0
+        return
       endif
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)
@@ -206,7 +206,7 @@ function GetJavascriptIndent()
   endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)
   if !l:lnum
-    return 0
+    return
   endif
 
   let l:line = substitute(substitute(l:line,'^\s*\%(\/\*.\{-}\*\/\s*\)*','',''),'^\/[/*].*','','')

From eac13000f5998dc90d10452718fda18ab8aa9133 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 6 Nov 2016 14:11:20 -0800
Subject: [PATCH 0598/1043] another return

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bf1e7fbb..bdb1e159 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: November 5, 2016
+" Last Change: November 6, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -116,7 +116,7 @@ function s:iscontOne(i,num,cont)
               \ 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
+          return
         endif
         let bL += s:W
         let [l:cont, l:i] = [0, line('.')]

From 15905f20882b9ed2cddf6aeb9bdc1ebbaa3cabfa Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 6 Nov 2016 14:28:13 -0800
Subject: [PATCH 0599/1043] refactor,cleaning isblock

---
 indent/javascript.vim | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bdb1e159..a2a1645b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -135,23 +135,22 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
-  if search('\S','bW')
-    let char = s:token()
-    let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
-    if syn =~? '\%(xml\|jsx\)'
-      return char != '{'
-    elseif syn =~? 'comment'
-      return search('\/[/*]','bW') && s:IsBlock(l:ln)
-    elseif char == '>'
-      return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
-    elseif char == ':'
-      return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
-            \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
-    endif
-    return index(split('return const let import export yield default delete var void typeof throw new in instanceof'
-          \ . ' - = ~ ! < * + , / ? ^ % | & ( ['), char) < (0 + (line('.') != l:ln))
+  let char = s:previous_token()
+  let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
+  if char is ''
+    return 1
+  elseif syn =~? '\%(xml\|jsx\)'
+    return char != '{'
+  elseif syn =~? 'comment'
+    return search('\/[/*]','bW') && s:IsBlock(l:ln)
+  elseif char == '>'
+    return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
+  elseif char == ':'
+    return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
+          \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
   endif
-  return 1
+  return index(split('return const let import export yield default delete var void typeof throw new in instanceof'
+        \ . ' - = ~ ! < * + , / ? ^ % | & ( ['), char) < (0 + (line('.') != l:ln))
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.

From 8a40889ba41741a07566d9320e6bd60bd73f9405 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 6 Nov 2016 20:38:25 -0800
Subject: [PATCH 0600/1043] skip any html

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a2a1645b..af2244b1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -45,12 +45,12 @@ let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
   if !s:free || search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
-    let s:free = !eval(s:skip_expr)
+    let s:free = !eval(s:skip_expr . '. "\\|html"')
     let s:looksyn = s:free ? line('.') : s:looksyn
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
+  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr . '. "\\|html"')
 endfunction
 
 if has('reltime')

From 6f3e6e9748675a04efd01a7be93b775e8f051ea0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 6 Nov 2016 20:44:11 -0800
Subject: [PATCH 0601/1043] keep string type

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index af2244b1..8bfaeb98 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -40,17 +40,16 @@ endif
 let s:expr_case = '\<\%(\%(case\>\s*[^[:blank:]:].\{-}\)\|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\)'
-
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
   if !s:free || search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
-    let s:free = !eval(s:skip_expr . '. "\\|html"')
+    let s:free = !eval(s:skip_expr . " . '\\|html'")
     let s:looksyn = s:free ? line('.') : s:looksyn
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr . '. "\\|html"')
+  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr . " . '\\|html'")
 endfunction
 
 if has('reltime')

From bedb8cb2e67f42c0dffb92a3f32d81f5faa9679e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 6 Nov 2016 22:15:22 -0800
Subject: [PATCH 0602/1043] cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8bfaeb98..be4203f0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,13 +37,14 @@ else
   endfunction
 endif
 
-let s:expr_case = '\<\%(\%(case\>\s*[^[:blank:]:].\{-}\)\|default\)\s*:\C'
+let s:case_stmt = '\<\%(\%(case\>\s*[^[:blank:]:].\{-}\)\|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\)'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
-  if !s:free || search('`','nW',a:lnum) || search('\*\/','nW',a:lnum)
+  if !s:free || search('`\|\%(\*\/\)','nW',a:lnum)
     let s:free = !eval(s:skip_expr . " . '\\|html'")
     let s:looksyn = s:free ? line('.') : s:looksyn
     return !s:free
@@ -145,7 +146,7 @@ function s:IsBlock(...)
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
-    return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:expr_case . '$')) + 1 &&
+    return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) + 1 &&
           \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
   endif
   return index(split('return const let import export yield default delete var void typeof throw new in instanceof'
@@ -244,10 +245,10 @@ function GetJavascriptIndent()
     if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
       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
+      if l:line =~# '^' . s:case_stmt
         return indent(num) + switch_offset
       endif
-      let stmt = pline !~# s:expr_case . '$'
+      let stmt = pline !~# s:case_stmt . '$'
     endif
   endif
 

From 8ac7badb3c8d38dd5b3a01b320cac2887a8e9902 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 7 Nov 2016 10:23:25 -0800
Subject: [PATCH 0603/1043] Remove all extra grouping (#697)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index be4203f0..a5f8cf0f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,14 +37,14 @@ else
   endfunction
 endif
 
-let s:case_stmt = '\<\%(\%(case\>\s*[^[:blank:]:].\{-}\)\|default\)\s*:\C'
+let s:case_stmt = '\<\%(case\>\s*[^[:blank:]:].\{-}\|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\)'
+let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
-  if !s:free || search('`\|\%(\*\/\)','nW',a:lnum)
+  if !s:free || search('`\|\*\/','nW',a:lnum)
     let s:free = !eval(s:skip_expr . " . '\\|html'")
     let s:looksyn = s:free ? line('.') : s:looksyn
     return !s:free
@@ -79,7 +79,7 @@ endfunction
 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\)'
+  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
@@ -139,7 +139,7 @@ function s:IsBlock(...)
   let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
   if char is ''
     return 1
-  elseif syn =~? '\%(xml\|jsx\)'
+  elseif syn =~? 'xml\|jsx'
     return char != '{'
   elseif syn =~? 'comment'
     return search('\/[/*]','bW') && s:IsBlock(l:ln)
@@ -194,13 +194,13 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.
-  if syns =~? '\%(comment\|doc\)'
+  if syns =~? 'comment\|doc'
     if l:line =~ '^\s*\*'
       return cindent(v:lnum)
     elseif l:line !~ '^\s*\/'
       return -1
     endif
-  elseif syns =~? '\%(string\|template\)' && l:line !~ '^[''"]'
+  elseif syns =~? 'string\|template' && l:line !~ '^[''"]'
     return -1
   endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)

From 74f6d46f7bfa0613cf9bc5799781ac41289e856c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 7 Nov 2016 21:04:14 -0800
Subject: [PATCH 0604/1043] remove es6 semi-less do-while handling (#698)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a5f8cf0f..83bc204e 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
@@ -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

From d47868cad502ac31b681b29ae454f8815f76d9ce Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 7 Nov 2016 22:49:52 -0800
Subject: [PATCH 0605/1043] remove magic try

anyone changing the magic setting will have a non-operable program anyway
---
 indent/javascript.vim | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 83bc204e..1ccc55fb 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -179,9 +179,6 @@ function s:Balanced(lnum)
 endfunction
 
 function GetJavascriptIndent()
-  try
-    let save_magic = &magic
-    set magic
   let b:js_cache = get(b:,'js_cache',[0,0,0])
   " Get the current line.
   let l:line = getline(v:lnum)
@@ -259,10 +256,6 @@ function GetJavascriptIndent()
     return indent(num) + s:W + switch_offset + bL
   endif
   return bL
-  
-  finally
-    let &magic = save_magic
-  endtry
 endfunction
 
 let &cpo = s:cpo_save

From b0f562956984e70bfd09d30200da6a2340286bc5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 8 Nov 2016 00:09:21 -0800
Subject: [PATCH 0606/1043] de-noising

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1ccc55fb..a71a9b0d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -37,7 +37,7 @@ else
   endfunction
 endif
 
-let s:case_stmt = '\<\%(case\>\s*[^[:blank:]:].\{-}\|default\s*\):\C'
+let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
 
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'

From 419f0d6a84fda49378257eb6464222ed7a9ea150 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 8 Nov 2016 09:26:33 -0800
Subject: [PATCH 0607/1043] accurate collection (#699)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a71a9b0d..f68bdd85 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,7 +73,7 @@ endfunction
 
 " NOTE: moves the cursor
 function s:previous_token()
-  return search('\<\|[^[:alnum:]_$[:space:]]','bW') ? s:token() : ''
+  return search('\<\|[][`^!"%-/:-?{-~]','bW') ? s:token() : ''
 endfunction
 
 function s:Trim(ln)

From e9a59c87703d7d67d9933e68b80732326163a5c5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 8 Nov 2016 10:05:43 -0800
Subject: [PATCH 0608/1043] hotfix: Improve switch

This isn't worth starting dev branch again
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f68bdd85..b72ff920 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -235,7 +235,7 @@ function GetJavascriptIndent()
     let stmt = 1
     if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
       let switch_offset = &cino !~ ':' || !has('float') ? s:W :
-            \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
+            \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '\%(.*:\)\@>[^,]*s' ? s:W : 1))
       if l:line =~# '^' . s:case_stmt
         return indent(num) + switch_offset
       endif

From 22b9f0f8e4be167d153b501775b2476e2e7d0d95 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 9 Nov 2016 12:13:36 -0800
Subject: [PATCH 0609/1043] consider regex when matching '/' (#703)

* consider regex when matching '/'

```
i = /o/
{
    i().
        n()
}
```

* match == col || match == -1

* regex is code

* list concat instead of string
---
 indent/javascript.vim | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b72ff920..44231e99 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -131,7 +131,7 @@ function s:IsBlock(...)
   let l:ln = get(a:000,0,line('.'))
   let char = s:previous_token()
   let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
-  if char is ''
+  if char is '' || syn =~? 'regex'
     return 1
   elseif syn =~? 'xml\|jsx'
     return char != '{'
@@ -143,8 +143,8 @@ function s:IsBlock(...)
     return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) + 1 &&
           \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
   endif
-  return index(split('return const let import export yield default delete var void typeof throw new in instanceof'
-        \ . ' - = ~ ! < * + , / ? ^ % | & ( ['), char) < (0 + (line('.') != l:ln))
+  return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
+        \ + split('-=~!<*+,/?^%|&([','\zs'), char) < (0 + (line('.') != l:ln))
 endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
@@ -154,7 +154,7 @@ function s:PrevCodeLine(lnum)
     let syn = synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"`]'),0),'name')
     if syn =~? 'html'
       return
-    elseif syn !~? s:syng_strcom
+    elseif syn !~? 'comment\|doc\|string\|template'
       return l:lnum
     endif
     let l:lnum = prevnonblank(l:lnum - 1)
@@ -244,7 +244,8 @@ function GetJavascriptIndent()
   endif
 
   if stmt || !num
-    let isOp = l:line =~# s:opfirst || pline =~# s:continuation
+    let isOp = l:line =~# s:opfirst || pline =~# s:continuation &&
+          \ synIDattr(synID(l:lnum,match(' ' . pline,'\/$'),0),'name') !~? 'regex'
     let bL = s:iscontOne(l:lnum,num,isOp)
     let bL -= (bL && l:line[0] == '{') * s:W
   endif

From c938b83e290f83ef4a1d692625c45b3ba09957a0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 9 Nov 2016 19:03:50 -0800
Subject: [PATCH 0610/1043] Update README.md (#702)

---
 CONTRIBUTING.md | 18 ------------------
 README.md       | 11 +++++------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index c47cbc86..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,18 +0,0 @@
-## Contributing
-
-This project uses the [git
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
-development. There's [a handy git module for git
-flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor,
-the price of admission is 1 pull request. Please follow the general code style
-guides (read the code) and in your pull request explain the reason for the
-proposed change and how it is valuable.
-
-## Pull Requests
-
-Please make your pull requests against the `develop` branch; we stage changes
-for testing there to avoid unexpected breakages for our users. :)
-
-## Bug report
-
-Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
diff --git a/README.md b/README.md
index 1cd79f4c..a1137f79 100644
--- a/README.md
+++ b/README.md
@@ -103,13 +103,12 @@ variables:
 
 ## Contributing
 
-This project uses the [git
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
-development. There's [a handy git module for git
-flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor,
-the price of admission is 1 pull request. Please follow the general code style
+Please follow the general code style
 guides (read the code) and in your pull request explain the reason for the
-proposed change and how it is valuable.
+proposed change and how it is valuable. All p.r.'s will be reviewed by a
+maintainer(s) then, hopefully, merged.
+
+Thank you!
 
 
 ## Bug Reports

From bbabf9d67e0e45eee0e5e6c2fa377c457b96a08d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 12 Nov 2016 02:09:39 -0800
Subject: [PATCH 0611/1043] syntax aware previous token (#705)

* syntax aware previous token

Experimental at the moment

* Replace logic from isBlock

* remove asi special logic

* no args

* remove concat

* remove lvl

* clean reg

* realign

* strange regex 'haviour

* date
---
 indent/javascript.vim | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 44231e99..25ce893d 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: November 6, 2016
+" Last Change: November 12, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -73,7 +73,13 @@ endfunction
 
 " NOTE: moves the cursor
 function s:previous_token()
-  return search('\<\|[][`^!"%-/:-?{-~]','bW') ? s:token() : ''
+  let l:ln = line('.')
+  return search('\<\|[][`^!"%-/:-?{-~]','bW') ?
+        \ (s:token() == '/' || line('.') != l:ln) &&
+        \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
+        \ search('\/[/*]\&','bW') ? s:previous_token() : ''
+        \ : s:token()
+        \ : ''
 endfunction
 
 function s:Trim(ln)
@@ -127,16 +133,14 @@ function s:iscontOne(i,num,cont)
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
-function s:IsBlock(...)
-  let l:ln = get(a:000,0,line('.'))
+function s:IsBlock()
+  let l:ln = line('.')
   let char = s:previous_token()
   let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
   if char is '' || syn =~? 'regex'
     return 1
   elseif syn =~? 'xml\|jsx'
     return char != '{'
-  elseif syn =~? 'comment'
-    return search('\/[/*]','bW') && s:IsBlock(l:ln)
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'

From f177220ebea04d777196f0478d484c58643e0ed4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 13 Nov 2016 10:04:17 -0800
Subject: [PATCH 0612/1043] regex prettify

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 25ce893d..c77734e5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -84,10 +84,10 @@ endfunction
 
 function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
-  let l:max = max([strridx(pline,'//'),strridx(pline,'/*'),0])
+  let l:max = max([match(pline,'.*\zs\/[/*]'),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])
+    let l:max = max([match(pline,'.*\zs\/[/*]'),0])
   endwhile
   return pline
 endfunction

From b3b85e34b744cffab67104cf455530d18a55f203 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 13 Nov 2016 14:50:53 -0800
Subject: [PATCH 0613/1043] trim from start of comment sequence (#709)

* trim from start of comment sequence
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c77734e5..a0048d4a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -84,10 +84,10 @@ endfunction
 
 function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
-  let l:max = max([match(pline,'.*\zs\/[/*]'),0])
+  let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),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([match(pline,'.*\zs\/[/*]'),0])
+    let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
   endwhile
   return pline
 endfunction

From 540d3a572d5ab922f0773a87044b044f0740d922 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 13 Nov 2016 21:30:48 -0800
Subject: [PATCH 0614/1043] improve regex for s:Trim (#710)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a0048d4a..2d49c982 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -84,10 +84,10 @@ endfunction
 
 function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
-  let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
+  let l:max = max([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),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([match(pline,'.*[^/]\zs\/[/*]'),0])
+    let l:max = max([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),0])
   endwhile
   return pline
 endfunction

From b8c62023da422199beaa9377960ebd373e51351c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 15 Nov 2016 19:08:21 -0800
Subject: [PATCH 0615/1043] add operators, regex experiment (#711)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2d49c982..763b99ed 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -94,9 +94,9 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\%([<>,?^%|*/&]\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)')
+      \ '\%([<>,?^%|*/&]\|\([-.:+]\)\1\@!\|=>\@!\|typeof\>\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)') . '$'
+      \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<typeof\|\<in\%(stanceof\)\=\)') . '$'
 
 function s:OneScope(lnum,text)
   if cursor(a:lnum, match(' ' . a:text, ')$')) + 1 &&

From 737c23845d0d2543d304718dfc0383d2471a0c3c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 16 Nov 2016 16:07:24 -0800
Subject: [PATCH 0616/1043] faster prevline (#713)

is just as fast as before and also far quicker with a file like: https://raw.githubusercontent.com/sanctuary-js/sanctuary-def/master/index.js
---
 indent/javascript.vim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 763b99ed..32ba1e65 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -153,15 +153,15 @@ endfunction
 
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevCodeLine(lnum)
-  let l:lnum = prevnonblank(a:lnum)
-  while l:lnum
-    let syn = synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"`]'),0),'name')
+  let curp = [line('.'),col('.')]
+  call cursor(a:lnum+1,1)
+  while search('^\s*\%(\/\/\)\@!\S','bW')
+    let syn = synIDattr(synID(line('.'),matchend(getline('.'), '^\s*[^''"`]'),0),'name')
     if syn =~? 'html'
       return
     elseif syn !~? 'comment\|doc\|string\|template'
-      return l:lnum
+      return line('.') + call('cursor',curp)
     endif
-    let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
 endfunction
 

From f4245c4f794de2a923dd8ee634adc87352ef7748 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 16 Nov 2016 22:55:03 -0800
Subject: [PATCH 0617/1043] more correct comment match (#714)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 32ba1e65..b1c1fc79 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -192,7 +192,7 @@ function GetJavascriptIndent()
   if syns =~? 'comment\|doc'
     if l:line =~ '^\s*\*'
       return cindent(v:lnum)
-    elseif l:line !~ '^\s*\/'
+    elseif l:line !~ '^\s*\/[/*]'
       return -1
     endif
   elseif syns =~? 'string\|template' && l:line !~ '^[''"]'

From b18c6b88a687f5c1eb06ff1f559695ca15cf2d3a Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 18 Nov 2016 14:38:09 -0800
Subject: [PATCH 0618/1043] Basic improvement to jsClassDefinition

This improves things a bit to ensure that extends keyword can accept a
jsExpression. I think this should work as everywhere as expected...

Probably worth testing though.
---
 syntax/javascript.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 22733c78..4d3341f8 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -175,10 +175,11 @@ exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGene
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction               '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 
 " Classes
-syntax keyword jsClassKeywords          contained extends class
+syntax keyword jsClassKeyword           contained class
+syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
-syntax match   jsClassDefinition        /\<class\>\%( [a-zA-Z_$][0-9a-zA-Z_$ \n.]*\)*/ contains=jsClassKeywords,jsClassNoise skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
+syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
@@ -290,7 +291,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsOperator             Operator
   HiLink jsOf                   Operator
   HiLink jsStorageClass         StorageClass
-  HiLink jsClassKeywords        Keyword
+  HiLink jsClassKeyword         Keyword
+  HiLink jsExtendsKeyword       Keyword
   HiLink jsThis                 Special
   HiLink jsSuper                Constant
   HiLink jsNan                  Number

From 3efcf3111231c5737648c3eb9d4cea9320b98c70 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 18 Nov 2016 17:38:52 -0800
Subject: [PATCH 0619/1043] Adds jsSpreadExpression to jsBracket

We were incorrectly not matching a spread in arrays. Whoops.

Fixes #707
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4d3341f8..ddf34515 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -135,7 +135,7 @@ syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECT
 syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
 
 " Code blocks
-syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression extend fold
+syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
 syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc extend fold
 syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock extend fold

From ae9324a61c5b5b82db38cefa0325a0b36b2d3dd6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 18 Nov 2016 23:04:47 -0800
Subject: [PATCH 0620/1043] improve ptoken (#719)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b1c1fc79..ce8fb089 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -77,7 +77,7 @@ function s:previous_token()
   return search('\<\|[][`^!"%-/:-?{-~]','bW') ?
         \ (s:token() == '/' || line('.') != l:ln) &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
-        \ search('\/[/*]\&','bW') ? s:previous_token() : ''
+        \ search('\%(\/\@<!\/\/\|\/\*\)\&','bW') ? s:previous_token() : ''
         \ : s:token()
         \ : ''
 endfunction

From 209b57f9deffa2b23a5482c3dcdb5f6a58e75060 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 20 Nov 2016 11:21:37 -0800
Subject: [PATCH 0621/1043] remove dead code, rename function, date (#721)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ce8fb089..83aae3a2 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: November 12, 2016
+" Last Change: November 20, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -14,9 +14,8 @@ let b:did_indent = 1
 setlocal indentexpr=GetJavascriptIndent()
 setlocal autoindent nolisp nosmartindent
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
-setlocal cinoptions+=j1,J1
 
-let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< cinoptions<'
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')
@@ -45,12 +44,12 @@ let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
   if !s:free || search('`\|\*\/','nW',a:lnum)
-    let s:free = !eval(s:skip_expr . " . '\\|html'")
+    let s:free = !eval(s:skip_expr)
     let s:looksyn = s:free ? line('.') : s:looksyn
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr . " . '\\|html'")
+  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
 endfunction
 
 if has('reltime')
@@ -63,12 +62,12 @@ else
   endfunction
 endif
 
-function s:current_char()
+function s:looking_at()
   return getline('.')[col('.')-1]
 endfunction
 
 function s:token()
-  return s:current_char() =~ '\k' ? expand('<cword>') : s:current_char()
+  return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
 endfunction
 
 " NOTE: moves the cursor
@@ -156,10 +155,8 @@ function s:PrevCodeLine(lnum)
   let curp = [line('.'),col('.')]
   call cursor(a:lnum+1,1)
   while search('^\s*\%(\/\/\)\@!\S','bW')
-    let syn = synIDattr(synID(line('.'),matchend(getline('.'), '^\s*[^''"`]'),0),'name')
-    if syn =~? 'html'
-      return
-    elseif syn !~? 'comment\|doc\|string\|template'
+    if synIDattr(synID(line('.'),matchend(getline('.'), '^\s*[^''"`]'),0),'name') !~?
+          \ 'comment\|doc\|string\|template'
       return line('.') + call('cursor',curp)
     endif
   endwhile
@@ -225,7 +222,7 @@ function GetJavascriptIndent()
   endif
 
   if idx + 1
-    if idx == 2 && search('\S','bW',line('.')) && s:current_char() == ')'
+    if idx == 2 && search('\S','bW',line('.')) && s:looking_at() == ')'
       call s:GetPair('(',')','bW',s:skip_expr,200)
     endif
     return indent(line('.'))
@@ -235,9 +232,9 @@ function GetJavascriptIndent()
   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 && s:current_char() == '{' && s:IsBlock()
+  if num && s:looking_at() == '{' && s:IsBlock()
     let stmt = 1
-    if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
+    if s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
       let switch_offset = &cino !~ ':' || !has('float') ? s:W :
             \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '\%(.*:\)\@>[^,]*s' ? s:W : 1))
       if l:line =~# '^' . s:case_stmt

From a87c94438b038a060fa2920055a50a0c1cf08186 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 20 Nov 2016 12:24:31 -0800
Subject: [PATCH 0622/1043] unneeded token call (#722)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 83aae3a2..35f047a3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,7 +74,7 @@ endfunction
 function s:previous_token()
   let l:ln = line('.')
   return search('\<\|[][`^!"%-/:-?{-~]','bW') ?
-        \ (s:token() == '/' || line('.') != l:ln) &&
+        \ (s:looking_at() == '/' || line('.') != l:ln) &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
         \ search('\%(\/\@<!\/\/\|\/\*\)\&','bW') ? s:previous_token() : ''
         \ : s:token()

From c92a0cad86b05d79949a6ac98b7c47432bdf08ef Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 24 Nov 2016 10:08:01 -0800
Subject: [PATCH 0623/1043] paren start line as baseline in blocks (#725)

---
 indent/javascript.vim | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 35f047a3..57972bc6 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: November 20, 2016
+" Last Change: November 24, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -93,7 +93,7 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\%([<>,?^%|*/&]\|\([-.:+]\)\1\@!\|=>\@!\|typeof\>\|in\%(stanceof\)\=\>\)')
+      \ '\%([<>,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|=>\@!\|typeof\>\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
       \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<typeof\|\<in\%(stanceof\)\=\)') . '$'
 
@@ -233,15 +233,19 @@ function GetJavascriptIndent()
 
   let [s:W, pline, isOp, stmt, bL, switch_offset] = [s:sw(), s:Trim(l:lnum),0,0,0,0]
   if num && s:looking_at() == '{' && s:IsBlock()
-    let stmt = 1
-    if s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
-      let switch_offset = &cino !~ ':' || !has('float') ? s:W :
-            \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '\%(.*:\)\@>[^,]*s' ? s:W : 1))
-      if l:line =~# '^' . s:case_stmt
-        return indent(num) + switch_offset
+    if s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+      let num = line('.')
+      if s:previous_token() ==# 'switch'
+        let switch_offset = &cino !~ ':' || !has('float') ? s:W :
+              \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '\%(.*:\)\@>[^,]*s' ? s:W : 1))
+        if l:line =~# '^' . s:case_stmt
+          return indent(num) + switch_offset
+        elseif pline =~# s:case_stmt . '$'
+          return indent(l:lnum) + s:W
+        endif
       endif
-      let stmt = pline !~# s:case_stmt . '$'
     endif
+    let stmt = 1
   endif
 
   if stmt || !num

From 91b0a0da0c2b1af1af168e5149cdc9a6eb99a190 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 24 Nov 2016 12:18:27 -0800
Subject: [PATCH 0624/1043] Fix end pattern for import region

There was a bug where import regions required a semicolon, no longer.

This fixes issue #726
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index ddf34515..fad38627 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -44,7 +44,7 @@ syntax keyword jsModuleOperators contained as
 syntax region  jsModuleGroup     contained matchgroup=jsModuleBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
 syntax match   jsModuleAsterisk  contained /*/
 syntax keyword jsModuleDefault   contained default skipwhite skipempty nextgroup=@jsExpression
-syntax region  jsImportContainer start=/\<import\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk
+syntax region  jsImportContainer start=/\<import\>/ end=/\%("\|'\s*\)\@<=\%(;\|\n\)/ contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk keepend
 syntax region  jsExportContainer start=/\<export\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsStorageClass,jsModuleDefault,@jsExpression
 syntax region  jsExportBlock     contained matchgroup=jsExportBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
 

From 3873adbff5f1b626130bb7f1dad8b62b1aec1b7f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 25 Nov 2016 11:17:38 -0800
Subject: [PATCH 0625/1043] Completely refactored how import/export work

I've never liked how I originally built import/export. This refactors
everything keeping the logic simpler and also share matches between
them.  Using regions I think was a mistake on my part, I've opted
instead to use nextgroups which works much better.
---
 syntax/javascript.vim | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index fad38627..bbe6ff98 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -37,16 +37,14 @@ syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
 " Modules
-syntax keyword jsModuleKeywords  contained import
-syntax keyword jsModuleKeywords  contained export skipwhite skipempty nextgroup=jsExportBlock,jsModuleDefault
-syntax keyword jsModuleOperators contained from
-syntax keyword jsModuleOperators contained as
-syntax region  jsModuleGroup     contained matchgroup=jsModuleBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
-syntax match   jsModuleAsterisk  contained /*/
-syntax keyword jsModuleDefault   contained default skipwhite skipempty nextgroup=@jsExpression
-syntax region  jsImportContainer start=/\<import\>/ end=/\%("\|'\s*\)\@<=\%(;\|\n\)/ contains=jsModuleKeywords,jsModuleOperators,jsComment,jsString,jsTemplateString,jsNoise,jsModuleGroup,jsModuleAsterisk keepend
-syntax region  jsExportContainer start=/\<export\> / end="\%(;\|$\)" contains=jsModuleKeywords,jsModuleOperators,jsStorageClass,jsModuleDefault,@jsExpression
-syntax region  jsExportBlock     contained matchgroup=jsExportBraces start=/{/ end=/}/ contains=jsModuleOperators,jsNoise,jsComment
+syntax keyword jsImport                     import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
+syntax keyword jsExport                     export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword
+syntax match   jsModuleKeyword    contained /\k\+/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
+syntax keyword jsExportDefault    contained default skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsModuleAsterisk   contained /\*/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAs,jsFrom
+syntax keyword jsModuleAs         contained as skipwhite skipempty nextgroup=jsModuleKeyword
+syntax keyword jsFrom             contained from skipwhite skipempty nextgroup=jsString
+syntax match   jsModuleComma      contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup
 
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
@@ -154,6 +152,7 @@ syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        s
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
 syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator extend fold
+syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
@@ -229,7 +228,7 @@ if exists("javascript_plugin_flow")
 endif
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
-syntax cluster jsAll         contains=@jsExpression,jsExportContainer,jsImportContainer,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -319,7 +318,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFinallyBraces        jsBraces
   HiLink jsRepeatBraces         jsBraces
   HiLink jsSwitchBraces         jsBraces
-  HiLink jsExportBraces         jsBraces
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
   HiLink jsTemplateBraces       jsBraces
@@ -327,14 +325,17 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsGlobalNodeObjects    Constant
   HiLink jsExceptions           Constant
   HiLink jsBuiltins             Constant
-  HiLink jsModuleKeywords       Include
-  HiLink jsModuleOperators      Include
-  HiLink jsModuleDefault        Include
+  HiLink jsImport               Include
+  HiLink jsExport               Include
+  HiLink jsExportDefault        Include
+  HiLink jsModuleAs             Include
+  HiLink jsModuleComma          jsNoise
+  HiLink jsModuleAsterisk       Noise
+  HiLink jsFrom                 Include
   HiLink jsDecorator            Special
   HiLink jsDecoratorFunction    Function
   HiLink jsParensDecorator      jsParens
   HiLink jsFuncArgOperator      jsFuncArgs
-  HiLink jsModuleAsterisk       Noise
   HiLink jsClassProperty        jsObjectKey
   HiLink jsSpreadOperator       Operator
   HiLink jsRestOperator         Operator

From 66f120cb0cb87977e7275aa49b6e1a73405a3549 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 25 Nov 2016 11:30:17 -0800
Subject: [PATCH 0626/1043] Improve default handling

`default` is more like a StorageClass, so I've opted to highlight it
more appropriately.  Also make it highlight properly within
`jsModuleGroup` as well.
---
 syntax/javascript.vim | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index bbe6ff98..a526c4cf 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -37,14 +37,15 @@ syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
 " Modules
-syntax keyword jsImport                     import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
-syntax keyword jsExport                     export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword
-syntax match   jsModuleKeyword    contained /\k\+/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
-syntax keyword jsExportDefault    contained default skipwhite skipempty nextgroup=@jsExpression
-syntax match   jsModuleAsterisk   contained /\*/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAs,jsFrom
-syntax keyword jsModuleAs         contained as skipwhite skipempty nextgroup=jsModuleKeyword
-syntax keyword jsFrom             contained from skipwhite skipempty nextgroup=jsString
-syntax match   jsModuleComma      contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup
+syntax keyword jsImport                       import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
+syntax keyword jsExport                       export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword
+syntax match   jsModuleKeyword      contained /\k\+/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
+syntax keyword jsExportDefault      contained default skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsExportDefaultGroup contained default skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
+syntax match   jsModuleAsterisk     contained /\*/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAs,jsFrom
+syntax keyword jsModuleAs           contained as skipwhite skipempty nextgroup=jsModuleKeyword,jsExportDefaultGroup
+syntax keyword jsFrom               contained from skipwhite skipempty nextgroup=jsString
+syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup
 
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
@@ -327,7 +328,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBuiltins             Constant
   HiLink jsImport               Include
   HiLink jsExport               Include
-  HiLink jsExportDefault        Include
+  HiLink jsExportDefault        StorageClass
+  HiLink jsExportDefaultGroup   jsExportDefault
   HiLink jsModuleAs             Include
   HiLink jsModuleComma          jsNoise
   HiLink jsModuleAsterisk       Noise

From 1801887f2e39c984d861368f3e0ea51b8555b0d2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 25 Nov 2016 17:56:22 -0800
Subject: [PATCH 0627/1043] operator cleaning (#729)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 57972bc6..a261169b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -93,9 +93,9 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\%([<>,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|=>\@!\|typeof\>\|in\%(stanceof\)\=\>\)')
+      \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\%([<=,.?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<typeof\|\<in\%(stanceof\)\=\)') . '$'
+      \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
 function s:OneScope(lnum,text)
   if cursor(a:lnum, match(' ' . a:text, ')$')) + 1 &&

From 8265877f70452d0a8c09255c52f4ac0d9fb145e0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 25 Nov 2016 21:25:06 -0800
Subject: [PATCH 0628/1043] indentkeys (#732)

add values to indentkeys rather than replace user's
---
 README.md             | 1 +
 indent/javascript.vim | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a1137f79..23ec94af 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,7 @@ variables:
 ## Indentation Specific
 
 * `:h cino-:`
+* `:h 'indentkeys'`
 
 ## Contributing
 
diff --git a/indent/javascript.vim b/indent/javascript.vim
index a261169b..3da887e0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -13,7 +13,7 @@ let b:did_indent = 1
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
 setlocal autoindent nolisp nosmartindent
-setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
+setlocal indentkeys+=0],0)
 
 let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 

From 18ff935c9c126e14fd62e0df8e688fc54598e867 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 26 Nov 2016 01:13:52 -0800
Subject: [PATCH 0629/1043] optimization: no continuation at block start (#733)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3da887e0..86a814cf 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -248,7 +248,7 @@ function GetJavascriptIndent()
     let stmt = 1
   endif
 
-  if stmt || !num
+  if stmt && pline[-1:] != '{' || !num
     let isOp = l:line =~# s:opfirst || pline =~# s:continuation &&
           \ synIDattr(synID(l:lnum,match(' ' . pline,'\/$'),0),'name') !~? 'regex'
     let bL = s:iscontOne(l:lnum,num,isOp)

From 3dd27d6316c6031c2a7e6ae0a69ace683e2b431b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 26 Nov 2016 12:14:17 -0800
Subject: [PATCH 0630/1043] Adding support for Flow type imports

---
 extras/flow.vim       | 1 +
 syntax/javascript.vim | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 028ea3fc..b181e0e1 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -13,6 +13,7 @@ syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup
 syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
+syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a526c4cf..478b4b46 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -37,7 +37,7 @@ syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
 " Modules
-syntax keyword jsImport                       import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
+syntax keyword jsImport                       import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup,jsFlowImportType
 syntax keyword jsExport                       export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword
 syntax match   jsModuleKeyword      contained /\k\+/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
 syntax keyword jsExportDefault      contained default skipwhite skipempty nextgroup=@jsExpression

From 25ceb55782cab1c83089e399b8c683fbee1fdfd2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 27 Nov 2016 13:02:23 -0800
Subject: [PATCH 0631/1043] cleaning, Rework prevcodeline() (#736)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 86a814cf..62b9f453 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -150,16 +150,14 @@ function s:IsBlock()
         \ + split('-=~!<*+,/?^%|&([','\zs'), char) < (0 + (line('.') != l:ln))
 endfunction
 
-" Find line above 'lnum' that isn't empty, in a comment, or in a string.
+" Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
-  let curp = [line('.'),col('.')]
-  call cursor(a:lnum+1,1)
-  while search('^\s*\%(\/\/\)\@!\S','bW')
-    if synIDattr(synID(line('.'),matchend(getline('.'), '^\s*[^''"`]'),0),'name') !~?
-          \ 'comment\|doc\|string\|template'
-      return line('.') + call('cursor',curp)
-    endif
+  let l:n = prevnonblank(a:lnum)
+  while getline(l:n) =~ '^\s*\/[/*]' || synIDattr(synID(l:n,1,0),'name') =~?
+        \ 'comment\|doc'
+    let l:n = prevnonblank(l:n-1)
   endwhile
+  return l:n
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
@@ -225,10 +223,10 @@ function GetJavascriptIndent()
     if idx == 2 && search('\S','bW',line('.')) && s:looking_at() == ')'
       call s:GetPair('(',')','bW',s:skip_expr,200)
     endif
-    return indent(line('.'))
+    return indent('.')
   endif
 
-  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : [line('.'),col('.')])
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
   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]

From c1d4b3b0726164df803dc4c8a249ca3b4bee7e54 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 28 Nov 2016 22:01:53 -0800
Subject: [PATCH 0632/1043] keywords used as props (#737)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 62b9f453..36cf7add 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -36,7 +36,7 @@ else
   endfunction
 endif
 
-let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
+let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|\%(\.\s*\)\@<!default\s*\):\C'
 
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'
@@ -95,7 +95,7 @@ endfunction
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
+      \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\%(\.\s*\)\@<!\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
 function s:OneScope(lnum,text)
   if cursor(a:lnum, match(' ' . a:text, ')$')) + 1 &&
@@ -106,7 +106,7 @@ function s:OneScope(lnum,text)
     endif
     return index(split('for if let while with'),token) + 1
   endif
-  return cursor(a:lnum, match(' ' . a:text, '\%(\<else\|\<do\|=>\)$\C')) + 1
+  return cursor(a:lnum, match(' ' . a:text, '\%(\%(\.\s*\)\@<!\<\%(else\|do\)\|=>\)$\C')) + 1
 endfunction
 
 function s:iscontOne(i,num,cont)

From 1bc94813713b782de5d020b6c947a931fe7faa63 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 29 Nov 2016 01:24:27 -0800
Subject: [PATCH 0633/1043] date, minor regex

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 36cf7add..754e5a79 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: November 24, 2016
+" Last Change: November 29, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -36,7 +36,7 @@ else
   endfunction
 endif
 
-let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|\%(\.\s*\)\@<!default\s*\):\C'
+let s:case_stmt = '\%(\.\s*\)\@<!\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
 
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'

From 982f699defd96d94566c4184d2f04c8d014bdcb9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 30 Nov 2016 12:05:31 -0800
Subject: [PATCH 0634/1043] small optimization (#738)

* small optimization

removes a syntax check unless possible comment

* refactor isBlock for keywords

makes isBlock more accurate

* cleaning

* cursor() is 0 for success
---
 indent/javascript.vim | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 754e5a79..672158d6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -74,7 +74,7 @@ endfunction
 function s:previous_token()
   let l:ln = line('.')
   return search('\<\|[][`^!"%-/:-?{-~]','bW') ?
-        \ (s:looking_at() == '/' || line('.') != l:ln) &&
+        \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
         \ search('\%(\/\@<!\/\/\|\/\*\)\&','bW') ? s:previous_token() : ''
         \ : s:token()
@@ -98,7 +98,7 @@ let s:continuation = get(g:,'javascript_continuation',
       \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\%(\.\s*\)\@<!\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
 function s:OneScope(lnum,text)
-  if cursor(a:lnum, match(' ' . a:text, ')$')) + 1 &&
+  if !cursor(a:lnum, match(' ' . a:text, ')$')) &&
         \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
     let token = s:previous_token()
     if index(split('await each'),token) + 1
@@ -106,7 +106,7 @@ function s:OneScope(lnum,text)
     endif
     return index(split('for if let while with'),token) + 1
   endif
-  return cursor(a:lnum, match(' ' . a:text, '\%(\%(\.\s*\)\@<!\<\%(else\|do\)\|=>\)$\C')) + 1
+  return !cursor(a:lnum, match(' ' . a:text, '\%(\%(\.\s*\)\@<!\<\%(else\|do\)\|=>\)$\C'))
 endfunction
 
 function s:iscontOne(i,num,cont)
@@ -140,14 +140,16 @@ function s:IsBlock()
     return 1
   elseif syn =~? 'xml\|jsx'
     return char != '{'
+  elseif char =~ '\k'
+    return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
+          \ ,char) < (0 + (line('.') != l:ln)) || s:previous_token() == '.'
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
-    return cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) + 1 &&
+    return !cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) &&
           \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
   endif
-  return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
-        \ + split('-=~!<*+,/?^%|&([','\zs'), char) < (0 + (line('.') != l:ln))
+  return char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment

From 7ceb23304343759608ddfc5aca74f4f892cf4619 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 30 Nov 2016 23:53:54 -0800
Subject: [PATCH 0635/1043] misc indent changes (#739)

* misc indent changes

* more refactor (#740)
---
 indent/javascript.vim | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 672158d6..1bdd6ab4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,7 +73,7 @@ endfunction
 " NOTE: moves the cursor
 function s:previous_token()
   let l:ln = line('.')
-  return search('\<\|[][`^!"%-/:-?{-~]','bW') ?
+  return search('.\>\|[][`^!"%-/:-?{-~]','bW') ?
         \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
         \ search('\%(\/\@<!\/\/\|\/\*\)\&','bW') ? s:previous_token() : ''
@@ -81,32 +81,30 @@ function s:previous_token()
         \ : ''
 endfunction
 
-function s:Trim(ln)
-  let pline = substitute(getline(a:ln),'\s*$','','')
-  let l:max = max([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),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([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),0])
-  endwhile
-  return pline
-endfunction
-
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
       \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\%(\.\s*\)\@<!\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
-function s:OneScope(lnum,text)
-  if !cursor(a:lnum, match(' ' . a:text, ')$')) &&
-        \ s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+" get the line (or if empty, look further back) of code stripped of comments
+function s:Trim(lnum,...)
+  let p = a:0 ? [0,0] : getpos('.')[1:2]
+  let r = !cursor(a:lnum+1,1) && s:previous_token() isnot '' ? strpart(getline('.'),0,col('.')) : ''
+  call call('cursor',p)
+  return r
+endfunction
+
+function s:OneScope(lnum)
+  let pline = s:Trim(a:lnum,1)
+  if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
     let token = s:previous_token()
     if index(split('await each'),token) + 1
       return s:previous_token() ==# 'for'
     endif
     return index(split('for if let while with'),token) + 1
   endif
-  return !cursor(a:lnum, match(' ' . a:text, '\%(\%(\.\s*\)\@<!\<\%(else\|do\)\|=>\)$\C'))
+  return pline =~# '\%(\%(\.\s*\)\@<!\<\%(else\|do\)\|=>\)$'
 endfunction
 
 function s:iscontOne(i,num,cont)
@@ -116,7 +114,7 @@ function s:iscontOne(i,num,cont)
   let bL = 0
   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:OneScope(l:i)
         let bL += s:W
         let [l:cont, l:i] = [0, line('.')]
       elseif !l:cont
@@ -136,9 +134,7 @@ function s:IsBlock()
   let l:ln = line('.')
   let char = s:previous_token()
   let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
-  if char is '' || syn =~? 'regex'
-    return 1
-  elseif syn =~? 'xml\|jsx'
+  if syn =~? 'xml\|jsx'
     return char != '{'
   elseif char =~ '\k'
     return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
@@ -149,7 +145,7 @@ function s:IsBlock()
     return !cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) &&
           \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
   endif
-  return char !~ '[-=~!<*+,/?^%|&([]'
+  return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment

From 14919946c45e52f99f3a81e896daa7c974f6488c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 1 Dec 2016 12:01:27 -0800
Subject: [PATCH 0636/1043] date, code documenting

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1bdd6ab4..451e521b 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: November 29, 2016
+" Last Change: December 1, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -87,7 +87,8 @@ let s:opfirst = '^' . get(g:,'javascript_opfirst',
 let s:continuation = get(g:,'javascript_continuation',
       \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\%(\.\s*\)\@<!\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
-" get the line (or if empty, look further back) of code stripped of comments
+" get the line of code stripped of comments. if called with two args, leave
+" cursor at the last non-comment char.
 function s:Trim(lnum,...)
   let p = a:0 ? [0,0] : getpos('.')[1:2]
   let r = !cursor(a:lnum+1,1) && s:previous_token() isnot '' ? strpart(getline('.'),0,col('.')) : ''

From 66b25d97c74b39fa6d488989fef56309aa3aaab8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 1 Dec 2016 12:40:10 -0800
Subject: [PATCH 0637/1043] Indent: use previous Trim, with new interface
 (#741)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 451e521b..7739fc86 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -89,11 +89,14 @@ let s:continuation = get(g:,'javascript_continuation',
 
 " get the line of code stripped of comments. if called with two args, leave
 " cursor at the last non-comment char.
-function s:Trim(lnum,...)
-  let p = a:0 ? [0,0] : getpos('.')[1:2]
-  let r = !cursor(a:lnum+1,1) && s:previous_token() isnot '' ? strpart(getline('.'),0,col('.')) : ''
-  call call('cursor',p)
-  return r
+function s:Trim(ln,...)
+  let pline = substitute(getline(a:ln),'\s*$','','')
+  let l:max = max([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),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([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),0])
+  endwhile
+  return !a:0 || cursor(a:ln,strlen(pline)) ? pline : pline
 endfunction
 
 function s:OneScope(lnum)

From 6d81ec817a2ab7742d68d1b628a352abb50a4c9a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Dec 2016 10:55:17 -0800
Subject: [PATCH 0638/1043] only Trim() if in a block (#743)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7739fc86..7267d014 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -231,9 +231,10 @@ function GetJavascriptIndent()
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
   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 && s:looking_at() == '{' && s:IsBlock()
-    if s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+  let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
+  if !num || s:looking_at() == '{' && s:IsBlock()
+    let pline = s:Trim(l:lnum)
+    if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')
       if s:previous_token() ==# 'switch'
         let switch_offset = &cino !~ ':' || !has('float') ? s:W :
@@ -245,14 +246,12 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    let stmt = 1
-  endif
-
-  if stmt && pline[-1:] != '{' || !num
-    let isOp = l:line =~# s:opfirst || pline =~# s:continuation &&
-          \ synIDattr(synID(l:lnum,match(' ' . pline,'\/$'),0),'name') !~? 'regex'
-    let bL = s:iscontOne(l:lnum,num,isOp)
-    let bL -= (bL && l:line[0] == '{') * s:W
+    if !num || pline[-1:] !~ '[{;]'
+      let isOp = l:line =~# s:opfirst || pline =~# s:continuation &&
+            \ synIDattr(synID(l:lnum,match(' ' . pline,'\/$'),0),'name') !~? 'regex'
+      let bL = s:iscontOne(l:lnum,num,isOp)
+      let bL -= (bL && l:line[0] == '{') * s:W
+    endif
   endif
 
   " main return

From 9f4772175444c1b8610f64a13909a93d9f1b8f66 Mon Sep 17 00:00:00 2001
From: Matt Carter <m@ttcarter.com>
Date: Sat, 3 Dec 2016 07:37:22 +1000
Subject: [PATCH 0639/1043] Added conceal for no-argument arrow functions -
 either `()=>` or `_=>` (#735)

* Added conceal for no-argument arrow functions - either `()=>` or `_=>`

* Split Arrow+no-arg and Arrow+underscore into two seperate config variables

* Added README note about enabling conceal mode along with an example to toggle via key bindings
---
 README.md             | 36 ++++++++++++++++++++++++------------
 syntax/javascript.vim |  2 ++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 23ec94af..959b254f 100644
--- a/README.md
+++ b/README.md
@@ -84,18 +84,30 @@ global vim option, we do not set it ourselves.
 ## Concealing Characters
 
 You can customize concealing characters by defining one or more of the following
-variables:
-
-    let g:javascript_conceal_function       = "ƒ"
-    let g:javascript_conceal_null           = "ø"
-    let g:javascript_conceal_this           = "@"
-    let g:javascript_conceal_return         = "⇚"
-    let g:javascript_conceal_undefined      = "¿"
-    let g:javascript_conceal_NaN            = "ℕ"
-    let g:javascript_conceal_prototype      = "¶"
-    let g:javascript_conceal_static         = "•"
-    let g:javascript_conceal_super          = "Ω"
-    let g:javascript_conceal_arrow_function = "⇒"
+variables (these are all disabled by default):
+
+    let g:javascript_conceal_function             = "ƒ"
+    let g:javascript_conceal_null                 = "ø"
+    let g:javascript_conceal_this                 = "@"
+    let g:javascript_conceal_return               = "⇚"
+    let g:javascript_conceal_undefined            = "¿"
+    let g:javascript_conceal_NaN                  = "ℕ"
+    let g:javascript_conceal_prototype            = "¶"
+    let g:javascript_conceal_static               = "•"
+    let g:javascript_conceal_super                = "Ω"
+    let g:javascript_conceal_arrow_function       = "⇒"
+    let g:javascript_conceal_noarg_arrow_function = "🞅"
+    let g:javascript_conceal_underscore_arrow_function = "🞅"
+
+
+You can enable concealing within VIM with:
+
+    set conceallevel=1
+
+OR if you wish to toggle concealing you may wish to bind a command such as the following which will map LEADER+L (leader is usually the comma key) to toggling conceal mode:
+
+    map <leader>l :exec &conceallevel ? "set conceallevel=0" : "set conceallevel=1"<CR>
+
 
 ## Indentation Specific
 
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 478b4b46..3685646c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -173,6 +173,8 @@ syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipe
 
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction               '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/   skipwhite skipempty nextgroup=jsArrowFunction                    '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
+exe 'syntax match jsArrowFunction /_\s*\(=>\)\@=/    skipwhite skipempty nextgroup=jsArrowFunction                    '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
 
 " Classes
 syntax keyword jsClassKeyword           contained class

From df14847ad3a1a7a24c1d98e28fa8f9a8564ebf42 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Dec 2016 13:41:54 -0800
Subject: [PATCH 0640/1043] fix readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 959b254f..dedd48f5 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ global vim option, we do not set it ourselves.
 
 ## Concealing Characters
 
-You can customize concealing characters by defining one or more of the following
+You can customize concealing characters, if your font provides the character you want, by defining one or more of the following
 variables (these are all disabled by default):
 
     let g:javascript_conceal_function             = "ƒ"
@@ -104,7 +104,7 @@ You can enable concealing within VIM with:
 
     set conceallevel=1
 
-OR if you wish to toggle concealing you may wish to bind a command such as the following which will map LEADER+L (leader is usually the comma key) to toggling conceal mode:
+OR if you wish to toggle concealing you may wish to bind a command such as the following which will map LEADER+L (leader is usually the `\` key) to toggling conceal mode:
 
     map <leader>l :exec &conceallevel ? "set conceallevel=0" : "set conceallevel=1"<CR>
 

From 41a3bceb433947340e651de8e111eea436e71fd2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Dec 2016 13:44:04 -0800
Subject: [PATCH 0641/1043] more readme fixes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dedd48f5..c2dd3475 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ You can enable concealing within VIM with:
 
     set conceallevel=1
 
-OR if you wish to toggle concealing you may wish to bind a command such as the following which will map LEADER+L (leader is usually the `\` key) to toggling conceal mode:
+OR if you wish to toggle concealing you may wish to bind a command such as the following which will map <LEADER>l (leader is usually the `\` key) to toggling conceal mode:
 
     map <leader>l :exec &conceallevel ? "set conceallevel=0" : "set conceallevel=1"<CR>
 

From ba9501bfc763a9d648c2bf8ba90dde34bfda6301 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Dec 2016 13:44:46 -0800
Subject: [PATCH 0642/1043] markdown fixes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c2dd3475..8e8bf434 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ You can enable concealing within VIM with:
 
     set conceallevel=1
 
-OR if you wish to toggle concealing you may wish to bind a command such as the following which will map <LEADER>l (leader is usually the `\` key) to toggling conceal mode:
+OR if you wish to toggle concealing you may wish to bind a command such as the following which will map `<LEADER>l` (leader is usually the `\` key) to toggling conceal mode:
 
     map <leader>l :exec &conceallevel ? "set conceallevel=0" : "set conceallevel=1"<CR>
 

From 9e0aa00b618cc2b5c78375322a9d1f91e50a5495 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Dec 2016 13:49:05 -0800
Subject: [PATCH 0643/1043] clarify readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e8bf434..ba921744 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ global vim option, we do not set it ourselves.
 ## Concealing Characters
 
 You can customize concealing characters, if your font provides the character you want, by defining one or more of the following
-variables (these are all disabled by default):
+variables:
 
     let g:javascript_conceal_function             = "ƒ"
     let g:javascript_conceal_null                 = "ø"

From d2bc5d49e3306caca3dc81665b93112c239b1d0e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Dec 2016 15:38:56 -0800
Subject: [PATCH 0644/1043] remove conditional

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7267d014..a7513ff2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -246,7 +246,7 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    if !num || pline[-1:] !~ '[{;]'
+    if pline[-1:] !~ '[{;]'
       let isOp = l:line =~# s:opfirst || pline =~# s:continuation &&
             \ synIDattr(synID(l:lnum,match(' ' . pline,'\/$'),0),'name') !~? 'regex'
       let bL = s:iscontOne(l:lnum,num,isOp)

From d377f45bd8697e544efc4e9ce933bcc05f54c2f4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Dec 2016 11:52:47 -0800
Subject: [PATCH 0645/1043] regex simplified in trim() (#745)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a7513ff2..fdf8c9ac 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -76,7 +76,7 @@ function s:previous_token()
   return search('.\>\|[][`^!"%-/:-?{-~]','bW') ?
         \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
-        \ search('\%(\/\@<!\/\/\|\/\*\)\&','bW') ? s:previous_token() : ''
+        \ search('\_[^/]\zs\/[/*]','bW') ? s:previous_token() : ''
         \ : s:token()
         \ : ''
 endfunction
@@ -91,10 +91,10 @@ let s:continuation = get(g:,'javascript_continuation',
 " cursor at the last non-comment char.
 function s:Trim(ln,...)
   let pline = substitute(getline(a:ln),'\s*$','','')
-  let l:max = max([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),0])
+  let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),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([match(pline,'.*\zs\%([^/]\zs\/\/\|\/\*\)'),0])
+    let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
   endwhile
   return !a:0 || cursor(a:ln,strlen(pline)) ? pline : pline
 endfunction
@@ -137,7 +137,7 @@ endfunction
 function s:IsBlock()
   let l:ln = line('.')
   let char = s:previous_token()
-  let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
+  let syn = char =~ '[{>/]' ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
   if syn =~? 'xml\|jsx'
     return char != '{'
   elseif char =~ '\k'

From 554ae9b24e7fb5bf7a6bd4ba8502758a9e18a744 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Dec 2016 20:06:47 -0800
Subject: [PATCH 0646/1043] package-manager info (#744)

---
 README.md | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index ba921744..2c51c0ad 100644
--- a/README.md
+++ b/README.md
@@ -6,32 +6,12 @@ improved indentation.
 
 ## Installation
 
-### Install with [Vundle](https://github.com/gmarik/vundle)
-
-Add to vimrc:
-
-    Plugin 'pangloss/vim-javascript'
-
-And install it:
-
-    :so ~/.vimrc
-    :PluginInstall
-
-### Install with [vim-plug](https://github.com/junegunn/vim-plug)
-
-Add to vimrc:
-
-    Plug 'pangloss/vim-javascript'
-
-And install it:
-
-    :so ~/.vimrc
-    :PlugInstall
-
 ### Install with [pathogen](https://github.com/tpope/vim-pathogen)
 
       git clone https://github.com/pangloss/vim-javascript.git ~/.vim/bundle/vim-javascript
 
+alternatively, use a package manager like [vim-plug](https://github.com/junegunn/vim-plug)
+
 
 ## Configuration Variables
 
@@ -124,11 +104,6 @@ maintainer(s) then, hopefully, merged.
 Thank you!
 
 
-## Bug Reports
-
-Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
-
-
 ## License
 
 Distributed under the same terms as Vim itself. See `:help license`.

From a210f3916ed7d1615d8ae86549935a8dc1a64066 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Dec 2016 22:29:01 -0800
Subject: [PATCH 0647/1043] fix code comment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index fdf8c9ac..0ede1ece 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -202,7 +202,7 @@ function GetJavascriptIndent()
 
   let l:line = substitute(substitute(l:line,'^\s*\%(\/\*.\{-}\*\/\s*\)*','',''),'^\/[/*].*','','')
 
-  " the containing paren, bracket, curly. Many hacks for performance
+  " the containing paren, bracket, or curly. Many hacks for performance
   call cursor(v:lnum,1)
   let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
   if indent(l:lnum)

From d81b076b594284b3d234dd924dc73f4436bd5a77 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Dec 2016 09:57:50 -0800
Subject: [PATCH 0648/1043] make regex for token() more intuitive (#746)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0ede1ece..c08764ec 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,7 +73,7 @@ endfunction
 " NOTE: moves the cursor
 function s:previous_token()
   let l:ln = line('.')
-  return search('.\>\|[][`^!"%-/:-?{-~]','bW') ?
+  return search('.\>\|[^[:alnum:][:space:]_$]','bW') ?
         \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
         \ search('\_[^/]\zs\/[/*]','bW') ? s:previous_token() : ''

From 039c611e1a6af83e3ce34283630a9d811fc97981 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 5 Dec 2016 12:28:20 -0800
Subject: [PATCH 0649/1043] refactor v:lnum cleaning (#748)

faster, more readable
---
 indent/javascript.vim | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c08764ec..4922b541 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -199,11 +199,17 @@ function GetJavascriptIndent()
   if !l:lnum
     return
   endif
+  call cursor(v:lnum,1)
 
-  let l:line = substitute(substitute(l:line,'^\s*\%(\/\*.\{-}\*\/\s*\)*','',''),'^\/[/*].*','','')
+  let l:line = l:line[indent('.'):]
+  if l:line[:1] == '/*'
+    let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
+  endif
+  if l:line =~ '^\/[/*]'
+    let l:line = ''
+  endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  call cursor(v:lnum,1)
   let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
   if indent(l:lnum)
     let [s:looksyn,s:free] = [v:lnum - 1,1]

From 82f064a12a2c50fbaa2716756613a56010ce5402 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 5 Dec 2016 12:36:50 -0800
Subject: [PATCH 0650/1043] match isk in token regex (#749)

the @ is a vim/vi default part of iskeyword. also decorators
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4922b541..d48faf2f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,7 +73,7 @@ endfunction
 " NOTE: moves the cursor
 function s:previous_token()
   let l:ln = line('.')
-  return search('.\>\|[^[:alnum:][:space:]_$]','bW') ?
+  return search('.\>\|[^[:alnum:][:space:]_$@]','bW') ?
         \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
         \ search('\_[^/]\zs\/[/*]','bW') ? s:previous_token() : ''

From e807258688e5355dada2d1cf963f614f15468284 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 5 Dec 2016 12:50:53 -0800
Subject: [PATCH 0651/1043] Revert "match isk in token regex" (#750)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d48faf2f..4922b541 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,7 +73,7 @@ endfunction
 " NOTE: moves the cursor
 function s:previous_token()
   let l:ln = line('.')
-  return search('.\>\|[^[:alnum:][:space:]_$@]','bW') ?
+  return search('.\>\|[^[:alnum:][:space:]_$]','bW') ?
         \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
         \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
         \ search('\_[^/]\zs\/[/*]','bW') ? s:previous_token() : ''

From 3cc3ef7c112b4a5fa465239712aba56111850900 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 6 Dec 2016 11:03:39 -0800
Subject: [PATCH 0652/1043] cleaning (#751)

* cleaning

* update cache inside of string

* switch case accuracy

* case

* Update javascript.vim

* edge cases

* cleaning

* ws

* extract to var
---
 indent/javascript.vim | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4922b541..7794a59f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -36,10 +36,12 @@ else
   endfunction
 endif
 
-let s:case_stmt = '\%(\.\s*\)\@<!\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
+let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
 
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'
+let s:syng_str = 'string\|template'
+let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 function s:skip_func(lnum)
@@ -75,7 +77,7 @@ function s:previous_token()
   let l:ln = line('.')
   return search('.\>\|[^[:alnum:][:space:]_$]','bW') ?
         \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
-        \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' ?
+        \ synIDattr(synID(line('.'),col('.'),0),'name') =~? s:syng_com ?
         \ search('\_[^/]\zs\/[/*]','bW') ? s:previous_token() : ''
         \ : s:token()
         \ : ''
@@ -92,7 +94,7 @@ let s:continuation = get(g:,'javascript_continuation',
 function s:Trim(ln,...)
   let pline = substitute(getline(a:ln),'\s*$','','')
   let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
-  while l:max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? 'comment\|doc'
+  while l:max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? s:syng_com
     let pline = substitute(strpart(pline, 0, l:max),'\s*$','','')
     let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
   endwhile
@@ -147,7 +149,7 @@ function s:IsBlock()
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
     return !cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) &&
-          \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[,{]')
+          \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[{,.]')
   endif
   return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
@@ -156,7 +158,7 @@ endfunction
 function s:PrevCodeLine(lnum)
   let l:n = prevnonblank(a:lnum)
   while getline(l:n) =~ '^\s*\/[/*]' || synIDattr(synID(l:n,1,0),'name') =~?
-        \ 'comment\|doc'
+        \ s:syng_com
     let l:n = prevnonblank(l:n-1)
   endwhile
   return l:n
@@ -186,13 +188,16 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.
-  if syns =~? 'comment\|doc'
+  if syns =~? s:syng_com
     if l:line =~ '^\s*\*'
       return cindent(v:lnum)
     elseif l:line !~ '^\s*\/[/*]'
       return -1
     endif
-  elseif syns =~? 'string\|template' && l:line !~ '^[''"]'
+  elseif syns =~? s:syng_str && l:line !~ '^[''"]'
+    if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
+      let b:js_cache[0] = v:lnum
+    endif
     return -1
   endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)
@@ -211,20 +216,19 @@ function GetJavascriptIndent()
 
   " the containing paren, bracket, or curly. Many hacks for performance
   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))
-      call call('cursor',b:js_cache[1:])
-    elseif idx + 1
-      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000)
+  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
+        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
+    call call('cursor',b:js_cache[1:])
+  else
+    let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) &&
+          \ synIDattr(synID(l:lnum,1,0),'name') !~? s:syng_str) * l:lnum]
+    if idx + 1
+      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000,top)
     elseif indent(v:lnum) && syns =~? 'block'
-      call s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000)
+      call s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000,top)
     else
-      call s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000)
+      call s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000,top)
     endif
-  else
-    call s:GetPair('[({[]','[])}]','bW',s:skip_expr,200,l:lnum)
   endif
 
   if idx + 1
@@ -245,7 +249,7 @@ function GetJavascriptIndent()
       if s:previous_token() ==# 'switch'
         let switch_offset = &cino !~ ':' || !has('float') ? s:W :
               \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '\%(.*:\)\@>[^,]*s' ? s:W : 1))
-        if l:line =~# '^' . s:case_stmt
+        if pline[-1:] != '.' && l:line =~# '^' . s:case_stmt
           return indent(num) + switch_offset
         elseif pline =~# s:case_stmt . '$'
           return indent(l:lnum) + s:W

From afecff2b544a9c479debba6520b5678d8ea7d25e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 7 Dec 2016 11:05:45 -0800
Subject: [PATCH 0653/1043] v:lnum cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7794a59f..c9a7b7d0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -204,9 +204,8 @@ function GetJavascriptIndent()
   if !l:lnum
     return
   endif
-  call cursor(v:lnum,1)
 
-  let l:line = l:line[indent('.'):]
+  let l:line = substitute(l:line,'^\s*','','')
   if l:line[:1] == '/*'
     let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
   endif
@@ -215,6 +214,7 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
+  call cursor(v:lnum,1)
   let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))

From 0bf390d9c795724196379496ebb465b3a15183d8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 7 Dec 2016 15:04:57 -0800
Subject: [PATCH 0654/1043] optimize indent with basic syntax file (#753)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c9a7b7d0..687d8a13 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: December 1, 2016
+" Last Change: December 7, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -44,8 +44,9 @@ let s:syng_str = 'string\|template'
 let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
-function s:skip_func(lnum)
-  if !s:free || search('`\|\*\/','nW',a:lnum)
+
+function s:skip_func()
+  if !s:free || search('`\|\*\/','nW',s:looksyn)
     let s:free = !eval(s:skip_expr)
     let s:looksyn = s:free ? line('.') : s:looksyn
     return !s:free
@@ -54,6 +55,22 @@ function s:skip_func(lnum)
   return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
 endfunction
 
+function s:alternatePair(stop)
+  while search('[][(){}]','bW',a:stop)
+    if !s:skip_func()
+      let idx = stridx('])}',s:looking_at())
+      if idx + 1
+        if !s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop)
+          break
+        endif
+      else
+        return
+      endif
+    endif
+  endwhile
+  call cursor(v:lnum,1)
+endfunction
+
 if has('reltime')
   function s:GetPair(start,end,flags,skip,time,...)
     return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
@@ -223,11 +240,11 @@ function GetJavascriptIndent()
     let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) &&
           \ synIDattr(synID(l:lnum,1,0),'name') !~? s:syng_str) * l:lnum]
     if idx + 1
-      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func(s:looksyn)',2000,top)
+      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,top)
     elseif indent(v:lnum) && syns =~? 'block'
-      call s:GetPair('{','}','bW','s:skip_func(s:looksyn)',2000,top)
+      call s:GetPair('{','}','bW','s:skip_func()',2000,top)
     else
-      call s:GetPair('[({[]','[])}]','bW','s:skip_func(s:looksyn)',2000,top)
+      call s:alternatePair(top)
     endif
   endif
 

From 0dd9ad3b43a2626014bc33b1de5f4f75c63f2acc Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 7 Dec 2016 19:29:31 -0800
Subject: [PATCH 0655/1043] Fix array destructuring as func arg definitions

Had object destructuring, forgot to include array destructuring.  All
should be well in the world now.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3685646c..52bafbac 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -141,7 +141,7 @@ syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        s
 syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsRepeatBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
-syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll extend fold

From 9db487d00381050ac6eae095706716284beed501 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 9 Dec 2016 23:43:20 -0800
Subject: [PATCH 0656/1043] add option in s:prev_token() (#757)

---
 indent/javascript.vim | 116 +++++++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 52 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 687d8a13..39629765 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: December 7, 2016
+" Last Change: December 9, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -36,7 +36,16 @@ else
   endfunction
 endif
 
-let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
+" searchpair() wrapper
+if has('reltime')
+  function s:GetPair(start,end,flags,skip,time,...)
+    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,skip,...)
+    return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
+  endfunction
+endif
 
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'
@@ -71,15 +80,9 @@ function s:alternatePair(stop)
   call cursor(v:lnum,1)
 endfunction
 
-if has('reltime')
-  function s:GetPair(start,end,flags,skip,time,...)
-    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,skip,...)
-    return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
-  endfunction
-endif
+function s:syn_at(l,c)
+  return synIDattr(synID(a:l,a:c,0),'name')
+endfunction
 
 function s:looking_at()
   return getline('.')[col('.')-1]
@@ -89,17 +92,20 @@ function s:token()
   return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
 endfunction
 
-" NOTE: moves the cursor
-function s:previous_token()
-  let l:ln = line('.')
-  return search('.\>\|[^[:alnum:][:space:]_$]','bW') ?
-        \ (s:looking_at() == '/' || line('.') != l:ln && getline('.') =~ '\/\/') &&
-        \ synIDattr(synID(line('.'),col('.'),0),'name') =~? s:syng_com ?
+" NOTE: Moves the cursor, unless a arg is supplied.
+function s:previous_token(...)
+  let l:pos = getpos('.')[1:2]
+  return [search('.\>\|[^[:alnum:][:space:]_$]','bW') ?
+        \ (s:looking_at() == '/' || line('.') != l:pos[0] && getline('.') =~ '\/\/') &&
+        \ s:syn_at(line('.'),col('.')) =~? s:syng_com ?
         \ search('\_[^/]\zs\/[/*]','bW') ? s:previous_token() : ''
         \ : s:token()
-        \ : ''
+        \ : ''][a:0 && call('cursor',l:pos)]
 endfunction
 
+" switch case label pattern
+let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
+
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
@@ -111,13 +117,40 @@ let s:continuation = get(g:,'javascript_continuation',
 function s:Trim(ln,...)
   let pline = substitute(getline(a:ln),'\s*$','','')
   let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
-  while l:max && synIDattr(synID(a:ln, strlen(pline), 0), 'name') =~? s:syng_com
+  while l:max && s:syn_at(a:ln, strlen(pline)) =~? s:syng_com
     let pline = substitute(strpart(pline, 0, l:max),'\s*$','','')
     let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
   endwhile
   return !a:0 || cursor(a:ln,strlen(pline)) ? pline : pline
 endfunction
 
+" Find line above 'lnum' that isn't empty or in a comment
+function s:PrevCodeLine(lnum)
+  let l:n = prevnonblank(a:lnum)
+  while getline(l:n) =~ '^\s*\/[/*]' || s:syn_at(l:n,1) =~? s:syng_com
+    let l:n = prevnonblank(l:n-1)
+  endwhile
+  return l:n
+endfunction
+
+" Check if line 'lnum' has a balanced amount of parentheses.
+function s:Balanced(lnum)
+  let l:open = 0
+  let l:line = getline(a:lnum)
+  let pos = match(l:line, '[][(){}]', 0)
+  while pos != -1
+    if s:syn_at(a:lnum,pos + 1) !~? s:syng_strcom
+      let l:open += match(' ' . l:line[pos],'[[({]')
+      if l:open < 0
+        return
+      endif
+    endif
+    let pos = match(l:line, '[][(){}]', pos + 1)
+  endwhile
+  return !l:open
+endfunction
+
+" start of a braceless scope?
 function s:OneScope(lnum)
   let pline = s:Trim(a:lnum,1)
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
@@ -127,16 +160,22 @@ function s:OneScope(lnum)
     endif
     return index(split('for if let while with'),token) + 1
   endif
-  return pline =~# '\%(\%(\.\s*\)\@<!\<\%(else\|do\)\|=>\)$'
+  return eval((['getline(".")[col(".")-2] == "="'] +
+        \ repeat(['s:previous_token(1) != "."'],2) + [0])[
+        \ index(split('> else do'),s:token())])
 endfunction
 
+" returns braceless levels started by 'i' and above lines * &sw.
+" 'num' is the lineNr which encloses the entire context, 'cont' if whether
+" line 'i' + 1 is a continued expression, which could have started in a
+" braceless context created above 'i'
 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 : 0
   let ind = indent(l:i) + (a:cont ? 0 : s:W)
   let bL = 0
   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 indent(l:i) < ind " first line depends on a:cont
       if s:OneScope(l:i)
         let bL += s:W
         let [l:cont, l:i] = [0, line('.')]
@@ -156,7 +195,7 @@ endfunction
 function s:IsBlock()
   let l:ln = line('.')
   let char = s:previous_token()
-  let syn = char =~ '[{>/]' ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
+  let syn = char =~ '[{>/]' ? s:syn_at(line('.'),col('.')-(char == '{')) : ''
   if syn =~? 'xml\|jsx'
     return char != '{'
   elseif char =~ '\k'
@@ -171,38 +210,11 @@ function s:IsBlock()
   return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
 
-" Find line above 'lnum' that isn't empty or in a comment
-function s:PrevCodeLine(lnum)
-  let l:n = prevnonblank(a:lnum)
-  while getline(l:n) =~ '^\s*\/[/*]' || synIDattr(synID(l:n,1,0),'name') =~?
-        \ s:syng_com
-    let l:n = prevnonblank(l:n-1)
-  endwhile
-  return l:n
-endfunction
-
-" Check if line 'lnum' has a balanced amount of parentheses.
-function s:Balanced(lnum)
-  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 l:open += match(' ' . l:line[pos],'[[({]')
-      if l:open < 0
-        return
-      endif
-    endif
-    let pos = match(l:line, '[][(){}]', pos + 1)
-  endwhile
-  return !l:open
-endfunction
-
 function GetJavascriptIndent()
   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')
+  let syns = s:syn_at(v:lnum, 1)
 
   " start with strings,comments,etc.
   if syns =~? s:syng_com
@@ -238,7 +250,7 @@ function GetJavascriptIndent()
     call call('cursor',b:js_cache[1:])
   else
     let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) &&
-          \ synIDattr(synID(l:lnum,1,0),'name') !~? s:syng_str) * l:lnum]
+          \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum]
     if idx + 1
       call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,top)
     elseif indent(v:lnum) && syns =~? 'block'
@@ -275,7 +287,7 @@ function GetJavascriptIndent()
     endif
     if pline[-1:] !~ '[{;]'
       let isOp = l:line =~# s:opfirst || pline =~# s:continuation &&
-            \ synIDattr(synID(l:lnum,match(' ' . pline,'\/$'),0),'name') !~? 'regex'
+            \ s:syn_at(l:lnum,match(' ' . pline,'\/$')) !~? 'regex'
       let bL = s:iscontOne(l:lnum,num,isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif

From 4149f1d30448cb5f2841b12d95c46146b2d39fe9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 10 Dec 2016 15:31:00 -0800
Subject: [PATCH 0657/1043] cleaning continued braceless statement (#758)

---
 indent/javascript.vim | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 39629765..aab3678a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -150,7 +150,6 @@ function s:Balanced(lnum)
   return !l:open
 endfunction
 
-" start of a braceless scope?
 function s:OneScope(lnum)
   let pline = s:Trim(a:lnum,1)
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
@@ -168,21 +167,16 @@ endfunction
 " returns braceless levels started by 'i' and above lines * &sw.
 " 'num' is the lineNr which encloses the entire context, 'cont' if whether
 " line 'i' + 1 is a continued expression, which could have started in a
-" braceless context created above 'i'
+" braceless context
 function s:iscontOne(i,num,cont)
-  let [l:i, l:cont, l:num] = [a:i, a:cont, a:num + !a:num]
+  let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
   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)
-    if indent(l:i) < ind " first line depends on a:cont
-      if s:OneScope(l:i)
-        let bL += s:W
-        let [l:cont, l:i] = [0, line('.')]
-      elseif !l:cont
-        break
-      endif
-    elseif !a:cont
+  while l:i >= l:num && (ind > pind || l:i == l:num)
+    if indent(l:i) < ind && s:OneScope(l:i)
+      let bL += s:W
+      let l:i = line('.')
+    elseif !a:cont || bL || ind < indent(a:i)
       break
     endif
     let ind = min([ind, indent(l:i)])

From 3583822dab4be5b11c285233535ebf56b986524e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 10 Dec 2016 18:05:58 -0800
Subject: [PATCH 0658/1043] reflow comment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index aab3678a..8059e0b0 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: December 9, 2016
+" Last Change: December 10, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -164,10 +164,9 @@ function s:OneScope(lnum)
         \ index(split('> else do'),s:token())])
 endfunction
 
-" returns braceless levels started by 'i' and above lines * &sw.
-" 'num' is the lineNr which encloses the entire context, 'cont' if whether
-" line 'i' + 1 is a continued expression, which could have started in a
-" braceless context
+" returns braceless levels started by 'i' and above lines * &sw. 'num' is the
+" lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
+" a continued expression, which could have started in a braceless context
 function s:iscontOne(i,num,cont)
   let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
   let pind = a:num ? indent(l:num) + s:W : 0

From 25cff858e5f5f1fdc65f35d75fd52fdbc091e0bc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 10 Dec 2016 19:07:58 -0800
Subject: [PATCH 0659/1043] don't move cursor at default label

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8059e0b0..d8de150a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -198,7 +198,7 @@ function s:IsBlock()
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
     return !cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) &&
-          \ (expand('<cword>') !=# 'default' || s:previous_token() !~ '[{,.]')
+          \ (expand('<cword>') !=# 'default' || s:previous_token(1) !~ '[{,.]')
   endif
   return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction

From 8e17e2330c4bb252d9657f1cea34159367f7cdad Mon Sep 17 00:00:00 2001
From: Ryan Bright <rbright@users.noreply.github.com>
Date: Sun, 11 Dec 2016 03:44:26 -0500
Subject: [PATCH 0660/1043] Detect .es6 files as JavaScript (#199)

---
 ftdetect/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index d6aa6d01..f42e06f8 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1,6 +1,7 @@
 au BufNewFile,BufRead *.js setf javascript
 au BufNewFile,BufRead *.jsm setf javascript
 au BufNewFile,BufRead Jakefile setf javascript
+au BufNewFile,BufRead *.es6 setf javascript
 
 fun! s:SelectJavascript()
   if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'

From 63daab731daf93e1503667f2f24ff619f504186f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 11 Dec 2016 18:36:15 -0800
Subject: [PATCH 0661/1043] better &cino parsing (#759)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d8de150a..c8142778 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -269,8 +269,12 @@ function GetJavascriptIndent()
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')
       if s:previous_token() ==# 'switch'
-        let switch_offset = &cino !~ ':' || !has('float') ? s:W :
-              \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '\%(.*:\)\@>[^,]*s' ? s:W : 1))
+        if &cino !~ ':' || !has('float')
+          let switch_offset = s:W
+        else
+          let cinc = matchlist(&cino,'.*:\(-\)\=\([0-9.]*\)\(s\)\=\C')
+          let switch_offset = float2nr(str2float(cinc[1].(strlen(cinc[2]) ? cinc[2] : 1)) * (strlen(cinc[3]) ? s:W : 1))
+        endif
         if pline[-1:] != '.' && l:line =~# '^' . s:case_stmt
           return indent(num) + switch_offset
         elseif pline =~# s:case_stmt . '$'

From 294563c6181215270fa645a685264ecb724471d2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 11 Dec 2016 18:54:14 -0800
Subject: [PATCH 0662/1043] &cino format

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c8142778..e072ad16 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -273,7 +273,8 @@ function GetJavascriptIndent()
           let switch_offset = s:W
         else
           let cinc = matchlist(&cino,'.*:\(-\)\=\([0-9.]*\)\(s\)\=\C')
-          let switch_offset = float2nr(str2float(cinc[1].(strlen(cinc[2]) ? cinc[2] : 1)) * (strlen(cinc[3]) ? s:W : 1))
+          let switch_offset = float2nr(str2float(cinc[1].(strlen(cinc[2]) ? cinc[2] : strlen(cinc[3])))
+                \ * (strlen(cinc[3]) ? s:W : 1))
         endif
         if pline[-1:] != '.' && l:line =~# '^' . s:case_stmt
           return indent(num) + switch_offset

From 117c7272188bbd2417a4d1addb8f90a0de52e91d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 15 Dec 2016 10:02:15 -0800
Subject: [PATCH 0663/1043] more edge case accuracy,refactoring (#761)

* more edge case accuracy,refactoring

* missing paren

* label func

* remove if

* ws
---
 indent/javascript.vim | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e072ad16..1bb59433 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: December 10, 2016
+" Last Change: December 14, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -106,11 +106,23 @@ endfunction
 " switch case label pattern
 let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
 
+function s:label_end(ln,con)
+  return !cursor(a:ln,match(' '.a:con, '.*\zs' . s:case_stmt . '$')) &&
+        \ (expand('<cword>') !=# 'default' || s:previous_token(1) !~ '[{,.]')
+endfunction
+
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\%(\.\s*\)\@<!\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
+      \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
+
+function s:continues(ln,con)
+  return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
+        \ eval((['s:syn_at(line("."),col(".")) !~? "regex"'] +
+        \ repeat(['s:previous_token() != "."'],5) + [1])[
+        \ index(split('/ typeof in instanceof void delete'),s:token())])
+endfunction
 
 " get the line of code stripped of comments. if called with two args, leave
 " cursor at the last non-comment char.
@@ -197,8 +209,7 @@ function s:IsBlock()
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
-    return !cursor(0,match(' ' . strpart(getline('.'),0,col('.')),'.*\zs' . s:case_stmt . '$')) &&
-          \ (expand('<cword>') !=# 'default' || s:previous_token(1) !~ '[{,.]')
+    return s:label_end(0,strpart(getline('.'),0,col('.')))
   endif
   return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
@@ -278,14 +289,13 @@ function GetJavascriptIndent()
         endif
         if pline[-1:] != '.' && l:line =~# '^' . s:case_stmt
           return indent(num) + switch_offset
-        elseif pline =~# s:case_stmt . '$'
+        elseif s:label_end(l:lnum,pline)
           return indent(l:lnum) + s:W
         endif
       endif
     endif
     if pline[-1:] !~ '[{;]'
-      let isOp = l:line =~# s:opfirst || pline =~# s:continuation &&
-            \ s:syn_at(l:lnum,match(' ' . pline,'\/$')) !~? 'regex'
+      let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
       let bL = s:iscontOne(l:lnum,num,isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif

From f33b9ed81b5a07de1be786e9574454e0bddc62b7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 20 Dec 2016 21:41:26 -0800
Subject: [PATCH 0664/1043] cleaning, edge case with keyword (#764)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1bb59433..f5ddcbc4 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: December 14, 2016
+" Last Change: December 20, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -171,9 +171,9 @@ function s:OneScope(lnum)
     endif
     return index(split('for if let while with'),token) + 1
   endif
-  return eval((['getline(".")[col(".")-2] == "="'] +
-        \ repeat(['s:previous_token(1) != "."'],2) + [0])[
-        \ index(split('> else do'),s:token())])
+  let token = s:token()
+  return token == '>' ? getline('.')[col('.')-2] == '=' :
+        \ token =~# '^\%(else\|do\)$' && s:previous_token(1) != '.'
 endfunction
 
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
@@ -205,7 +205,7 @@ function s:IsBlock()
     return char != '{'
   elseif char =~ '\k'
     return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
-          \ ,char) < (0 + (line('.') != l:ln)) || s:previous_token() == '.'
+          \ ,char) < (line('.') != l:ln) || s:previous_token() == '.'
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
@@ -279,7 +279,7 @@ function GetJavascriptIndent()
     let pline = s:Trim(l:lnum)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')
-      if s:previous_token() ==# 'switch'
+      if s:previous_token() ==# 'switch' && s:previous_token() != '.'
         if &cino !~ ':' || !has('float')
           let switch_offset = s:W
         else

From 1cb6f109418f4e18f569ee8953fc96c1e23b456f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 21 Dec 2016 10:55:06 -0800
Subject: [PATCH 0665/1043] cleaner loop (#765)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f5ddcbc4..d4e90d96 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -95,12 +95,18 @@ endfunction
 " NOTE: Moves the cursor, unless a arg is supplied.
 function s:previous_token(...)
   let l:pos = getpos('.')[1:2]
-  return [search('.\>\|[^[:alnum:][:space:]_$]','bW') ?
-        \ (s:looking_at() == '/' || line('.') != l:pos[0] && getline('.') =~ '\/\/') &&
-        \ s:syn_at(line('.'),col('.')) =~? s:syng_com ?
-        \ search('\_[^/]\zs\/[/*]','bW') ? s:previous_token() : ''
-        \ : s:token()
-        \ : ''][a:0 && call('cursor',l:pos)]
+  let token = ''
+  while search('.\>\|[^[:alnum:][:space:]_$]','bW')
+    if (s:looking_at() == '/' || line('.') != l:pos[0] && search('\/\/','nbW',
+          \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
+      call search('\_[^/]\zs\/[/*]','bW')
+    else
+      let token = s:token()
+      break
+    endif
+  endwhile
+  call call('cursor', a:0 ? l:pos : [0,0])
+  return token
 endfunction
 
 " switch case label pattern

From ce0f529bbb938b42f757aeedbe8f5d95f095b51d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 21 Dec 2016 15:12:52 -0800
Subject: [PATCH 0666/1043] refactor s:OneScope() (#766)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d4e90d96..53e0bd02 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -170,16 +170,16 @@ endfunction
 
 function s:OneScope(lnum)
   let pline = s:Trim(a:lnum,1)
+  let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
-    let token = s:previous_token()
-    if index(split('await each'),token) + 1
-      return s:previous_token() ==# 'for'
+    call s:previous_token()
+    let kw = 'for if let while with'
+    if index(split('await each'),s:token()) + 1
+      call s:previous_token()
+      let kw = 'for'
     endif
-    return index(split('for if let while with'),token) + 1
   endif
-  let token = s:token()
-  return token == '>' ? getline('.')[col('.')-2] == '=' :
-        \ token =~# '^\%(else\|do\)$' && s:previous_token(1) != '.'
+  return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 && s:previous_token(1) != '.'
 endfunction
 
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the

From da1eee4452cb7acdfc4b495c46d51fe0507b68ff Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 22 Dec 2016 16:29:44 -0800
Subject: [PATCH 0667/1043] odd comments, shebang (#768)

basic support, other area's depend on syntax supporting this stuff
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 53e0bd02..a7d3fdf2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -145,7 +145,7 @@ endfunction
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
   let l:n = prevnonblank(a:lnum)
-  while getline(l:n) =~ '^\s*\/[/*]' || s:syn_at(l:n,1) =~? s:syng_com
+  while getline(l:n) =~ '^\s*\%(\/[/*]\|-->\|<!--\|#\)' || s:syn_at(l:n,1) =~? s:syng_com
     let l:n = prevnonblank(l:n-1)
   endwhile
   return l:n

From ccc9f301773097955b162247e513e5c381aa6db2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 22 Dec 2016 23:59:20 -0800
Subject: [PATCH 0668/1043] improvements to prevcodeline() (#769)

* improvements to prevcodeline()

* date
---
 indent/javascript.vim | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a7d3fdf2..89f6bd77 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: December 20, 2016
+" Last Change: December 22, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -145,10 +145,15 @@ endfunction
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
   let l:n = prevnonblank(a:lnum)
-  while getline(l:n) =~ '^\s*\%(\/[/*]\|-->\|<!--\|#\)' || s:syn_at(l:n,1) =~? s:syng_com
-    let l:n = prevnonblank(l:n-1)
+  while l:n
+    if getline(l:n) =~ '^\s*\%(\/[/*]\|-->\|<!--\|#\)' 
+      let l:n = prevnonblank(l:n-1)
+    elseif s:syn_at(l:n,1) =~? s:syng_com
+      let l:n = search('\/\*\%<' . l:n . 'l','nbW')
+    else
+      return l:n
+    endif
   endwhile
-  return l:n
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
@@ -223,7 +228,8 @@ endfunction
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])
   " Get the current line.
-  let l:line = getline(v:lnum)
+  call cursor(v:lnum,1)
+  let l:line = getline('.')
   let syns = s:syn_at(v:lnum, 1)
 
   " start with strings,comments,etc.
@@ -253,7 +259,6 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  call cursor(v:lnum,1)
   let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
@@ -299,6 +304,7 @@ function GetJavascriptIndent()
           return indent(l:lnum) + s:W
         endif
       endif
+      call cursor(v:lnum,1) " normalize pos
     endif
     if pline[-1:] !~ '[{;]'
       let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)

From 8043c4bc040257da853e9d73a02055367c7c1fc6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 23 Dec 2016 17:34:52 -0800
Subject: [PATCH 0669/1043] detect string, prevline (#771)

* detect string, prevline

* reorder
---
 indent/javascript.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 89f6bd77..7e2bb5aa 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: December 22, 2016
+" Last Change: December 23, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -147,6 +147,10 @@ function s:PrevCodeLine(lnum)
   let l:n = prevnonblank(a:lnum)
   while l:n
     if getline(l:n) =~ '^\s*\%(\/[/*]\|-->\|<!--\|#\)' 
+      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+            \ s:syn_at(l:n,1) =~? s:syng_str
+        return l:n
+      endif
       let l:n = prevnonblank(l:n-1)
     elseif s:syn_at(l:n,1) =~? s:syng_com
       let l:n = search('\/\*\%<' . l:n . 'l','nbW')

From a6176945cbbfa32e6b3f4973ae9187985a44e463 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 24 Dec 2016 01:26:12 -0800
Subject: [PATCH 0670/1043] add other comments

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7e2bb5aa..79421a6d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -258,7 +258,7 @@ function GetJavascriptIndent()
   if l:line[:1] == '/*'
     let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
   endif
-  if l:line =~ '^\/[/*]'
+  if l:line =~ '^\%(\/[/*]\|-->\|<!--\|#\)'
     let l:line = ''
   endif
 

From 521f4eda73c9a483e29df4894eeef7421982aba2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 25 Dec 2016 00:39:13 -0800
Subject: [PATCH 0671/1043] jump label support (#772)

also moves cursor() call
---
 indent/javascript.vim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 79421a6d..461801ec 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -117,6 +117,10 @@ function s:label_end(ln,con)
         \ (expand('<cword>') !=# 'default' || s:previous_token(1) !~ '[{,.]')
 endfunction
 
+function s:jump_label(ln,con)
+  return !cursor(a:ln,match(' '.a:con, ':$')) && s:previous_token() =~ '\k' && s:IsBlock()
+endfunction
+
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
@@ -195,6 +199,7 @@ endfunction
 " lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
 " a continued expression, which could have started in a braceless context
 function s:iscontOne(i,num,cont)
+  call cursor(v:lnum,1) " normalize pos
   let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
   let pind = a:num ? indent(l:num) + s:W : 0
   let ind = indent(l:i) + (a:cont ? 0 : s:W)
@@ -308,10 +313,9 @@ function GetJavascriptIndent()
           return indent(l:lnum) + s:W
         endif
       endif
-      call cursor(v:lnum,1) " normalize pos
     endif
     if pline[-1:] !~ '[{;]'
-      let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
+      let isOp = !s:jump_label(l:lnum,pline) && (l:line =~# s:opfirst || s:continues(l:lnum,pline))
       let bL = s:iscontOne(l:lnum,num,isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif

From c12ae76092fda399f99d77756d38f2b3044e7778 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 25 Dec 2016 22:48:22 -0800
Subject: [PATCH 0672/1043] An attempted fix for jsClassValue region end

Looks like it might need a keepend
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 52bafbac..e11593ab 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -183,7 +183,7 @@ syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
-syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
+syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression keepend
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
 syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsClassStringKey         contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs

From 6f01baa6618595431990dab99b6a8ea179b5ee60 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 25 Dec 2016 23:19:23 -0800
Subject: [PATCH 0673/1043] Adding jsSpreadExpression to jsBlock

This should fix JSX
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e11593ab..c1faff7f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -145,7 +145,7 @@ syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          s
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
 syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsLabel,jsSwitchColon extend fold

From c347e2da1011b8e1a3ba5a3ab686103174248d35 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Dec 2016 00:35:27 -0800
Subject: [PATCH 0674/1043] Adds __dirname & __filename to jsGlobalNodeObjects

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c1faff7f..3f309750 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -112,7 +112,7 @@ syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgro
 
 " Keywords
 syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
-syntax keyword jsGlobalNodeObjects  module exports global process
+syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
 syntax match   jsGlobalNodeObjects  /require/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 syntax keyword jsBuiltins           decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval

From 431e2292675e69bd80041ffa7261b777e539e0c4 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Dec 2016 00:36:17 -0800
Subject: [PATCH 0675/1043] Fix require in jsGlobalNodeObjects

Adds word boundries to the rejex
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3f309750..1871555a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -113,7 +113,7 @@ syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgro
 " Keywords
 syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
 syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
-syntax match   jsGlobalNodeObjects  /require/ containedin=jsFuncCall
+syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
 syntax keyword jsBuiltins           decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
 " DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?

From ddefa30d1a2a351ba520f11903b458682832505d Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Dec 2016 00:47:30 -0800
Subject: [PATCH 0676/1043] Adding Flow wildcard support

---
 extras/flow.vim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index b181e0e1..84ffb423 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -14,6 +14,7 @@ syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
 syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
+syntax match   jsFlowWildcard       contained /*/
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
@@ -23,6 +24,7 @@ syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowT
 syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock
 
 syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
@@ -42,8 +44,8 @@ syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ e
 
 syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
 
-syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp
-syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -84,5 +86,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObjectKey          jsObjectKey
   HiLink jsFlowOrOperator         PreProc
   HiLink jsFlowReturnOrOp         jsFlowOrOperator
+  HiLink jsFlowWildcard           PreProc
+  HiLink jsFlowWildcardReturn     PreProc
   delcommand HiLink
 endif

From 7cb3abf71850a4947fd40993c1fc01d5844fac89 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Dec 2016 00:56:45 -0800
Subject: [PATCH 0677/1043] Misc flow fixes

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

diff --git a/extras/flow.vim b/extras/flow.vim
index 84ffb423..5c86553f 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -10,7 +10,7 @@ syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipemp
 syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
 syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
-syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments
+syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
 syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
@@ -29,7 +29,7 @@ syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=
 syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
-syntax region  jsFlowTypeStatement                                   start=/type/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
 syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsExpression,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type

From 1a7632e6cbcac4f24faa1ac91d24888b1b87f760 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Dec 2016 01:08:23 -0800
Subject: [PATCH 0678/1043] Fixing how async is used

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1871555a..fce68a1e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -83,7 +83,7 @@ syntax match   jsObjectSeparator   contained /,/
 syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=jsObjectColon,@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
-syntax match   jsObjectMethodType  contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
+syntax match   jsObjectMethodType  contained /\%(get\|set\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
 syntax region  jsObjectStringKey   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 syntax region  jsObjectStringKey   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
@@ -142,7 +142,7 @@ syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        s
 syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
-syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsNoise extend fold
+syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsAsyncKeyword,jsNoise extend fold
 syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
@@ -152,7 +152,7 @@ syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        s
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
-syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator extend fold
+syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
@@ -180,7 +180,7 @@ exe 'syntax match jsArrowFunction /_\s*\(=>\)\@=/    skipwhite skipempty nextgro
 syntax keyword jsClassKeyword           contained class
 syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodType        contained /\%(get\|set\|static\|async\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsFuncName,jsClassProperty
+syntax match   jsClassMethodType        contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression keepend

From 36ebd9f8a31933f15ca14af3b1464c5fb4f205aa Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 26 Dec 2016 09:31:02 -0800
Subject: [PATCH 0679/1043] rename,refactor, jump label support for isblock()
 (#775)

* rename,refactor, jump label support for isblock()

* refactor

* dollar

* save_pos()

* commnt

* clean
---
 indent/javascript.vim | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 461801ec..720628ef 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: December 23, 2016
+" Last Change: December 26, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -80,6 +80,13 @@ function s:alternatePair(stop)
   call cursor(v:lnum,1)
 endfunction
 
+function s:save_pos(f,...)
+  let l:pos = getpos('.')[1:2]
+  let ret = call(a:f,a:000)
+  call call('cursor',l:pos)
+  return ret
+endfunction
+
 function s:syn_at(l,c)
   return synIDattr(synID(a:l,a:c,0),'name')
 endfunction
@@ -92,12 +99,11 @@ function s:token()
   return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
 endfunction
 
-" NOTE: Moves the cursor, unless a arg is supplied.
-function s:previous_token(...)
-  let l:pos = getpos('.')[1:2]
+function s:previous_token()
+  let ln = line('.')
   let token = ''
   while search('.\>\|[^[:alnum:][:space:]_$]','bW')
-    if (s:looking_at() == '/' || line('.') != l:pos[0] && search('\/\/','nbW',
+    if (s:looking_at() == '/' || line('.') != ln && search('\/\/','nbW',
           \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
       call search('\_[^/]\zs\/[/*]','bW')
     else
@@ -105,20 +111,19 @@ function s:previous_token(...)
       break
     endif
   endwhile
-  call call('cursor', a:0 ? l:pos : [0,0])
   return token
 endfunction
 
 " switch case label pattern
 let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
 
-function s:label_end(ln,con)
-  return !cursor(a:ln,match(' '.a:con, '.*\zs' . s:case_stmt . '$')) &&
-        \ (expand('<cword>') !=# 'default' || s:previous_token(1) !~ '[{,.]')
-endfunction
-
 function s:jump_label(ln,con)
-  return !cursor(a:ln,match(' '.a:con, ':$')) && s:previous_token() =~ '\k' && s:IsBlock()
+  if !cursor(a:ln,match(' '.a:con, ':$'))
+    let id = s:previous_token()
+    if id =~ '\k' && s:IsBlock()
+      return id ==# 'default' ? 2 : 1
+    endif
+  endif
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -192,7 +197,8 @@ function s:OneScope(lnum)
       let kw = 'for'
     endif
   endif
-  return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 && s:previous_token(1) != '.'
+  return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&
+        \ s:save_pos('s:previous_token') != '.'
 endfunction
 
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
@@ -229,7 +235,9 @@ function s:IsBlock()
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
-    return s:label_end(0,strpart(getline('.'),0,col('.')))
+    let lp = strpart(getline('.'),0,col('.'))
+    return lp =~# '\<case\>\s*[^ \t:].*:$' || s:save_pos('s:jump_label',line('.'),lp) &&
+          \ (s:looking_at() != '{' || s:IsBlock())
   endif
   return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
@@ -297,6 +305,7 @@ function GetJavascriptIndent()
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
   if !num || s:looking_at() == '{' && s:IsBlock()
     let pline = s:Trim(l:lnum)
+    let label = s:save_pos('s:jump_label',l:lnum,pline)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')
       if s:previous_token() ==# 'switch' && s:previous_token() != '.'
@@ -309,13 +318,13 @@ function GetJavascriptIndent()
         endif
         if pline[-1:] != '.' && l:line =~# '^' . s:case_stmt
           return indent(num) + switch_offset
-        elseif s:label_end(l:lnum,pline)
+        elseif label == 2 || pline =~# '\<case\>\s*[^ \t:].*:$'
           return indent(l:lnum) + s:W
         endif
       endif
     endif
-    if pline[-1:] !~ '[{;]'
-      let isOp = !s:jump_label(l:lnum,pline) && (l:line =~# s:opfirst || s:continues(l:lnum,pline))
+    if !label && pline[-1:] !~ '[{;]'
+      let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
       let bL = s:iscontOne(l:lnum,num,isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif

From 8e3ae21c319885a14370964a574b814c6bca55f9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 28 Dec 2016 14:21:38 -0800
Subject: [PATCH 0680/1043] fix case block logic

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 720628ef..9962019c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -236,7 +236,7 @@ function s:IsBlock()
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
     let lp = strpart(getline('.'),0,col('.'))
-    return lp =~# '\<case\>\s*[^ \t:].*:$' || s:save_pos('s:jump_label',line('.'),lp) &&
+    return lp =~# '\<case\>\s*[^ \t:].*:$' || s:jump_label(line('.'),lp) &&
           \ (s:looking_at() != '{' || s:IsBlock())
   endif
   return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'

From 3643099837a34e689cdf56975747f85c7f6bb1b8 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 29 Dec 2016 13:24:25 -0800
Subject: [PATCH 0681/1043] Adding jsComment to destructuring blocks

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index fce68a1e..6f3fcfc0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -150,8 +150,8 @@ syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      s
 syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsLabel,jsSwitchColon extend fold
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression extend fold
+syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsComment extend fold
 syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression

From ad3261e921a55d05a92decc85deaea8836c524ab Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 30 Dec 2016 02:19:23 -0800
Subject: [PATCH 0682/1043] magic portability (#786)

* magic portability

only needed for search and searchpair

* remove grouping
---
 indent/javascript.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9962019c..656471b4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -39,11 +39,11 @@ endif
 " searchpair() wrapper
 if has('reltime')
   function s:GetPair(start,end,flags,skip,time,...)
-    return searchpair(a:start,'',a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
   endfunction
 else
   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)]))
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
   endfunction
 endif
 
@@ -55,17 +55,17 @@ let s:syng_com = 'comment\|doc'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:skip_func()
-  if !s:free || search('`\|\*\/','nW',s:looksyn)
+  if !s:free || search('\m`\|\*\/','nW',s:looksyn)
     let s:free = !eval(s:skip_expr)
     let s:looksyn = s:free ? line('.') : s:looksyn
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\/','nbW',s:looksyn) || search('[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
+  return (search('\m\/','nbW',s:looksyn) || search('\m[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
 endfunction
 
 function s:alternatePair(stop)
-  while search('[][(){}]','bW',a:stop)
+  while search('\m[][(){}]','bW',a:stop)
     if !s:skip_func()
       let idx = stridx('])}',s:looking_at())
       if idx + 1
@@ -102,10 +102,10 @@ endfunction
 function s:previous_token()
   let ln = line('.')
   let token = ''
-  while search('.\>\|[^[:alnum:][:space:]_$]','bW')
-    if (s:looking_at() == '/' || line('.') != ln && search('\/\/','nbW',
+  while search('\m.\>\|[^[:alnum:][:space:]_$]','bW')
+    if (s:looking_at() == '/' || line('.') != ln && search('\m\/\/','nbW',
           \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
-      call search('\_[^/]\zs\/[/*]','bW')
+      call search('\m\_[^/]\zs\/[/*]','bW')
     else
       let token = s:token()
       break
@@ -162,7 +162,7 @@ function s:PrevCodeLine(lnum)
       endif
       let l:n = prevnonblank(l:n-1)
     elseif s:syn_at(l:n,1) =~? s:syng_com
-      let l:n = search('\/\*\%<' . l:n . 'l','nbW')
+      let l:n = search('\m\/\*\%<' . l:n . 'l','nbW')
     else
       return l:n
     endif
@@ -293,7 +293,7 @@ function GetJavascriptIndent()
   endif
 
   if idx + 1
-    if idx == 2 && search('\S','bW',line('.')) && s:looking_at() == ')'
+    if idx == 2 && search('\m\S','bW',line('.')) && s:looking_at() == ')'
       call s:GetPair('(',')','bW',s:skip_expr,200)
     endif
     return indent('.')

From ff1fc56defa52faf7daf0e98745b88e5fecb41d4 Mon Sep 17 00:00:00 2001
From: Marc Harter <wavded@gmail.com>
Date: Sat, 31 Dec 2016 21:57:00 -0600
Subject: [PATCH 0683/1043] Improve @typedef syntax for namepath.

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

diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 645d55a3..6acb8640 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -4,9 +4,9 @@ syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contai
 " tags containing a param
 syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
 " tags containing type and param
-syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\|typedef\)\>" skipwhite nextgroup=jsDocType
 " tags containing type but no param
-syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
 " tags containing references
 syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
 " other tags (no extra syntax)

From 17bbd02c1794a20240fe4b11cda6e846bed09ba6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 3 Jan 2017 09:46:57 -0800
Subject: [PATCH 0684/1043] ternary function (#788)

removes last regex for `case`
---
 indent/javascript.vim | 57 +++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 656471b4..332a82e3 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: December 26, 2016
+" Last Change: December 31, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -65,6 +65,7 @@ function s:skip_func()
 endfunction
 
 function s:alternatePair(stop)
+  let pos = getpos('.')[1:2]
   while search('\m[][(){}]','bW',a:stop)
     if !s:skip_func()
       let idx = stridx('])}',s:looking_at())
@@ -77,7 +78,7 @@ function s:alternatePair(stop)
       endif
     endif
   endwhile
-  call cursor(v:lnum,1)
+  call call('cursor',pos)
 endfunction
 
 function s:save_pos(f,...)
@@ -114,15 +115,29 @@ function s:previous_token()
   return token
 endfunction
 
-" switch case label pattern
-let s:case_stmt = '\<\%(case\>\s*[^ \t:].*\|default\s*\):\C'
+function s:others(p)
+  return ((line2byte(line('.')) + col('.')) <= (line2byte(a:p[0]) + a:p[1])) || eval(s:skip_expr)
+endfunction
 
-function s:jump_label(ln,con)
-  if !cursor(a:ln,match(' '.a:con, ':$'))
-    let id = s:previous_token()
-    if id =~ '\k' && s:IsBlock()
-      return id ==# 'default' ? 2 : 1
-    endif
+function s:tern_skip(p)
+  return s:GetPair('{','}','nbW','s:others('.string(a:p).')',200,a:p[0]) > 0
+endfunction
+
+function s:tern_col(p)
+  return s:GetPair('?',':\@<!::\@!','nbW',s:skip_expr
+        \ .' . ''\|jsflow\%(noise\|\%(return\)\=maybe\)'''
+        \ .' || s:tern_skip('.string(a:p).')',200,a:p[0]) > 0
+endfunction
+
+function s:label_col()
+  let pos = getpos('.')[1:2]
+  let [s:looksyn,s:free] = pos
+  call s:alternatePair(0)
+  if s:looking_at() == '{' && s:save_pos('s:IsBlock')
+    let poss = getpos('.')[1:2]
+    return call('cursor',pos) || !s:tern_col(poss)
+  elseif s:looking_at() == ':'
+    return !s:tern_col([0,0])
   endif
 endfunction
 
@@ -162,7 +177,8 @@ function s:PrevCodeLine(lnum)
       endif
       let l:n = prevnonblank(l:n-1)
     elseif s:syn_at(l:n,1) =~? s:syng_com
-      let l:n = search('\m\/\*\%<' . l:n . 'l','nbW')
+      let l:n = s:save_pos('eval',
+            \ 'cursor('.l:n.',1) + search(''\m\/\*'',"bW")')
     else
       return l:n
     endif
@@ -205,7 +221,6 @@ endfunction
 " lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
 " a continued expression, which could have started in a braceless context
 function s:iscontOne(i,num,cont)
-  call cursor(v:lnum,1) " normalize pos
   let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
   let pind = a:num ? indent(l:num) + s:W : 0
   let ind = indent(l:i) + (a:cont ? 0 : s:W)
@@ -235,9 +250,7 @@ function s:IsBlock()
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'
-    let lp = strpart(getline('.'),0,col('.'))
-    return lp =~# '\<case\>\s*[^ \t:].*:$' || s:jump_label(line('.'),lp) &&
-          \ (s:looking_at() != '{' || s:IsBlock())
+    return getline('.')[col('.')-2] != ':' && s:label_col()
   endif
   return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
@@ -305,7 +318,6 @@ function GetJavascriptIndent()
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
   if !num || s:looking_at() == '{' && s:IsBlock()
     let pline = s:Trim(l:lnum)
-    let label = s:save_pos('s:jump_label',l:lnum,pline)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')
       if s:previous_token() ==# 'switch' && s:previous_token() != '.'
@@ -316,15 +328,18 @@ function GetJavascriptIndent()
           let switch_offset = float2nr(str2float(cinc[1].(strlen(cinc[2]) ? cinc[2] : strlen(cinc[3])))
                 \ * (strlen(cinc[3]) ? s:W : 1))
         endif
-        if pline[-1:] != '.' && l:line =~# '^' . s:case_stmt
+        if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
           return indent(num) + switch_offset
-        elseif label == 2 || pline =~# '\<case\>\s*[^ \t:].*:$'
-          return indent(l:lnum) + s:W
         endif
       endif
     endif
-    if !label && pline[-1:] !~ '[{;]'
-      let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
+    if pline[-1:] !~ '[{;]'
+      if pline =~# ':\@<!:$'
+        call cursor(l:lnum,strlen(pline))
+        let isOp = s:tern_col(b:js_cache[1:2])
+      else
+        let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
+      endif
       let bL = s:iscontOne(l:lnum,num,isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif

From aa3a16993f86a58b038eb76c08e00545eda76984 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 3 Jan 2017 15:38:30 -0800
Subject: [PATCH 0685/1043] various fixes (#790)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 332a82e3..745d7236 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -116,15 +116,15 @@ function s:previous_token()
 endfunction
 
 function s:others(p)
-  return ((line2byte(line('.')) + col('.')) <= (line2byte(a:p[0]) + a:p[1])) || eval(s:skip_expr)
+  return "((line2byte(line('.')) + col('.')) <= ".(line2byte(a:p[0]) + a:p[1]).") || ".s:skip_expr
 endfunction
 
 function s:tern_skip(p)
-  return s:GetPair('{','}','nbW','s:others('.string(a:p).')',200,a:p[0]) > 0
+  return s:GetPair('{','}','nbW',s:others(a:p),200,a:p[0]) > 0
 endfunction
 
 function s:tern_col(p)
-  return s:GetPair('?',':\@<!::\@!','nbW',s:skip_expr
+  return s:GetPair('?',':\@<!::\@!','nbW',s:others(a:p)
         \ .' . ''\|jsflow\%(noise\|\%(return\)\=maybe\)'''
         \ .' || s:tern_skip('.string(a:p).')',200,a:p[0]) > 0
 endfunction

From d8a6fef99e30c089616397850ab554deaaa1a7e2 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 3 Jan 2017 18:37:34 -0800
Subject: [PATCH 0686/1043] Bugfix for jsArrowFuncArgs

If the parens in a jsArrowFunction definition contained no arguments,
they were not assigned the `jsArrowFuncArgs` highlight group, which is
technically a bug.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6f3fcfc0..02c80e9b 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -173,7 +173,7 @@ syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipe
 
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction               '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
-exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/   skipwhite skipempty nextgroup=jsArrowFunction                    '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
+exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/   skipwhite skipempty nextgroup=jsArrowFunction                    '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '').(' contains=jsArrowFuncArgs')
 exe 'syntax match jsArrowFunction /_\s*\(=>\)\@=/    skipwhite skipempty nextgroup=jsArrowFunction                    '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
 
 " Classes

From 006f889b4b1094457c31e4bb5cb11ea47aa04570 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 3 Jan 2017 19:33:48 -0800
Subject: [PATCH 0687/1043] exact object indent (#793)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 745d7236..ffbbd097 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -305,7 +305,7 @@ function GetJavascriptIndent()
     endif
   endif
 
-  if idx + 1
+  if idx + 1 || l:line[:1] == '|}'
     if idx == 2 && search('\m\S','bW',line('.')) && s:looking_at() == ')'
       call s:GetPair('(',')','bW',s:skip_expr,200)
     endif

From 0b9c46e4630a6f1a72abfa891061dc71f52602c1 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 4 Jan 2017 15:16:53 -0800
Subject: [PATCH 0688/1043] remove flow cases

not actually needed in the contexts which use that func
---
 indent/javascript.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ffbbd097..1458d384 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -125,7 +125,6 @@ endfunction
 
 function s:tern_col(p)
   return s:GetPair('?',':\@<!::\@!','nbW',s:others(a:p)
-        \ .' . ''\|jsflow\%(noise\|\%(return\)\=maybe\)'''
         \ .' || s:tern_skip('.string(a:p).')',200,a:p[0]) > 0
 endfunction
 

From 2f182a1f401d916d2835bdc48707bea1f7173126 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 4 Jan 2017 21:00:55 -0800
Subject: [PATCH 0689/1043] generic search function (#795)

---
 indent/javascript.vim | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1458d384..8a69bde8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -100,10 +100,17 @@ function s:token()
   return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
 endfunction
 
+function s:b_token()
+  if s:looking_at() =~ '\k'
+    call search('\m\<','cbW')
+  endif
+  return search('\m\S','bW')
+endfunction
+
 function s:previous_token()
   let ln = line('.')
   let token = ''
-  while search('\m.\>\|[^[:alnum:][:space:]_$]','bW')
+  while s:b_token()
     if (s:looking_at() == '/' || line('.') != ln && search('\m\/\/','nbW',
           \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
       call search('\m\_[^/]\zs\/[/*]','bW')

From dce5a10a0ff0a69f52cd6902eaad43f5f237ef1a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 4 Jan 2017 23:02:57 -0800
Subject: [PATCH 0690/1043] remove check of keyword

is actually useless
---
 indent/javascript.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8a69bde8..db9f20b1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -251,8 +251,7 @@ function s:IsBlock()
   if syn =~? 'xml\|jsx'
     return char != '{'
   elseif char =~ '\k'
-    return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
-          \ ,char) < (line('.') != l:ln) || s:previous_token() == '.'
+    return char !=# 'return' || line('.') != l:ln
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'

From 043bb4aa0319ffb9d97728776f66b27b8300cd59 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 4 Jan 2017 23:44:43 -0800
Subject: [PATCH 0691/1043] fix destruct

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index db9f20b1..3f950df6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -251,7 +251,8 @@ function s:IsBlock()
   if syn =~? 'xml\|jsx'
     return char != '{'
   elseif char =~ '\k'
-    return char !=# 'return' || line('.') != l:ln
+    return index(split('return const let var export import')
+          \ ,char) < (line('.') != l:ln) || s:previous_token() == '.'
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
   elseif char == ':'

From 3ee5de406ddc8099d271f52e9d68b53d727695bf Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 4 Jan 2017 23:49:11 -0800
Subject: [PATCH 0692/1043] fix keywords

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3f950df6..8a69bde8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -251,7 +251,7 @@ function s:IsBlock()
   if syn =~? 'xml\|jsx'
     return char != '{'
   elseif char =~ '\k'
-    return index(split('return const let var export import')
+    return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
           \ ,char) < (line('.') != l:ln) || s:previous_token() == '.'
   elseif char == '>'
     return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'

From 58fdba82d6c874dc6a60bd7a4d31e5cf76ceeeef Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 4 Jan 2017 23:58:25 -0800
Subject: [PATCH 0693/1043] cleaning

---
 indent/javascript.vim | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8a69bde8..2aee4ba7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -108,10 +108,10 @@ function s:b_token()
 endfunction
 
 function s:previous_token()
-  let ln = line('.')
+  let l:n = line('.')
   let token = ''
   while s:b_token()
-    if (s:looking_at() == '/' || line('.') != ln && search('\m\/\/','nbW',
+    if (s:looking_at() == '/' || line('.') != l:n && search('\m\/\/','nbW',
           \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
       call search('\m\_[^/]\zs\/[/*]','bW')
     else
@@ -139,7 +139,7 @@ function s:label_col()
   let pos = getpos('.')[1:2]
   let [s:looksyn,s:free] = pos
   call s:alternatePair(0)
-  if s:looking_at() == '{' && s:save_pos('s:IsBlock')
+  if s:save_pos('s:IsBlock')
     let poss = getpos('.')[1:2]
     return call('cursor',pos) || !s:tern_col(poss)
   elseif s:looking_at() == ':'
@@ -245,20 +245,22 @@ endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
-  let l:ln = line('.')
-  let char = s:previous_token()
-  let syn = char =~ '[{>/]' ? s:syn_at(line('.'),col('.')-(char == '{')) : ''
-  if syn =~? 'xml\|jsx'
-    return char != '{'
-  elseif char =~ '\k'
-    return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
-          \ ,char) < (line('.') != l:ln) || s:previous_token() == '.'
-  elseif char == '>'
-    return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
-  elseif char == ':'
-    return getline('.')[col('.')-2] != ':' && s:label_col()
+  if s:looking_at() == '{'
+    let l:n = line('.')
+    let char = s:previous_token()
+    let syn = char =~ '[{>/]' ? s:syn_at(line('.'),col('.')-(char == '{')) : ''
+    if syn =~? 'xml\|jsx'
+      return char != '{'
+    elseif char =~ '\k'
+      return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
+            \ ,char) < (line('.') != l:n) || s:previous_token() == '.'
+    elseif char == '>'
+      return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
+    elseif char == ':'
+      return getline('.')[col('.')-2] != ':' && s:label_col()
+    endif
+    return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
   endif
-  return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
 endfunction
 
 function GetJavascriptIndent()
@@ -322,7 +324,7 @@ function GetJavascriptIndent()
   let num = b:js_cache[1]
 
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
-  if !num || s:looking_at() == '{' && s:IsBlock()
+  if !num || s:IsBlock()
     let pline = s:Trim(l:lnum)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')

From bba35b25cbbddb6e15c593443a0e9ae205b5852d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 5 Jan 2017 00:01:30 -0800
Subject: [PATCH 0694/1043] change a keyword

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2aee4ba7..1d55346e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -252,7 +252,7 @@ function s:IsBlock()
     if syn =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
-      return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
+      return index(split('return const let import export yield default delete var void typeof case new in instanceof')
             \ ,char) < (line('.') != l:n) || s:previous_token() == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'

From d817bd4f1df3385347b66446670ff954c0c7a95d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 5 Jan 2017 00:21:08 -0800
Subject: [PATCH 0695/1043] re-add throw

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1d55346e..211beffa 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -252,7 +252,7 @@ function s:IsBlock()
     if syn =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
-      return index(split('return const let import export yield default delete var void typeof case new in instanceof')
+      return index(split('return const let import export yield default delete var void typeof throw case new in instanceof')
             \ ,char) < (line('.') != l:n) || s:previous_token() == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'

From b3a1e8a87d202cdc1b05db9b21d4e673cdfc7055 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 5 Jan 2017 00:26:57 -0800
Subject: [PATCH 0696/1043] add await

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 211beffa..28b9661d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -252,7 +252,7 @@ function s:IsBlock()
     if syn =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
-      return index(split('return const let import export yield default delete var void typeof throw case new in instanceof')
+      return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof')
             \ ,char) < (line('.') != l:n) || s:previous_token() == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'

From 685219245d9681a4cc9137abe27796954da93d74 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 5 Jan 2017 19:39:53 -0800
Subject: [PATCH 0697/1043] Fix Function capitalization in Flow annotations

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 5c86553f..af883ac8 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -4,7 +4,7 @@ syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
 syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster
 syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object array bool class
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
 syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
 syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
 syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster

From faa1a4bf4535053b51ff8ab56c62df94ccdc1c83 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 8 Jan 2017 18:32:31 -0800
Subject: [PATCH 0698/1043] cleaning (#799)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 28b9661d..2d4f2867 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -61,7 +61,7 @@ function s:skip_func()
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\m\/','nbW',s:looksyn) || search('\m[''"\\]','nW',s:looksyn)) && eval(s:skip_expr)
+  return (search('\m\/','nbW',s:looksyn) || search('\m[''"]\|\\$','nW',s:looksyn)) && eval(s:skip_expr)
 endfunction
 
 function s:alternatePair(stop)
@@ -109,17 +109,15 @@ endfunction
 
 function s:previous_token()
   let l:n = line('.')
-  let token = ''
   while s:b_token()
     if (s:looking_at() == '/' || line('.') != l:n && search('\m\/\/','nbW',
           \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
       call search('\m\_[^/]\zs\/[/*]','bW')
     else
-      let token = s:token()
-      break
+      return s:token()
     endif
   endwhile
-  return token
+  return ''
 endfunction
 
 function s:others(p)

From bd9b70af04a1ea64a2e038bdb7c2fed3642b3041 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 9 Jan 2017 09:18:31 -0800
Subject: [PATCH 0699/1043] remove html comment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2d4f2867..120192ac 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -174,7 +174,7 @@ endfunction
 function s:PrevCodeLine(lnum)
   let l:n = prevnonblank(a:lnum)
   while l:n
-    if getline(l:n) =~ '^\s*\%(\/[/*]\|-->\|<!--\|#\)' 
+    if getline(l:n) =~ '^\s*\/[/*]' 
       if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
             \ s:syn_at(l:n,1) =~? s:syng_str
         return l:n
@@ -290,7 +290,7 @@ function GetJavascriptIndent()
   if l:line[:1] == '/*'
     let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
   endif
-  if l:line =~ '^\%(\/[/*]\|-->\|<!--\|#\)'
+  if l:line =~ '^\/[/*]'
     let l:line = ''
   endif
 

From 9e9e2c4f3b9533e022ce41e3a775bcbdc9792f87 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 9 Jan 2017 20:12:32 -0800
Subject: [PATCH 0700/1043] remove added s:Trim arg

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 120192ac..6017f66d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -158,16 +158,16 @@ function s:continues(ln,con)
         \ index(split('/ typeof in instanceof void delete'),s:token())])
 endfunction
 
-" get the line of code stripped of comments. if called with two args, leave
-" cursor at the last non-comment char.
-function s:Trim(ln,...)
+" get the line of code stripped of comments and move cursor to the last
+" non-comment char.
+function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
   let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
   while l:max && s:syn_at(a:ln, strlen(pline)) =~? s:syng_com
     let pline = substitute(strpart(pline, 0, l:max),'\s*$','','')
     let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
   endwhile
-  return !a:0 || cursor(a:ln,strlen(pline)) ? pline : pline
+  return cursor(a:ln,strlen(pline)) ? pline : pline
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
@@ -207,7 +207,7 @@ function s:Balanced(lnum)
 endfunction
 
 function s:OneScope(lnum)
-  let pline = s:Trim(a:lnum,1)
+  let pline = s:Trim(a:lnum)
   let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
     call s:previous_token()
@@ -323,7 +323,7 @@ function GetJavascriptIndent()
 
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
   if !num || s:IsBlock()
-    let pline = s:Trim(l:lnum)
+    let pline = s:save_pos('s:Trim',l:lnum)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = line('.')
       if s:previous_token() ==# 'switch' && s:previous_token() != '.'

From fe92d4991ea851275917da4655cab83af0c70541 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Dec 2016 00:19:33 -0800
Subject: [PATCH 0701/1043] First pass at Block support

I haven't yet added support for labels, but I want to sit on this a bit
and test it out before I add labels.  This change may have serious
ramifications
---
 syntax/javascript.vim | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 02c80e9b..176ebaca 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -30,9 +30,9 @@ syntax match   jsParensError    /[)}\]]/
 
 " Program Keywords
 syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
-syntax match   jsVariableDef    contained /\k\+/ nextgroup=jsFlowDefinition
-syntax keyword jsOperator       delete instanceof typeof void new in of
-syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/
+syntax match   jsVariableDef    contained /\k\+/ skipwhite skipempty nextgroup=jsFlowDefinition
+syntax keyword jsOperator       delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
@@ -88,7 +88,7 @@ syntax region  jsObjectStringKey   contained start=+"+  skip=+\\\("\|$\)+  end=+
 syntax region  jsObjectStringKey   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
 exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
-exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '')
+exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '').' skipwhite skipempty nextgroup=@jsExpression'
 exe 'syntax keyword jsUndefined undefined        '.(exists('g:javascript_conceal_undefined') ? 'conceal cchar='.g:javascript_conceal_undefined  : '')
 exe 'syntax keyword jsNan       NaN              '.(exists('g:javascript_conceal_NaN')       ? 'conceal cchar='.g:javascript_conceal_NaN        : '')
 exe 'syntax keyword jsPrototype prototype        '.(exists('g:javascript_conceal_prototype') ? 'conceal cchar='.g:javascript_conceal_prototype  : '')
@@ -143,16 +143,16 @@ syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        s
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsAsyncKeyword,jsNoise extend fold
-syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsBlock              contained matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
-syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
-syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll extend fold
-syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsLabel,jsSwitchColon extend fold
-syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll,jsBlock skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
+syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsLabel,jsSwitchColon extend fold
+syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsComment extend fold
-syntax region  jsObject                       matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
+syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
+syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
@@ -230,8 +230,8 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsBlock,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsNoise
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -313,17 +313,17 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFuncParens           Noise
   HiLink jsClassBraces          Noise
   HiLink jsClassNoise           Noise
-  HiLink jsIfElseBraces         jsBraces
-  HiLink jsTryCatchBraces       jsBraces
-  HiLink jsModuleBraces         jsBraces
+  HiLink jsIfElseBraces         Noise
+  HiLink jsTryCatchBraces       Noise
+  HiLink jsModuleBraces         Noise
   HiLink jsObjectBraces         Noise
   HiLink jsObjectSeparator      Noise
-  HiLink jsFinallyBraces        jsBraces
-  HiLink jsRepeatBraces         jsBraces
-  HiLink jsSwitchBraces         jsBraces
+  HiLink jsFinallyBraces        Noise
+  HiLink jsRepeatBraces         Noise
+  HiLink jsSwitchBraces         Noise
   HiLink jsSpecial              Special
   HiLink jsTemplateVar          Special
-  HiLink jsTemplateBraces       jsBraces
+  HiLink jsTemplateBraces       Noise
   HiLink jsGlobalObjects        Constant
   HiLink jsGlobalNodeObjects    Constant
   HiLink jsExceptions           Constant

From 4839870f29807035541b658c1c835797c944290d Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 5 Jan 2017 19:39:01 -0800
Subject: [PATCH 0702/1043] Fix jsTernaryIf and jsObjects

---
 syntax/javascript.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 176ebaca..8920c38c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -154,10 +154,9 @@ syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces s
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom
-syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
-syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression
+syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression skipwhite skipempty nextgroup=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup

From f11f948c007fc36fc435f430ec47be43ce61111f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 10 Jan 2017 16:49:01 -0800
Subject: [PATCH 0703/1043] Adding support for block statement labels

---
 syntax/javascript.vim | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 8920c38c..821f1ea7 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -96,19 +96,22 @@ exe 'syntax keyword jsThis      this             '.(exists('g:javascript_conceal
 exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
 
 " Statement Keywords
-syntax keyword jsStatement    contained break continue with yield debugger
-syntax keyword jsConditional            if           skipwhite skipempty nextgroup=jsParenIfElse
-syntax keyword jsConditional            else         skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock
-syntax keyword jsConditional            switch       skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat                 while for    skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
-syntax keyword jsDo                     do           skipwhite skipempty nextgroup=jsRepeatBlock
+syntax keyword jsStatement    contained with yield debugger
+syntax keyword jsStatement    contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
+syntax keyword jsConditional            if             skipwhite skipempty nextgroup=jsParenIfElse
+syntax keyword jsConditional            else           skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock
+syntax keyword jsConditional            switch         skipwhite skipempty nextgroup=jsParenSwitch
+syntax keyword jsRepeat                 while for      skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
+syntax keyword jsDo                     do             skipwhite skipempty nextgroup=jsRepeatBlock
 syntax keyword jsLabel        contained case default
-syntax keyword jsTry                    try          skipwhite skipempty nextgroup=jsTryCatchBlock
-syntax keyword jsFinally      contained finally      skipwhite skipempty nextgroup=jsFinallyBlock
-syntax keyword jsCatch        contained catch        skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsTry                    try            skipwhite skipempty nextgroup=jsTryCatchBlock
+syntax keyword jsFinally      contained finally        skipwhite skipempty nextgroup=jsFinallyBlock
+syntax keyword jsCatch        contained catch          skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
-syntax match   jsSwitchColon  contained /:/          skipwhite skipempty nextgroup=jsSwitchBlock
+syntax match   jsSwitchColon   contained /:/            skipwhite skipempty nextgroup=jsSwitchBlock
+syntax match   jsBlockLabel              /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\s*:/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
+syntax match   jsBlockLabelKey contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*\%(;\|\n\)\)\@=/
 
 " Keywords
 syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
@@ -230,7 +233,7 @@ if exists("javascript_plugin_flow")
 endif
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsNoise
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsNoise,,jsBlockLabel
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -347,6 +350,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsClassMethodType      Type
   HiLink jsObjectMethodType     Type
   HiLink jsClassDefinition      jsFuncName
+  HiLink jsBlockLabel           Identifier
+  HiLink jsBlockLabelKey        jsBlockLabel
 
   HiLink jsDestructuringBraces     Noise
   HiLink jsDestructuringProperty   jsFuncArgs

From 659cbf3ded3f12621a9018ce01367e4fcfbe6ae6 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 10 Jan 2017 17:37:12 -0800
Subject: [PATCH 0704/1043] Fix switch cases from being detected as labels

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 821f1ea7..48ccbe7c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -96,6 +96,8 @@ exe 'syntax keyword jsThis      this             '.(exists('g:javascript_conceal
 exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
 
 " Statement Keywords
+syntax match   jsBlockLabel              /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\s*:/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
+syntax match   jsBlockLabelKey contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*\%(;\|\n\)\)\@=/
 syntax keyword jsStatement    contained with yield debugger
 syntax keyword jsStatement    contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
 syntax keyword jsConditional            if             skipwhite skipempty nextgroup=jsParenIfElse
@@ -103,15 +105,13 @@ syntax keyword jsConditional            else           skipwhite skipempty nextg
 syntax keyword jsConditional            switch         skipwhite skipempty nextgroup=jsParenSwitch
 syntax keyword jsRepeat                 while for      skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
 syntax keyword jsDo                     do             skipwhite skipempty nextgroup=jsRepeatBlock
-syntax keyword jsLabel        contained case default
+syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
 syntax keyword jsTry                    try            skipwhite skipempty nextgroup=jsTryCatchBlock
 syntax keyword jsFinally      contained finally        skipwhite skipempty nextgroup=jsFinallyBlock
 syntax keyword jsCatch        contained catch          skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /:/            skipwhite skipempty nextgroup=jsSwitchBlock
-syntax match   jsBlockLabel              /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\s*:/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
-syntax match   jsBlockLabelKey contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*\%(;\|\n\)\)\@=/
 
 " Keywords
 syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
@@ -150,7 +150,7 @@ syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          s
 syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll,jsBlock skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
 syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsLabel,jsSwitchColon extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsComment extend fold

From 9148cd38d684a7dc7e31108b08cb8502b6e8834e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 11 Jan 2017 11:13:43 -0800
Subject: [PATCH 0705/1043] Add extend to jsTernaryIf

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 48ccbe7c..a29c88fc 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -159,7 +159,7 @@ syntax region  jsBlock                        matchgroup=jsBraces              s
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
-syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression skipwhite skipempty nextgroup=@jsExpression
+syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup

From cb7d5aeae0328c21f153d9737bc5bd9f44bfb01b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 11 Jan 2017 16:33:25 -0800
Subject: [PATCH 0706/1043] Attempted fix for jsTemplateVar

There are certain cases where various regions can attempt to break out
of jsTemplateVar.  This hopefully fixes some of those cases
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a29c88fc..4f381053 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -58,7 +58,7 @@ syntax match   jsFloat            /\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\
 
 " Regular Expressions
 syntax match   jsSpecial          contained "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
-syntax region  jsTemplateVar      contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression
+syntax region  jsTemplateVar      contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression keepend
 syntax region  jsRegexpCharClass  contained start=+\[+ skip=+\\.+ end=+\]+
 syntax match   jsRegexpBoundary   contained "\v%(\<@![\^$]|\\[bB])"
 syntax match   jsRegexpBackRef    contained "\v\\[1-9][0-9]*"

From f8e9c1a7f8b684c04aa13e9cfab3b2e7b87ac727 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 11 Jan 2017 23:14:20 -0800
Subject: [PATCH 0707/1043] check for lines which contain at least 2 `/` (#804)

more potential time saving, must have one `/` to the left of pos and at least two `/` in the line
---
 indent/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6017f66d..4648b264 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -61,7 +61,8 @@ function s:skip_func()
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\m\/','nbW',s:looksyn) || search('\m[''"]\|\\$','nW',s:looksyn)) && eval(s:skip_expr)
+  return (search('\m[''"]\|\\$','nW',s:looksyn) || getline('.') =~ '\/\%(.*\/\)\@=.*\%'.col('.').'c') &&
+        \ eval(s:skip_expr)
 endfunction
 
 function s:alternatePair(stop)

From 56f6fbbe481c4a71dc105ede9651630e56e29f2b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 12 Jan 2017 12:15:47 -0800
Subject: [PATCH 0708/1043] improve regex at skip_func (#806)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4648b264..da0161cf 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -61,7 +61,7 @@ function s:skip_func()
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\m[''"]\|\\$','nW',s:looksyn) || getline('.') =~ '\/\%(.*\/\)\@=.*\%'.col('.').'c') &&
+  return (search('\m[''"]\|\\$','nW',s:looksyn) || getline('.') =~ '\/\%<'.(col('.')+1).'c.\{-}\/') &&
         \ eval(s:skip_expr)
 endfunction
 

From 53dea7aff91a3a570982d8bca1b02869e6b3a07c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 13 Jan 2017 10:53:33 -0800
Subject: [PATCH 0709/1043] cleaning,search flags (#807)

the use case of the z flag is for forward searching or backwards searching starting at the previous line. It is faster
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index da0161cf..3e661785 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -55,13 +55,13 @@ let s:syng_com = 'comment\|doc'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:skip_func()
-  if !s:free || search('\m`\|\*\/','nW',s:looksyn)
+  if !s:free || search('\m`\|\*\/','znW',s:looksyn)
     let s:free = !eval(s:skip_expr)
-    let s:looksyn = s:free ? line('.') : s:looksyn
+    let s:looksyn = line('.')
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\m[''"]\|\\$','nW',s:looksyn) || getline('.') =~ '\/\%<'.(col('.')+1).'c.\{-}\/') &&
+  return (search('\m[''"]\|\\$','znW',s:looksyn) || getline('.') =~ '\/\%<'.(col('.')+1).'c.\{-}\/') &&
         \ eval(s:skip_expr)
 endfunction
 

From 96a5b5ec66f2d1e207a2c86a142ceda9e3e19a46 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 13 Jan 2017 12:07:23 -0800
Subject: [PATCH 0710/1043] remove z flag

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3e661785..7ac03178 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -55,13 +55,13 @@ let s:syng_com = 'comment\|doc'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:skip_func()
-  if !s:free || search('\m`\|\*\/','znW',s:looksyn)
+  if !s:free || search('\m`\|\*\/','nW',s:looksyn)
     let s:free = !eval(s:skip_expr)
     let s:looksyn = line('.')
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\m[''"]\|\\$','znW',s:looksyn) || getline('.') =~ '\/\%<'.(col('.')+1).'c.\{-}\/') &&
+  return (search('\m[''"]\|\\$','nW',s:looksyn) || getline('.') =~ '\/\%<'.(col('.')+1).'c.\{-}\/') &&
         \ eval(s:skip_expr)
 endfunction
 

From f54c861a8d7963c2249c854acdae8ed3ec54df31 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 14 Jan 2017 22:55:51 -0800
Subject: [PATCH 0711/1043] remove search call (#809)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7ac03178..d455f15c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -61,7 +61,7 @@ function s:skip_func()
     return !s:free
   endif
   let s:looksyn = line('.')
-  return (search('\m[''"]\|\\$','nW',s:looksyn) || getline('.') =~ '\/\%<'.(col('.')+1).'c.\{-}\/') &&
+  return getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$' &&
         \ eval(s:skip_expr)
 endfunction
 

From 0367cb5d563576909e4254734f2fbe97d252ce12 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 15 Jan 2017 10:50:54 -0800
Subject: [PATCH 0712/1043] add compiler plugin (#808)

* add compiler plugin

adds eslint as a compiler for javascript files. It is used like:
`:compiler javascript` then `:make`
Most people already use plugins like neomake or syntastic, and i don't think this should be anything but a sensible fallback, e.g. not really interested in p.r.s adding different linters/styleguides etc.

* simplify
---
 compiler/eslint.vim | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 compiler/eslint.vim

diff --git a/compiler/eslint.vim b/compiler/eslint.vim
new file mode 100644
index 00000000..fc60a2a3
--- /dev/null
+++ b/compiler/eslint.vim
@@ -0,0 +1,11 @@
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "eslint"
+
+if exists(":CompilerSet") != 2
+  command! -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=eslint\ -f\ compact\ %
+CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m

From 18cbb4bde238ee55572d6ead286720e7e24c0b8a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 15 Jan 2017 21:49:49 -0800
Subject: [PATCH 0713/1043] cleaning (#810)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d455f15c..2cf3b0a9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -111,8 +111,8 @@ endfunction
 function s:previous_token()
   let l:n = line('.')
   while s:b_token()
-    if (s:looking_at() == '/' || line('.') != l:n && search('\m\/\/','nbW',
-          \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
+    if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:n &&
+          \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       call search('\m\_[^/]\zs\/[/*]','bW')
     else
       return s:token()
@@ -340,7 +340,7 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    if pline[-1:] !~ '[{;]'
+    if pline !~ '[{;]$'
       if pline =~# ':\@<!:$'
         call cursor(l:lnum,strlen(pline))
         let isOp = s:tern_col(b:js_cache[1:2])

From 690f23ea8867b489f734a837766f4d74bdd77c3f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 16 Jan 2017 00:20:39 -0800
Subject: [PATCH 0714/1043] fix for inc/dec operators and blocks (#811)

* fix for inc/dec operators and blocks
1000th Commit!
---
 indent/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2cf3b0a9..b5c11f5c 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: December 31, 2016
+" Last Change: January 16, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -258,7 +258,8 @@ function s:IsBlock()
     elseif char == ':'
       return getline('.')[col('.')-2] != ':' && s:label_col()
     endif
-    return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
+    return syn =~? 'regex' || char !~ '[=~!<*,/?^%|&([]' &&
+          \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
   endif
 endfunction
 

From 88c85d9ea92c4ce4464a3df629bc887c23c80266 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 16 Jan 2017 15:19:36 -0800
Subject: [PATCH 0715/1043] Renaming jsTemplateVar -> jsTemplateExpression

This has been kind of bugging me for a while.

Also we shouldn't assign it to any groups since it could be any form of
expression contained within.
---
 syntax/javascript.vim | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4f381053..35479520 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -50,22 +50,22 @@ syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
 syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial extend
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
 syntax match   jsTaggedTemplate   /\k\+\%(`\)\@=/ nextgroup=jsTemplateString
 syntax match   jsNumber           /\<\d\+\%([eE][+-]\=\d\+\)\=\>\|\<0[bB][01]\+\>\|\<0[oO]\o\+\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 
 " Regular Expressions
-syntax match   jsSpecial          contained "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
-syntax region  jsTemplateVar      contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression keepend
-syntax region  jsRegexpCharClass  contained start=+\[+ skip=+\\.+ end=+\]+
-syntax match   jsRegexpBoundary   contained "\v%(\<@![\^$]|\\[bB])"
-syntax match   jsRegexpBackRef    contained "\v\\[1-9][0-9]*"
-syntax match   jsRegexpQuantifier contained "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??"
-syntax match   jsRegexpOr         contained "\v\<@!\|"
-syntax match   jsRegexpMod        contained "\v\(@<=\?[:=!>]"
-syntax region  jsRegexpGroup      contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax match   jsSpecial            contained "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
+syntax region  jsTemplateExpression contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression keepend
+syntax region  jsRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+
+syntax match   jsRegexpBoundary     contained "\v%(\<@![\^$]|\\[bB])"
+syntax match   jsRegexpBackRef      contained "\v\\[1-9][0-9]*"
+syntax match   jsRegexpQuantifier   contained "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??"
+syntax match   jsRegexpOr           contained "\v\<@!\|"
+syntax match   jsRegexpMod          contained "\v\(@<=\?[:=!>]"
+syntax region  jsRegexpGroup        contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 if v:version > 703 || v:version == 603 && has("patch1088")
   syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 else
@@ -324,7 +324,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsRepeatBraces         Noise
   HiLink jsSwitchBraces         Noise
   HiLink jsSpecial              Special
-  HiLink jsTemplateVar          Special
   HiLink jsTemplateBraces       Noise
   HiLink jsGlobalObjects        Constant
   HiLink jsGlobalNodeObjects    Constant

From 7c95ee824a04a5a217bab8d29ab67a7a1e044383 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 11 Jan 2017 12:26:11 -0800
Subject: [PATCH 0716/1043] First pas at :: support

---
 syntax/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 35479520..f0e1b2bf 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -33,6 +33,7 @@ syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDe
 syntax match   jsVariableDef    contained /\k\+/ skipwhite skipempty nextgroup=jsFlowDefinition
 syntax keyword jsOperator       delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/ skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsOperator       /::/ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
 
@@ -80,7 +81,7 @@ syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+
 syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
 syntax match   jsObjectSeparator   contained /,/
-syntax region  jsObjectValue       contained start=/:/ end=/\%(,\|}\)\@=/ contains=jsObjectColon,@jsExpression extend
+syntax region  jsObjectValue       contained matchgroup=jsNoise start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
 syntax match   jsObjectMethodType  contained /\%(get\|set\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
@@ -111,7 +112,7 @@ syntax keyword jsFinally      contained finally        skipwhite skipempty nextg
 syntax keyword jsCatch        contained catch          skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
-syntax match   jsSwitchColon   contained /:/            skipwhite skipempty nextgroup=jsSwitchBlock
+syntax match   jsSwitchColon   contained /::\@!/       skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
 syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch

From 22c7e7b3ece45e22dafda57e8446f6d74dc53f8b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 16 Jan 2017 14:41:20 -0800
Subject: [PATCH 0717/1043] jsBlockLabels are not allowed if ::

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f0e1b2bf..1d265856 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -97,7 +97,7 @@ exe 'syntax keyword jsThis      this             '.(exists('g:javascript_conceal
 exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
 
 " Statement Keywords
-syntax match   jsBlockLabel              /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\s*:/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
+syntax match   jsBlockLabel              /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\s*::\@!/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
 syntax match   jsBlockLabelKey contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*\%(;\|\n\)\)\@=/
 syntax keyword jsStatement    contained with yield debugger
 syntax keyword jsStatement    contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey

From 67b90c7374a6766b72a3efc5ac5722712935c3ee Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 16 Jan 2017 15:06:49 -0800
Subject: [PATCH 0718/1043] First pass at `jsObjectProp`

I had an interesting idea to disable various matches like `class` and
`require` from appearing when using `.` notation on objects.

The proposed fix is to create a special `jsObjectProp` match, with a
super high priority, that is used as a `nextgroup` for `.`

It is not assigned any colors or match groups, it simply exists to
disable other items from matching.

This is a very quick pass and I have not really tested it yet, but I
think it could be a very viable, working solution
---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1d265856..bdc58ea0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -24,7 +24,8 @@ syntax sync fromstart
 " syntax case ignore
 syntax case match
 
-syntax match   jsNoise          /[:,\;\.]\{1}/
+syntax match   jsNoise          /[:,\;]\{1}/
+syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp
 syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
 syntax match   jsParensError    /[)}\]]/
 
@@ -220,6 +221,7 @@ syntax region  jsCommentMisc        contained start=/\/\*/ end=/\*\// contains=j
 " Decorators
 syntax match   jsDecorator                    /^\s*@/ nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction  contained /[a-zA-Z_][a-zA-Z0-9_.]*/ nextgroup=jsParenDecorator
+syntax match   jsObjectProp         contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/
 
 if exists("javascript_plugin_jsdoc")
   runtime extras/jsdoc.vim

From 019e523aa21f321824a65f41df5f72cc0088665a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 17 Jan 2017 15:01:11 -0800
Subject: [PATCH 0719/1043] combine ind logic (#816)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b5c11f5c..4cdc263c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -313,22 +313,16 @@ function GetJavascriptIndent()
     endif
   endif
 
-  if idx + 1 || l:line[:1] == '|}'
-    if idx == 2 && search('\m\S','bW',line('.')) && s:looking_at() == ')'
-      call s:GetPair('(',')','bW',s:skip_expr,200)
-    endif
-    return indent('.')
-  endif
-
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
   let num = b:js_cache[1]
 
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
   if !num || s:IsBlock()
+    let ilnum = line('.')
     let pline = s:save_pos('s:Trim',l:lnum)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
-      let num = line('.')
-      if s:previous_token() ==# 'switch' && s:previous_token() != '.'
+      let num = ilnum == num ? line('.') : num
+      if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
         if &cino !~ ':' || !has('float')
           let switch_offset = s:W
         else
@@ -341,20 +335,22 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    if pline !~ '[{;]$'
+    if idx < 0 && pline !~ '[{;]$'
       if pline =~# ':\@<!:$'
         call cursor(l:lnum,strlen(pline))
         let isOp = s:tern_col(b:js_cache[1:2])
       else
         let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
       endif
-      let bL = s:iscontOne(l:lnum,num,isOp)
+      let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
   endif
 
   " main return
-  if isOp
+  if idx + 1 || l:line[:1] == '|}'
+    return indent(num)
+  elseif isOp
     return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
     return indent(num) + s:W + switch_offset + bL

From 9d24edb471a809b9946c0478aa11e4d22239e924 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 18 Jan 2017 20:21:12 -0800
Subject: [PATCH 0720/1043] accurate Trim and prev_token funcs (#817)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4cdc263c..525dfa5f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -101,23 +101,20 @@ function s:token()
   return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
 endfunction
 
-function s:b_token()
-  if s:looking_at() =~ '\k'
-    call search('\m\<','cbW')
-  endif
-  return search('\m\S','bW')
-endfunction
-
 function s:previous_token()
   let l:n = line('.')
-  while s:b_token()
+  if (s:looking_at() !~ '\k' || search('\m\<','cbW')) && search('\m\S','bW')
     if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:n &&
           \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
-      call search('\m\_[^/]\zs\/[/*]','bW')
+      while search('\m\/\ze[/*]','cbW')
+        if search('\m\S','bW') && s:syn_at(line('.'),col('.')) !~? s:syng_com
+          return s:token()
+        endif
+      endwhile
     else
       return s:token()
     endif
-  endwhile
+  endif
   return ''
 endfunction
 
@@ -162,13 +159,9 @@ endfunction
 " get the line of code stripped of comments and move cursor to the last
 " non-comment char.
 function s:Trim(ln)
-  let pline = substitute(getline(a:ln),'\s*$','','')
-  let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
-  while l:max && s:syn_at(a:ln, strlen(pline)) =~? s:syng_com
-    let pline = substitute(strpart(pline, 0, l:max),'\s*$','','')
-    let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
-  endwhile
-  return cursor(a:ln,strlen(pline)) ? pline : pline
+  call cursor(a:ln+1,1)
+  call s:previous_token()
+  return strpart(getline('.'),0,col('.'))
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment

From 4e1ec95dc05e61c93e490c063e1ea40d12c0f773 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 18 Jan 2017 20:28:30 -0800
Subject: [PATCH 0721/1043] fix

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 525dfa5f..97a6389b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -107,7 +107,9 @@ function s:previous_token()
     if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:n &&
           \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       while search('\m\/\ze[/*]','cbW')
-        if search('\m\S','bW') && s:syn_at(line('.'),col('.')) !~? s:syng_com
+        if !search('\m\S','bW')
+          break
+        elseif s:syn_at(line('.'),col('.')) !~? s:syng_com
           return s:token()
         endif
       endwhile

From 8b55755e98348b1d0ed7191f2b75eab24763499a Mon Sep 17 00:00:00 2001
From: Quinn Strahl <qstrahl@gmail.com>
Date: Tue, 24 Jan 2017 12:50:14 -0500
Subject: [PATCH 0722/1043] Remove keepend from jsClassValue region

- Fixes highlighting issues with argless arrow functions in jsClassValue

- Closes #821
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index bdc58ea0..15ed6cff 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -187,7 +187,7 @@ syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
-syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression keepend
+syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
 syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsClassStringKey         contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs

From 1ec99477466d8f5ff2fad272cae0b7b414f9ce67 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 24 Jan 2017 11:05:34 -0800
Subject: [PATCH 0723/1043] shorten final return

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 97a6389b..b4d58286 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: January 16, 2017
+" Last Change: January 24, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -333,9 +333,9 @@ function GetJavascriptIndent()
     if idx < 0 && pline !~ '[{;]$'
       if pline =~# ':\@<!:$'
         call cursor(l:lnum,strlen(pline))
-        let isOp = s:tern_col(b:js_cache[1:2])
+        let isOp = s:tern_col(b:js_cache[1:2]) * s:W
       else
-        let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
+        let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
       endif
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
@@ -345,12 +345,10 @@ function GetJavascriptIndent()
   " main return
   if idx + 1 || l:line[:1] == '|}'
     return indent(num)
-  elseif isOp
-    return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
   elseif num
-    return indent(num) + s:W + switch_offset + bL
+    return indent(num) + s:W + switch_offset + bL + isOp
   endif
-  return bL
+  return bL + isOp
 endfunction
 
 let &cpo = s:cpo_save

From 2195ce0103993535fc24be3621c8d9eecdb93d98 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 24 Jan 2017 12:56:38 -0800
Subject: [PATCH 0724/1043] safer GetPair condition (#824)

searchpair can return `-1` if it fails from an error, which should be considered a falsey return value
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b4d58286..29e36772 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -71,7 +71,7 @@ function s:alternatePair(stop)
     if !s:skip_func()
       let idx = stridx('])}',s:looking_at())
       if idx + 1
-        if !s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop)
+        if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0
           break
         endif
       else

From bf2f6a8e4692308e5040937526e5afcf4986c7b6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 26 Jan 2017 09:52:22 -0800
Subject: [PATCH 0725/1043] do inc/dec/arrow detection in function (#827)

* do inc/dec/arrow detection in function

should be faster than the regex because of how often it is called. I also get to use `tr()` for something

* clearer
---
 indent/javascript.vim | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 29e36772..c315e54d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -149,13 +149,14 @@ endfunction
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
+      \ '\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
 function s:continues(ln,con)
   return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
-        \ eval((['s:syn_at(line("."),col(".")) !~? "regex"'] +
+        \ eval( (['s:syn_at(line("."),col(".")) !~? "regex"'] +
+        \ repeat(['getline(".")[col(".")-2] != tr(s:looking_at(),">","=")'],3) +
         \ repeat(['s:previous_token() != "."'],5) + [1])[
-        \ index(split('/ typeof in instanceof void delete'),s:token())])
+        \ index(split('/ > - + typeof in instanceof void delete'),s:token())])
 endfunction
 
 " get the line of code stripped of comments and move cursor to the last

From 307eb850d9b7cda5da3568efbe24c5d03db11716 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 28 Jan 2017 13:35:20 -0800
Subject: [PATCH 0726/1043] better zero char solution

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c315e54d..5bee78d7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -293,7 +293,7 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
+  let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
     call call('cursor',b:js_cache[1:])

From b7677c924f6c3dfc7d5aadcf7be5039950c7f587 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 29 Jan 2017 13:22:48 -0800
Subject: [PATCH 0727/1043] float-less cino parsing (#828)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5bee78d7..3db7dc88 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -319,12 +319,13 @@ function GetJavascriptIndent()
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = ilnum == num ? line('.') : num
       if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
-        if &cino !~ ':' || !has('float')
+        if &cino !~ ':'
           let switch_offset = s:W
         else
-          let cinc = matchlist(&cino,'.*:\(-\)\=\([0-9.]*\)\(s\)\=\C')
-          let switch_offset = float2nr(str2float(cinc[1].(strlen(cinc[2]) ? cinc[2] : strlen(cinc[3])))
-                \ * (strlen(cinc[3]) ? s:W : 1))
+          let cinc = matchlist(&cino,'.*:\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
+          let switch_offset = cinc[0] is '' ? 0 : (cinc[1] is '' ? 1 : -1) *
+                \ ((strlen(cinc[2].cinc[3]) ? cinc[2].printf('%d',cinc[3][1]) : 10) *
+                \ (cinc[4] is '' ? 1 : s:W)) / 10
         endif
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
           return indent(num) + switch_offset

From 8d0d45349de3e494228300fea84b2ddf16b03c49 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 29 Jan 2017 14:34:05 -0800
Subject: [PATCH 0728/1043] template inner code (#830)

* template inner code

* Need a syn check if behind ${
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3db7dc88..cd7306c3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -48,14 +48,14 @@ else
 endif
 
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'
+let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!'
 let s:syng_str = 'string\|template'
 let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:skip_func()
-  if !s:free || search('\m`\|\*\/','nW',s:looksyn)
+  if !s:free || search('\m`\|\${\|\*\/','nW',s:looksyn)
     let s:free = !eval(s:skip_expr)
     let s:looksyn = line('.')
     return !s:free

From 9ada8ab92bf0f22dbf7cfe9025593f8f1a48031a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 29 Jan 2017 20:58:12 -0800
Subject: [PATCH 0729/1043] switch_offset min value (#832)

changes to zero column indent if product is less than 0
---
 indent/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cd7306c3..cdb8f98c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -323,9 +323,9 @@ function GetJavascriptIndent()
           let switch_offset = s:W
         else
           let cinc = matchlist(&cino,'.*:\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
-          let switch_offset = cinc[0] is '' ? 0 : (cinc[1] is '' ? 1 : -1) *
+          let switch_offset = max([cinc[0] is '' ? 0 : (cinc[1] is '' ? 1 : -1) *
                 \ ((strlen(cinc[2].cinc[3]) ? cinc[2].printf('%d',cinc[3][1]) : 10) *
-                \ (cinc[4] is '' ? 1 : s:W)) / 10
+                \ (cinc[4] is '' ? 1 : s:W)) / 10, -indent(num)])
         endif
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
           return indent(num) + switch_offset

From 871ab2959c89d53eeaa6f462c0176afb5810d830 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 30 Jan 2017 18:35:58 -0800
Subject: [PATCH 0730/1043] prevent octal conversion (#835)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cdb8f98c..7d0a8d5b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -323,8 +323,8 @@ function GetJavascriptIndent()
           let switch_offset = s:W
         else
           let cinc = matchlist(&cino,'.*:\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
-          let switch_offset = max([cinc[0] is '' ? 0 : (cinc[1] is '' ? 1 : -1) *
-                \ ((strlen(cinc[2].cinc[3]) ? cinc[2].printf('%d',cinc[3][1]) : 10) *
+          let switch_offset = max([cinc[0] is '' ? 0 : (cinc[1].1) *
+                \ ((strlen(cinc[2].cinc[3]) ? str2nr(cinc[2].str2nr(cinc[3][1])) : 10) *
                 \ (cinc[4] is '' ? 1 : s:W)) / 10, -indent(num)])
         endif
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'

From 994b78bf70cb93b0e79e93c8c8509e2574df80db Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 5 Feb 2017 20:43:39 -0800
Subject: [PATCH 0731/1043] Fix for jsFuncCall

It looks like `jsFuncCall` was broken when I added the `jsObjectProp`
group.  Mostly I just needed to add `jsFuncCall` to `.` nextgroup and
tweak syntax priorities.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 15ed6cff..b2edcab3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -25,7 +25,8 @@ syntax sync fromstart
 syntax case match
 
 syntax match   jsNoise          /[:,\;]\{1}/
-syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp
+syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall
+syntax match   jsObjectProp     contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/
 syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
 syntax match   jsParensError    /[)}\]]/
 
@@ -221,7 +222,6 @@ syntax region  jsCommentMisc        contained start=/\/\*/ end=/\*\// contains=j
 " Decorators
 syntax match   jsDecorator                    /^\s*@/ nextgroup=jsDecoratorFunction
 syntax match   jsDecoratorFunction  contained /[a-zA-Z_][a-zA-Z0-9_.]*/ nextgroup=jsParenDecorator
-syntax match   jsObjectProp         contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/
 
 if exists("javascript_plugin_jsdoc")
   runtime extras/jsdoc.vim

From 1f1d5ebf3375db58c9122b7927210ca295564bd3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 7 Feb 2017 12:12:14 -0800
Subject: [PATCH 0732/1043] unicode regex flag (#840)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b2edcab3..f2f0a098 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -70,9 +70,9 @@ syntax match   jsRegexpOr           contained "\v\<@!\|"
 syntax match   jsRegexpMod          contained "\v\(@<=\?[:=!>]"
 syntax region  jsRegexpGroup        contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
 if v:version > 703 || v:version == 603 && has("patch1088")
-  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
+  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimyu]\{,5}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 else
-  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
+  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimyu]\{,5}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 endif
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 

From 5c526adcb78f57c6170f9e0d993c2d0189ab9364 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 7 Feb 2017 23:36:47 -0800
Subject: [PATCH 0733/1043] Fixes to some comment chaining

I found that some recent changes broke how we chain comment, this should
fix those cases.
---
 syntax/javascript.vim | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f2f0a098..72c4b3ee 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -104,7 +104,7 @@ syntax match   jsBlockLabelKey contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*\%(;
 syntax keyword jsStatement    contained with yield debugger
 syntax keyword jsStatement    contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
 syntax keyword jsConditional            if             skipwhite skipempty nextgroup=jsParenIfElse
-syntax keyword jsConditional            else           skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock
+syntax keyword jsConditional            else           skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock
 syntax keyword jsConditional            switch         skipwhite skipempty nextgroup=jsParenSwitch
 syntax keyword jsRepeat                 while for      skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
 syntax keyword jsDo                     do             skipwhite skipempty nextgroup=jsRepeatBlock
@@ -142,9 +142,9 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 " Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsIfElseBlock extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentMisc,jsRepeatBlock extend fold
+syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock extend fold
+syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
@@ -216,8 +216,10 @@ syntax region  jsCommentFunction    contained start=/\/\// end=/$/    contains=j
 syntax region  jsCommentFunction    contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn fold extend keepend
 syntax region  jsCommentClass       contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup extend keepend
 syntax region  jsCommentClass       contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup fold extend keepend
-syntax region  jsCommentMisc        contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock extend keepend
-syntax region  jsCommentMisc        contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsBlock fold extend keepend
+syntax region  jsCommentIfElse      contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock extend keepend
+syntax region  jsCommentIfElse      contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock fold extend keepend
+syntax region  jsCommentRepeat      contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock extend keepend
+syntax region  jsCommentRepeat      contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock fold extend keepend
 
 " Decorators
 syntax match   jsDecorator                    /^\s*@/ nextgroup=jsDecoratorFunction
@@ -362,7 +364,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 
   HiLink jsCommentFunction      jsComment
   HiLink jsCommentClass         jsComment
-  HiLink jsCommentMisc          jsComment
+  HiLink jsCommentIfElse        jsComment
+  HiLink jsCommentRepeat        jsComment
 
   HiLink jsDomErrNo             Constant
   HiLink jsDomNodeConsts        Constant

From 742f55bf12f0904267ca9245fdd0891a188c65fc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 9 Feb 2017 11:15:08 -0800
Subject: [PATCH 0734/1043] syn related indent fixes (#843)

* syn related indent fixes

surprised to figure out some strangeness in this script was caused by vim's internal behavior of synId
---
 indent/javascript.vim | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7d0a8d5b..18c99acc 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: January 24, 2017
+" Last Change: February 8, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -177,7 +177,7 @@ function s:PrevCodeLine(lnum)
         return l:n
       endif
       let l:n = prevnonblank(l:n-1)
-    elseif s:syn_at(l:n,1) =~? s:syng_com
+    elseif getline(l:n) =~ '\([/*]\)\1\@![/*]' && s:syn_at(l:n,1) =~? s:syng_com
       let l:n = s:save_pos('eval',
             \ 'cursor('.l:n.',1) + search(''\m\/\*'',"bW")')
     else
@@ -264,7 +264,8 @@ function GetJavascriptIndent()
   " Get the current line.
   call cursor(v:lnum,1)
   let l:line = getline('.')
-  let syns = s:syn_at(v:lnum, 1)
+  " use synstack as it validates syn state
+  let syns = synIDattr(get(synstack(v:lnum, 1),-1),'name')
 
   " start with strings,comments,etc.
   if syns =~? s:syng_com
@@ -301,8 +302,8 @@ function GetJavascriptIndent()
     let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) &&
           \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum]
     if idx + 1
-      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,top)
-    elseif indent(v:lnum) && syns =~? 'block'
+      call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
+    elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
       call s:GetPair('{','}','bW','s:skip_func()',2000,top)
     else
       call s:alternatePair(top)

From 38c2b557bdba5bf19836048614d94b62a8dd8014 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 10 Feb 2017 18:31:50 -0800
Subject: [PATCH 0735/1043] full syntax check if inside jsx (#844)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 18c99acc..dd472d3e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -243,7 +243,7 @@ function s:IsBlock()
   if s:looking_at() == '{'
     let l:n = line('.')
     let char = s:previous_token()
-    let syn = char =~ '[{>/]' ? s:syn_at(line('.'),col('.')-(char == '{')) : ''
+    let syn = char =~ '[>/]' || match(s:stack,'xml\|jsx') + 1 ? s:syn_at(line('.'),col('.')-1) : ''
     if syn =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
@@ -254,7 +254,7 @@ function s:IsBlock()
     elseif char == ':'
       return getline('.')[col('.')-2] != ':' && s:label_col()
     endif
-    return syn =~? 'regex' || char !~ '[=~!<*,/?^%|&([]' &&
+    return syn =~? 'regex\|special' || char !~ '[=~!<*,/?^%|&([]' &&
           \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
   endif
 endfunction
@@ -264,8 +264,9 @@ function GetJavascriptIndent()
   " Get the current line.
   call cursor(v:lnum,1)
   let l:line = getline('.')
-  " use synstack as it validates syn state
-  let syns = synIDattr(get(synstack(v:lnum, 1),-1),'name')
+  " use synstack as it validates syn state and works in an empty line
+  let s:stack = synstack(v:lnum,1)
+  let syns = synIDattr(get(s:stack,-1),'name')
 
   " start with strings,comments,etc.
   if syns =~? s:syng_com

From 18bc58a0247a439bfac58e741f4b8c80c8fdb39d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 10 Feb 2017 21:00:42 -0800
Subject: [PATCH 0736/1043] refactor isBlock (#846)

tidy code after last commit
---
 indent/javascript.vim | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index dd472d3e..fe02ed80 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -243,18 +243,19 @@ function s:IsBlock()
   if s:looking_at() == '{'
     let l:n = line('.')
     let char = s:previous_token()
-    let syn = char =~ '[>/]' || match(s:stack,'xml\|jsx') + 1 ? s:syn_at(line('.'),col('.')-1) : ''
-    if syn =~? 'xml\|jsx'
+    if match(s:stack,'xml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
       return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof')
             \ ,char) < (line('.') != l:n) || s:previous_token() == '.'
     elseif char == '>'
-      return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
+      return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'
     elseif char == ':'
       return getline('.')[col('.')-2] != ':' && s:label_col()
+    elseif char == '/'
+      return s:syn_at(line('.'),col('.')) =~? 'regex'
     endif
-    return syn =~? 'regex\|special' || char !~ '[=~!<*,/?^%|&([]' &&
+    return char !~ '[=~!<*,?^%|&([]' &&
           \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
   endif
 endfunction

From 9cf48ee3d82932250adf826cc06559ab1ca3fdba Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 12 Feb 2017 00:51:31 -0800
Subject: [PATCH 0737/1043] string group name

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index fe02ed80..e51bfe69 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -49,7 +49,7 @@ endif
 
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!'
-let s:syng_str = 'string\|template'
+let s:syng_str = 'string\|template\|special'
 let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"

From 3bb778ee7a3caef0afd9026a8a58fc3b2a240324 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 14 Feb 2017 18:57:16 -0800
Subject: [PATCH 0738/1043] faster tern col regex (#849)

* faster tern col regex

vim's old regexengine is terribly slow with lookbehinds. otherwise this is equivalent
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e51bfe69..6e41fabc 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -129,7 +129,7 @@ function s:tern_skip(p)
 endfunction
 
 function s:tern_col(p)
-  return s:GetPair('?',':\@<!::\@!','nbW',s:others(a:p)
+  return s:GetPair('?','\%([^:]\|^\)\zs::\@!','nbW',s:others(a:p)
         \ .' || s:tern_skip('.string(a:p).')',200,a:p[0]) > 0
 endfunction
 

From c63905600a0eef4fc31b24a50a1b5e5526e386c4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 15 Feb 2017 01:03:28 -0800
Subject: [PATCH 0739/1043] regex case fixes (#850)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6e41fabc..d067b43e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -149,7 +149,7 @@ endfunction
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
+      \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
 function s:continues(ln,con)
   return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
@@ -243,7 +243,7 @@ function s:IsBlock()
   if s:looking_at() == '{'
     let l:n = line('.')
     let char = s:previous_token()
-    if match(s:stack,'xml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
+    if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
       return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof')
@@ -336,7 +336,7 @@ function GetJavascriptIndent()
       endif
     endif
     if idx < 0 && pline !~ '[{;]$'
-      if pline =~# ':\@<!:$'
+      if pline =~ ':\@<!:$'
         call cursor(l:lnum,strlen(pline))
         let isOp = s:tern_col(b:js_cache[1:2]) * s:W
       else

From e3a0e1f552f14aab1228853c453297e9b883b1e3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 17 Feb 2017 14:24:03 -0800
Subject: [PATCH 0740/1043] ternary algorithm simplified

small improvement to performance, since it isn't a bottleneck, but much more readable and only one function
---
 indent/javascript.vim | 69 +++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d067b43e..8b5e120e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -106,10 +106,8 @@ function s:previous_token()
   if (s:looking_at() !~ '\k' || search('\m\<','cbW')) && search('\m\S','bW')
     if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:n &&
           \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
-      while search('\m\/\ze[/*]','cbW')
-        if !search('\m\S','bW')
-          break
-        elseif s:syn_at(line('.'),col('.')) !~? s:syng_com
+      while search('\m\S\ze\_s*\/[/*]','bW')
+        if s:syn_at(line('.'),col('.')) !~? s:syng_com
           return s:token()
         endif
       endwhile
@@ -120,29 +118,35 @@ function s:previous_token()
   return ''
 endfunction
 
-function s:others(p)
-  return "((line2byte(line('.')) + col('.')) <= ".(line2byte(a:p[0]) + a:p[1]).") || ".s:skip_expr
-endfunction
-
-function s:tern_skip(p)
-  return s:GetPair('{','}','nbW',s:others(a:p),200,a:p[0]) > 0
-endfunction
-
-function s:tern_col(p)
-  return s:GetPair('?','\%([^:]\|^\)\zs::\@!','nbW',s:others(a:p)
-        \ .' || s:tern_skip('.string(a:p).')',200,a:p[0]) > 0
-endfunction
-
-function s:label_col()
-  let pos = getpos('.')[1:2]
-  let [s:looksyn,s:free] = pos
-  call s:alternatePair(0)
-  if s:save_pos('s:IsBlock')
-    let poss = getpos('.')[1:2]
-    return call('cursor',pos) || !s:tern_col(poss)
-  elseif s:looking_at() == ':'
-    return !s:tern_col([0,0])
+function s:expr_col()
+  if getline('.')[col('.')-2] == ':'
+    return 1
   endif
+  let [l:pos,bal] = [getpos('.')[1:2],0]
+  try
+    while search('\m[{}?:;]','bW')
+      if !eval(s:skip_expr)
+        if s:looking_at() == '}'
+          if s:GetPair('{','}','bW',s:skip_expr,200) <= 0
+            return
+          endif
+        elseif s:looking_at() == '{'
+          return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
+        elseif s:looking_at() == ';'
+          return
+        elseif s:looking_at() == ':'
+          let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'
+        else
+          let bal += 1
+          if bal > 0
+            return 1
+          endif
+        endif
+      endif
+    endwhile
+  finally
+    call call('cursor',l:pos)
+  endtry
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -155,8 +159,8 @@ function s:continues(ln,con)
   return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
         \ eval( (['s:syn_at(line("."),col(".")) !~? "regex"'] +
         \ repeat(['getline(".")[col(".")-2] != tr(s:looking_at(),">","=")'],3) +
-        \ repeat(['s:previous_token() != "."'],5) + [1])[
-        \ index(split('/ > - + typeof in instanceof void delete'),s:token())])
+        \ repeat(['s:previous_token() != "."'],5) + ['s:expr_col()',1])[
+        \ index(split('/ > - + typeof in instanceof void delete :'),s:token())])
 endfunction
 
 " get the line of code stripped of comments and move cursor to the last
@@ -251,7 +255,7 @@ function s:IsBlock()
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'
     elseif char == ':'
-      return getline('.')[col('.')-2] != ':' && s:label_col()
+      return !s:expr_col()
     elseif char == '/'
       return s:syn_at(line('.'),col('.')) =~? 'regex'
     endif
@@ -336,12 +340,7 @@ function GetJavascriptIndent()
       endif
     endif
     if idx < 0 && pline !~ '[{;]$'
-      if pline =~ ':\@<!:$'
-        call cursor(l:lnum,strlen(pline))
-        let isOp = s:tern_col(b:js_cache[1:2]) * s:W
-      else
-        let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
-      endif
+      let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif

From 6e8811c32483eec959e6f2981ad870656cd5b4ec Mon Sep 17 00:00:00 2001
From: Albert Mojir <albert.mojir@mobenga.com>
Date: Sat, 18 Feb 2017 02:42:34 +0100
Subject: [PATCH 0741/1043] Enabling spell checking on template strings (#834)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 72c4b3ee..1344e876 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -53,7 +53,7 @@ syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
 syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
+syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateExpression,jsSpecial,@Spell extend
 syntax match   jsTaggedTemplate   /\k\+\%(`\)\@=/ nextgroup=jsTemplateString
 syntax match   jsNumber           /\<\d\+\%([eE][+-]\=\d\+\)\=\>\|\<0[bB][01]\+\>\|\<0[oO]\o\+\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber           Infinity

From 220ce28eed4c1d80798cf500c1ce30ccf995109b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 19 Feb 2017 18:55:38 -0800
Subject: [PATCH 0742/1043] reduce if nesting, isBlock consistency (#853)

---
 indent/javascript.vim | 46 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8b5e120e..77258b08 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -68,15 +68,14 @@ endfunction
 function s:alternatePair(stop)
   let pos = getpos('.')[1:2]
   while search('\m[][(){}]','bW',a:stop)
-    if !s:skip_func()
-      let idx = stridx('])}',s:looking_at())
-      if idx + 1
-        if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0
-          break
-        endif
-      else
-        return
+    if s:skip_func() | continue | endif
+    let idx = stridx('])}',s:looking_at())
+    if idx + 1
+      if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0
+        break
       endif
+    else
+      return
     endif
   endwhile
   call call('cursor',pos)
@@ -125,22 +124,21 @@ function s:expr_col()
   let [l:pos,bal] = [getpos('.')[1:2],0]
   try
     while search('\m[{}?:;]','bW')
-      if !eval(s:skip_expr)
-        if s:looking_at() == '}'
-          if s:GetPair('{','}','bW',s:skip_expr,200) <= 0
-            return
-          endif
-        elseif s:looking_at() == '{'
-          return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
-        elseif s:looking_at() == ';'
+      if eval(s:skip_expr) | continue | endif
+      if s:looking_at() == '}'
+        if s:GetPair('{','}','bW',s:skip_expr,200) <= 0
           return
-        elseif s:looking_at() == ':'
-          let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'
-        else
-          let bal += 1
-          if bal > 0
-            return 1
-          endif
+        endif
+      elseif s:looking_at() == '{'
+        return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
+      elseif s:looking_at() == ';'
+        return
+      elseif s:looking_at() == ':'
+        let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'
+      else
+        let bal += 1
+        if bal > 0
+          return 1
         endif
       endif
     endwhile
@@ -251,7 +249,7 @@ function s:IsBlock()
       return char != '{'
     elseif char =~ '\k'
       return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof')
-            \ ,char) < (line('.') != l:n) || s:previous_token() == '.'
+            \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'
     elseif char == ':'

From 97a8ab46e384306084ceb10425f71f694691bbd7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 20 Feb 2017 17:48:49 -0800
Subject: [PATCH 0743/1043] cino option

we use cindent for multiline comments starting with `*`
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2c51c0ad..2330e52e 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 ## Indentation Specific
 
 * `:h cino-:`
+* `:h cino-star`
 * `:h 'indentkeys'`
 
 ## Contributing

From 7072eb54a744be2a789a501437ae764ab8aaf787 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 21 Feb 2017 00:41:30 -0800
Subject: [PATCH 0744/1043] new operator

if `delete` is an operator, so is `new`
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 77258b08..6e81de97 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -151,14 +151,14 @@ endfunction
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
+      \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\)\)') . '$'
 
 function s:continues(ln,con)
   return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
         \ eval( (['s:syn_at(line("."),col(".")) !~? "regex"'] +
         \ repeat(['getline(".")[col(".")-2] != tr(s:looking_at(),">","=")'],3) +
-        \ repeat(['s:previous_token() != "."'],5) + ['s:expr_col()',1])[
-        \ index(split('/ > - + typeof in instanceof void delete :'),s:token())])
+        \ repeat(['s:previous_token() != "."'],6) + ['s:expr_col()',1])[
+        \ index(split('/ > - + typeof new delete void in instanceof :'),s:token())])
 endfunction
 
 " get the line of code stripped of comments and move cursor to the last

From 3344f13886edf1fcf545d194b889a0bf271bbfd4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 22 Feb 2017 11:21:16 -0800
Subject: [PATCH 0745/1043] more keywords/operators (#854)

* more keywords/operators

* yield doesn't require an expression
---
 indent/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6e81de97..c1307ebb 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -151,14 +151,14 @@ endfunction
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\)\)') . '$'
+      \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
 function s:continues(ln,con)
   return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
         \ eval( (['s:syn_at(line("."),col(".")) !~? "regex"'] +
         \ repeat(['getline(".")[col(".")-2] != tr(s:looking_at(),">","=")'],3) +
-        \ repeat(['s:previous_token() != "."'],6) + ['s:expr_col()',1])[
-        \ index(split('/ > - + typeof new delete void in instanceof :'),s:token())])
+        \ repeat(['s:previous_token() != "."'],7) + ['s:expr_col()',1])[
+        \ index(split('/ > - + typeof new delete void in instanceof await :'),s:token())])
 endfunction
 
 " get the line of code stripped of comments and move cursor to the last
@@ -248,7 +248,7 @@ function s:IsBlock()
     if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
-      return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof')
+      return index(split('return const let import export yield default delete var await void typeof throw case new of in instanceof')
             \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'

From 51e0cc54fa80e2babc60c98bf78ed514fbcaefab Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 23 Feb 2017 10:14:11 -0800
Subject: [PATCH 0746/1043] more likely condition first (#855)

early exit, another small improvement for performance
---
 indent/javascript.vim | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c1307ebb..ff03fb3f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -55,14 +55,13 @@ let s:syng_com = 'comment\|doc'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:skip_func()
-  if !s:free || search('\m`\|\${\|\*\/','nW',s:looksyn)
+  if getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
+    return eval(s:skip_expr)
+  elseif !s:free || search('\m`\|\${\|\*\/','nW',s:looksyn)
     let s:free = !eval(s:skip_expr)
-    let s:looksyn = line('.')
-    return !s:free
   endif
   let s:looksyn = line('.')
-  return getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$' &&
-        \ eval(s:skip_expr)
+  return !s:free
 endfunction
 
 function s:alternatePair(stop)

From f70263dc6fea30814e9031bf9a4eb8c7c665bacc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 23 Feb 2017 21:49:54 -0800
Subject: [PATCH 0747/1043] clean up continues() (#856)

* clean up continues()

slightly less ugly switch

* remove verymagic
---
 indent/javascript.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ff03fb3f..dfb91916 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -154,10 +154,10 @@ let s:continuation = get(g:,'javascript_continuation',
 
 function s:continues(ln,con)
   return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
-        \ eval( (['s:syn_at(line("."),col(".")) !~? "regex"'] +
-        \ repeat(['getline(".")[col(".")-2] != tr(s:looking_at(),">","=")'],3) +
-        \ repeat(['s:previous_token() != "."'],7) + ['s:expr_col()',1])[
-        \ index(split('/ > - + typeof new delete void in instanceof await :'),s:token())])
+        \ eval(['s:syn_at(line("."),col(".")) !~? "regex"',
+        \ 'getline(".")[col(".")-2] != tr(s:looking_at(),">","=")',
+        \ 's:previous_token() != "."','s:expr_col()',1][
+        \ match(matchlist(s:looking_at(),'\(\/\)\|\([-+>]\)\|\(\l\)\|\(:\)')[1:],'.')])
 endfunction
 
 " get the line of code stripped of comments and move cursor to the last

From 23e5fa2044316e0277e8e42ffe427027ac7962b0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 24 Feb 2017 10:48:19 -0800
Subject: [PATCH 0748/1043] fix jsx detection (#857)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index dfb91916..ac8d34cf 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -267,8 +267,8 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   let l:line = getline('.')
   " use synstack as it validates syn state and works in an empty line
-  let s:stack = synstack(v:lnum,1)
-  let syns = synIDattr(get(s:stack,-1),'name')
+  let s:stack = map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
+  let syns = get(s:stack,-1,'')
 
   " start with strings,comments,etc.
   if syns =~? s:syng_com

From 05e17e4d47936955eabb0ad5fca4546c508647be Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 25 Feb 2017 00:03:22 -0800
Subject: [PATCH 0749/1043] if ptoken fails, restore cursor (#858)

* if ptoken fails, restore cursor

* date
---
 indent/javascript.vim | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ac8d34cf..83f85774 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: February 8, 2017
+" Last Change: February 25, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -100,9 +100,9 @@ function s:token()
 endfunction
 
 function s:previous_token()
-  let l:n = line('.')
+  let l:pos = getpos('.')[1:2]
   if (s:looking_at() !~ '\k' || search('\m\<','cbW')) && search('\m\S','bW')
-    if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:n &&
+    if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:pos[0] &&
           \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       while search('\m\S\ze\_s*\/[/*]','bW')
         if s:syn_at(line('.'),col('.')) !~? s:syng_com
@@ -113,6 +113,7 @@ function s:previous_token()
       return s:token()
     endif
   endif
+  call call('cursor',l:pos)
   return ''
 endfunction
 

From 203126daec4000ab7056d784901417fd99622371 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 25 Feb 2017 08:37:04 -0800
Subject: [PATCH 0750/1043] remove quote inaccuracy

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 83f85774..52c3c74c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -278,7 +278,7 @@ function GetJavascriptIndent()
     elseif l:line !~ '^\s*\/[/*]'
       return -1
     endif
-  elseif syns =~? s:syng_str && l:line !~ '^[''"]'
+  elseif syns =~? s:syng_str
     if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
       let b:js_cache[0] = v:lnum
     endif

From 4dc80ee25d0dad91574969548b0137cf1249f4c4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 25 Feb 2017 12:33:49 -0800
Subject: [PATCH 0751/1043] regex explicit case

not needed, since it isn't being used with a internal function, but consistent
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 52c3c74c..5295f2a7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -149,7 +149,7 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
+      \ '\C\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 

From 53c547bbb4f22f493a42c19bf90f71fec6675f3d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 27 Feb 2017 00:50:29 -0800
Subject: [PATCH 0752/1043] extends, isBlock

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5295f2a7..e953f210 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -248,7 +248,7 @@ function s:IsBlock()
     if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
-      return index(split('return const let import export yield default delete var await void typeof throw case new of in instanceof')
+      return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
             \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'

From 6c0bd6505185b52535882aa5bf915a6a4c6c7f0d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 27 Feb 2017 21:19:07 -0800
Subject: [PATCH 0753/1043] cino=( (#860)

* cino=(

* greedy

* cindent combat

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e953f210..b3c1f7a7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -342,6 +342,8 @@ function GetJavascriptIndent()
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
+  elseif num && idx < 0 && s:looking_at() == '(' && &cino =~ '\%(.*(\)\@>0\=\%(,\|$\)'
+    return -(!!search('\S','W',num)) + col('.')
   endif
 
   " main return

From 4b219f6c955cfda8e44ab27ce856892c63f65f26 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 27 Feb 2017 21:26:12 -0800
Subject: [PATCH 0754/1043] doc

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2330e52e..a4850e65 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 
 * `:h cino-:`
 * `:h cino-star`
+* `:h cino-(` (only an empty argument or 0)
 * `:h 'indentkeys'`
 
 ## Contributing

From d1b6d908d336e9842930ae3a8d63337ed1856652 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 28 Feb 2017 08:30:53 -0800
Subject: [PATCH 0755/1043] safer check for paren/cino

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b3c1f7a7..ce0890d0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -342,7 +342,8 @@ function GetJavascriptIndent()
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
-  elseif num && idx < 0 && s:looking_at() == '(' && &cino =~ '\%(.*(\)\@>0\=\%(,\|$\)'
+  elseif num && idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' &&
+        \ &cino =~ '\%(.*(\)\@>0\=\%(,\|$\)'
     return -(!!search('\S','W',num)) + col('.')
   endif
 

From c07c727005699bc4a63ee92d2597d0a2011503fa Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 28 Feb 2017 08:44:02 -0800
Subject: [PATCH 0756/1043] unneeded condition

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ce0890d0..239ecc2f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -342,7 +342,7 @@ function GetJavascriptIndent()
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
-  elseif num && idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' &&
+  elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' &&
         \ &cino =~ '\%(.*(\)\@>0\=\%(,\|$\)'
     return -(!!search('\S','W',num)) + col('.')
   endif

From 5824735cdde2fb217bbc60ebc4de982e65b0f2ef Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 28 Feb 2017 21:50:49 -0800
Subject: [PATCH 0757/1043] cino-b (#861)

---
 README.md             | 1 +
 indent/javascript.vim | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4850e65..a1809e79 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 ## Indentation Specific
 
 * `:h cino-:`
+* `:h cino-b`
 * `:h cino-star`
 * `:h cino-(` (only an empty argument or 0)
 * `:h 'indentkeys'`
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 239ecc2f..3760bea1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -332,7 +332,8 @@ function GetJavascriptIndent()
                 \ ((strlen(cinc[2].cinc[3]) ? str2nr(cinc[2].str2nr(cinc[3][1])) : 10) *
                 \ (cinc[4] is '' ? 1 : s:W)) / 10, -indent(num)])
         endif
-        if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
+        if pline[-1:] != '.' && l:line =~# '^\%(default\|case'
+              \ .(&cino =~# '\%(.*b\)\@>[^0,]' ? '\|break' : '').'\)\>'
           return indent(num) + switch_offset
         endif
       endif

From 6968e93e30e527481f1c5a65083a3ef84b4d7bed Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 1 Mar 2017 19:03:10 -0800
Subject: [PATCH 0758/1043] cino-parsing helper (#862)

cino-parsing helper
full cino-( support
---
 README.md             |  2 +-
 indent/javascript.vim | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index a1809e79..34241d78 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 * `:h cino-:`
 * `:h cino-b`
 * `:h cino-star`
-* `:h cino-(` (only an empty argument or 0)
+* `:h cino-(`
 * `:h 'indentkeys'`
 
 ## Contributing
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3760bea1..36664a24 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -54,6 +54,13 @@ let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
+function s:parse_cino(f)
+  let cin = matchlist(&cino,'.*'.a:f.'\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
+  return cin[0] is '' ? 0 : (cin[1].1) *
+        \ ((strlen(cin[2].cin[3]) ? str2nr(cin[2].str2nr(cin[3][1])) : 10) *
+        \ (cin[4] is '' ? 1 : s:W)) / 10
+endfunction
+
 function s:skip_func()
   if getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
     return eval(s:skip_expr)
@@ -327,13 +334,10 @@ function GetJavascriptIndent()
         if &cino !~ ':'
           let switch_offset = s:W
         else
-          let cinc = matchlist(&cino,'.*:\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
-          let switch_offset = max([cinc[0] is '' ? 0 : (cinc[1].1) *
-                \ ((strlen(cinc[2].cinc[3]) ? str2nr(cinc[2].str2nr(cinc[3][1])) : 10) *
-                \ (cinc[4] is '' ? 1 : s:W)) / 10, -indent(num)])
+          let switch_offset = max([-indent(num),s:parse_cino(':')])
         endif
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case'
-              \ .(&cino =~# '\%(.*b\)\@>[^0,]' ? '\|break' : '').'\)\>'
+              \ .(s:parse_cino('b') ? '\|break' : '').'\)\>'
           return indent(num) + switch_offset
         endif
       endif
@@ -343,9 +347,10 @@ function GetJavascriptIndent()
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
-  elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' &&
-        \ &cino =~ '\%(.*(\)\@>0\=\%(,\|$\)'
-    return -(!!search('\S','W',num)) + col('.')
+  elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
+    let pval = s:parse_cino('(')
+    return !pval ? -(!!search('\S','W',num)) + col('.') : max([indent('.') + pval +
+          \ (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
   endif
 
   " main return

From ab5f29eeef2c68a7e90ed09b26d9a04cc06f85e1 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 1 Mar 2017 19:14:39 -0800
Subject: [PATCH 0759/1043] safe list value

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 36664a24..0d91e86f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -56,7 +56,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_s
 
 function s:parse_cino(f)
   let cin = matchlist(&cino,'.*'.a:f.'\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
-  return cin[0] is '' ? 0 : (cin[1].1) *
+  return get(cin,0,'') is '' ? 0 : (cin[1].1) *
         \ ((strlen(cin[2].cin[3]) ? str2nr(cin[2].str2nr(cin[3][1])) : 10) *
         \ (cin[4] is '' ? 1 : s:W)) / 10
 endfunction

From eb046527420c87b3e160389d2df4a39022af6501 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 1 Mar 2017 19:32:40 -0800
Subject: [PATCH 0760/1043] more c-parse fixes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0d91e86f..720a0e8a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -56,7 +56,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_s
 
 function s:parse_cino(f)
   let cin = matchlist(&cino,'.*'.a:f.'\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
-  return get(cin,0,'') is '' ? 0 : (cin[1].1) *
+  return get(cin,0) =~ '^[-0]*$' ? 0 : (cin[1].1) *
         \ ((strlen(cin[2].cin[3]) ? str2nr(cin[2].str2nr(cin[3][1])) : 10) *
         \ (cin[4] is '' ? 1 : s:W)) / 10
 endfunction

From 73a8a137d8bb224e6f3598ca7bb4a81e6feb61fb Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 2 Mar 2017 13:44:44 -0800
Subject: [PATCH 0761/1043] cino-w (#864)

* cino-w

* don't fail with -1 return
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 720a0e8a..2bcca263 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -349,13 +349,13 @@ function GetJavascriptIndent()
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
-    return !pval ? -(!!search('\S','W',num)) + col('.') : max([indent('.') + pval +
-          \ (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
+    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\S','W',num))) + col('.') :
+          \ max([indent('.') + pval + (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
   endif
 
   " main return
   if idx + 1 || l:line[:1] == '|}'
-    return indent(num)
+    return max([indent(num),0])
   elseif num
     return indent(num) + s:W + switch_offset + bL + isOp
   endif

From 6fad4c536a25ab6ff66a49331790548789c6c953 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 2 Mar 2017 18:39:24 -0800
Subject: [PATCH 0762/1043] document cino-w

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 34241d78..9f2442cc 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 * `:h cino-b`
 * `:h cino-star`
 * `:h cino-(`
+* `:h cino-w`
 * `:h 'indentkeys'`
 
 ## Contributing

From 0f36d47e887606925aeab8556c9601e189532de1 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 2 Mar 2017 19:00:14 -0800
Subject: [PATCH 0763/1043] make search magic

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2bcca263..2634a9f0 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -349,7 +349,7 @@ function GetJavascriptIndent()
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
-    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\S','W',num))) + col('.') :
+    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\m\S','W',num))) + col('.') :
           \ max([indent('.') + pval + (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
   endif
 

From b99793534591158780e8ae313983681a130640b0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 4 Mar 2017 19:53:15 -0800
Subject: [PATCH 0764/1043] optimization in alternatepair() (#867)

* optimization in alternatepair()

* z flag

slightly unrelated, but small

* Update javascript.vim
---
 indent/javascript.vim | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2634a9f0..9f49ab2f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -36,6 +36,10 @@ else
   endfunction
 endif
 
+" Performance for forwards search(): start search at pos rather than masking
+" matches before pos.
+let s:z = has('patch-7.4.984') ? 'z' : ''
+
 " searchpair() wrapper
 if has('reltime')
   function s:GetPair(start,end,flags,skip,time,...)
@@ -64,7 +68,7 @@ endfunction
 function s:skip_func()
   if getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
     return eval(s:skip_expr)
-  elseif !s:free || search('\m`\|\${\|\*\/','nW',s:looksyn)
+  elseif !s:free || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
     let s:free = !eval(s:skip_expr)
   endif
   let s:looksyn = line('.')
@@ -73,9 +77,11 @@ endfunction
 
 function s:alternatePair(stop)
   let pos = getpos('.')[1:2]
-  while search('\m[][(){}]','bW',a:stop)
+  let pat = '[][(){};]'
+  while search('\m'.pat,'bW',a:stop)
     if s:skip_func() | continue | endif
-    let idx = stridx('])}',s:looking_at())
+    let idx = stridx('])};',s:looking_at())
+    if idx is 3 | let pat = '[{}()]' | continue | endif
     if idx + 1
       if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0
         break
@@ -349,7 +355,7 @@ function GetJavascriptIndent()
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
-    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\m\S','W',num))) + col('.') :
+    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\m\S','W'.s:z,num))) + col('.') :
           \ max([indent('.') + pval + (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
   endif
 

From 57c8370457999c29533c2e22b3e735a0f2656a8d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 5 Mar 2017 21:28:04 -0800
Subject: [PATCH 0765/1043] regex in token (#868)

* regex test

* Update javascript.vim

* m

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9f49ab2f..400d67f7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -114,7 +114,7 @@ endfunction
 
 function s:previous_token()
   let l:pos = getpos('.')[1:2]
-  if (s:looking_at() !~ '\k' || search('\m\<','cbW')) && search('\m\S','bW')
+  if search('\m\k\{1,}\zs\k\|\S','bW')
     if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:pos[0] &&
           \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       while search('\m\S\ze\_s*\/[/*]','bW')

From c3892c40a764915c77c914b34dde9c2473f3b9f5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 6 Mar 2017 13:43:33 -0800
Subject: [PATCH 0766/1043] reverse logic,skipfunc (#869)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 400d67f7..eb8cf623 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -68,11 +68,11 @@ endfunction
 function s:skip_func()
   if getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
     return eval(s:skip_expr)
-  elseif !s:free || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
-    let s:free = !eval(s:skip_expr)
+  elseif s:checkIn || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
+    let s:checkIn = eval(s:skip_expr)
   endif
   let s:looksyn = line('.')
-  return !s:free
+  return s:checkIn
 endfunction
 
 function s:alternatePair(stop)
@@ -316,7 +316,7 @@ function GetJavascriptIndent()
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
     call call('cursor',b:js_cache[1:])
   else
-    let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) &&
+    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, (!indent(l:lnum) &&
           \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum]
     if idx + 1
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)

From 1ad5378d6bb275fb99b8a35585c380c05823f77d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 6 Mar 2017 22:26:46 -0800
Subject: [PATCH 0767/1043] cleaning (#870)

* cleaning

* 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 eb8cf623..3e0a2b3d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -348,7 +348,7 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    if idx < 0 && pline !~ '[{;]$'
+    if idx < 0 && pline[-1:] !~ '[{;]'
       let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
@@ -360,7 +360,7 @@ function GetJavascriptIndent()
   endif
 
   " main return
-  if idx + 1 || l:line[:1] == '|}'
+  if l:line =~ '^\%([])}]\||}\)'
     return max([indent(num),0])
   elseif num
     return indent(num) + s:W + switch_offset + bL + isOp

From 44b70ce739c5279c2d2c1f5fe77324eacce2416f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 7 Mar 2017 00:52:48 -0800
Subject: [PATCH 0768/1043] remove pointless format flag (#872)

* remove pointless format flag

* Update README.md
---
 README.md             | 1 -
 indent/javascript.vim | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9f2442cc..47f18609 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,6 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 ## Indentation Specific
 
 * `:h cino-:`
-* `:h cino-b`
 * `:h cino-star`
 * `:h cino-(`
 * `:h cino-w`
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3e0a2b3d..15444d54 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -342,8 +342,7 @@ function GetJavascriptIndent()
         else
           let switch_offset = max([-indent(num),s:parse_cino(':')])
         endif
-        if pline[-1:] != '.' && l:line =~# '^\%(default\|case'
-              \ .(s:parse_cino('b') ? '\|break' : '').'\)\>'
+        if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
           return indent(num) + switch_offset
         endif
       endif

From f92f5814e20afda2f05e851b5bbf7e48fe51beba Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 7 Mar 2017 17:35:21 -0800
Subject: [PATCH 0769/1043] use float support rather than reimplement it (#873)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 15444d54..16386ef3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -59,10 +59,9 @@ let s:syng_com = 'comment\|doc'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:parse_cino(f)
-  let cin = matchlist(&cino,'.*'.a:f.'\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
-  return get(cin,0) =~ '^[-0]*$' ? 0 : (cin[1].1) *
-        \ ((strlen(cin[2].cin[3]) ? str2nr(cin[2].str2nr(cin[3][1])) : 10) *
-        \ (cin[4] is '' ? 1 : s:W)) / 10
+  silent! return float2nr(eval(substitute(substitute(join(split(
+        \ matchstr(&cino,'.*'.a:f.'\zs[^,]*'), 's',1), '*'.s:W)
+        \ , '^-\=\zs\*','',''), '^-\=\zs\.','0.','')))
 endfunction
 
 function s:skip_func()

From 6be84aa6b20ac2e620202700d794bbd792d8176d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 8 Mar 2017 10:01:07 -0800
Subject: [PATCH 0770/1043] alternating balanced() (#874)

* alternating balanced()

* proper escaping

* Update javascript.vim
---
 indent/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 16386ef3..b5da4675 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -212,7 +212,9 @@ function s:Balanced(lnum)
         return
       endif
     endif
-    let pos = match(l:line, '[][(){}]', pos + 1)
+    let pos = match(l:line, (l:open ?
+          \ '['.escape(tr(l:line[pos],'({[]})',')}][{(').l:line[pos],']').']' :
+          \ '[][(){}]'), pos + 1)
   endwhile
   return !l:open
 endfunction

From 40c437fd13d2d3e22145ae2063804a0d53dffdd8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 9 Mar 2017 14:23:43 -0800
Subject: [PATCH 0771/1043] reimplement Trim() (#876)

* reimplement Trim()

uses older version, only, as accurate as the current and faster than what is current
---
 indent/javascript.vim | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b5da4675..7e049208 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -176,9 +176,14 @@ endfunction
 " get the line of code stripped of comments and move cursor to the last
 " non-comment char.
 function s:Trim(ln)
-  call cursor(a:ln+1,1)
-  call s:previous_token()
-  return strpart(getline('.'),0,col('.'))
+  let pline = substitute(getline(a:ln),'\s*$','','')
+  let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
+  while l:max != -1 && s:syn_at(a:ln, strlen(pline)) =~? s:syng_com
+    let pline = pline[: l:max]
+    let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
+    let pline = substitute(pline[:-2],'\s*$','','')
+  endwhile
+  return pline is '' || cursor(a:ln,strlen(pline)) ? pline : pline
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment

From a35306e0a930e5936f29725a4e1eec0f3e04a62f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 9 Mar 2017 23:57:20 -0800
Subject: [PATCH 0772/1043] save_pos instead of try/finally , date (#877)

---
 indent/javascript.vim | 44 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7e049208..d77d38b3 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: February 25, 2017
+" Last Change: March 9, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -133,30 +133,26 @@ function s:expr_col()
   if getline('.')[col('.')-2] == ':'
     return 1
   endif
-  let [l:pos,bal] = [getpos('.')[1:2],0]
-  try
-    while search('\m[{}?:;]','bW')
-      if eval(s:skip_expr) | continue | endif
-      if s:looking_at() == '}'
-        if s:GetPair('{','}','bW',s:skip_expr,200) <= 0
-          return
-        endif
-      elseif s:looking_at() == '{'
-        return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
-      elseif s:looking_at() == ';'
+  let bal = 0
+  while search('\m[{}?:;]','bW')
+    if eval(s:skip_expr) | continue | endif
+    if s:looking_at() == '}'
+      if s:GetPair('{','}','bW',s:skip_expr,200) <= 0
         return
-      elseif s:looking_at() == ':'
-        let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'
-      else
-        let bal += 1
-        if bal > 0
-          return 1
-        endif
       endif
-    endwhile
-  finally
-    call call('cursor',l:pos)
-  endtry
+    elseif s:looking_at() == '{'
+      return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
+    elseif s:looking_at() == ';'
+      return
+    elseif s:looking_at() == ':'
+      let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'
+    else
+      let bal += 1
+      if bal > 0
+        return 1
+      endif
+    endif
+  endwhile
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -272,7 +268,7 @@ function s:IsBlock()
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'
     elseif char == ':'
-      return !s:expr_col()
+      return !s:save_pos('s:expr_col')
     elseif char == '/'
       return s:syn_at(line('.'),col('.')) =~? 'regex'
     endif

From d79de5b4f8ac03f2910f0abbcecc6ab1491f12cc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 10 Mar 2017 20:12:15 -0800
Subject: [PATCH 0773/1043] expr_col switch? (#878)

* expr_col switch?

* Update javascript.vim
---
 indent/javascript.vim | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d77d38b3..3888b11e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -136,22 +136,12 @@ function s:expr_col()
   let bal = 0
   while search('\m[{}?:;]','bW')
     if eval(s:skip_expr) | continue | endif
-    if s:looking_at() == '}'
-      if s:GetPair('{','}','bW',s:skip_expr,200) <= 0
-        return
-      endif
-    elseif s:looking_at() == '{'
-      return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
-    elseif s:looking_at() == ';'
-      return
-    elseif s:looking_at() == ':'
-      let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'
-    else
-      let bal += 1
-      if bal > 0
-        return 1
-      endif
-    endif
+    " switch (looking_at())
+    exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) <= 0 | return | endif",
+          \ ';': "return",
+          \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
+          \ ':': "let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'",
+          \ '?': "let bal += 1 | if bal > 0 | return 1 | endif" }[s:looking_at()]
   endwhile
 endfunction
 

From 95405f8e3c74d2757647aec842e63bd4e2250e7e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 11 Mar 2017 14:49:27 -0800
Subject: [PATCH 0774/1043] shiftwidth() compat (#879)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3888b11e..ae5ee087 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -32,7 +32,7 @@ if exists('*shiftwidth')
   endfunction
 else
   function s:sw()
-    return &sw
+    return &l:shiftwidth == 0 ? &l:tabstop : &l:shiftwidth
   endfunction
 endif
 

From 867f5003882bb6ce7a02d466bd53dd1a6b06782f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 11 Mar 2017 23:08:33 -0800
Subject: [PATCH 0775/1043] remove eval in continues() (#881)

* nicer looking eval expression

* statement (#882)
---
 indent/javascript.vim | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ae5ee087..c38af9ef 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -152,11 +152,19 @@ let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
 function s:continues(ln,con)
-  return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
-        \ eval(['s:syn_at(line("."),col(".")) !~? "regex"',
-        \ 'getline(".")[col(".")-2] != tr(s:looking_at(),">","=")',
-        \ 's:previous_token() != "."','s:expr_col()',1][
-        \ match(matchlist(s:looking_at(),'\(\/\)\|\([-+>]\)\|\(\l\)\|\(:\)')[1:],'.')])
+  if !cursor(a:ln, match(' '.a:con,s:continuation))
+    let teol = s:looking_at()
+    if teol == '/'
+      return s:syn_at(line("."),col(".")) !~? "regex"
+    elseif teol =~ '[-+>]'
+      return getline(".")[col(".")-2] != tr(s:looking_at(),">","=")
+    elseif teol =~ '\l'
+      return s:previous_token() != "."
+    elseif teol == ':'
+      return s:expr_col()
+    endif
+    return 1
+  endif
 endfunction
 
 " get the line of code stripped of comments and move cursor to the last

From d8ffdf71ef56678b1abfef9502857f781cf2908f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 11 Mar 2017 23:54:55 -0800
Subject: [PATCH 0776/1043] remove extra func call

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c38af9ef..efec8c75 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -157,7 +157,7 @@ function s:continues(ln,con)
     if teol == '/'
       return s:syn_at(line("."),col(".")) !~? "regex"
     elseif teol =~ '[-+>]'
-      return getline(".")[col(".")-2] != tr(s:looking_at(),">","=")
+      return getline(".")[col(".")-2] != tr(teol,">","=")
     elseif teol =~ '\l'
       return s:previous_token() != "."
     elseif teol == ':'

From 6007c680e5b72663119fcc2561a3b9b598de2974 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 12 Mar 2017 12:53:51 -0700
Subject: [PATCH 0777/1043] refactor Prevcodeline (#883)

---
 indent/javascript.vim | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index efec8c75..5a73d6d8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -182,21 +182,25 @@ endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
-  let l:n = prevnonblank(a:lnum)
+  let [in_comm,l:n] = [0,prevnonblank(a:lnum)]
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]' 
-      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+      if (stridx(getline(l:n),'`') + 1 || getline(l:n-1)[-1:] == '\') &&
             \ s:syn_at(l:n,1) =~? s:syng_str
-        return l:n
+        break
       endif
-      let l:n = prevnonblank(l:n-1)
-    elseif getline(l:n) =~ '\([/*]\)\1\@![/*]' && s:syn_at(l:n,1) =~? s:syng_com
-      let l:n = s:save_pos('eval',
-            \ 'cursor('.l:n.',1) + search(''\m\/\*'',"bW")')
-    else
-      return l:n
+      let in_comm = 0
+    elseif stridx(getline(l:n), '*/') + 1
+      if s:syn_at(l:n,1) !~? s:syng_com
+        break
+      endif
+      let in_comm = 1
+    elseif !in_comm
+      break
     endif
+    let l:n = prevnonblank(l:n-1)
   endwhile
+  return l:n
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.

From 6c2007980df25763bf867eae25def32b51d5c12e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 12 Mar 2017 14:46:01 -0700
Subject: [PATCH 0778/1043] small fix

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5a73d6d8..4ba18a54 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -195,7 +195,7 @@ function s:PrevCodeLine(lnum)
         break
       endif
       let in_comm = 1
-    elseif !in_comm
+    elseif !in_comm || stridx(getline(l:n), '/*') + 1
       break
     endif
     let l:n = prevnonblank(l:n-1)

From 5ff6d5071fffb560e2ac021e51a217448f1c48de Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 13 Mar 2017 11:37:56 -0700
Subject: [PATCH 0779/1043] more prevcodeline improving (#884)

* more prevcodeline improving
---
 indent/javascript.vim | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4ba18a54..fc6bdf97 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -182,24 +182,19 @@ endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
-  let [in_comm,l:n] = [0,prevnonblank(a:lnum)]
+  let [l:pos, l:n] = [getpos('.')[1:2], prevnonblank(a:lnum)]
   while l:n
-    if getline(l:n) =~ '^\s*\/[/*]' 
-      if (stridx(getline(l:n),'`') + 1 || getline(l:n-1)[-1:] == '\') &&
-            \ s:syn_at(l:n,1) =~? s:syng_str
-        break
-      endif
-      let in_comm = 0
-    elseif stridx(getline(l:n), '*/') + 1
-      if s:syn_at(l:n,1) !~? s:syng_com
-        break
-      endif
-      let in_comm = 1
-    elseif !in_comm || stridx(getline(l:n), '/*') + 1
+    if getline(l:n) =~ '^\s*\/[/*]'
+      let l:n = prevnonblank(l:n-1)
+    elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
+      call cursor(l:n,1)
+      keepjumps norm! [*
+      let l:n = search('\m\S','nbW')
+    else
       break
     endif
-    let l:n = prevnonblank(l:n-1)
   endwhile
+  call call('cursor',l:pos)
   return l:n
 endfunction
 

From a2259d32be59951c463aca73fbb8416f74734e82 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 13 Mar 2017 15:58:29 -0700
Subject: [PATCH 0780/1043] flow type ob (#886)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index fc6bdf97..552aa8a9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -260,7 +260,7 @@ function s:IsBlock()
     if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
-      return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
+      return index(split('return const let import export extends yield default delete var await void type typeof throw case new of in instanceof')
             \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'

From 688d34b2e9dd0a6bc3c1c3d7ead27af3c2504c78 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 13 Mar 2017 17:50:45 -0700
Subject: [PATCH 0781/1043] fix type as identifier (#887)

* fix type as identifier
---
 indent/javascript.vim | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 552aa8a9..21ac60e3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -260,7 +260,10 @@ function s:IsBlock()
     if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
       return char != '{'
     elseif char =~ '\k'
-      return index(split('return const let import export extends yield default delete var await void type typeof throw case new of in instanceof')
+      if char ==# 'type'
+        return s:previous_token() !~# '^\%(im\|ex\)port$'
+      endif
+      return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
             \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'

From 1f9e29243c82252c72598e5c425e7f27410943e5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 14 Mar 2017 07:22:03 -0700
Subject: [PATCH 0782/1043] Onescope() refining (#889)

* Onescope() refining

* Update javascript.vim
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 21ac60e3..e717401e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -221,11 +221,11 @@ function s:OneScope(lnum)
   let pline = s:Trim(a:lnum)
   let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
-    call s:previous_token()
-    let kw = 'for if let while with'
-    if index(split('await each'),s:token()) + 1
+    if s:previous_token() =~# '^\%(await\|each\)$'
       call s:previous_token()
       let kw = 'for'
+    else
+      let kw = 'for if let while with'
     endif
   endif
   return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&

From 2ad6da79172180d0c1adeea4765445dc587dd2c6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 14 Mar 2017 19:23:04 -0700
Subject: [PATCH 0783/1043] small code style fixes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e717401e..7b457dde 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -58,8 +58,8 @@ let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
-function s:parse_cino(f)
-  silent! return float2nr(eval(substitute(substitute(join(split(
+function s:parse_cino(f) abort
+  return float2nr(eval(substitute(substitute(join(split(
         \ matchstr(&cino,'.*'.a:f.'\zs[^,]*'), 's',1), '*'.s:W)
         \ , '^-\=\zs\*','',''), '^-\=\zs\.','0.','')))
 endfunction
@@ -155,11 +155,11 @@ function s:continues(ln,con)
   if !cursor(a:ln, match(' '.a:con,s:continuation))
     let teol = s:looking_at()
     if teol == '/'
-      return s:syn_at(line("."),col(".")) !~? "regex"
+      return s:syn_at(line('.'),col('.')) !~? 'regex'
     elseif teol =~ '[-+>]'
-      return getline(".")[col(".")-2] != tr(teol,">","=")
+      return getline('.')[col('.')-2] != tr(teol,'>','=')
     elseif teol =~ '\l'
-      return s:previous_token() != "."
+      return s:previous_token() != '.'
     elseif teol == ':'
       return s:expr_col()
     endif

From e79107b49497fce9be06cedb94a9084be7988e7c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 15 Mar 2017 00:57:03 -0700
Subject: [PATCH 0784/1043] add small note about testing in shell (#890)

* add small note about testing in shell

* remove lines containing only blanks from diff

If you use OS X you need to `brew install diffutils` or this won't work
---
 indent/javascript.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7b457dde..c3bbfcc2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -14,6 +14,10 @@ let b:did_indent = 1
 setlocal indentexpr=GetJavascriptIndent()
 setlocal autoindent nolisp nosmartindent
 setlocal indentkeys+=0],0)
+" Testable with something like:
+" vim  -eNs "+filetype plugin indent on" "+syntax on" "+set ft=javascript" \
+"	"+norm! gg=G" '+%print' '+:q!' testfile.js \
+"	| diff -uBZ testfile.js -
 
 let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 

From 66926238838664765177d89dea940641863e90f3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 15 Mar 2017 23:45:04 -0700
Subject: [PATCH 0785/1043] replace tabs shell comment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c3bbfcc2..faa20566 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -16,8 +16,8 @@ setlocal autoindent nolisp nosmartindent
 setlocal indentkeys+=0],0)
 " Testable with something like:
 " vim  -eNs "+filetype plugin indent on" "+syntax on" "+set ft=javascript" \
-"	"+norm! gg=G" '+%print' '+:q!' testfile.js \
-"	| diff -uBZ testfile.js -
+"       "+norm! gg=G" '+%print' '+:q!' testfile.js \
+"       | diff -uBZ testfile.js -
 
 let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 

From 4a442bade3b01d6f5fdd3b44009795307e69ad90 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 21 Mar 2017 10:22:10 -0700
Subject: [PATCH 0786/1043] virtual (#894)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index faa20566..cb676aa6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -360,7 +360,7 @@ function GetJavascriptIndent()
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
-    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\m\S','W'.s:z,num))) + col('.') :
+    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\m\S','W'.s:z,num))) + virtcol('.') :
           \ max([indent('.') + pval + (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
   endif
 

From 015004855c4dee3f2d8fb3e434d06b9f4bc0c5d5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 22 Mar 2017 10:06:21 -0700
Subject: [PATCH 0787/1043] case

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cb676aa6..e803bc5f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -64,7 +64,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_s
 
 function s:parse_cino(f) abort
   return float2nr(eval(substitute(substitute(join(split(
-        \ matchstr(&cino,'.*'.a:f.'\zs[^,]*'), 's',1), '*'.s:W)
+        \ matchstr(&cino,'\C.*'.a:f.'\zs[^,]*'), 's',1), '*'.s:W)
         \ , '^-\=\zs\*','',''), '^-\=\zs\.','0.','')))
 endfunction
 

From 289eca381672783ff942c48e9d5077fc33eed636 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 22 Mar 2017 17:45:03 -0700
Subject: [PATCH 0788/1043] use search() 'e' flag to simplify regex

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e803bc5f..ef760c46 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -117,7 +117,7 @@ endfunction
 
 function s:previous_token()
   let l:pos = getpos('.')[1:2]
-  if search('\m\k\{1,}\zs\k\|\S','bW')
+  if search('\m\k\{1,}\|\S','ebW')
     if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:pos[0] &&
           \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       while search('\m\S\ze\_s*\/[/*]','bW')

From d87476f300680b035cfedfe8ccd83f20a57e55db Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 23 Mar 2017 08:50:08 -0700
Subject: [PATCH 0789/1043] simplify balance optimization (#897)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ef760c46..00ce0250 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -215,7 +215,7 @@ function s:Balanced(lnum)
       endif
     endif
     let pos = match(l:line, (l:open ?
-          \ '['.escape(tr(l:line[pos],'({[]})',')}][{(').l:line[pos],']').']' :
+          \ '['.matchstr(['][','()','{}'],l:line[pos]).']' :
           \ '[][(){}]'), pos + 1)
   endwhile
   return !l:open

From 0034e332bd34b544e337c7b58a396575c454bbeb Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 24 Mar 2017 10:16:32 -0700
Subject: [PATCH 0790/1043] strpart instead of substrings,date (#898)

* strpart instead of substrings,date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 00ce0250..d0b01dff 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: March 9, 2017
+" Last Change: March 23, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -79,12 +79,11 @@ function s:skip_func()
 endfunction
 
 function s:alternatePair(stop)
-  let pos = getpos('.')[1:2]
-  let pat = '[][(){};]'
+  let [pos, pat, l:for] = [getpos('.')[1:2], '[][(){};]', 3]
   while search('\m'.pat,'bW',a:stop)
     if s:skip_func() | continue | endif
     let idx = stridx('])};',s:looking_at())
-    if idx is 3 | let pat = '[{}()]' | continue | endif
+    if idx is 3 | let l:for -= 1 | let pat = !l:for ? '[{}]' : '[{}();]' | continue | endif
     if idx + 1
       if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0
         break
@@ -118,7 +117,7 @@ endfunction
 function s:previous_token()
   let l:pos = getpos('.')[1:2]
   if search('\m\k\{1,}\|\S','ebW')
-    if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:pos[0] &&
+    if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[0] &&
           \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       while search('\m\S\ze\_s*\/[/*]','bW')
         if s:syn_at(line('.'),col('.')) !~? s:syng_com
@@ -144,7 +143,7 @@ function s:expr_col()
     exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) <= 0 | return | endif",
           \ ';': "return",
           \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
-          \ ':': "let bal -= getline('.')[max([col('.')-2,0]):col('.')] !~ '::'",
+          \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
           \ '?': "let bal += 1 | if bal > 0 | return 1 | endif" }[s:looking_at()]
   endwhile
 endfunction

From afe6b8bf2bbdd7c293c47e2a06dcc4a24589e225 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 25 Mar 2017 14:28:03 -0700
Subject: [PATCH 0791/1043] do while; experiment (#899)

* do while; experiment

* Update javascript.vim
---
 indent/javascript.vim | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d0b01dff..a42e539a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -232,7 +232,25 @@ function s:OneScope(lnum)
     endif
   endif
   return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&
-        \ s:save_pos('s:previous_token') != '.'
+        \ s:save_pos('s:previous_token') != '.' && !s:save_pos('s:doWhile')
+endfunction
+
+function s:doWhile()
+  if expand('<cword>') ==# 'while'
+    call search('\m\<','cbW')
+    let bal = 0
+    while search('\m\C[{}]\|\<\%(do\|while\)\>','bW',b:js_cache[1])
+      if eval(s:skip_expr) | continue | endif
+      " switch (token())
+      exe get({'}': "if s:GetPair('{','}','bW',s:skip_expr,200) <= 0 | return | endif",
+            \  '{': "return",
+            \  'do': "let bal += s:save_pos('s:IsBlock',1)"}, s:token(),
+            \        "let bal -= s:save_pos('s:previous_token') != '.'")
+      if bal > 0
+        return 1
+      endif
+    endwhile
+  endif
 endfunction
 
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
@@ -256,8 +274,8 @@ function s:iscontOne(i,num,cont)
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
-function s:IsBlock()
-  if s:looking_at() == '{'
+function s:IsBlock(...)
+  if a:0 || s:looking_at() == '{'
     let l:n = line('.')
     let char = s:previous_token()
     if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'

From 90cf82a9fbcb8f45ce0839cb88df7b1a0e355bd7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 25 Mar 2017 22:00:47 -0700
Subject: [PATCH 0792/1043] Remove a call to trim() in Onescope (#900)

* Remove a call to trim() in Onescope

* date, line length
---
 indent/javascript.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a42e539a..dd591021 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: March 23, 2017
+" Last Change: March 25, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -170,8 +170,6 @@ function s:continues(ln,con)
   endif
 endfunction
 
-" get the line of code stripped of comments and move cursor to the last
-" non-comment char.
 function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
   let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
@@ -180,7 +178,7 @@ function s:Trim(ln)
     let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
     let pline = substitute(pline[:-2],'\s*$','','')
   endwhile
-  return pline is '' || cursor(a:ln,strlen(pline)) ? pline : pline
+  return pline
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
@@ -220,8 +218,9 @@ function s:Balanced(lnum)
   return !l:open
 endfunction
 
-function s:OneScope(lnum)
-  let pline = s:Trim(a:lnum)
+function s:OneScope(lnum,...)
+  let pline = a:0 ? a:1 : s:Trim(a:lnum)
+  call cursor(a:lnum,strlen(pline))
   let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
     if s:previous_token() =~# '^\%(await\|each\)$'
@@ -256,12 +255,13 @@ endfunction
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
 " lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
 " a continued expression, which could have started in a braceless context
-function s:iscontOne(i,num,cont)
+function s:iscontOne(i,num,cont,cached)
   let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
   let pind = a:num ? indent(l:num) + s:W : 0
   let ind = indent(l:i) + (a:cont ? 0 : s:W)
   while l:i >= l:num && (ind > pind || l:i == l:num)
-    if indent(l:i) < ind && s:OneScope(l:i)
+    if indent(l:i) < ind &&
+          \ call('s:OneScope',[l:i] + (l:i == a:i ? [a:cached] : []))
       let bL += s:W
       let l:i = line('.')
     elseif !a:cont || bL || ind < indent(a:i)
@@ -356,7 +356,7 @@ function GetJavascriptIndent()
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
   if !num || s:IsBlock()
     let ilnum = line('.')
-    let pline = s:save_pos('s:Trim',l:lnum)
+    let pline = s:Trim(l:lnum)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
       let num = ilnum == num ? line('.') : num
       if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
@@ -372,7 +372,7 @@ function GetJavascriptIndent()
     endif
     if idx < 0 && pline[-1:] !~ '[{;]'
       let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
-      let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
+      let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp,pline)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('

From a24f345f47703d957742275d0525e83b68e83b40 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 26 Mar 2017 11:32:47 -0700
Subject: [PATCH 0793/1043] dot isblock

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index dd591021..eba6c6de 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -293,7 +293,7 @@ function s:IsBlock(...)
     elseif char == '/'
       return s:syn_at(line('.'),col('.')) =~? 'regex'
     endif
-    return char !~ '[=~!<*,?^%|&([]' &&
+    return char !~ '[=~!<*,.?^%|&([]' &&
           \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
   endif
 endfunction

From fac43e7d2dac3b22e0aa175dd7e9b1661d38e2d7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 29 Mar 2017 23:09:15 -0700
Subject: [PATCH 0794/1043] explicit match of cino parse (#902)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index eba6c6de..12d7d674 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -64,8 +64,8 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_s
 
 function s:parse_cino(f) abort
   return float2nr(eval(substitute(substitute(join(split(
-        \ matchstr(&cino,'\C.*'.a:f.'\zs[^,]*'), 's',1), '*'.s:W)
-        \ , '^-\=\zs\*','',''), '^-\=\zs\.','0.','')))
+        \ matchstr(&cino,'\C.*'.a:f.'\zs-\=\d*\%(\.\d\+\)\=s\=')
+        \ , 's',1), '*'.s:W), '^-\=\zs\*','',''), '^-\=\zs\.','0.','')))
 endfunction
 
 function s:skip_func()

From d2bc31992292b9fc6c3b1d30a94b15f9d5f4c1fe Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 30 Mar 2017 20:23:31 -0700
Subject: [PATCH 0795/1043] more pattern simplifications (#903)

* more pattern simplifications

* Update javascript.vim
---
 indent/javascript.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 12d7d674..e9011401 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -118,7 +118,7 @@ function s:previous_token()
   let l:pos = getpos('.')[1:2]
   if search('\m\k\{1,}\|\S','ebW')
     if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[0] &&
-          \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
+          \ getline('.')[:col('.')-1] =~ '\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       while search('\m\S\ze\_s*\/[/*]','bW')
         if s:syn_at(line('.'),col('.')) !~? s:syng_com
           return s:token()
@@ -287,7 +287,7 @@ function s:IsBlock(...)
       return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
             \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
-      return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'
+      return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow'
     elseif char == ':'
       return !s:save_pos('s:expr_col')
     elseif char == '/'
@@ -382,7 +382,7 @@ function GetJavascriptIndent()
   endif
 
   " main return
-  if l:line =~ '^\%([])}]\||}\)'
+  if l:line =~ '^[])}]\|^|}'
     return max([indent(num),0])
   elseif num
     return indent(num) + s:W + switch_offset + bL + isOp

From 3530116b522bea57c9f09d800aa4435c55153c76 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 31 Mar 2017 15:38:55 -0700
Subject: [PATCH 0796/1043] builtin optimization, fail condition (#904)

* builtin optimization, fail condition

* Update javascript.vim
---
 indent/javascript.vim | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e9011401..7e493b7c 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: March 25, 2017
+" Last Change: March 31, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -83,9 +83,13 @@ function s:alternatePair(stop)
   while search('\m'.pat,'bW',a:stop)
     if s:skip_func() | continue | endif
     let idx = stridx('])};',s:looking_at())
-    if idx is 3 | let l:for -= 1 | let pat = !l:for ? '[{}]' : '[{}();]' | continue | endif
-    if idx + 1
-      if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0
+    if idx is 3
+      if l:for is 1
+        return s:GetPair('{','}','bW','s:skip_func()',2000,a:stop) > 0 || call('cursor',pos)
+      endif
+      let [pat, l:for] = ['[{}();]', l:for - 1]
+    elseif idx + 1
+      if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) < 1
         break
       endif
     else
@@ -140,7 +144,7 @@ function s:expr_col()
   while search('\m[{}?:;]','bW')
     if eval(s:skip_expr) | continue | endif
     " switch (looking_at())
-    exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) <= 0 | return | endif",
+    exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
           \ ';': "return",
           \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
           \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
@@ -241,7 +245,7 @@ function s:doWhile()
     while search('\m\C[{}]\|\<\%(do\|while\)\>','bW',b:js_cache[1])
       if eval(s:skip_expr) | continue | endif
       " switch (token())
-      exe get({'}': "if s:GetPair('{','}','bW',s:skip_expr,200) <= 0 | return | endif",
+      exe get({'}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
             \  '{': "return",
             \  'do': "let bal += s:save_pos('s:IsBlock',1)"}, s:token(),
             \        "let bal -= s:save_pos('s:previous_token') != '.'")

From 63355ea7006b8b5690a9dcbc25dad4f226ba1eef Mon Sep 17 00:00:00 2001
From: Gerald <gera2ld@163.com>
Date: Sat, 1 Apr 2017 17:00:39 +0800
Subject: [PATCH 0797/1043] fix: add jsImport and jsExport to htmlJavaScript
 (#906)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 1344e876..e0b8a6dd 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -238,7 +238,7 @@ if exists("javascript_plugin_flow")
 endif
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsNoise,,jsBlockLabel
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsNoise,jsBlockLabel
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -382,7 +382,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 endif
 
 " Define the htmlJavaScript for HTML syntax html.vim
-syntax cluster  htmlJavaScript       contains=@jsAll
+syntax cluster  htmlJavaScript       contains=@jsAll,jsImport,jsExport
 syntax cluster  javaScriptExpression contains=@jsAll
 
 " Vim's default html.vim highlights all javascript as 'Special'

From 8e51618baec5de83d39e20bd0046b9c0c480dee7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 1 Apr 2017 19:29:34 -0700
Subject: [PATCH 0798/1043] fix embedded js (#907)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7e493b7c..6c58154f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -163,8 +163,10 @@ function s:continues(ln,con)
     let teol = s:looking_at()
     if teol == '/'
       return s:syn_at(line('.'),col('.')) !~? 'regex'
-    elseif teol =~ '[-+>]'
-      return getline('.')[col('.')-2] != tr(teol,'>','=')
+    elseif teol == '>'
+      return getline('.')[col('.')-2] != '=' && s:syn_at(line('.'),col('.')) !~? '^html'
+    elseif teol =~ '[-+]'
+      return getline('.')[col('.')-2] != teol
     elseif teol =~ '\l'
       return s:previous_token() != '.'
     elseif teol == ':'
@@ -291,7 +293,7 @@ function s:IsBlock(...)
       return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
             \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
-      return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow'
+      return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
     elseif char == ':'
       return !s:save_pos('s:expr_col')
     elseif char == '/'
@@ -347,6 +349,9 @@ function GetJavascriptIndent()
           \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum]
     if idx + 1
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
+    elseif getline(v:lnum) !~ '^\S' && syns ==# 'javaScript' && &indentexpr =~? '^html' &&
+          \ search('\m\c^\s*<\s*script\>.*>\s*$','bW')
+      let inhtml = 1
     elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
       call s:GetPair('{','}','bW','s:skip_func()',2000,top)
     else
@@ -358,7 +363,7 @@ function GetJavascriptIndent()
   let num = b:js_cache[1]
 
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
-  if !num || s:IsBlock()
+  if !num || exists('inhtml') || s:IsBlock()
     let ilnum = line('.')
     let pline = s:Trim(l:lnum)
     if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0

From 1e4ec0aafd501f3d245590a4728966bc96567420 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 1 Apr 2017 19:43:41 -0700
Subject: [PATCH 0799/1043] also disregard flow bracket as operator

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6c58154f..1ffc2601 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -164,7 +164,7 @@ function s:continues(ln,con)
     if teol == '/'
       return s:syn_at(line('.'),col('.')) !~? 'regex'
     elseif teol == '>'
-      return getline('.')[col('.')-2] != '=' && s:syn_at(line('.'),col('.')) !~? '^html'
+      return getline('.')[col('.')-2] != '=' && s:syn_at(line('.'),col('.')) !~? 'jsflow\|^html'
     elseif teol =~ '[-+]'
       return getline('.')[col('.')-2] != teol
     elseif teol =~ '\l'

From ac4efdca05a1c35b40cd52f3c70e453462a8492c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 01:50:54 -0700
Subject: [PATCH 0800/1043] indenting for first line after script tag (#908)

this is a indent/html.vim script variable, not needed with this script
---
 indent/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1ffc2601..7248c7d6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -351,6 +351,7 @@ function GetJavascriptIndent()
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
     elseif getline(v:lnum) !~ '^\S' && syns ==# 'javaScript' && &indentexpr =~? '^html' &&
           \ search('\m\c^\s*<\s*script\>.*>\s*$','bW')
+      let b:hi_js1indent = 'GetJavascriptIndent()'
       let inhtml = 1
     elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
       call s:GetPair('{','}','bW','s:skip_func()',2000,top)

From 87ecc87428c7ce7abd7d2fbd72dc97cae397bc1d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 08:41:48 -0700
Subject: [PATCH 0801/1043] fix html without pangloss repo syntax file (#909)

* fix html without pangloss repo syntax file

* remove search

* Update javascript.vim

* Update javascript.vim
---
 indent/javascript.vim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7248c7d6..6233de6f 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -345,14 +345,14 @@ function GetJavascriptIndent()
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
     call call('cursor',b:js_cache[1:])
   else
-    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, (!indent(l:lnum) &&
-          \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum]
+    if &indentexpr =~? '^html'
+      let b:hi_js1indent = 'GetJavascriptIndent()'
+      let l:scriptTag = b:hi_indent.blocklnr
+    endif
+    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, max([get(l:,'scriptTag'),
+          \ (!indent(l:lnum) && s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum])]
     if idx + 1
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
-    elseif getline(v:lnum) !~ '^\S' && syns ==# 'javaScript' && &indentexpr =~? '^html' &&
-          \ search('\m\c^\s*<\s*script\>.*>\s*$','bW')
-      let b:hi_js1indent = 'GetJavascriptIndent()'
-      let inhtml = 1
     elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
       call s:GetPair('{','}','bW','s:skip_func()',2000,top)
     else
@@ -360,14 +360,14 @@ function GetJavascriptIndent()
     endif
   endif
 
-  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [get(l:,'scriptTag'),0] : getpos('.')[1:2])
   let num = b:js_cache[1]
 
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
-  if !num || exists('inhtml') || s:IsBlock()
+  if !b:js_cache[2] || s:IsBlock()
     let ilnum = line('.')
     let pline = s:Trim(l:lnum)
-    if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+    if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
       let num = ilnum == num ? line('.') : num
       if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
         if &cino !~ ':'

From 10f71931a766eeb6bf7e5917e946b7a416925b4b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 08:50:35 -0700
Subject: [PATCH 0802/1043] don't move to scriptTag

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6233de6f..e747612a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -343,7 +343,9 @@ function GetJavascriptIndent()
   let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
-    call call('cursor',b:js_cache[1:])
+    if b:js_cache[2]
+      call call('cursor',b:js_cache[1:])
+    endif
   else
     if &indentexpr =~? '^html'
       let b:hi_js1indent = 'GetJavascriptIndent()'

From 3ca2f636df2670fa86c2bda843b502dbe6a16080 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 08:55:15 -0700
Subject: [PATCH 0803/1043] fix, keep cache valid in tag

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e747612a..2ef0075d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -345,6 +345,8 @@ function GetJavascriptIndent()
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
     if b:js_cache[2]
       call call('cursor',b:js_cache[1:])
+    elseif b:js_cache[1]
+      let l:scriptTag = b:js_cache[1]
     endif
   else
     if &indentexpr =~? '^html'

From bea0e20963c7e4557a30563d059c503360197d1e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 10:39:21 -0700
Subject: [PATCH 0804/1043] change buffer variable for html

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2ef0075d..0aaeda65 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -10,6 +10,9 @@ if exists('b:did_indent')
 endif
 let b:did_indent = 1
 
+" indent correctly if inside <script>
+let b:html_indent_script1 = 'inc'
+
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
 setlocal autoindent nolisp nosmartindent
@@ -350,7 +353,6 @@ function GetJavascriptIndent()
     endif
   else
     if &indentexpr =~? '^html'
-      let b:hi_js1indent = 'GetJavascriptIndent()'
       let l:scriptTag = b:hi_indent.blocklnr
     endif
     let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, max([get(l:,'scriptTag'),

From 4e64bcff97435b540c1318ec0b49f66f6e0db680 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 13:09:18 -0700
Subject: [PATCH 0805/1043] cleaner limiting in html

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0aaeda65..b18cf391 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -343,19 +343,15 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
+  let l:scriptTag = &indentexpr =~? '^html' ? b:hi_indent.blocklnr : 0
   let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
     if b:js_cache[2]
       call call('cursor',b:js_cache[1:])
-    elseif b:js_cache[1]
-      let l:scriptTag = b:js_cache[1]
     endif
   else
-    if &indentexpr =~? '^html'
-      let l:scriptTag = b:hi_indent.blocklnr
-    endif
-    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, max([get(l:,'scriptTag'),
+    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, max([l:scriptTag,
           \ (!indent(l:lnum) && s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum])]
     if idx + 1
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
@@ -366,7 +362,7 @@ function GetJavascriptIndent()
     endif
   endif
 
-  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [get(l:,'scriptTag'),0] : getpos('.')[1:2])
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [l:scriptTag,0] : getpos('.')[1:2])
   let num = b:js_cache[1]
 
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]

From b954ab478019598e1a1a78e3f1701a44ef1bde19 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 13:16:19 -0700
Subject: [PATCH 0806/1043] ternary assignment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b18cf391..99783370 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -372,11 +372,7 @@ function GetJavascriptIndent()
     if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
       let num = ilnum == num ? line('.') : num
       if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
-        if &cino !~ ':'
-          let switch_offset = s:W
-        else
-          let switch_offset = max([-indent(num),s:parse_cino(':')])
-        endif
+        let switch_offset = &cino !~ ':' ? s:W : max([-indent(num),s:parse_cino(':')])
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
           return indent(num) + switch_offset
         endif

From 9cbe46c4aabcc4018fb04e677271797b1767a96b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 15:06:26 -0700
Subject: [PATCH 0807/1043] limit expr_col

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 99783370..1159bd87 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -144,7 +144,7 @@ function s:expr_col()
     return 1
   endif
   let bal = 0
-  while search('\m[{}?:;]','bW')
+  while search('\m[{}?:;]','bW',s:scriptTag+1)
     if eval(s:skip_expr) | continue | endif
     " switch (looking_at())
     exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
@@ -343,7 +343,7 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  let l:scriptTag = &indentexpr =~? '^html' ? b:hi_indent.blocklnr : 0
+  let s:scriptTag = &indentexpr =~? '^html' ? b:hi_indent.blocklnr : 0
   let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
@@ -351,7 +351,7 @@ function GetJavascriptIndent()
       call call('cursor',b:js_cache[1:])
     endif
   else
-    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, max([l:scriptTag,
+    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, max([s:scriptTag,
           \ (!indent(l:lnum) && s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum])]
     if idx + 1
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
@@ -362,7 +362,7 @@ function GetJavascriptIndent()
     endif
   endif
 
-  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [l:scriptTag,0] : getpos('.')[1:2])
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:scriptTag,0] : getpos('.')[1:2])
   let num = b:js_cache[1]
 
   let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]

From 8fb55c5bea854eea45817a187f1625f262875128 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Apr 2017 15:09:17 -0700
Subject: [PATCH 0808/1043] minor change to limit

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1159bd87..17e7ddc4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -144,7 +144,7 @@ function s:expr_col()
     return 1
   endif
   let bal = 0
-  while search('\m[{}?:;]','bW',s:scriptTag+1)
+  while search('\m[{}?:;]','bW',s:scriptTag)
     if eval(s:skip_expr) | continue | endif
     " switch (looking_at())
     exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",

From c87bb4345a854a4f06f74366aaa942cad7c5b430 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 4 Apr 2017 00:54:05 -0700
Subject: [PATCH 0809/1043] auto load flow file with comment header (#911)

* auto load flow file with comment header

* shorter regex

* don't move the cursor

* better regex

* very magic
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e0b8a6dd..6ac84d88 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -233,7 +233,7 @@ if exists("javascript_plugin_jsdoc")
   endif
 endif
 
-if exists("javascript_plugin_flow")
+if exists("javascript_plugin_flow") || search('\v\C%^\_s*%(//\s*|/\*[ \t\n*]*)\@flow>','nw')
   runtime extras/flow.vim
 endif
 

From 0cc170159be95b90d0cc2a9fb59385d1f5fe901f Mon Sep 17 00:00:00 2001
From: Sebastian Volland <seb@baunz.net>
Date: Tue, 4 Apr 2017 20:30:39 +0200
Subject: [PATCH 0810/1043] Allow flowtype annotation for arrow func return val

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6ac84d88..823ee9c1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -174,7 +174,7 @@ syntax keyword jsForAwait             contained await skipwhite skipempty nextgr
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
 " Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
+syntax match   jsArrowFuncArgs  /([^()]*)[^()=]*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction               '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')

From b6c00a1943a62ac287189dbc3036227d7f5816a5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 5 Apr 2017 09:37:16 -0700
Subject: [PATCH 0811/1043] move flow detect to ft detect file (#913)

* move flow detect to ft detect file

* remove syntax instance

* Update javascript.vim

* concise match
---
 ftdetect/javascript.vim | 14 ++++++++++----
 syntax/javascript.vim   |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index f42e06f8..9d22bac5 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1,7 +1,13 @@
-au BufNewFile,BufRead *.js setf javascript
-au BufNewFile,BufRead *.jsm setf javascript
-au BufNewFile,BufRead Jakefile setf javascript
-au BufNewFile,BufRead *.es6 setf javascript
+au BufNewFile,BufRead *.{js,jsm,es6},Jakefile setf javascript
+
+fun! s:SourceFlowSyntax()
+  if !exists('javascript_plugin_flow') && !exists('b:flow_active') &&
+        \ search('\v\C%^\_s*%(//\s*|/\*[ \t\n*]*)\@flow>','nw')
+    runtime extras/flow.vim
+    let b:flow_active = 1
+  endif
+endfun
+au FileType javascript au BufRead,BufWritePost <buffer> call s:SourceFlowSyntax()
 
 fun! s:SelectJavascript()
   if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 823ee9c1..fb486e53 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -233,7 +233,7 @@ if exists("javascript_plugin_jsdoc")
   endif
 endif
 
-if exists("javascript_plugin_flow") || search('\v\C%^\_s*%(//\s*|/\*[ \t\n*]*)\@flow>','nw')
+if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 

From 55651ba6daf768fc87a68908c1fb1ae991a19904 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 5 Apr 2017 16:13:15 -0700
Subject: [PATCH 0812/1043] add "es" extension (#916)

https://github.com/vim/vim/blob/master/runtime/filetype.vim#L1019 already in vim proper. still i wonder why people do this
---
 ftdetect/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index 9d22bac5..d481d988 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1,4 +1,4 @@
-au BufNewFile,BufRead *.{js,jsm,es6},Jakefile setf javascript
+au BufNewFile,BufRead *.{js,jsm,es,es6},Jakefile setf javascript
 
 fun! s:SourceFlowSyntax()
   if !exists('javascript_plugin_flow') && !exists('b:flow_active') &&

From 665501ba2fdd08c9241fb4a595339a5a97b24674 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 6 Apr 2017 09:16:57 -0700
Subject: [PATCH 0813/1043] various indent cleanups (#917)

* various indent cleanups

* isBlock: flow Wildcard, cursor consistency

* Update javascript.vim
---
 indent/javascript.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 17e7ddc4..3b83ef91 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -247,7 +247,7 @@ function s:doWhile()
   if expand('<cword>') ==# 'while'
     call search('\m\<','cbW')
     let bal = 0
-    while search('\m\C[{}]\|\<\%(do\|while\)\>','bW',b:js_cache[1])
+    while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
       if eval(s:skip_expr) | continue | endif
       " switch (token())
       exe get({'}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
@@ -291,18 +291,20 @@ function s:IsBlock(...)
       return char != '{'
     elseif char =~ '\k'
       if char ==# 'type'
-        return s:previous_token() !~# '^\%(im\|ex\)port$'
+        return s:save_pos('s:previous_token') !~# '^\%(im\|ex\)port$'
       endif
       return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
             \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
+    elseif char == '*'
+      return s:save_pos('s:previous_token') == ':'
     elseif char == ':'
       return !s:save_pos('s:expr_col')
     elseif char == '/'
       return s:syn_at(line('.'),col('.')) =~? 'regex'
     endif
-    return char !~ '[=~!<*,.?^%|&([]' &&
+    return char !~ '[=~!<,.?^%|&([]' &&
           \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
   endif
 endfunction

From 5e85c21d08057b078f165e92980d7c91c11e60a3 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 12 Apr 2017 14:18:13 -0700
Subject: [PATCH 0814/1043] Adding await to @jsExpression

Fix #919
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index fb486e53..906a20ae 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -237,7 +237,7 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait
 syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsNoise,jsBlockLabel
 
 " Define the default highlighting.

From ff9918c7cb8da4633a52882b3254f662adbd5518 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 12 Apr 2017 14:26:20 -0700
Subject: [PATCH 0815/1043] Fix prototype matching

Fix #915
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 906a20ae..e222f440 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -25,7 +25,7 @@ syntax sync fromstart
 syntax case match
 
 syntax match   jsNoise          /[:,\;]\{1}/
-syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall
+syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype
 syntax match   jsObjectProp     contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/
 syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
 syntax match   jsParensError    /[)}\]]/

From a327247d1f121ed799514706015d65844de707f2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 14 Apr 2017 10:15:28 -0700
Subject: [PATCH 0816/1043] add note

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3b83ef91..fa888864 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -11,6 +11,7 @@ endif
 let b:did_indent = 1
 
 " indent correctly if inside <script>
+" vim/vim@690afe1 for the switch from cindent
 let b:html_indent_script1 = 'inc'
 
 " Now, set up our indentation expression and keys that trigger it.

From d8729f2212d18ad9d7ea9570f183ff321099e825 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 15 Apr 2017 19:51:42 -0700
Subject: [PATCH 0817/1043] string detecting for prevline()

lost in a refactor
---
 indent/javascript.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index fa888864..10607123 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -196,6 +196,10 @@ function s:PrevCodeLine(lnum)
   let [l:pos, l:n] = [getpos('.')[1:2], prevnonblank(a:lnum)]
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]'
+      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+            \ s:syn_at(l:n,1) =~? s:syng_str
+        return l:n
+      endif
       let l:n = prevnonblank(l:n-1)
     elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
       call cursor(l:n,1)

From 1a7a8fc8df65f32babb1eb92bedda91728b86856 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 19 Apr 2017 13:50:25 -0700
Subject: [PATCH 0818/1043] no pos movement, exit correctly in prevline()

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 10607123..733ace43 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -198,7 +198,7 @@ function s:PrevCodeLine(lnum)
     if getline(l:n) =~ '^\s*\/[/*]'
       if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
             \ s:syn_at(l:n,1) =~? s:syng_str
-        return l:n
+        break
       endif
       let l:n = prevnonblank(l:n-1)
     elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com

From 0d7ad9320c061f30fb1beb7b0a07dc4ac492cc9f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 21 Apr 2017 01:06:38 -0700
Subject: [PATCH 0819/1043] better do -> while "switch"

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 733ace43..44305909 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -255,10 +255,10 @@ function s:doWhile()
     while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
       if eval(s:skip_expr) | continue | endif
       " switch (token())
-      exe get({'}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
+      exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
             \  '{': "return",
-            \  'do': "let bal += s:save_pos('s:IsBlock',1)"}, s:token(),
-            \        "let bal -= s:save_pos('s:previous_token') != '.'")
+            \  'd': "let bal += s:save_pos('s:IsBlock',1)",
+            \  'w': "let bal -= s:save_pos('s:previous_token') != '.'" }[s:looking_at()]
       if bal > 0
         return 1
       endif

From 23f5d0ed1ea0599ca6ea78c42fe3660c213c0214 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 21 Apr 2017 01:15:23 -0700
Subject: [PATCH 0820/1043] update comments

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 44305909..16797705 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: March 31, 2017
+" Last Change: April 21, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -254,7 +254,7 @@ function s:doWhile()
     let bal = 0
     while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
       if eval(s:skip_expr) | continue | endif
-      " switch (token())
+      " switch (looking_at())
       exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
             \  '{': "return",
             \  'd': "let bal += s:save_pos('s:IsBlock',1)",

From 5511721b17e6fe46be347d9fc307bd08f9042b46 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 22 Apr 2017 11:02:55 -0700
Subject: [PATCH 0821/1043] compiler header

---
 compiler/eslint.vim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compiler/eslint.vim b/compiler/eslint.vim
index fc60a2a3..7695a072 100644
--- a/compiler/eslint.vim
+++ b/compiler/eslint.vim
@@ -1,3 +1,8 @@
+" Vim compiler plugin
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
+
 if exists("current_compiler")
   finish
 endif

From 021a5ff80e9ca6a0e912941516d7b2e31835f07e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 23 Apr 2017 11:22:38 -0700
Subject: [PATCH 0822/1043] simpler, float less, cino parse (#926)

* simpler, float less, cino parse

* Update javascript.vim
---
 indent/javascript.vim | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 16797705..3117a7ff 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -66,10 +66,12 @@ let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
-function s:parse_cino(f) abort
-  return float2nr(eval(substitute(substitute(join(split(
-        \ matchstr(&cino,'\C.*'.a:f.'\zs-\=\d*\%(\.\d\+\)\=s\=')
-        \ , 's',1), '*'.s:W), '^-\=\zs\*','',''), '^-\=\zs\.','0.','')))
+function s:parse_cino(f)
+  let pv = matchstr(&cino,'\C.*'.a:f.'\zs-\=\d*\%(\.\d\+\)\=s\=')
+  let factor = 1 . repeat(0,strlen(matchstr(pv,'\.\zs\d*')))
+  return eval(substitute(join(split(pv
+            \ , 's',1), '*'.s:W), '^-\=\zs\*\|\.','','g'))
+            \ / factor
 endfunction
 
 function s:skip_func()

From 2c8733ed76d88a4f48353f003529749d0a1bce50 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 24 Apr 2017 11:31:28 -0700
Subject: [PATCH 0823/1043] vim script minify (#924)

* vim script minified, disregard pr

* Update javascript.vim
---
 indent/javascript.vim | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3117a7ff..0da405d3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -147,15 +147,15 @@ function s:expr_col()
     return 1
   endif
   let bal = 0
-  while search('\m[{}?:;]','bW',s:scriptTag)
+  while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
     if eval(s:skip_expr) | continue | endif
     " switch (looking_at())
     exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-          \ ';': "return",
           \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
           \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
-          \ '?': "let bal += 1 | if bal > 0 | return 1 | endif" }[s:looking_at()]
+          \ '?': "let bal += 1" }[s:looking_at()]
   endwhile
+  return max([bal,0])
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -254,17 +254,14 @@ function s:doWhile()
   if expand('<cword>') ==# 'while'
     call search('\m\<','cbW')
     let bal = 0
-    while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
+    while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
       if eval(s:skip_expr) | continue | endif
       " switch (looking_at())
       exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-            \  '{': "return",
             \  'd': "let bal += s:save_pos('s:IsBlock',1)",
             \  'w': "let bal -= s:save_pos('s:previous_token') != '.'" }[s:looking_at()]
-      if bal > 0
-        return 1
-      endif
     endwhile
+    return max([bal,0])
   endif
 endfunction
 

From 3c2923e4310a6100653abf0c957b508b743cf4ca Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 24 Apr 2017 11:45:48 -0700
Subject: [PATCH 0824/1043] dont depend on loop error handling

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0da405d3..e0d3b5cd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -151,6 +151,7 @@ function s:expr_col()
     if eval(s:skip_expr) | continue | endif
     " switch (looking_at())
     exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
+          \ ';': "return",
           \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
           \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
           \ '?': "let bal += 1" }[s:looking_at()]
@@ -258,6 +259,7 @@ function s:doWhile()
       if eval(s:skip_expr) | continue | endif
       " switch (looking_at())
       exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
+            \  '{': "return",
             \  'd': "let bal += s:save_pos('s:IsBlock',1)",
             \  'w': "let bal -= s:save_pos('s:previous_token') != '.'" }[s:looking_at()]
     endwhile

From 145fdc76db723564b0c8553e010140bea26d4641 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 24 Apr 2017 13:52:14 -0700
Subject: [PATCH 0825/1043] script-tag var access (#927)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e0d3b5cd..334646cc 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -351,7 +351,7 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  let s:scriptTag = &indentexpr =~? '^html' ? b:hi_indent.blocklnr : 0
+  let s:scriptTag = get(get(b:,'hi_indent',{}),'blocklnr')
   let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))

From 10492a89d3d16ccf65fb6e0c0938123dcb66d83e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 25 Apr 2017 00:34:04 -0700
Subject: [PATCH 0826/1043] cino-U (#928)

* cino-U

* Update javascript.vim

* Update javascript.vim

* Update javascript.vim

* Update README.md

* Update javascript.vim
---
 README.md             | 1 +
 indent/javascript.vim | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 47f18609..84e75294 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 * `:h cino-star`
 * `:h cino-(`
 * `:h cino-w`
+* `:h cino-U`
 * `:h 'indentkeys'`
 
 ## Contributing
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 334646cc..d5969b6e 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: April 21, 2017
+" Last Change: April 25, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -393,7 +393,8 @@ function GetJavascriptIndent()
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
-    return !pval ? (s:parse_cino('w') ? 0 : -(!!search('\m\S','W'.s:z,num))) + virtcol('.') :
+    return !pval || !search('\S','nbW',line('.')) && !s:parse_cino('U') ?
+          \ (s:parse_cino('w') ? 0 : -(!!search('\m\S','W'.s:z,num))) + virtcol('.') :
           \ max([indent('.') + pval + (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
   endif
 

From 2bca9c6f603a5bcdf6e7494158d178fb48c13f24 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 25 Apr 2017 19:46:52 -0700
Subject: [PATCH 0827/1043] misc fixes, non-critical stuff (#929)

* misc fixes, non-critical stuff

* Update javascript.vim

* Update javascript.vim
---
 indent/javascript.vim | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d5969b6e..6c1efa09 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -69,8 +69,7 @@ let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_s
 function s:parse_cino(f)
   let pv = matchstr(&cino,'\C.*'.a:f.'\zs-\=\d*\%(\.\d\+\)\=s\=')
   let factor = 1 . repeat(0,strlen(matchstr(pv,'\.\zs\d*')))
-  return eval(substitute(join(split(pv
-            \ , 's',1), '*'.s:W), '^-\=\zs\*\|\.','','g'))
+  return eval(substitute(join(split(pv,'s',1), '*'.s:W), '^-\=\zs\*\|\.','','g'))
             \ / factor
 endfunction
 
@@ -393,9 +392,9 @@ function GetJavascriptIndent()
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
-    return !pval || !search('\S','nbW',line('.')) && !s:parse_cino('U') ?
-          \ (s:parse_cino('w') ? 0 : -(!!search('\m\S','W'.s:z,num))) + virtcol('.') :
-          \ max([indent('.') + pval + (s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W),0])
+    return !pval || !search('\m\S','nbW',num) && !s:parse_cino('U') ?
+          \ (s:parse_cino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :
+          \ max([indent('.') + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W,0])
   endif
 
   " main return

From 317125e18deb07f597224c39a39876cda1e4518c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 2 May 2017 00:21:35 -0700
Subject: [PATCH 0828/1043] &cino non-regex (#931)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6c1efa09..ac3cfdcd 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: April 25, 2017
+" Last Change: May 2, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -67,10 +67,28 @@ let s:syng_com = 'comment\|doc'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:parse_cino(f)
-  let pv = matchstr(&cino,'\C.*'.a:f.'\zs-\=\d*\%(\.\d\+\)\=s\=')
-  let factor = 1 . repeat(0,strlen(matchstr(pv,'\.\zs\d*')))
-  return eval(substitute(join(split(pv,'s',1), '*'.s:W), '^-\=\zs\*\|\.','','g'))
-            \ / factor
+  let [cin, divider, n, sign] = [strridx(&cino,a:f), 0, '', 1]
+  if cin == -1
+    return
+  endif
+  let [sign, cstr] = &cino[cin+1] ==# '-' ? [-1, &cino[cin+2:]] : [1, &cino[cin+1:]]
+  for c in split(cstr,'\zs')
+    if c ==# '.' && !divider
+      let divider = 1
+    elseif c ==# 's'
+      if n is ''
+        let n = s:W
+      else
+        let n = n * s:W
+      endif
+      break
+    elseif c =~ '\d'
+      let [n, divider] .= [c, 0]
+    else
+      break
+    endif
+  endfor
+  return sign * n / max([str2nr(divider),1])
 endfunction
 
 function s:skip_func()

From e573aa0b6b5b75e43ab5e7722f26fb4945471d17 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 2 May 2017 02:00:44 -0700
Subject: [PATCH 0829/1043] unneeded var declare (#932)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ac3cfdcd..a1bde073 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -67,7 +67,7 @@ let s:syng_com = 'comment\|doc'
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
 function s:parse_cino(f)
-  let [cin, divider, n, sign] = [strridx(&cino,a:f), 0, '', 1]
+  let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
   if cin == -1
     return
   endif

From 45d092f65b318e7a6a6c3725d434370f700aed92 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 2 May 2017 02:16:59 -0700
Subject: [PATCH 0830/1043] str2nr() to prevent octal

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a1bde073..ba363d5c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -88,7 +88,7 @@ function s:parse_cino(f)
       break
     endif
   endfor
-  return sign * n / max([str2nr(divider),1])
+  return sign * str2nr(n) / max([str2nr(divider),1])
 endfunction
 
 function s:skip_func()

From ac71ceca363d7c5502a5d46565218da416302215 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 2 May 2017 02:18:21 -0700
Subject: [PATCH 0831/1043] another str2nr()

missed it, sorry for the extra commits
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ba363d5c..b3e8d9f8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -79,7 +79,7 @@ function s:parse_cino(f)
       if n is ''
         let n = s:W
       else
-        let n = n * s:W
+        let n = str2nr(n) * s:W
       endif
       break
     elseif c =~ '\d'

From fcdacf6f7c9b279dd0c6efa102d67a3d2c1d71e2 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 4 May 2017 00:11:20 -0700
Subject: [PATCH 0832/1043] break search at col:1 (#933)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b3e8d9f8..c9898808 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: May 2, 2017
+" Last Change: May 4, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -92,27 +92,40 @@ function s:parse_cino(f)
 endfunction
 
 function s:skip_func()
-  if getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
-    return eval(s:skip_expr)
+  if s:topCol == 1
+    return {} " :break, causes E731 in searchpair()
+  endif
+  let s:topCol = col('.')
+  if getline('.') =~ '\%<'.s:topCol.'c\/.\{-}\/\|\%>'.s:topCol.'c[''"]\|\\$'
+    if eval(s:skip_expr)
+      let s:topCol = 0
+    endif
+    return !s:topCol
   elseif s:checkIn || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
     let s:checkIn = eval(s:skip_expr)
+    if s:checkIn
+      let s:topCol = 0
+    endif
   endif
   let s:looksyn = line('.')
   return s:checkIn
 endfunction
 
-function s:alternatePair(stop)
+function s:alternatePair()
   let [pos, pat, l:for] = [getpos('.')[1:2], '[][(){};]', 3]
-  while search('\m'.pat,'bW',a:stop)
-    if s:skip_func() | continue | endif
+  while search('\m'.pat,'bW')
+    let not = s:skip_func()
+    if type(not) == type({})
+      break
+    elseif not | continue | endif
     let idx = stridx('])};',s:looking_at())
     if idx is 3
       if l:for is 1
-        return s:GetPair('{','}','bW','s:skip_func()',2000,a:stop) > 0 || call('cursor',pos)
+        return s:GetPair('{','}','bW','s:skip_func()',2000) > 0 || call('cursor',pos)
       endif
       let [pat, l:for] = ['[{}();]', l:for - 1]
     elseif idx + 1
-      if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) < 1
+      if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000) < 1
         break
       endif
     else
@@ -368,22 +381,19 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  let s:scriptTag = get(get(b:,'hi_indent',{}),'blocklnr')
-  let idx = index([']',')','}'],l:line[0])
+  let [ s:scriptTag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'),
+        \ index([']',')','}'],l:line[0]) ]
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
-    if b:js_cache[2]
-      call call('cursor',b:js_cache[1:])
-    endif
+    call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [0,0])
   else
-    let [s:looksyn, s:checkIn, top] = [v:lnum - 1, 0, max([s:scriptTag,
-          \ (!indent(l:lnum) && s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum])]
+    let [s:looksyn, s:checkIn, s:topCol] = [v:lnum - 1, 0, 0]
     if idx + 1
-      call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
+      call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000)
     elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-      call s:GetPair('{','}','bW','s:skip_func()',2000,top)
+      call s:GetPair('{','}','bW','s:skip_func()',2000)
     else
-      call s:alternatePair(top)
+      call s:alternatePair()
     endif
   endif
 

From 1e59f84882b6ab017533e25bcff1a635d9a0ce49 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 4 May 2017 00:32:54 -0700
Subject: [PATCH 0833/1043] break at html too

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c9898808..548048c9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -92,7 +92,7 @@ function s:parse_cino(f)
 endfunction
 
 function s:skip_func()
-  if s:topCol == 1
+  if s:topCol == 1 || line('.') < s:scriptTag
     return {} " :break, causes E731 in searchpair()
   endif
   let s:topCol = col('.')

From 259f5282f0675aa47ea6292321501bfd64b2cbee Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 4 May 2017 10:29:55 -0700
Subject: [PATCH 0834/1043] (silent) exception same as within searchpair (#934)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 548048c9..aea44e09 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -93,7 +93,7 @@ endfunction
 
 function s:skip_func()
   if s:topCol == 1 || line('.') < s:scriptTag
-    return {} " :break, causes E731 in searchpair()
+    return {} " causes E731, to break from search loops
   endif
   let s:topCol = col('.')
   if getline('.') =~ '\%<'.s:topCol.'c\/.\{-}\/\|\%>'.s:topCol.'c[''"]\|\\$'
@@ -114,10 +114,7 @@ endfunction
 function s:alternatePair()
   let [pos, pat, l:for] = [getpos('.')[1:2], '[][(){};]', 3]
   while search('\m'.pat,'bW')
-    let not = s:skip_func()
-    if type(not) == type({})
-      break
-    elseif not | continue | endif
+    if s:skip_func() | continue | endif
     let idx = stridx('])};',s:looking_at())
     if idx is 3
       if l:for is 1

From 53b04392431715efc591a45713458c9a8db2dcf3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 5 May 2017 08:59:04 -0700
Subject: [PATCH 0835/1043] misc: indent.vim (#935)

* Update javascript.vim

* use setpos() as state restorer
---
 indent/javascript.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index aea44e09..7be665e3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -112,13 +112,13 @@ function s:skip_func()
 endfunction
 
 function s:alternatePair()
-  let [pos, pat, l:for] = [getpos('.')[1:2], '[][(){};]', 3]
+  let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 3]
   while search('\m'.pat,'bW')
     if s:skip_func() | continue | endif
     let idx = stridx('])};',s:looking_at())
     if idx is 3
       if l:for is 1
-        return s:GetPair('{','}','bW','s:skip_func()',2000) > 0 || call('cursor',pos)
+        return s:GetPair('{','}','bW','s:skip_func()',2000) > 0 || setpos('.',l:pos)
       endif
       let [pat, l:for] = ['[{}();]', l:for - 1]
     elseif idx + 1
@@ -129,13 +129,13 @@ function s:alternatePair()
       return
     endif
   endwhile
-  call call('cursor',pos)
+  call setpos('.',l:pos)
 endfunction
 
 function s:save_pos(f,...)
-  let l:pos = getpos('.')[1:2]
+  let l:pos = getpos('.')
   let ret = call(a:f,a:000)
-  call call('cursor',l:pos)
+  call setpos('.',l:pos)
   return ret
 endfunction
 
@@ -152,9 +152,9 @@ function s:token()
 endfunction
 
 function s:previous_token()
-  let l:pos = getpos('.')[1:2]
+  let l:pos = getpos('.')
   if search('\m\k\{1,}\|\S','ebW')
-    if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[0] &&
+    if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] &&
           \ getline('.')[:col('.')-1] =~ '\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
       while search('\m\S\ze\_s*\/[/*]','bW')
         if s:syn_at(line('.'),col('.')) !~? s:syng_com
@@ -165,7 +165,7 @@ function s:previous_token()
       return s:token()
     endif
   endif
-  call call('cursor',l:pos)
+  call setpos('.',l:pos)
   return ''
 endfunction
 
@@ -223,7 +223,7 @@ endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
-  let [l:pos, l:n] = [getpos('.')[1:2], prevnonblank(a:lnum)]
+  let [l:pos, l:n] = [getpos('.'), prevnonblank(a:lnum)]
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]'
       if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
@@ -239,7 +239,7 @@ function s:PrevCodeLine(lnum)
       break
     endif
   endwhile
-  call call('cursor',l:pos)
+  call setpos('.',l:pos)
   return l:n
 endfunction
 

From 896bb54d2e2179258cd5da4290692faa1109a06e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 5 May 2017 15:01:27 -0700
Subject: [PATCH 0836/1043] configurable syntax skipping (#936)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7be665e3..62537fca 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -60,11 +60,15 @@ else
 endif
 
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!'
-let s:syng_str = 'string\|template\|special'
+let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
+let b:syng_str = get(b:,'syng_strcom','string\|template\|special')
+" template strings may want to be excluded when editing graphql.
+" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
+" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
+
 let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
+let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? b:syng_strcom"
 
 function s:parse_cino(f)
   let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
@@ -227,7 +231,7 @@ function s:PrevCodeLine(lnum)
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]'
       if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
-            \ s:syn_at(l:n,1) =~? s:syng_str
+            \ s:syn_at(l:n,1) =~? b:syng_str
         break
       endif
       let l:n = prevnonblank(l:n-1)
@@ -249,7 +253,7 @@ function s:Balanced(lnum)
   let l:line = getline(a:lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
-    if s:syn_at(a:lnum,pos + 1) !~? s:syng_strcom
+    if s:syn_at(a:lnum,pos + 1) !~? b:syng_strcom
       let l:open += match(' ' . l:line[pos],'[[({]')
       if l:open < 0
         return
@@ -358,7 +362,7 @@ function GetJavascriptIndent()
     elseif l:line !~ '^\s*\/[/*]'
       return -1
     endif
-  elseif syns =~? s:syng_str
+  elseif syns =~? b:syng_str
     if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
       let b:js_cache[0] = v:lnum
     endif

From f7ffea0953cfef716af97f7c1fa2a35beeb4eeeb Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 6 May 2017 00:09:16 -0700
Subject: [PATCH 0837/1043] Misc: indent (#937)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 62537fca..31e0b015 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,7 +62,7 @@ endif
 " Regex of syntax group names that are or delimit string or are comments.
 let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
 let b:syng_str = get(b:,'syng_strcom','string\|template\|special')
-" template strings may want to be excluded when editing graphql.
+" template strings may want to be excluded when editing graphql:
 " au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
 " au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
 
@@ -97,7 +97,7 @@ endfunction
 
 function s:skip_func()
   if s:topCol == 1 || line('.') < s:scriptTag
-    return {} " causes E731, to break from search loops
+    return {} " E728, used as limit condition for loops and searchpair()
   endif
   let s:topCol = col('.')
   if getline('.') =~ '\%<'.s:topCol.'c\/.\{-}\/\|\%>'.s:topCol.'c[''"]\|\\$'

From 65dbdfc4517de60acd263bcb407a9c3b471d53ea Mon Sep 17 00:00:00 2001
From: Kevin Yue <yuezk001@gmail.com>
Date: Tue, 9 May 2017 05:23:50 +0800
Subject: [PATCH 0838/1043] Fix variable typo (#939)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 31e0b015..d1fa6545 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -61,7 +61,7 @@ endif
 
 " Regex of syntax group names that are or delimit string or are comments.
 let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
-let b:syng_str = get(b:,'syng_strcom','string\|template\|special')
+let b:syng_str = get(b:,'syng_str','string\|template\|special')
 " template strings may want to be excluded when editing graphql:
 " au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
 " au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'

From 5b2f56d75e9bc60f1707ee70258195640dc9bff0 Mon Sep 17 00:00:00 2001
From: Kevin Yue <yuezk001@gmail.com>
Date: Tue, 9 May 2017 10:14:49 +0800
Subject: [PATCH 0839/1043] Fix buffer variables inited only once (#941)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d1fa6545..3d07fc91 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -25,6 +25,17 @@ setlocal indentkeys+=0],0)
 
 let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 
+" Regex of syntax group names that are or delimit string or are comments.
+let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
+let b:syng_str = get(b:,'syng_str','string\|template\|special')
+" template strings may want to be excluded when editing graphql:
+" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
+" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
+
+let s:syng_com = 'comment\|doc'
+" Expression used to check whether we should skip a match with searchpair().
+let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? b:syng_strcom"
+
 " Only define the function once.
 if exists('*GetJavascriptIndent')
   finish
@@ -59,17 +70,6 @@ else
   endfunction
 endif
 
-" Regex of syntax group names that are or delimit string or are comments.
-let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
-let b:syng_str = get(b:,'syng_str','string\|template\|special')
-" template strings may want to be excluded when editing graphql:
-" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
-" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
-
-let s:syng_com = 'comment\|doc'
-" Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? b:syng_strcom"
-
 function s:parse_cino(f)
   let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
   if cin == -1

From a1f36ff79fe1b60aea338694ac5047a46e0c590c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 8 May 2017 19:17:05 -0700
Subject: [PATCH 0840/1043] move s: vars

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3d07fc91..f4fc480d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -32,10 +32,6 @@ let b:syng_str = get(b:,'syng_str','string\|template\|special')
 " au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
 " au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
 
-let s:syng_com = 'comment\|doc'
-" Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? b:syng_strcom"
-
 " Only define the function once.
 if exists('*GetJavascriptIndent')
   finish
@@ -59,6 +55,10 @@ endif
 " matches before pos.
 let s:z = has('patch-7.4.984') ? 'z' : ''
 
+let s:syng_com = 'comment\|doc'
+" Expression used to check whether we should skip a match with searchpair().
+let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? b:syng_strcom"
+
 " searchpair() wrapper
 if has('reltime')
   function s:GetPair(start,end,flags,skip,time,...)

From 81166acad2376724318a25f6b471822a8406be92 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 8 May 2017 21:43:22 -0700
Subject: [PATCH 0841/1043] cache synID calls (#938)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f4fc480d..09013fd3 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -57,7 +57,7 @@ let s:z = has('patch-7.4.984') ? 'z' : ''
 
 let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? b:syng_strcom"
+let s:skip_expr = "s:syn_at(line('.'),col('.')) =~? b:syng_strcom"
 
 " searchpair() wrapper
 if has('reltime')
@@ -70,6 +70,15 @@ else
   endfunction
 endif
 
+function s:syn_at(l,c)
+  let pos = join([a:l,a:c],',')
+  if has_key(s:synId_cache,pos)
+    return s:synId_cache[pos]
+  endif
+  let s:synId_cache[pos] = synIDattr(synID(a:l,a:c,0),'name')
+  return s:synId_cache[pos]
+endfunction
+
 function s:parse_cino(f)
   let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
   if cin == -1
@@ -143,10 +152,6 @@ function s:save_pos(f,...)
   return ret
 endfunction
 
-function s:syn_at(l,c)
-  return synIDattr(synID(a:l,a:c,0),'name')
-endfunction
-
 function s:looking_at()
   return getline('.')[col('.')-1]
 endfunction
@@ -266,8 +271,8 @@ function s:Balanced(lnum)
   return !l:open
 endfunction
 
-function s:OneScope(lnum,...)
-  let pline = a:0 ? a:1 : s:Trim(a:lnum)
+function s:OneScope(lnum)
+  let pline = s:Trim(a:lnum)
   call cursor(a:lnum,strlen(pline))
   let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
@@ -301,13 +306,12 @@ endfunction
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
 " lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
 " a continued expression, which could have started in a braceless context
-function s:iscontOne(i,num,cont,cached)
+function s:iscontOne(i,num,cont)
   let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
   let pind = a:num ? indent(l:num) + s:W : 0
   let ind = indent(l:i) + (a:cont ? 0 : s:W)
   while l:i >= l:num && (ind > pind || l:i == l:num)
-    if indent(l:i) < ind &&
-          \ call('s:OneScope',[l:i] + (l:i == a:i ? [a:cached] : []))
+    if indent(l:i) < ind && s:OneScope(l:i)
       let bL += s:W
       let l:i = line('.')
     elseif !a:cont || bL || ind < indent(a:i)
@@ -348,6 +352,7 @@ endfunction
 
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])
+  let s:synId_cache = {}
   " Get the current line.
   call cursor(v:lnum,1)
   let l:line = getline('.')
@@ -416,7 +421,7 @@ function GetJavascriptIndent()
     endif
     if idx < 0 && pline[-1:] !~ '[{;]'
       let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
-      let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp,pline)
+      let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
   elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('

From 0c26c4808e6b50e014ab17c0109eb4445df00bda Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 9 May 2017 14:02:13 -0700
Subject: [PATCH 0842/1043] fix #940: ternary expression returning arrow

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e222f440..68d7d5a9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -174,7 +174,7 @@ syntax keyword jsForAwait             contained await skipwhite skipempty nextgr
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
 " Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /([^()]*)[^()=]*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
+syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction               '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')

From 573879c9db2c468ac29cee862e5dab92820fc652 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 12 May 2017 01:07:28 -0700
Subject: [PATCH 0843/1043] Reuse pos restorer, misc cleaning (#943)

function factory
---
 indent/javascript.vim | 51 ++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 09013fd3..4b20a8c9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -47,7 +47,7 @@ if exists('*shiftwidth')
   endfunction
 else
   function s:sw()
-    return &l:shiftwidth == 0 ? &l:tabstop : &l:shiftwidth
+    return &l:shiftwidth ? &l:shiftwidth : &l:tabstop
   endfunction
 endif
 
@@ -104,6 +104,7 @@ function s:parse_cino(f)
   return sign * str2nr(n) / max([str2nr(divider),1])
 endfunction
 
+" Optimized {skip} expr, used only once per GetJavascriptIndent() call
 function s:skip_func()
   if s:topCol == 1 || line('.') < s:scriptTag
     return {} " E728, used as limit condition for loops and searchpair()
@@ -145,13 +146,6 @@ function s:alternatePair()
   call setpos('.',l:pos)
 endfunction
 
-function s:save_pos(f,...)
-  let l:pos = getpos('.')
-  let ret = call(a:f,a:000)
-  call setpos('.',l:pos)
-  return ret
-endfunction
-
 function s:looking_at()
   return getline('.')[col('.')-1]
 endfunction
@@ -178,7 +172,22 @@ function s:previous_token()
   return ''
 endfunction
 
-function s:expr_col()
+" creates (s:) scoped, stationary functions
+func s:anon(d)
+  for key in keys(a:d)
+    exe "func s:".key."(...)\n"
+        \ "let l:pos = getpos('.')\n"
+        \ "let ret = call(".(key[:1] == '__' ? ('"s:'.key.'"') : ('s:__.'.key)).",a:000,{})\n"
+        \ "call setpos('.',l:pos)\n"
+        \ "retu ret\n"
+      \ "endfunc"
+  endfor
+  retu 'delfunc s:anon'
+endfunc
+
+let s:__ = {'__previous_token': 'previous_token', '__IsBlock': 'IsBlock'}
+
+function s:__.expr_col()
   if getline('.')[col('.')-2] == ':'
     return 1
   endif
@@ -231,8 +240,8 @@ function s:Trim(ln)
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
-function s:PrevCodeLine(lnum)
-  let [l:pos, l:n] = [getpos('.'), prevnonblank(a:lnum)]
+function s:__.PrevCodeLine(lnum)
+  let l:n = prevnonblank(a:lnum)
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]'
       if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
@@ -248,7 +257,6 @@ function s:PrevCodeLine(lnum)
       break
     endif
   endwhile
-  call setpos('.',l:pos)
   return l:n
 endfunction
 
@@ -284,10 +292,10 @@ function s:OneScope(lnum)
     endif
   endif
   return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&
-        \ s:save_pos('s:previous_token') != '.' && !s:save_pos('s:doWhile')
+        \ s:__previous_token() != '.' && !s:doWhile()
 endfunction
 
-function s:doWhile()
+function s:__.doWhile()
   if expand('<cword>') ==# 'while'
     call search('\m\<','cbW')
     let bal = 0
@@ -296,8 +304,8 @@ function s:doWhile()
       " switch (looking_at())
       exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
             \  '{': "return",
-            \  'd': "let bal += s:save_pos('s:IsBlock',1)",
-            \  'w': "let bal -= s:save_pos('s:previous_token') != '.'" }[s:looking_at()]
+            \  'd': "let bal += s:__IsBlock(1)",
+            \  'w': "let bal -= s:__previous_token() != '.'" }[s:looking_at()]
     endwhile
     return max([bal,0])
   endif
@@ -332,16 +340,16 @@ function s:IsBlock(...)
       return char != '{'
     elseif char =~ '\k'
       if char ==# 'type'
-        return s:save_pos('s:previous_token') !~# '^\%(im\|ex\)port$'
+        return s:__previous_token() !~# '^\%(im\|ex\)port$'
       endif
       return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
-            \ ,char) < (line('.') != l:n) || s:save_pos('s:previous_token') == '.'
+            \ ,char) < (line('.') != l:n) || s:__previous_token() == '.'
     elseif char == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
     elseif char == '*'
-      return s:save_pos('s:previous_token') == ':'
+      return s:__previous_token() == ':'
     elseif char == ':'
-      return !s:save_pos('s:expr_col')
+      return !s:expr_col()
     elseif char == '/'
       return s:syn_at(line('.'),col('.')) =~? 'regex'
     endif
@@ -350,6 +358,9 @@ function s:IsBlock(...)
   endif
 endfunction
 
+exe s:anon(s:__)
+
+
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])
   let s:synId_cache = {}

From 244985f10f9ffc6eb6df6307fea2c6c0f738785c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 12 May 2017 01:13:44 -0700
Subject: [PATCH 0844/1043] don't use cursor() in conditional

in vim 7.2 it always returns MAX_INT for some reason
---
 indent/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4b20a8c9..ed88b4c2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -211,7 +211,9 @@ let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
 function s:continues(ln,con)
-  if !cursor(a:ln, match(' '.a:con,s:continuation))
+  let tpos = match(' '.a:con,s:continuation)
+  if tpos > -1
+    call cursor(a:ln,tpos)
     let teol = s:looking_at()
     if teol == '/'
       return s:syn_at(line('.'),col('.')) !~? 'regex'

From c8aa5ed52a084b91a130df55781932e7e930a778 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 12 May 2017 10:06:24 -0700
Subject: [PATCH 0845/1043] fix wrong func call

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ed88b4c2..24400bb1 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -177,7 +177,7 @@ func s:anon(d)
   for key in keys(a:d)
     exe "func s:".key."(...)\n"
         \ "let l:pos = getpos('.')\n"
-        \ "let ret = call(".(key[:1] == '__' ? ('"s:'.key.'"') : ('s:__.'.key)).",a:000,{})\n"
+        \ "let ret = call(".(key[:1] == '__' ? ('"s:'.key[2:].'"') : ('s:__.'.key)).",a:000,{})\n"
         \ "call setpos('.',l:pos)\n"
         \ "retu ret\n"
       \ "endfunc"

From 7d8a2b117ccf24dc7619e914697b9ca3ab5083ce Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 21 Apr 2017 11:30:03 -0700
Subject: [PATCH 0846/1043] Adding an ISSUE_TEMPLATE.md

We are seeing way to many bugs that are JSX related, hopefully this
helps cut down on that.
---
 ISSUE_TEMPLATE.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ISSUE_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..473946d8
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,9 @@
+If you are reporting an issue that involves any JSX (e.g.
+<div>{`${example}`}</div>), PLEASE PLEASE PLEASE make sure you have properly
+setup and are sourcing this plugin https://github.com/mxw/vim-jsx
+
+WE DO NOT support JSX automatically, you need another plugin to add get this
+functionality.
+
+Also, if possible, please include a snippet of code that we can easily copy and
+paste that replicates your bug.

From d3356117260ccec5380c5c6d4c7daa519eacad5b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 12 May 2017 11:16:11 -0700
Subject: [PATCH 0847/1043] Improve issue template

---
 ISSUE_TEMPLATE.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 473946d8..155ea8d3 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -5,5 +5,8 @@ setup and are sourcing this plugin https://github.com/mxw/vim-jsx
 WE DO NOT support JSX automatically, you need another plugin to add get this
 functionality.
 
-Also, if possible, please include a snippet of code that we can easily copy and
-paste that replicates your bug.
+If applicable, include a snippet of code that we can easily copy and paste that
+replicates your bug.
+
+Make sure the bug still exists if you disable all other javascript plugins
+except the one noted above, mxw/vim-jsx

From d12dc61565552722248642450e4ccb70d4fe6b11 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 12 May 2017 15:07:05 -0700
Subject: [PATCH 0848/1043] just use dict value

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 24400bb1..ae0ad291 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -177,7 +177,7 @@ func s:anon(d)
   for key in keys(a:d)
     exe "func s:".key."(...)\n"
         \ "let l:pos = getpos('.')\n"
-        \ "let ret = call(".(key[:1] == '__' ? ('"s:'.key[2:].'"') : ('s:__.'.key)).",a:000,{})\n"
+        \ "let ret = call(".(key[:1] == '__' ? ('"s:'.a:d[key].'"') : ('s:__.'.key)).",a:000,{})\n"
         \ "call setpos('.',l:pos)\n"
         \ "retu ret\n"
       \ "endfunc"

From 9ce4ea852afb25425ff420d5629880d9a3c59bf4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 14 May 2017 09:24:18 -0700
Subject: [PATCH 0849/1043] misc: go back to l:pos only when needed; (#947)

---
 indent/javascript.vim | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ae0ad291..140082e4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -125,6 +125,8 @@ function s:skip_func()
   return s:checkIn
 endfunction
 
+let s:__ = {}
+
 function s:alternatePair()
   let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 3]
   while search('\m'.pat,'bW')
@@ -167,25 +169,32 @@ function s:previous_token()
     else
       return s:token()
     endif
+    call setpos('.',l:pos)
   endif
-  call setpos('.',l:pos)
   return ''
 endfunction
 
+function s:rdr(func)
+  exe '0verbose function s:'.a:func
+endfunction
 " creates (s:) scoped, stationary functions
-func s:anon(d)
-  for key in keys(a:d)
-    exe "func s:".key."(...)\n"
+function s:anon(d)
+  for key in keys(s:[a:d])
+    redir => func
+    silent call s:rdr(key[:1] == '__' ? s:[a:d][key] : (a:d.'.'.key))
+    redir END
+    let body = join(map(filter(split(func,"\n"),'v:val =~ "^\\s*\\d"'),'substitute(v:val,"^\\s*\\d*","","")'),"\n")
+    exe "func s:".key.matchstr(func,'\%^.\{-}\zs(.\{-})')."\n"
         \ "let l:pos = getpos('.')\n"
-        \ "let ret = call(".(key[:1] == '__' ? ('"s:'.a:d[key].'"') : ('s:__.'.key)).",a:000,{})\n"
+        \ "try\n"
+        \ .body."\n"
+        \ "finally\n"
         \ "call setpos('.',l:pos)\n"
-        \ "retu ret\n"
+        \ "endtry\n"
       \ "endfunc"
   endfor
-  retu 'delfunc s:anon'
-endfunc
-
-let s:__ = {'__previous_token': 'previous_token', '__IsBlock': 'IsBlock'}
+  return 'delfunc s:anon | delfunc s:rdr | unlet s:'.a:d
+endfunction
 
 function s:__.expr_col()
   if getline('.')[col('.')-2] == ':'
@@ -360,8 +369,8 @@ function s:IsBlock(...)
   endif
 endfunction
 
-exe s:anon(s:__)
-
+call extend(s:__, {'__previous_token': 'previous_token', '__IsBlock': 'IsBlock'})
+exe s:anon('__')
 
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])

From 82b14224292f6daefc0a7916b933b5f617b16f62 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 15 May 2017 09:00:09 -0700
Subject: [PATCH 0850/1043] test fix (#952)

---
 indent/javascript.vim | 143 ++++++++++++++++++++++--------------------
 1 file changed, 75 insertions(+), 68 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 140082e4..6e584915 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -125,8 +125,6 @@ function s:skip_func()
   return s:checkIn
 endfunction
 
-let s:__ = {}
-
 function s:alternatePair()
   let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 3]
   while search('\m'.pat,'bW')
@@ -174,43 +172,44 @@ function s:previous_token()
   return ''
 endfunction
 
-function s:rdr(func)
-  exe '0verbose function s:'.a:func
+function s:__previous_token()
+  try
+    let l:pos = getpos('.')
+    return s:previous_token()
+  finally
+    call setpos('.',l:pos)
+  endtry
 endfunction
-" creates (s:) scoped, stationary functions
-function s:anon(d)
-  for key in keys(s:[a:d])
-    redir => func
-    silent call s:rdr(key[:1] == '__' ? s:[a:d][key] : (a:d.'.'.key))
-    redir END
-    let body = join(map(filter(split(func,"\n"),'v:val =~ "^\\s*\\d"'),'substitute(v:val,"^\\s*\\d*","","")'),"\n")
-    exe "func s:".key.matchstr(func,'\%^.\{-}\zs(.\{-})')."\n"
-        \ "let l:pos = getpos('.')\n"
-        \ "try\n"
-        \ .body."\n"
-        \ "finally\n"
-        \ "call setpos('.',l:pos)\n"
-        \ "endtry\n"
-      \ "endfunc"
-  endfor
-  return 'delfunc s:anon | delfunc s:rdr | unlet s:'.a:d
+
+function s:__IsBlock()
+  try
+    let l:pos = getpos('.')
+    return s:IsBlock()
+  finally
+    call setpos('.',l:pos)
+  endtry
 endfunction
 
-function s:__.expr_col()
-  if getline('.')[col('.')-2] == ':'
-    return 1
-  endif
-  let bal = 0
-  while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
-    if eval(s:skip_expr) | continue | endif
-    " switch (looking_at())
-    exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-          \ ';': "return",
-          \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
-          \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
-          \ '?': "let bal += 1" }[s:looking_at()]
-  endwhile
-  return max([bal,0])
+function s:expr_col()
+  try
+    let l:pos = getpos('.')
+    if getline('.')[col('.')-2] == ':'
+      return 1
+    endif
+    let bal = 0
+    while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
+      if eval(s:skip_expr) | continue | endif
+      " switch (looking_at())
+      exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
+            \ ';': "return",
+            \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
+            \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
+            \ '?': "let bal += 1" }[s:looking_at()]
+    endwhile
+    return max([bal,0])
+  finally
+    call setpos('.',l:pos)
+  endtry
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -251,24 +250,29 @@ function s:Trim(ln)
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
-function s:__.PrevCodeLine(lnum)
-  let l:n = prevnonblank(a:lnum)
-  while l:n
-    if getline(l:n) =~ '^\s*\/[/*]'
-      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
-            \ s:syn_at(l:n,1) =~? b:syng_str
+function s:PrevCodeLine(lnum)
+  try
+    let l:pos = getpos('.')
+    let l:n = prevnonblank(a:lnum)
+    while l:n
+      if getline(l:n) =~ '^\s*\/[/*]'
+        if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+              \ s:syn_at(l:n,1) =~? b:syng_str
+          break
+        endif
+        let l:n = prevnonblank(l:n-1)
+      elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
+        call cursor(l:n,1)
+        keepjumps norm! [*
+        let l:n = search('\m\S','nbW')
+      else
         break
       endif
-      let l:n = prevnonblank(l:n-1)
-    elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
-      call cursor(l:n,1)
-      keepjumps norm! [*
-      let l:n = search('\m\S','nbW')
-    else
-      break
-    endif
-  endwhile
-  return l:n
+    endwhile
+    return l:n
+  finally
+    call setpos('.',l:pos)
+  endtry
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
@@ -306,20 +310,25 @@ function s:OneScope(lnum)
         \ s:__previous_token() != '.' && !s:doWhile()
 endfunction
 
-function s:__.doWhile()
-  if expand('<cword>') ==# 'while'
-    call search('\m\<','cbW')
-    let bal = 0
-    while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
-      if eval(s:skip_expr) | continue | endif
-      " switch (looking_at())
-      exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-            \  '{': "return",
-            \  'd': "let bal += s:__IsBlock(1)",
-            \  'w': "let bal -= s:__previous_token() != '.'" }[s:looking_at()]
-    endwhile
-    return max([bal,0])
-  endif
+function s:doWhile()
+  try
+    let l:pos = getpos('.')
+    if expand('<cword>') ==# 'while'
+      call search('\m\<','cbW')
+      let bal = 0
+      while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
+        if eval(s:skip_expr) | continue | endif
+        " switch (looking_at())
+        exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
+              \  '{': "return",
+              \  'd': "let bal += s:__IsBlock(1)",
+              \  'w': "let bal -= s:__previous_token() != '.'" }[s:looking_at()]
+      endwhile
+      return max([bal,0])
+    endif
+  finally
+    call setpos('.',l:pos)
+  endtry
 endfunction
 
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
@@ -369,8 +378,6 @@ function s:IsBlock(...)
   endif
 endfunction
 
-call extend(s:__, {'__previous_token': 'previous_token', '__IsBlock': 'IsBlock'})
-exe s:anon('__')
 
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])

From 809b6beb4023003d4a5db5080ed528d09c38c6c8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 15 May 2017 15:34:39 -0700
Subject: [PATCH 0851/1043] move state out of try block

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6e584915..5e0ab477 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -173,8 +173,8 @@ function s:previous_token()
 endfunction
 
 function s:__previous_token()
+  let l:pos = getpos('.')
   try
-    let l:pos = getpos('.')
     return s:previous_token()
   finally
     call setpos('.',l:pos)
@@ -182,8 +182,8 @@ function s:__previous_token()
 endfunction
 
 function s:__IsBlock()
+  let l:pos = getpos('.')
   try
-    let l:pos = getpos('.')
     return s:IsBlock()
   finally
     call setpos('.',l:pos)
@@ -191,8 +191,8 @@ function s:__IsBlock()
 endfunction
 
 function s:expr_col()
+  let l:pos = getpos('.')
   try
-    let l:pos = getpos('.')
     if getline('.')[col('.')-2] == ':'
       return 1
     endif
@@ -251,8 +251,8 @@ endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
+  let l:pos = getpos('.')
   try
-    let l:pos = getpos('.')
     let l:n = prevnonblank(a:lnum)
     while l:n
       if getline(l:n) =~ '^\s*\/[/*]'
@@ -311,8 +311,8 @@ function s:OneScope(lnum)
 endfunction
 
 function s:doWhile()
+  let l:pos = getpos('.')
   try
-    let l:pos = getpos('.')
     if expand('<cword>') ==# 'while'
       call search('\m\<','cbW')
       let bal = 0

From e73b3220791a67a71a40e1b4011486929c4133f7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 15 May 2017 21:49:56 -0700
Subject: [PATCH 0852/1043] deduplication (#953)

---
 indent/javascript.vim | 126 ++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 73 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5e0ab477..8c192e45 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -172,44 +172,32 @@ function s:previous_token()
   return ''
 endfunction
 
-function s:__previous_token()
-  let l:pos = getpos('.')
-  try
-    return s:previous_token()
-  finally
-    call setpos('.',l:pos)
-  endtry
-endfunction
-
-function s:__IsBlock()
-  let l:pos = getpos('.')
-  try
-    return s:IsBlock()
-  finally
-    call setpos('.',l:pos)
-  endtry
-endfunction
+for s:__ in ['__previous_token','__IsBlock']
+  function s:{s:__}(...)
+    let l:pos = getpos('.')
+    try
+      return call('s:'.matchstr(expand('<sfile>'),'.*__\zs\w\+'),a:000)
+    finally
+      call setpos('.',l:pos)
+    endtry
+  endfunction
+endfor
 
 function s:expr_col()
-  let l:pos = getpos('.')
-  try
-    if getline('.')[col('.')-2] == ':'
-      return 1
-    endif
-    let bal = 0
-    while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
-      if eval(s:skip_expr) | continue | endif
-      " switch (looking_at())
-      exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-            \ ';': "return",
-            \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
-            \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
-            \ '?': "let bal += 1" }[s:looking_at()]
-    endwhile
-    return max([bal,0])
-  finally
-    call setpos('.',l:pos)
-  endtry
+  if getline('.')[col('.')-2] == ':'
+    return 1
+  endif
+  let [bal, l:pos] = [0, getpos('.')]
+  while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
+    if eval(s:skip_expr) | continue | endif
+    " switch (looking_at())
+    exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
+          \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
+          \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
+          \ '?': "let bal += 1" }[s:looking_at()]
+  endwhile
+  call setpos('.',l:pos)
+  return max([bal,0])
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -251,28 +239,25 @@ endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
-  let l:pos = getpos('.')
-  try
-    let l:n = prevnonblank(a:lnum)
-    while l:n
-      if getline(l:n) =~ '^\s*\/[/*]'
-        if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
-              \ s:syn_at(l:n,1) =~? b:syng_str
-          break
-        endif
-        let l:n = prevnonblank(l:n-1)
-      elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
-        call cursor(l:n,1)
-        keepjumps norm! [*
-        let l:n = search('\m\S','nbW')
-      else
+  let l:n = prevnonblank(a:lnum)
+  while l:n
+    if getline(l:n) =~ '^\s*\/[/*]'
+      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+            \ s:syn_at(l:n,1) =~? b:syng_str
         break
       endif
-    endwhile
-    return l:n
-  finally
-    call setpos('.',l:pos)
-  endtry
+      let l:n = prevnonblank(l:n-1)
+    elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
+      let l:pos = getpos('.')
+      call cursor(l:n,1)
+      keepjumps norm! [*
+      let l:n = search('\m\S','nbW')
+      call setpos('.',l:pos)
+    else
+      break
+    endif
+  endwhile
+  return l:n
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
@@ -311,24 +296,19 @@ function s:OneScope(lnum)
 endfunction
 
 function s:doWhile()
-  let l:pos = getpos('.')
-  try
-    if expand('<cword>') ==# 'while'
-      call search('\m\<','cbW')
-      let bal = 0
-      while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
-        if eval(s:skip_expr) | continue | endif
-        " switch (looking_at())
-        exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-              \  '{': "return",
-              \  'd': "let bal += s:__IsBlock(1)",
-              \  'w': "let bal -= s:__previous_token() != '.'" }[s:looking_at()]
-      endwhile
-      return max([bal,0])
-    endif
-  finally
+  if expand('<cword>') ==# 'while'
+    let [bal, l:pos] = [0, getpos('.')]
+    call search('\m\<','cbW')
+    while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
+      if eval(s:skip_expr) | continue | endif
+      " switch (looking_at())
+      exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
+            \  'd': "let bal += s:__IsBlock(1)",
+            \  'w': "let bal -= s:__previous_token() != '.'" }[s:looking_at()]
+    endwhile
     call setpos('.',l:pos)
-  endtry
+    return max([bal,0])
+  endif
 endfunction
 
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the

From 5f0163963a4f3492c0218feb778494923e466c0b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 16 May 2017 00:08:52 -0700
Subject: [PATCH 0853/1043] no eval or confusing viml workarounds (#954)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8c192e45..26d6203b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -177,6 +177,7 @@ for s:__ in ['__previous_token','__IsBlock']
     let l:pos = getpos('.')
     try
       return call('s:'.matchstr(expand('<sfile>'),'.*__\zs\w\+'),a:000)
+    catch
     finally
       call setpos('.',l:pos)
     endtry
@@ -189,12 +190,17 @@ function s:expr_col()
   endif
   let [bal, l:pos] = [0, getpos('.')]
   while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
-    if eval(s:skip_expr) | continue | endif
-    " switch (looking_at())
-    exe {   '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-          \ '{': "return getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()",
-          \ ':': "let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'",
-          \ '?': "let bal += 1" }[s:looking_at()]
+    if eval(s:skip_expr)
+      continue
+    elseif s:looking_at() == ':'
+      let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
+    elseif s:looking_at() == '?'
+      let bal += 1
+    elseif s:looking_at() == '{' && getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
+      let bal = 1
+    elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+      break
+    endif
   endwhile
   call setpos('.',l:pos)
   return max([bal,0])
@@ -300,11 +306,15 @@ function s:doWhile()
     let [bal, l:pos] = [0, getpos('.')]
     call search('\m\<','cbW')
     while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
-      if eval(s:skip_expr) | continue | endif
-      " switch (looking_at())
-      exe {    '}': "if s:GetPair('{','}','bW',s:skip_expr,200) < 1 | return | endif",
-            \  'd': "let bal += s:__IsBlock(1)",
-            \  'w': "let bal -= s:__previous_token() != '.'" }[s:looking_at()]
+      if eval(s:skip_expr)
+        continue
+      elseif s:looking_at() ==# 'd'
+        let bal += s:__IsBlock(1)
+      elseif s:looking_at() ==# 'w'
+        let bal -= s:__previous_token() != '.'
+      elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+        break
+      endif
     endwhile
     call setpos('.',l:pos)
     return max([bal,0])

From d9820f9931d4238b53a07ae5a1cea73ace16f84d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 16 May 2017 00:47:22 -0700
Subject: [PATCH 0854/1043] remove comment hack

i really don't trust vimscript
---
 indent/javascript.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 26d6203b..1a45906e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -256,8 +256,7 @@ function s:PrevCodeLine(lnum)
     elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
       let l:pos = getpos('.')
       call cursor(l:n,1)
-      keepjumps norm! [*
-      let l:n = search('\m\S','nbW')
+      let l:n = search('\m\S\_s*\/\*','nbW')
       call setpos('.',l:pos)
     else
       break

From d3068263e251fd8d90045a00dda663812ac2a6b6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 16 May 2017 10:20:22 -0700
Subject: [PATCH 0855/1043] date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1a45906e..21e908f1 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: May 4, 2017
+" Last Change: May 16, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')

From dc0bb4748b4cd2b24b0b276c6e6139077166d41c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 17 May 2017 00:28:43 -0700
Subject: [PATCH 0856/1043] cleaning: indent.vim (#956)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 21e908f1..612a7b50 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -210,22 +210,17 @@ endfunction
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
       \ '\C\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
-      \ '\C\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
+      \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
 function s:continues(ln,con)
-  let tpos = match(' '.a:con,s:continuation)
-  if tpos > -1
-    call cursor(a:ln,tpos)
-    let teol = s:looking_at()
-    if teol == '/'
-      return s:syn_at(line('.'),col('.')) !~? 'regex'
-    elseif teol == '>'
-      return getline('.')[col('.')-2] != '=' && s:syn_at(line('.'),col('.')) !~? 'jsflow\|^html'
-    elseif teol =~ '[-+]'
-      return getline('.')[col('.')-2] != teol
-    elseif teol =~ '\l'
+  let token = matchstr(a:con[-15:],s:continuation)
+  if strlen(token)
+    call cursor(a:ln,strlen(a:con))
+    if token =~ '[/>]'
+      return s:syn_at(a:ln,col('.')) !~? (token == '>' ? 'jsflow\|^html' : 'regex')
+    elseif token =~ '\l'
       return s:previous_token() != '.'
-    elseif teol == ':'
+    elseif token == ':'
       return s:expr_col()
     endif
     return 1

From 21a8a7ed8545b9c5f0dbc158d8c00cc8360411ea Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 17 May 2017 13:22:56 -0700
Subject: [PATCH 0857/1043] misc:refactor (#957)

* misc:refactor

* Update javascript.vim

* Update javascript.vim

* naming convention

* Update javascript.vim

* Update javascript.vim
---
 indent/javascript.vim | 70 ++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 612a7b50..3c23718b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -126,22 +126,29 @@ function s:skip_func()
 endfunction
 
 function s:alternatePair()
-  let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 3]
+  let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 2]
   while search('\m'.pat,'bW')
-    if s:skip_func() | continue | endif
-    let idx = stridx('])};',s:looking_at())
-    if idx is 3
-      if l:for is 1
-        return s:GetPair('{','}','bW','s:skip_func()',2000) > 0 || setpos('.',l:pos)
+    if s:skip_func()
+      continue
+    endif
+    let tok = s:looking_at()
+    if tok == ';'
+      if !l:for
+        if s:GetPair('{','}','bW','s:skip_func()',2000) > 0
+          return
+        endif
+      else
+        let [pat, l:for] = ['[{}();]', l:for - 1]
+        continue
       endif
-      let [pat, l:for] = ['[{}();]', l:for - 1]
-    elseif idx + 1
-      if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000) < 1
-        break
+    elseif tok =~ '[])}]'
+      if s:GetPair(escape(tr(tok,'])}','[({'),'['), tok,'bW','s:skip_func()',2000) > 0
+        continue
       endif
     else
       return
     endif
+    break
   endwhile
   call setpos('.',l:pos)
 endfunction
@@ -185,15 +192,16 @@ for s:__ in ['__previous_token','__IsBlock']
 endfor
 
 function s:expr_col()
-  if getline('.')[col('.')-2] == ':'
-    return 1
-  endif
   let [bal, l:pos] = [0, getpos('.')]
   while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
     if eval(s:skip_expr)
       continue
     elseif s:looking_at() == ':'
-      let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
+      if getpos('.')[1:2] == [l:pos[1],l:pos[2]-1]
+        let bal = 1
+      else
+        let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
+      endif
     elseif s:looking_at() == '?'
       let bal += 1
     elseif s:looking_at() == '{' && getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
@@ -213,14 +221,14 @@ let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
 function s:continues(ln,con)
-  let token = matchstr(a:con[-15:],s:continuation)
-  if strlen(token)
+  let tok = matchstr(a:con[-15:],s:continuation)
+  if strlen(tok)
     call cursor(a:ln,strlen(a:con))
-    if token =~ '[/>]'
-      return s:syn_at(a:ln,col('.')) !~? (token == '>' ? 'jsflow\|^html' : 'regex')
-    elseif token =~ '\l'
+    if tok =~ '[/>]'
+      return s:syn_at(a:ln,col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
+    elseif tok =~ '\l'
       return s:previous_token() != '.'
-    elseif token == ':'
+    elseif tok == ':'
       return s:expr_col()
     endif
     return 1
@@ -339,26 +347,26 @@ endfunction
 function s:IsBlock(...)
   if a:0 || s:looking_at() == '{'
     let l:n = line('.')
-    let char = s:previous_token()
+    let tok = s:previous_token()
     if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
-      return char != '{'
-    elseif char =~ '\k'
-      if char ==# 'type'
+      return tok != '{'
+    elseif tok =~ '\k'
+      if tok ==# 'type'
         return s:__previous_token() !~# '^\%(im\|ex\)port$'
       endif
       return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
-            \ ,char) < (line('.') != l:n) || s:__previous_token() == '.'
-    elseif char == '>'
+            \ ,tok) < (line('.') != l:n) || s:__previous_token() == '.'
+    elseif tok == '>'
       return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
-    elseif char == '*'
+    elseif tok == '*'
       return s:__previous_token() == ':'
-    elseif char == ':'
+    elseif tok == ':'
       return !s:expr_col()
-    elseif char == '/'
+    elseif tok == '/'
       return s:syn_at(line('.'),col('.')) =~? 'regex'
     endif
-    return char !~ '[=~!<,.?^%|&([]' &&
-          \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
+    return tok !~ '[=~!<,.?^%|&([]' &&
+          \ (tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok)
   endif
 endfunction
 

From 89c3d920e025f03c54470180c99670277e015d9e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 18 May 2017 01:03:37 -0700
Subject: [PATCH 0858/1043] variable of current token in functions (#958)

---
 indent/javascript.vim | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3c23718b..10429767 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -128,11 +128,10 @@ endfunction
 function s:alternatePair()
   let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 2]
   while search('\m'.pat,'bW')
-    if s:skip_func()
+    let tok = s:skip_func() ? '' : s:looking_at()
+    if tok is ''
       continue
-    endif
-    let tok = s:looking_at()
-    if tok == ';'
+    elseif tok == ';'
       if !l:for
         if s:GetPair('{','}','bW','s:skip_func()',2000) > 0
           return
@@ -194,19 +193,20 @@ endfor
 function s:expr_col()
   let [bal, l:pos] = [0, getpos('.')]
   while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
-    if eval(s:skip_expr)
+    let tok = eval(s:skip_expr) ? '' : s:looking_at()
+    if tok is ''
       continue
-    elseif s:looking_at() == ':'
+    elseif tok == ':'
       if getpos('.')[1:2] == [l:pos[1],l:pos[2]-1]
         let bal = 1
       else
         let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
       endif
-    elseif s:looking_at() == '?'
+    elseif tok == '?'
       let bal += 1
-    elseif s:looking_at() == '{' && getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
+    elseif tok == '{' && getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
       let bal = 1
-    elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+    elseif tok != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
       break
     endif
   endwhile
@@ -308,13 +308,14 @@ function s:doWhile()
     let [bal, l:pos] = [0, getpos('.')]
     call search('\m\<','cbW')
     while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
-      if eval(s:skip_expr)
+      let tok = eval(s:skip_expr) ? '' : s:looking_at()
+      if tok is ''
         continue
-      elseif s:looking_at() ==# 'd'
+      elseif tok ==# 'd'
         let bal += s:__IsBlock(1)
-      elseif s:looking_at() ==# 'w'
+      elseif tok ==# 'w'
         let bal -= s:__previous_token() != '.'
-      elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+      elseif tok != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
         break
       endif
     endwhile

From bb2c6857d2ec102aec2e67756139a3d3a212b76d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 20 May 2017 11:07:07 -0700
Subject: [PATCH 0859/1043] cino-= and misc style changes: indent.vim (#959)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cino patch helped by Aurélien Lajoie
---
 indent/javascript.vim | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 10429767..a3bef795 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -84,9 +84,9 @@ function s:parse_cino(f)
   if cin == -1
     return
   endif
-  let [sign, cstr] = &cino[cin+1] ==# '-' ? [-1, &cino[cin+2:]] : [1, &cino[cin+1:]]
+  let [sign, cstr] = &cino[cin+1] == '-' ? [-1, &cino[cin+2:]] : [1, &cino[cin+1:]]
   for c in split(cstr,'\zs')
-    if c ==# '.' && !divider
+    if c == '.' && !divider
       let divider = 1
     elseif c ==# 's'
       if n is ''
@@ -204,7 +204,7 @@ function s:expr_col()
       endif
     elseif tok == '?'
       let bal += 1
-    elseif tok == '{' && getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
+    elseif tok == '{' && !s:IsBlock()
       let bal = 1
     elseif tok != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
       break
@@ -222,7 +222,7 @@ let s:continuation = get(g:,'javascript_continuation',
 
 function s:continues(ln,con)
   let tok = matchstr(a:con[-15:],s:continuation)
-  if strlen(tok)
+  if tok isnot ''
     call cursor(a:ln,strlen(a:con))
     if tok =~ '[/>]'
       return s:syn_at(a:ln,col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
@@ -428,16 +428,19 @@ function GetJavascriptIndent()
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:scriptTag,0] : getpos('.')[1:2])
   let num = b:js_cache[1]
 
-  let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
+  let [s:W, numInd, isOp, bL, l:switch_offset] = [s:sw(), max([indent(num),0]),0,0,0]
   if !b:js_cache[2] || s:IsBlock()
-    let ilnum = line('.')
-    let pline = s:Trim(l:lnum)
+    let [ilnum, pline] = [line('.'), s:Trim(l:lnum)]
     if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
-      let num = ilnum == num ? line('.') : num
+      if ilnum == num
+        let [num, numInd] = [line('.'), indent('.')]
+      endif
       if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
-        let switch_offset = &cino !~ ':' ? s:W : max([-indent(num),s:parse_cino(':')])
+        let l:switch_offset = &cino !~ ':' ? s:W : s:parse_cino(':')
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
-          return indent(num) + switch_offset
+          return max([numInd + l:switch_offset, 0])
+        elseif &cino =~ '='
+          let l:case_offset = s:parse_cino('=')
         endif
       endif
     endif
@@ -450,14 +453,14 @@ function GetJavascriptIndent()
     let pval = s:parse_cino('(')
     return !pval || !search('\m\S','nbW',num) && !s:parse_cino('U') ?
           \ (s:parse_cino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :
-          \ max([indent('.') + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W,0])
+          \ max([numInd + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W,0])
   endif
 
   " main return
   if l:line =~ '^[])}]\|^|}'
-    return max([indent(num),0])
+    return numInd
   elseif num
-    return indent(num) + s:W + switch_offset + bL + isOp
+    return max([numInd + get(l:,'case_offset',s:W) + l:switch_offset + bL + isOp, 0])
   endif
   return bL + isOp
 endfunction

From f5f32a9f4f6a21527bfe01a9c71bef71722fa1f3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 24 May 2017 00:11:04 -0700
Subject: [PATCH 0860/1043] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 84e75294..07b7fdf8 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 ## Indentation Specific
 
 * `:h cino-:`
+* `:h cino-=`
 * `:h cino-star`
 * `:h cino-(`
 * `:h cino-w`

From 2e24d89cc8b10f20e1ac0422d9fb81ca070cbf0a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 25 May 2017 13:26:25 -0700
Subject: [PATCH 0861/1043] fix wording

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 07b7fdf8..08ccdfed 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ global vim option, we do not set it ourselves.
 
 ## Concealing Characters
 
-You can customize concealing characters, if your font provides the character you want, by defining one or more of the following
+You can customize concealing characters, if your font provides the glyph you want, by defining one or more of the following
 variables:
 
     let g:javascript_conceal_function             = "ƒ"

From 4242a4b5f33313d7c6ecf767b8e86724bbc2235c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 26 May 2017 00:45:41 -0700
Subject: [PATCH 0862/1043] remove function setup

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a3bef795..74959e26 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -178,17 +178,12 @@ function s:previous_token()
   return ''
 endfunction
 
-for s:__ in ['__previous_token','__IsBlock']
-  function s:{s:__}(...)
-    let l:pos = getpos('.')
-    try
-      return call('s:'.matchstr(expand('<sfile>'),'.*__\zs\w\+'),a:000)
-    catch
-    finally
-      call setpos('.',l:pos)
-    endtry
-  endfunction
-endfor
+function s:__previous_token()
+  let l:pos = getpos('.')
+  let ret = s:previous_token()
+  call setpos('.',l:pos)
+  return ret
+endfunction
 
 function s:expr_col()
   let [bal, l:pos] = [0, getpos('.')]
@@ -371,6 +366,13 @@ function s:IsBlock(...)
   endif
 endfunction
 
+function s:__IsBlock(...)
+  let l:pos = getpos('.')
+  let ret = call('s:IsBlock',a:000)
+  call setpos('.',l:pos)
+  return ret
+endfunction
+
 
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])

From 28281d25ad7962ac2dd2f6ec5e341dbfbeda2c43 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 26 May 2017 17:24:53 -0700
Subject: [PATCH 0863/1043] simplify isBlock and doWhile (#962)

---
 indent/javascript.vim | 71 +++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 74959e26..faf92468 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -300,22 +300,17 @@ endfunction
 
 function s:doWhile()
   if expand('<cword>') ==# 'while'
-    let [bal, l:pos] = [0, getpos('.')]
-    call search('\m\<','cbW')
-    while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
-      let tok = eval(s:skip_expr) ? '' : s:looking_at()
-      if tok is ''
-        continue
-      elseif tok ==# 'd'
-        let bal += s:__IsBlock(1)
-      elseif tok ==# 'w'
-        let bal -= s:__previous_token() != '.'
-      elseif tok != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+    let l:pos = searchpos('\m\<','cbW')
+    while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
+      if !eval(s:skip_expr)
+        if (s:looking_at() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) > 0 ?
+              \ s:previous_token() : s:token()) ==# 'do' && s:IsBlock()
+          return 1
+        endif
         break
       endif
     endwhile
     call setpos('.',l:pos)
-    return max([bal,0])
   endif
 endfunction
 
@@ -340,40 +335,30 @@ function s:iscontOne(i,num,cont)
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
-function s:IsBlock(...)
-  if a:0 || s:looking_at() == '{'
-    let l:n = line('.')
-    let tok = s:previous_token()
-    if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
-      return tok != '{'
-    elseif tok =~ '\k'
-      if tok ==# 'type'
-        return s:__previous_token() !~# '^\%(im\|ex\)port$'
-      endif
-      return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
-            \ ,tok) < (line('.') != l:n) || s:__previous_token() == '.'
-    elseif tok == '>'
-      return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
-    elseif tok == '*'
-      return s:__previous_token() == ':'
-    elseif tok == ':'
-      return !s:expr_col()
-    elseif tok == '/'
-      return s:syn_at(line('.'),col('.')) =~? 'regex'
+function s:IsBlock()
+  let l:n = line('.')
+  let tok = s:previous_token()
+  if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
+    return tok != '{'
+  elseif tok =~ '\k'
+    if tok ==# 'type'
+      return s:__previous_token() !~# '^\%(im\|ex\)port$'
     endif
-    return tok !~ '[=~!<,.?^%|&([]' &&
-          \ (tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok)
+    return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
+          \ ,tok) < (line('.') != l:n) || s:__previous_token() == '.'
+  elseif tok == '>'
+    return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
+  elseif tok == '*'
+    return s:__previous_token() == ':'
+  elseif tok == ':'
+    return !s:expr_col()
+  elseif tok == '/'
+    return s:syn_at(line('.'),col('.')) =~? 'regex'
   endif
+  return tok !~ '[=~!<,.?^%|&([]' &&
+        \ (tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok)
 endfunction
 
-function s:__IsBlock(...)
-  let l:pos = getpos('.')
-  let ret = call('s:IsBlock',a:000)
-  call setpos('.',l:pos)
-  return ret
-endfunction
-
-
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])
   let s:synId_cache = {}
@@ -431,7 +416,7 @@ function GetJavascriptIndent()
   let num = b:js_cache[1]
 
   let [s:W, numInd, isOp, bL, l:switch_offset] = [s:sw(), max([indent(num),0]),0,0,0]
-  if !b:js_cache[2] || s:IsBlock()
+  if !b:js_cache[2] || s:looking_at() == '{' && s:IsBlock()
     let [ilnum, pline] = [line('.'), s:Trim(l:lnum)]
     if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
       if ilnum == num

From 1d28953b1c4c18f6311929c30962586567d6e710 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 27 May 2017 01:43:57 -0700
Subject: [PATCH 0864/1043] clearer -1 check

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index faf92468..3da31c0c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -246,12 +246,12 @@ function s:PrevCodeLine(lnum)
   let l:n = prevnonblank(a:lnum)
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]'
-      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+      if (stridx(getline(l:n),'`') != -1 || getline(l:n-1)[-1:] == '\') &&
             \ s:syn_at(l:n,1) =~? b:syng_str
         break
       endif
       let l:n = prevnonblank(l:n-1)
-    elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
+    elseif stridx(getline(l:n), '*/') != -1 && s:syn_at(l:n,1) =~? s:syng_com
       let l:pos = getpos('.')
       call cursor(l:n,1)
       let l:n = search('\m\S\_s*\/\*','nbW')
@@ -294,7 +294,7 @@ function s:OneScope(lnum)
       let kw = 'for if let while with'
     endif
   endif
-  return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&
+  return pline[-2:] == '=>' || index(split(kw),s:token()) != -1 &&
         \ s:__previous_token() != '.' && !s:doWhile()
 endfunction
 
@@ -338,7 +338,7 @@ endfunction
 function s:IsBlock()
   let l:n = line('.')
   let tok = s:previous_token()
-  if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
+  if match(s:stack,'\cxml\|jsx') != -1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
     return tok != '{'
   elseif tok =~ '\k'
     if tok ==# 'type'
@@ -403,7 +403,7 @@ function GetJavascriptIndent()
     call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [0,0])
   else
     let [s:looksyn, s:checkIn, s:topCol] = [v:lnum - 1, 0, 0]
-    if idx + 1
+    if idx != -1
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000)
     elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
       call s:GetPair('{','}','bW','s:skip_func()',2000)

From beba61e8e57715f550451556de5e144f7320dbd5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 27 May 2017 02:09:18 -0700
Subject: [PATCH 0865/1043] trivial reading stuff and date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3da31c0c..ce60da41 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: May 16, 2017
+" Last Change: May 27, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -363,8 +363,7 @@ function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])
   let s:synId_cache = {}
   " Get the current line.
-  call cursor(v:lnum,1)
-  let l:line = getline('.')
+  let l:line = getline(v:lnum)
   " use synstack as it validates syn state and works in an empty line
   let s:stack = map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
   let syns = get(s:stack,-1,'')
@@ -400,8 +399,9 @@ function GetJavascriptIndent()
         \ index([']',')','}'],l:line[0]) ]
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
-    call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [0,0])
+    call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [v:lnum,1])
   else
+    call cursor(v:lnum,1)
     let [s:looksyn, s:checkIn, s:topCol] = [v:lnum - 1, 0, 0]
     if idx != -1
       call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000)
@@ -422,7 +422,7 @@ function GetJavascriptIndent()
       if ilnum == num
         let [num, numInd] = [line('.'), indent('.')]
       endif
-      if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
+      if idx == -1 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
         let l:switch_offset = &cino !~ ':' ? s:W : s:parse_cino(':')
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
           return max([numInd + l:switch_offset, 0])
@@ -431,12 +431,12 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    if idx < 0 && pline[-1:] !~ '[{;]'
+    if idx == -1 && pline[-1:] !~ '[{;]'
       let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:W
     endif
-  elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
+  elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
     return !pval || !search('\m\S','nbW',num) && !s:parse_cino('U') ?
           \ (s:parse_cino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :

From eb5f00f67c3431823cc4af3a9030b24a55617099 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 28 May 2017 11:30:43 -0700
Subject: [PATCH 0866/1043] Small fix for jsTaggedTemplate

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 68d7d5a9..959e5780 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -25,7 +25,7 @@ syntax sync fromstart
 syntax case match
 
 syntax match   jsNoise          /[:,\;]\{1}/
-syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype
+syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
 syntax match   jsObjectProp     contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/
 syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
 syntax match   jsParensError    /[)}\]]/

From e092e7fce091708708b15cc01ee9210f2a6b5037 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 28 May 2017 19:21:36 -0700
Subject: [PATCH 0867/1043] star comment find, as loop (#963)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ce60da41..53085542 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -252,10 +252,11 @@ function s:PrevCodeLine(lnum)
       endif
       let l:n = prevnonblank(l:n-1)
     elseif stridx(getline(l:n), '*/') != -1 && s:syn_at(l:n,1) =~? s:syng_com
-      let l:pos = getpos('.')
-      call cursor(l:n,1)
-      let l:n = search('\m\S\_s*\/\*','nbW')
-      call setpos('.',l:pos)
+      for l:n in reverse(range(max([l:n-71,0]),l:n-1))
+        if stridx(getline(l:n),'/*') != -1
+          break
+        endif
+      endfor
     else
       break
     endif

From 18cd99029e5d5c8d1c23fe7572562451da10a250 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 29 May 2017 21:34:18 -0700
Subject: [PATCH 0868/1043] cino-star behavior; remove s:W references

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 53085542..e600e12c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -90,9 +90,9 @@ function s:parse_cino(f)
       let divider = 1
     elseif c ==# 's'
       if n is ''
-        let n = s:W
+        let n = s:sw()
       else
-        let n = str2nr(n) * s:W
+        let n = str2nr(n) * s:sw()
       endif
       break
     elseif c =~ '\d'
@@ -252,7 +252,7 @@ function s:PrevCodeLine(lnum)
       endif
       let l:n = prevnonblank(l:n-1)
     elseif stridx(getline(l:n), '*/') != -1 && s:syn_at(l:n,1) =~? s:syng_com
-      for l:n in reverse(range(max([l:n-71,0]),l:n-1))
+      for l:n in reverse(range(max([l:n-(&cino =~ '\*' ? s:parse_cino('*') : 70)-1,0]),l:n-1))
         if stridx(getline(l:n),'/*') != -1
           break
         endif
@@ -320,11 +320,11 @@ endfunction
 " a continued expression, which could have started in a braceless context
 function s:iscontOne(i,num,cont)
   let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
-  let pind = a:num ? indent(l:num) + s:W : 0
-  let ind = indent(l:i) + (a:cont ? 0 : s:W)
+  let pind = a:num ? indent(l:num) + s:sw() : 0
+  let ind = indent(l:i) + (a:cont ? 0 : s:sw())
   while l:i >= l:num && (ind > pind || l:i == l:num)
     if indent(l:i) < ind && s:OneScope(l:i)
-      let bL += s:W
+      let bL += s:sw()
       let l:i = line('.')
     elseif !a:cont || bL || ind < indent(a:i)
       break

From 147e506692d0a982bff072ddff189acb6aba27b7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 30 May 2017 01:04:15 -0700
Subject: [PATCH 0869/1043] remove script-global, range reversal, max (#965)

* remove script-global, range reversal

* max helper

* natural helper

* just nat
---
 indent/javascript.vim | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e600e12c..6ae2e16a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -152,6 +152,10 @@ function s:alternatePair()
   call setpos('.',l:pos)
 endfunction
 
+function s:Nat(...)
+  return max(a:000+[0])
+endfunction
+
 function s:looking_at()
   return getline('.')[col('.')-1]
 endfunction
@@ -206,7 +210,7 @@ function s:expr_col()
     endif
   endwhile
   call setpos('.',l:pos)
-  return max([bal,0])
+  return s:Nat(bal)
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
@@ -252,7 +256,7 @@ function s:PrevCodeLine(lnum)
       endif
       let l:n = prevnonblank(l:n-1)
     elseif stridx(getline(l:n), '*/') != -1 && s:syn_at(l:n,1) =~? s:syng_com
-      for l:n in reverse(range(max([l:n-(&cino =~ '\*' ? s:parse_cino('*') : 70)-1,0]),l:n-1))
+      for l:n in range(l:n-1, s:Nat(l:n-(&cino =~ '\*' ? s:parse_cino('*') : 70)-1), -1)
         if stridx(getline(l:n),'/*') != -1
           break
         endif
@@ -416,7 +420,7 @@ function GetJavascriptIndent()
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:scriptTag,0] : getpos('.')[1:2])
   let num = b:js_cache[1]
 
-  let [s:W, numInd, isOp, bL, l:switch_offset] = [s:sw(), max([indent(num),0]),0,0,0]
+  let [numInd, isOp, bL, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
   if !b:js_cache[2] || s:looking_at() == '{' && s:IsBlock()
     let [ilnum, pline] = [line('.'), s:Trim(l:lnum)]
     if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
@@ -424,31 +428,31 @@ function GetJavascriptIndent()
         let [num, numInd] = [line('.'), indent('.')]
       endif
       if idx == -1 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
-        let l:switch_offset = &cino !~ ':' ? s:W : s:parse_cino(':')
+        let l:switch_offset = &cino !~ ':' ? s:sw() : s:parse_cino(':')
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
-          return max([numInd + l:switch_offset, 0])
+          return s:Nat(numInd + l:switch_offset)
         elseif &cino =~ '='
           let l:case_offset = s:parse_cino('=')
         endif
       endif
     endif
     if idx == -1 && pline[-1:] !~ '[{;]'
-      let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
+      let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:sw()
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
-      let bL -= (bL && l:line[0] == '{') * s:W
+      let bL -= (bL && l:line[0] == '{') * s:sw()
     endif
   elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:parse_cino('(')
     return !pval || !search('\m\S','nbW',num) && !s:parse_cino('U') ?
           \ (s:parse_cino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :
-          \ max([numInd + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W,0])
+          \ s:Nat(numInd + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:sw())
   endif
 
   " main return
   if l:line =~ '^[])}]\|^|}'
     return numInd
   elseif num
-    return max([numInd + get(l:,'case_offset',s:W) + l:switch_offset + bL + isOp, 0])
+    return s:Nat(numInd + get(l:,'case_offset',s:sw()) + l:switch_offset + bL + isOp)
   endif
   return bL + isOp
 endfunction

From 388c9cbc4ed17dff4b3b5607b3ad2edf278e1fe9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 30 May 2017 08:44:15 -0700
Subject: [PATCH 0870/1043] Nat is unary

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6ae2e16a..1763d376 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -152,8 +152,8 @@ function s:alternatePair()
   call setpos('.',l:pos)
 endfunction
 
-function s:Nat(...)
-  return max(a:000+[0])
+function s:Nat(int)
+  return max([a:int]+[0])
 endfunction
 
 function s:looking_at()

From 9ea6e5df1aaa797790490a413596c4b133a3f5e6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 30 May 2017 15:24:55 -0700
Subject: [PATCH 0871/1043] date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1763d376..7601a36f 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: May 27, 2017
+" Last Change: May 30, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -153,7 +153,7 @@ function s:alternatePair()
 endfunction
 
 function s:Nat(int)
-  return max([a:int]+[0])
+  return max([a:int,0])
 endfunction
 
 function s:looking_at()

From 2dfe7cded8f1120d052b50675bc01f1d0b0b8481 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 1 Jun 2017 18:25:19 -0700
Subject: [PATCH 0872/1043] star shorthand workaround

Will work on this to remove the syntax usage
---
 indent/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7601a36f..3705df1b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -436,7 +436,7 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    if idx == -1 && pline[-1:] !~ '[{;]'
+    if idx == -1 && pline[-1:] !~ '[{;]' && syns !~? 'classblock'
       let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:sw()
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:sw()

From 7ba0927393951b5613ecda35b5fb7311e68f4b0d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 1 Jun 2017 19:45:34 -0700
Subject: [PATCH 0873/1043] cleaner generator shorthand fix (#969)

---
 indent/javascript.vim | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3705df1b..af9e7245 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -436,7 +436,13 @@ function GetJavascriptIndent()
         endif
       endif
     endif
-    if idx == -1 && pline[-1:] !~ '[{;]' && syns !~? 'classblock'
+    if idx == -1 && pline[-1:] !~ '[{;]'
+      if l:line[0] == '*' && pline[-1:] == '}'
+        call cursor(l:lnum,strlen(pline))
+        if s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
+          return numInd + s:sw()
+        endif
+      endif
       let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:sw()
       let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
       let bL -= (bL && l:line[0] == '{') * s:sw()

From a5a9a17d4c9691c45092a5db3892a67c8fa299fc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Jun 2017 01:35:39 -0700
Subject: [PATCH 0874/1043] add possible ident shorthand (#970)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index af9e7245..37f72a93 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -437,7 +437,7 @@ function GetJavascriptIndent()
       endif
     endif
     if idx == -1 && pline[-1:] !~ '[{;]'
-      if l:line[0] == '*' && pline[-1:] == '}'
+      if l:line =~# '^\%(in\%(stanceof\)\=\>\|\*\)' && pline[-1:] == '}'
         call cursor(l:lnum,strlen(pline))
         if s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
           return numInd + s:sw()

From 931dbd5b6e9d15cd3c6cb942d7cf776d7b49db4d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Jun 2017 20:58:29 -0700
Subject: [PATCH 0875/1043] cino-M (#971)

---
 README.md             | 2 ++
 indent/javascript.vim | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 08ccdfed..04053796 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,8 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 * `:h cino-(`
 * `:h cino-w`
 * `:h cino-U`
+* `:h cino-m`
+* `:h cino-M`
 * `:h 'indentkeys'`
 
 ## Contributing
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 37f72a93..de623872 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -392,6 +392,7 @@ function GetJavascriptIndent()
   endif
 
   let l:line = substitute(l:line,'^\s*','','')
+  let l:lineRaw = l:line
   if l:line[:1] == '/*'
     let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
   endif
@@ -456,6 +457,13 @@ function GetJavascriptIndent()
 
   " main return
   if l:line =~ '^[])}]\|^|}'
+    if l:lineRaw[0] == ')' && getline(b:js_cache[1])[b:js_cache[2]-1] == '('
+      if s:parse_cino('M')
+        return indent(l:lnum)
+      elseif &cino =~# 'm' && !s:parse_cino('m')
+        return virtcol('.') - 1
+      endif
+    endif
     return numInd
   elseif num
     return s:Nat(numInd + get(l:,'case_offset',s:sw()) + l:switch_offset + bL + isOp)

From e5cdee7b240a34e9ae6c4b6d2ea39d344af6d05d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Jun 2017 10:26:38 -0700
Subject: [PATCH 0876/1043] assure switch isn't method (#974)

* assure switch isn't method

great idea tc39

* generator and initializer are included
---
 indent/javascript.vim | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index de623872..f3874da2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -339,6 +339,18 @@ function s:iscontOne(i,num,cont)
   return bL
 endfunction
 
+function s:isSwitch()
+  if s:previous_token() !~ '[.*]'
+    if s:GetPair('{','}','cbW',s:skip_expr,100) > 0 && s:IsBlock()
+      let tok = s:token()
+      if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) > 0 || tok =~ '\K\k*'
+        return s:IsBlock()
+      endif
+    endif
+    return 1
+  endif
+endfunction
+
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   let l:n = line('.')
@@ -428,7 +440,7 @@ function GetJavascriptIndent()
       if ilnum == num
         let [num, numInd] = [line('.'), indent('.')]
       endif
-      if idx == -1 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
+      if idx == -1 && s:previous_token() ==# 'switch' && s:isSwitch()
         let l:switch_offset = &cino !~ ':' ? s:sw() : s:parse_cino(':')
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
           return s:Nat(numInd + l:switch_offset)

From 4e3c3c0d62eb6fcc06a225133b70c52a2addfb64 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Jun 2017 18:51:53 -0700
Subject: [PATCH 0877/1043] small logic fix

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f3874da2..ebbd65ee 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -341,10 +341,14 @@ endfunction
 
 function s:isSwitch()
   if s:previous_token() !~ '[.*]'
-    if s:GetPair('{','}','cbW',s:skip_expr,100) > 0 && s:IsBlock()
-      let tok = s:token()
-      if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) > 0 || tok =~ '\K\k*'
-        return s:IsBlock()
+    if s:GetPair('{','}','cbW',s:skip_expr,100) > 0
+      if s:IsBlock()
+        let tok = s:token()
+        if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) > 0 || tok =~ '\K\k*'
+          return s:IsBlock()
+        endif
+      else
+        return
       endif
     endif
     return 1

From 6f880fe81462cf75ad8fe483034185db897308a1 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 6 Jun 2017 00:02:56 -0700
Subject: [PATCH 0878/1043] fix for non-inheriting (#976)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ebbd65ee..d79dfb0c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -345,7 +345,7 @@ function s:isSwitch()
       if s:IsBlock()
         let tok = s:token()
         if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) > 0 || tok =~ '\K\k*'
-          return s:IsBlock()
+          return s:IsBlock() && (tok == '}' || s:token() !=# 'class')
         endif
       else
         return

From 1cb44af82229b5a8a53e9569e746e36794ba14f5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 6 Jun 2017 14:04:24 -0700
Subject: [PATCH 0879/1043] make var naming consistent (#977)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d79dfb0c..b403d004 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -57,7 +57,7 @@ let s:z = has('patch-7.4.984') ? 'z' : ''
 
 let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "s:syn_at(line('.'),col('.')) =~? b:syng_strcom"
+let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
 
 " searchpair() wrapper
 if has('reltime')
@@ -70,16 +70,16 @@ else
   endfunction
 endif
 
-function s:syn_at(l,c)
+function s:SynAt(l,c)
   let pos = join([a:l,a:c],',')
-  if has_key(s:synId_cache,pos)
-    return s:synId_cache[pos]
+  if has_key(s:synid_cache,pos)
+    return s:synid_cache[pos]
   endif
-  let s:synId_cache[pos] = synIDattr(synID(a:l,a:c,0),'name')
-  return s:synId_cache[pos]
+  let s:synid_cache[pos] = synIDattr(synID(a:l,a:c,0),'name')
+  return s:synid_cache[pos]
 endfunction
 
-function s:parse_cino(f)
+function s:ParseCino(f)
   let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
   if cin == -1
     return
@@ -105,35 +105,35 @@ function s:parse_cino(f)
 endfunction
 
 " Optimized {skip} expr, used only once per GetJavascriptIndent() call
-function s:skip_func()
-  if s:topCol == 1 || line('.') < s:scriptTag
+function s:SkipFunc()
+  if s:top_col == 1 || line('.') < s:script_tag
     return {} " E728, used as limit condition for loops and searchpair()
   endif
-  let s:topCol = col('.')
-  if getline('.') =~ '\%<'.s:topCol.'c\/.\{-}\/\|\%>'.s:topCol.'c[''"]\|\\$'
+  let s:top_col = col('.')
+  if getline('.') =~ '\%<'.s:top_col.'c\/.\{-}\/\|\%>'.s:top_col.'c[''"]\|\\$'
     if eval(s:skip_expr)
-      let s:topCol = 0
+      let s:top_col = 0
     endif
-    return !s:topCol
-  elseif s:checkIn || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
-    let s:checkIn = eval(s:skip_expr)
-    if s:checkIn
-      let s:topCol = 0
+    return !s:top_col
+  elseif s:check_in || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
+    let s:check_in = eval(s:skip_expr)
+    if s:check_in
+      let s:top_col = 0
     endif
   endif
   let s:looksyn = line('.')
-  return s:checkIn
+  return s:check_in
 endfunction
 
-function s:alternatePair()
+function s:AlternatePair()
   let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 2]
   while search('\m'.pat,'bW')
-    let tok = s:skip_func() ? '' : s:looking_at()
+    let tok = s:SkipFunc() ? '' : s:LookingAt()
     if tok is ''
       continue
     elseif tok == ';'
       if !l:for
-        if s:GetPair('{','}','bW','s:skip_func()',2000) > 0
+        if s:GetPair('{','}','bW','s:SkipFunc()',2000) > 0
           return
         endif
       else
@@ -141,7 +141,7 @@ function s:alternatePair()
         continue
       endif
     elseif tok =~ '[])}]'
-      if s:GetPair(escape(tr(tok,'])}','[({'),'['), tok,'bW','s:skip_func()',2000) > 0
+      if s:GetPair(escape(tr(tok,'])}','[({'),'['), tok,'bW','s:SkipFunc()',2000) > 0
         continue
       endif
     else
@@ -156,43 +156,43 @@ function s:Nat(int)
   return max([a:int,0])
 endfunction
 
-function s:looking_at()
+function s:LookingAt()
   return getline('.')[col('.')-1]
 endfunction
 
-function s:token()
-  return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
+function s:Token()
+  return s:LookingAt() =~ '\k' ? expand('<cword>') : s:LookingAt()
 endfunction
 
-function s:previous_token()
+function s:PreviousToken()
   let l:pos = getpos('.')
   if search('\m\k\{1,}\|\S','ebW')
     if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] &&
-          \ getline('.')[:col('.')-1] =~ '\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
+          \ getline('.')[:col('.')-1] =~ '\/\/') && s:SynAt(line('.'),col('.')) =~? s:syng_com
       while search('\m\S\ze\_s*\/[/*]','bW')
-        if s:syn_at(line('.'),col('.')) !~? s:syng_com
-          return s:token()
+        if s:SynAt(line('.'),col('.')) !~? s:syng_com
+          return s:Token()
         endif
       endwhile
     else
-      return s:token()
+      return s:Token()
     endif
     call setpos('.',l:pos)
   endif
   return ''
 endfunction
 
-function s:__previous_token()
+function s:__PreviousToken()
   let l:pos = getpos('.')
-  let ret = s:previous_token()
+  let ret = s:PreviousToken()
   call setpos('.',l:pos)
   return ret
 endfunction
 
-function s:expr_col()
+function s:ExprCol()
   let [bal, l:pos] = [0, getpos('.')]
-  while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
-    let tok = eval(s:skip_expr) ? '' : s:looking_at()
+  while bal < 1 && search('\m[{}?:;]','bW',s:script_tag)
+    let tok = eval(s:skip_expr) ? '' : s:LookingAt()
     if tok is ''
       continue
     elseif tok == ':'
@@ -219,16 +219,16 @@ let s:opfirst = '^' . get(g:,'javascript_opfirst',
 let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
-function s:continues(ln,con)
+function s:Continues(ln,con)
   let tok = matchstr(a:con[-15:],s:continuation)
   if tok isnot ''
     call cursor(a:ln,strlen(a:con))
     if tok =~ '[/>]'
-      return s:syn_at(a:ln,col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
+      return s:SynAt(a:ln,col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
     elseif tok =~ '\l'
-      return s:previous_token() != '.'
+      return s:PreviousToken() != '.'
     elseif tok == ':'
-      return s:expr_col()
+      return s:ExprCol()
     endif
     return 1
   endif
@@ -237,7 +237,7 @@ endfunction
 function s:Trim(ln)
   let pline = substitute(getline(a:ln),'\s*$','','')
   let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
-  while l:max != -1 && s:syn_at(a:ln, strlen(pline)) =~? s:syng_com
+  while l:max != -1 && s:SynAt(a:ln, strlen(pline)) =~? s:syng_com
     let pline = pline[: l:max]
     let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
     let pline = substitute(pline[:-2],'\s*$','','')
@@ -251,12 +251,12 @@ function s:PrevCodeLine(lnum)
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]'
       if (stridx(getline(l:n),'`') != -1 || getline(l:n-1)[-1:] == '\') &&
-            \ s:syn_at(l:n,1) =~? b:syng_str
+            \ s:SynAt(l:n,1) =~? b:syng_str
         break
       endif
       let l:n = prevnonblank(l:n-1)
-    elseif stridx(getline(l:n), '*/') != -1 && s:syn_at(l:n,1) =~? s:syng_com
-      for l:n in range(l:n-1, s:Nat(l:n-(&cino =~ '\*' ? s:parse_cino('*') : 70)-1), -1)
+    elseif stridx(getline(l:n), '*/') != -1 && s:SynAt(l:n,1) =~? s:syng_com
+      for l:n in range(l:n-1, s:Nat(l:n-(&cino =~ '\*' ? s:ParseCino('*') : 70)-1), -1)
         if stridx(getline(l:n),'/*') != -1
           break
         endif
@@ -274,7 +274,7 @@ function s:Balanced(lnum)
   let l:line = getline(a:lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
-    if s:syn_at(a:lnum,pos + 1) !~? b:syng_strcom
+    if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
       let l:open += match(' ' . l:line[pos],'[[({]')
       if l:open < 0
         return
@@ -292,24 +292,24 @@ function s:OneScope(lnum)
   call cursor(a:lnum,strlen(pline))
   let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
-    if s:previous_token() =~# '^\%(await\|each\)$'
-      call s:previous_token()
+    if s:PreviousToken() =~# '^\%(await\|each\)$'
+      call s:PreviousToken()
       let kw = 'for'
     else
       let kw = 'for if let while with'
     endif
   endif
-  return pline[-2:] == '=>' || index(split(kw),s:token()) != -1 &&
-        \ s:__previous_token() != '.' && !s:doWhile()
+  return pline[-2:] == '=>' || index(split(kw),s:Token()) != -1 &&
+        \ s:__PreviousToken() != '.' && !s:DoWhile()
 endfunction
 
-function s:doWhile()
+function s:DoWhile()
   if expand('<cword>') ==# 'while'
     let l:pos = searchpos('\m\<','cbW')
     while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
       if !eval(s:skip_expr)
-        if (s:looking_at() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) > 0 ?
-              \ s:previous_token() : s:token()) ==# 'do' && s:IsBlock()
+        if (s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) > 0 ?
+              \ s:PreviousToken() : s:Token()) ==# 'do' && s:IsBlock()
           return 1
         endif
         break
@@ -322,30 +322,30 @@ endfunction
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
 " lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
 " a continued expression, which could have started in a braceless context
-function s:iscontOne(i,num,cont)
-  let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
+function s:IsContOne(i,num,cont)
+  let [l:i, l:num, b_l] = [a:i, a:num + !a:num, 0]
   let pind = a:num ? indent(l:num) + s:sw() : 0
   let ind = indent(l:i) + (a:cont ? 0 : s:sw())
   while l:i >= l:num && (ind > pind || l:i == l:num)
     if indent(l:i) < ind && s:OneScope(l:i)
-      let bL += s:sw()
+      let b_l += s:sw()
       let l:i = line('.')
-    elseif !a:cont || bL || ind < indent(a:i)
+    elseif !a:cont || b_l || ind < indent(a:i)
       break
     endif
     let ind = min([ind, indent(l:i)])
     let l:i = s:PrevCodeLine(l:i - 1)
   endwhile
-  return bL
+  return b_l
 endfunction
 
-function s:isSwitch()
-  if s:previous_token() !~ '[.*]'
+function s:IsSwitch()
+  if s:PreviousToken() !~ '[.*]'
     if s:GetPair('{','}','cbW',s:skip_expr,100) > 0
       if s:IsBlock()
-        let tok = s:token()
+        let tok = s:Token()
         if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) > 0 || tok =~ '\K\k*'
-          return s:IsBlock() && (tok == '}' || s:token() !=# 'class')
+          return s:IsBlock() && (tok == '}' || s:Token() !=# 'class')
         endif
       else
         return
@@ -358,23 +358,23 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   let l:n = line('.')
-  let tok = s:previous_token()
-  if match(s:stack,'\cxml\|jsx') != -1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
+  let tok = s:PreviousToken()
+  if match(s:stack,'\cxml\|jsx') != -1 && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
     return tok != '{'
   elseif tok =~ '\k'
     if tok ==# 'type'
-      return s:__previous_token() !~# '^\%(im\|ex\)port$'
+      return s:__PreviousToken() !~# '^\%(im\|ex\)port$'
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
-          \ ,tok) < (line('.') != l:n) || s:__previous_token() == '.'
+          \ ,tok) < (line('.') != l:n) || s:__PreviousToken() == '.'
   elseif tok == '>'
-    return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
+    return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'
   elseif tok == '*'
-    return s:__previous_token() == ':'
+    return s:__PreviousToken() == ':'
   elseif tok == ':'
-    return !s:expr_col()
+    return !s:ExprCol()
   elseif tok == '/'
-    return s:syn_at(line('.'),col('.')) =~? 'regex'
+    return s:SynAt(line('.'),col('.')) =~? 'regex'
   endif
   return tok !~ '[=~!<,.?^%|&([]' &&
         \ (tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok)
@@ -382,7 +382,7 @@ endfunction
 
 function GetJavascriptIndent()
   let b:js_cache = get(b:,'js_cache',[0,0,0])
-  let s:synId_cache = {}
+  let s:synid_cache = {}
   " Get the current line.
   let l:line = getline(v:lnum)
   " use synstack as it validates syn state and works in an empty line
@@ -408,7 +408,7 @@ function GetJavascriptIndent()
   endif
 
   let l:line = substitute(l:line,'^\s*','','')
-  let l:lineRaw = l:line
+  let l:line_raw = l:line
   if l:line[:1] == '/*'
     let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
   endif
@@ -417,39 +417,39 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  let [ s:scriptTag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'),
+  let [ s:script_tag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'),
         \ index([']',')','}'],l:line[0]) ]
   if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
     call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [v:lnum,1])
   else
     call cursor(v:lnum,1)
-    let [s:looksyn, s:checkIn, s:topCol] = [v:lnum - 1, 0, 0]
+    let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
     if idx != -1
-      call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000)
+      call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
     elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-      call s:GetPair('{','}','bW','s:skip_func()',2000)
+      call s:GetPair('{','}','bW','s:SkipFunc()',2000)
     else
-      call s:alternatePair()
+      call s:AlternatePair()
     endif
   endif
 
-  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:scriptTag,0] : getpos('.')[1:2])
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:script_tag,0] : getpos('.')[1:2])
   let num = b:js_cache[1]
 
-  let [numInd, isOp, bL, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
-  if !b:js_cache[2] || s:looking_at() == '{' && s:IsBlock()
+  let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
+  if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()
     let [ilnum, pline] = [line('.'), s:Trim(l:lnum)]
-    if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
+    if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
       if ilnum == num
-        let [num, numInd] = [line('.'), indent('.')]
+        let [num, num_ind] = [line('.'), indent('.')]
       endif
-      if idx == -1 && s:previous_token() ==# 'switch' && s:isSwitch()
-        let l:switch_offset = &cino !~ ':' ? s:sw() : s:parse_cino(':')
+      if idx == -1 && s:PreviousToken() ==# 'switch' && s:IsSwitch()
+        let l:switch_offset = &cino !~ ':' ? s:sw() : s:ParseCino(':')
         if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
-          return s:Nat(numInd + l:switch_offset)
+          return s:Nat(num_ind + l:switch_offset)
         elseif &cino =~ '='
-          let l:case_offset = s:parse_cino('=')
+          let l:case_offset = s:ParseCino('=')
         endif
       endif
     endif
@@ -457,34 +457,34 @@ function GetJavascriptIndent()
       if l:line =~# '^\%(in\%(stanceof\)\=\>\|\*\)' && pline[-1:] == '}'
         call cursor(l:lnum,strlen(pline))
         if s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
-          return numInd + s:sw()
+          return num_ind + s:sw()
         endif
       endif
-      let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:sw()
-      let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
-      let bL -= (bL && l:line[0] == '{') * s:sw()
+      let is_op = (l:line =~# s:opfirst || s:Continues(l:lnum,pline)) * s:sw()
+      let b_l = s:IsContOne(l:lnum,b:js_cache[1],is_op)
+      let b_l -= (b_l && l:line[0] == '{') * s:sw()
     endif
   elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
-    let pval = s:parse_cino('(')
-    return !pval || !search('\m\S','nbW',num) && !s:parse_cino('U') ?
-          \ (s:parse_cino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :
-          \ s:Nat(numInd + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:sw())
+    let pval = s:ParseCino('(')
+    return !pval || !search('\m\S','nbW',num) && !s:ParseCino('U') ?
+          \ (s:ParseCino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :
+          \ s:Nat(num_ind + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:sw())
   endif
 
   " main return
   if l:line =~ '^[])}]\|^|}'
-    if l:lineRaw[0] == ')' && getline(b:js_cache[1])[b:js_cache[2]-1] == '('
-      if s:parse_cino('M')
+    if l:line_raw[0] == ')' && getline(b:js_cache[1])[b:js_cache[2]-1] == '('
+      if s:ParseCino('M')
         return indent(l:lnum)
-      elseif &cino =~# 'm' && !s:parse_cino('m')
+      elseif &cino =~# 'm' && !s:ParseCino('m')
         return virtcol('.') - 1
       endif
     endif
-    return numInd
+    return num_ind
   elseif num
-    return s:Nat(numInd + get(l:,'case_offset',s:sw()) + l:switch_offset + bL + isOp)
+    return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
   endif
-  return bL + isOp
+  return b_l + is_op
 endfunction
 
 let &cpo = s:cpo_save

From 42c9451ab79e65c54a0816fd7557fb991c62b78b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 6 Jun 2017 21:00:45 -0700
Subject: [PATCH 0880/1043] more lookbehind needed... classes

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b403d004..2ce67720 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -345,7 +345,7 @@ function s:IsSwitch()
       if s:IsBlock()
         let tok = s:Token()
         if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) > 0 || tok =~ '\K\k*'
-          return s:IsBlock() && (tok == '}' || s:Token() !=# 'class')
+          return s:IsBlock() && (tok == '}' || s:Token() !=# 'class' || s:PreviousToken() == '.')
         endif
       else
         return

From 868c15b1c5286f36b109513c8912092e21c5df11 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 11 Jun 2017 00:29:00 -0700
Subject: [PATCH 0881/1043] non-interrupting limit info in debugging

---
 indent/javascript.vim | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2ce67720..1733e989 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -425,13 +425,19 @@ function GetJavascriptIndent()
   else
     call cursor(v:lnum,1)
     let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
-    if idx != -1
-      call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
-    elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-      call s:GetPair('{','}','bW','s:SkipFunc()',2000)
-    else
-      call s:AlternatePair()
-    endif
+    try
+      if idx != -1
+        call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+      elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
+        call s:GetPair('{','}','bW','s:SkipFunc()',2000)
+      else
+        call s:AlternatePair()
+      endif
+    catch /E728/
+      " DEBUG: set debug=throw ; sentinel exception
+      call cursor(v:lnum,1)
+      echom v:throwpoint
+    endtry
   endif
 
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:script_tag,0] : getpos('.')[1:2])

From 0b44edb6f8a257738f1130aabb0631996c48d436 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 13 Jun 2017 00:04:55 -0700
Subject: [PATCH 0882/1043] Pcodeline (#980)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1733e989..b6cd80c7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -256,11 +256,11 @@ function s:PrevCodeLine(lnum)
       endif
       let l:n = prevnonblank(l:n-1)
     elseif stridx(getline(l:n), '*/') != -1 && s:SynAt(l:n,1) =~? s:syng_com
-      for l:n in range(l:n-1, s:Nat(l:n-(&cino =~ '\*' ? s:ParseCino('*') : 70)-1), -1)
-        if stridx(getline(l:n),'/*') != -1
-          break
-        endif
-      endfor
+      let l:pos = getpos('.')
+      call cursor(l:n,1)
+      keepjumps norm! [*
+      let l:n = line('.') % l:n
+      call setpos('.',l:pos)
     else
       break
     endif

From 2b0889fa80e4cc557e078c87caeb284c85f4c474 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 14 Jun 2017 00:01:00 -0700
Subject: [PATCH 0883/1043] naturalize (#981)

* naturalize

* Update javascript.vim
---
 indent/javascript.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b6cd80c7..8da0c5b2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,11 +62,11 @@ let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
 " searchpair() wrapper
 if has('reltime')
   function s:GetPair(start,end,flags,skip,time,...)
-    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
+    return max([searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time),0])
   endfunction
 else
   function s:GetPair(start,end,flags,skip,...)
-    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
+    return max([searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)])),0])
   endfunction
 endif
 
@@ -133,7 +133,7 @@ function s:AlternatePair()
       continue
     elseif tok == ';'
       if !l:for
-        if s:GetPair('{','}','bW','s:SkipFunc()',2000) > 0
+        if s:GetPair('{','}','bW','s:SkipFunc()',2000)
           return
         endif
       else
@@ -141,7 +141,7 @@ function s:AlternatePair()
         continue
       endif
     elseif tok =~ '[])}]'
-      if s:GetPair(escape(tr(tok,'])}','[({'),'['), tok,'bW','s:SkipFunc()',2000) > 0
+      if s:GetPair(escape(tr(tok,'])}','[({'),'['), tok,'bW','s:SkipFunc()',2000)
         continue
       endif
     else
@@ -205,7 +205,7 @@ function s:ExprCol()
       let bal += 1
     elseif tok == '{' && !s:IsBlock()
       let bal = 1
-    elseif tok != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+    elseif tok != '}' || !s:GetPair('{','}','bW',s:skip_expr,200)
       break
     endif
   endwhile
@@ -291,7 +291,7 @@ function s:OneScope(lnum)
   let pline = s:Trim(a:lnum)
   call cursor(a:lnum,strlen(pline))
   let kw = 'else do'
-  if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+  if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
     if s:PreviousToken() =~# '^\%(await\|each\)$'
       call s:PreviousToken()
       let kw = 'for'
@@ -308,7 +308,7 @@ function s:DoWhile()
     let l:pos = searchpos('\m\<','cbW')
     while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
       if !eval(s:skip_expr)
-        if (s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) > 0 ?
+        if (s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) ?
               \ s:PreviousToken() : s:Token()) ==# 'do' && s:IsBlock()
           return 1
         endif
@@ -341,10 +341,10 @@ endfunction
 
 function s:IsSwitch()
   if s:PreviousToken() !~ '[.*]'
-    if s:GetPair('{','}','cbW',s:skip_expr,100) > 0
+    if s:GetPair('{','}','cbW',s:skip_expr,100)
       if s:IsBlock()
         let tok = s:Token()
-        if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) > 0 || tok =~ '\K\k*'
+        if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) || tok =~ '\K\k*'
           return s:IsBlock() && (tok == '}' || s:Token() !=# 'class' || s:PreviousToken() == '.')
         endif
       else
@@ -446,7 +446,7 @@ function GetJavascriptIndent()
   let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
   if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()
     let [ilnum, pline] = [line('.'), s:Trim(l:lnum)]
-    if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
+    if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr,100)
       if ilnum == num
         let [num, num_ind] = [line('.'), indent('.')]
       endif

From e14cfb6a0d550582e08d8439d4c011c2d1fd51f4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 14 Jun 2017 01:25:23 -0700
Subject: [PATCH 0884/1043] flowtype requiring (#982)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8da0c5b2..439c0c5a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -362,7 +362,7 @@ function s:IsBlock()
   if match(s:stack,'\cxml\|jsx') != -1 && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
     return tok != '{'
   elseif tok =~ '\k'
-    if tok ==# 'type'
+    if tok ==# 'type' && hlexists('jsFlowImportType')
       return s:__PreviousToken() !~# '^\%(im\|ex\)port$'
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')

From 271f73123f3b5d70a6e64665c8abc2f03166c3bd Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 14 Jun 2017 22:55:02 -0700
Subject: [PATCH 0885/1043] clean up Syn

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 439c0c5a..14057b29 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -70,12 +70,11 @@ else
   endfunction
 endif
 
-function s:SynAt(l,c)
-  let pos = join([a:l,a:c],',')
-  if has_key(s:synid_cache,pos)
-    return s:synid_cache[pos]
+function s:SynAt(...)
+  let pos = join(a:000,',')
+  if !has_key(s:synid_cache,pos)
+    let s:synid_cache[pos] = synIDattr(synID(a:1,a:2,0),'name')
   endif
-  let s:synid_cache[pos] = synIDattr(synID(a:l,a:c,0),'name')
   return s:synid_cache[pos]
 endfunction
 

From 43899087862e1ef89aac17f42fc8d3fb2e6dc541 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 15 Jun 2017 00:00:26 -0700
Subject: [PATCH 0886/1043] date, cleaning

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 14057b29..dcd6d88d 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: May 30, 2017
+" Last Change: June 15, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -70,10 +70,10 @@ else
   endfunction
 endif
 
-function s:SynAt(...)
-  let pos = join(a:000,',')
+function s:SynAt(l,c)
+  let pos = a:l.','.a:c
   if !has_key(s:synid_cache,pos)
-    let s:synid_cache[pos] = synIDattr(synID(a:1,a:2,0),'name')
+    let s:synid_cache[pos] = synIDattr(synID(a:l,a:c,0),'name')
   endif
   return s:synid_cache[pos]
 endfunction
@@ -361,8 +361,8 @@ function s:IsBlock()
   if match(s:stack,'\cxml\|jsx') != -1 && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
     return tok != '{'
   elseif tok =~ '\k'
-    if tok ==# 'type' && hlexists('jsFlowImportType')
-      return s:__PreviousToken() !~# '^\%(im\|ex\)port$'
+    if tok ==# 'type'
+      return hlexists('jsFlowImportType') && s:__PreviousToken() !~# '^\%(im\|ex\)port$'
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
           \ ,tok) < (line('.') != l:n) || s:__PreviousToken() == '.'

From f20659188be30f043db2a2ee4ce725b6f842efe5 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 15 Jun 2017 00:03:08 -0700
Subject: [PATCH 0887/1043] small logic reversal

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index dcd6d88d..cb3ca740 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -362,7 +362,7 @@ function s:IsBlock()
     return tok != '{'
   elseif tok =~ '\k'
     if tok ==# 'type'
-      return hlexists('jsFlowImportType') && s:__PreviousToken() !~# '^\%(im\|ex\)port$'
+      return !hlexists('jsFlowImportType') || s:__PreviousToken() !~# '^\%(im\|ex\)port$'
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
           \ ,tok) < (line('.') != l:n) || s:__PreviousToken() == '.'

From 8d6fbfb41fe208e25cf1e666661faa6f1b9dbb64 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 17 Jun 2017 12:55:48 -0700
Subject: [PATCH 0888/1043] lex type import (#984)

---
 indent/javascript.vim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cb3ca740..01cb5dfd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -362,7 +362,12 @@ function s:IsBlock()
     return tok != '{'
   elseif tok =~ '\k'
     if tok ==# 'type'
-      return !hlexists('jsFlowImportType') || s:__PreviousToken() !~# '^\%(im\|ex\)port$'
+      let l:pos = getpos('.')
+      try
+        return s:PreviousToken() !~# '^\%(im\|ex\)port$' || s:PreviousToken() == '.'
+      finally
+        call setpos('.',l:pos)
+      endtry
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
           \ ,tok) < (line('.') != l:n) || s:__PreviousToken() == '.'

From efd4f1f5e7a19f11e03d438d1fcd9ab69c6381a1 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 12 May 2017 11:45:51 -0700
Subject: [PATCH 0889/1043] Small fix for Flow class annotations

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 959e5780..0ecb00a0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -186,7 +186,7 @@ syntax keyword jsClassKeyword           contained class
 syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsFuncName,jsClassProperty
-syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
+syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend

From e6f514324bd8fcd9e334565fb9ca6205541d6a77 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 19 Jun 2017 18:39:25 -0700
Subject: [PATCH 0890/1043] IsCont trivial refactor (#986)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 01cb5dfd..258d0e80 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -152,7 +152,7 @@ function s:AlternatePair()
 endfunction
 
 function s:Nat(int)
-  return max([a:int,0])
+  return a:int * (a:int > 0)
 endfunction
 
 function s:LookingAt()
@@ -327,7 +327,7 @@ function s:IsContOne(i,num,cont)
   let ind = indent(l:i) + (a:cont ? 0 : s:sw())
   while l:i >= l:num && (ind > pind || l:i == l:num)
     if indent(l:i) < ind && s:OneScope(l:i)
-      let b_l += s:sw()
+      let b_l += 1
       let l:i = line('.')
     elseif !a:cont || b_l || ind < indent(a:i)
       break
@@ -471,8 +471,7 @@ function GetJavascriptIndent()
         endif
       endif
       let is_op = (l:line =~# s:opfirst || s:Continues(l:lnum,pline)) * s:sw()
-      let b_l = s:IsContOne(l:lnum,b:js_cache[1],is_op)
-      let b_l -= (b_l && l:line[0] == '{') * s:sw()
+      let b_l = s:Nat(s:IsContOne(l:lnum,b:js_cache[1],is_op) - (l:line =~ '^{')) * s:sw()
     endif
   elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
     let pval = s:ParseCino('(')

From 4eac815fac9d2d9cbb5c154fd09373d11a21cd37 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 20 Jun 2017 00:58:39 -0700
Subject: [PATCH 0891/1043] cleaner searcpair workaround

internally, searchpair just concats the regexes, making an `[` start a delimiter
---
 indent/javascript.vim | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 258d0e80..f79bc2bd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,11 +62,13 @@ let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
 " searchpair() wrapper
 if has('reltime')
   function s:GetPair(start,end,flags,skip,time,...)
-    return max([searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time),0])
+    return s:Nat(searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
+          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time))
   endfunction
 else
   function s:GetPair(start,end,flags,skip,...)
-    return max([searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)])),0])
+    return s:Nat(searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
+          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)])))
   endfunction
 endif
 
@@ -140,7 +142,7 @@ function s:AlternatePair()
         continue
       endif
     elseif tok =~ '[])}]'
-      if s:GetPair(escape(tr(tok,'])}','[({'),'['), tok,'bW','s:SkipFunc()',2000)
+      if s:GetPair(tr(tok,'])}','[({'), tok,'bW','s:SkipFunc()',2000)
         continue
       endif
     else
@@ -431,7 +433,7 @@ function GetJavascriptIndent()
     let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
     try
       if idx != -1
-        call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
       elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
         call s:GetPair('{','}','bW','s:SkipFunc()',2000)
       else

From e0472fc50f00fa0da62976520caa0593861fd7b9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 23 Jun 2017 11:11:12 -0700
Subject: [PATCH 0892/1043] indent file cleaning (#988)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f79bc2bd..e2f83338 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -281,9 +281,9 @@ function s:Balanced(lnum)
         return
       endif
     endif
-    let pos = match(l:line, (l:open ?
-          \ '['.matchstr(['][','()','{}'],l:line[pos]).']' :
-          \ '[][(){}]'), pos + 1)
+    let pos = match(l:line, l:open ?
+          \ matchstr(['[][]','[()]','[{}]'],l:line[pos]) :
+          \ '[][(){}]', pos + 1)
   endwhile
   return !l:open
 endfunction
@@ -431,19 +431,13 @@ function GetJavascriptIndent()
   else
     call cursor(v:lnum,1)
     let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
-    try
-      if idx != -1
-        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
-      elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-        call s:GetPair('{','}','bW','s:SkipFunc()',2000)
-      else
-        call s:AlternatePair()
-      endif
-    catch /E728/
-      " DEBUG: set debug=throw ; sentinel exception
-      call cursor(v:lnum,1)
-      echom v:throwpoint
-    endtry
+    if idx != -1
+      call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+    elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
+      call s:GetPair('{','}','bW','s:SkipFunc()',2000)
+    else
+      call s:AlternatePair()
+    endif
   endif
 
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:script_tag,0] : getpos('.')[1:2])

From 14cf98883bb74f73ecf1a2b6286071250fd38fc3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 24 Jun 2017 23:14:05 -0700
Subject: [PATCH 0893/1043] remove semicolon flag; flow (#989)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e2f83338..86cea91d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -192,7 +192,7 @@ endfunction
 
 function s:ExprCol()
   let [bal, l:pos] = [0, getpos('.')]
-  while bal < 1 && search('\m[{}?:;]','bW',s:script_tag)
+  while bal < 1 && search('\m[{}?:]','bW',s:script_tag)
     let tok = eval(s:skip_expr) ? '' : s:LookingAt()
     if tok is ''
       continue
@@ -206,7 +206,7 @@ function s:ExprCol()
       let bal += 1
     elseif tok == '{' && !s:IsBlock()
       let bal = 1
-    elseif tok != '}' || !s:GetPair('{','}','bW',s:skip_expr,200)
+    elseif !s:GetPair('{','}','bW',s:skip_expr,200)
       break
     endif
   endwhile

From ebc6fd267d35de845ade8561e79682423715a1b4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 26 Jun 2017 00:14:39 -0700
Subject: [PATCH 0894/1043] fix expr_col case

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 86cea91d..0a4a3054 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -206,7 +206,7 @@ function s:ExprCol()
       let bal += 1
     elseif tok == '{' && !s:IsBlock()
       let bal = 1
-    elseif !s:GetPair('{','}','bW',s:skip_expr,200)
+    elseif tok != '}' || !s:GetPair('{','}','bW',s:skip_expr,200)
       break
     endif
   endwhile

From 97203f192ab347afa86b310b50550040af4d6902 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Jun 2017 00:28:50 -0700
Subject: [PATCH 0895/1043] async/await should be an @jsExpression

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0ecb00a0..60606962 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -237,8 +237,8 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsAsyncKeyword,jsNoise,jsBlockLabel
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsNoise,jsBlockLabel
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From aba8630e2f42021c8859a1a99aa1b1c823fc5616 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Jun 2017 00:37:31 -0700
Subject: [PATCH 0896/1043] Making jsModuleGroup foldable

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 60606962..4171c81e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -159,7 +159,7 @@ syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces s
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsComment extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
-syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom
+syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom fold
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression

From 43097941ad86bf848d6ff9c181f0141ce5810715 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 27 Jun 2017 11:35:37 -0700
Subject: [PATCH 0897/1043] let [] =[], minor formatting (#990)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0a4a3054..ebfb21c7 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: June 15, 2017
+" Last Change: June 27, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -204,9 +204,10 @@ function s:ExprCol()
       endif
     elseif tok == '?'
       let bal += 1
-    elseif tok == '{' && !s:IsBlock()
-      let bal = 1
-    elseif tok != '}' || !s:GetPair('{','}','bW',s:skip_expr,200)
+    elseif tok == '{'
+      let bal = !s:IsBlock()
+      break
+    elseif !s:GetPair('{','}','bW',s:skip_expr,200)
       break
     endif
   endwhile
@@ -271,9 +272,8 @@ endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
-  let l:open = 0
-  let l:line = getline(a:lnum)
-  let pos = match(l:line, '[][(){}]', 0)
+  let [l:open, l:line] = [0, getline(a:lnum)]
+  let pos = match(l:line, '[][(){}]')
   while pos != -1
     if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
       let l:open += match(' ' . l:line[pos],'[[({]')
@@ -289,9 +289,8 @@ function s:Balanced(lnum)
 endfunction
 
 function s:OneScope(lnum)
-  let pline = s:Trim(a:lnum)
+  let [pline, kw] = [s:Trim(a:lnum), 'else do']
   call cursor(a:lnum,strlen(pline))
-  let kw = 'else do'
   if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
     if s:PreviousToken() =~# '^\%(await\|each\)$'
       call s:PreviousToken()
@@ -325,8 +324,8 @@ endfunction
 " a continued expression, which could have started in a braceless context
 function s:IsContOne(i,num,cont)
   let [l:i, l:num, b_l] = [a:i, a:num + !a:num, 0]
-  let pind = a:num ? indent(l:num) + s:sw() : 0
-  let ind = indent(l:i) + (a:cont ? 0 : s:sw())
+  let pind = a:num ? indent(a:num) + s:sw() : 0
+  let ind = indent(a:i) + (a:cont ? 0 : s:sw())
   while l:i >= l:num && (ind > pind || l:i == l:num)
     if indent(l:i) < ind && s:OneScope(l:i)
       let b_l += 1
@@ -387,12 +386,13 @@ function s:IsBlock()
 endfunction
 
 function GetJavascriptIndent()
-  let b:js_cache = get(b:,'js_cache',[0,0,0])
-  let s:synid_cache = {}
-  " Get the current line.
-  let l:line = getline(v:lnum)
+  let [b:js_cache, s:synid_cache, l:line, s:stack] = [
+        \ get(b:,'js_cache',[0,0,0]),
+        \ {},
+        \ getline(v:lnum),
+        \ map(synstack(v:lnum,1),"synIDattr(v:val,'name')"),
+        \ ]
   " use synstack as it validates syn state and works in an empty line
-  let s:stack = map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
   let syns = get(s:stack,-1,'')
 
   " start with strings,comments,etc.

From 72f4a95b226746cf015585a6682b75b5b8930f6d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 28 Jun 2017 17:13:51 -0700
Subject: [PATCH 0898/1043] fix for `[*` failing

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ebfb21c7..941eeae6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -260,8 +260,7 @@ function s:PrevCodeLine(lnum)
     elseif stridx(getline(l:n), '*/') != -1 && s:SynAt(l:n,1) =~? s:syng_com
       let l:pos = getpos('.')
       call cursor(l:n,1)
-      keepjumps norm! [*
-      let l:n = line('.') % l:n
+      let l:n = search('\/\*','nbW')
       call setpos('.',l:pos)
     else
       break

From 1bd80e0929f99d49acdf4f6a49e818283ad2a21e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 1 Jul 2017 10:44:01 -0700
Subject: [PATCH 0899/1043] edge case fix: prevcodeline() and c style comments
 (#994)

---
 indent/javascript.vim | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 941eeae6..bdd19c44 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -252,15 +252,28 @@ function s:PrevCodeLine(lnum)
   let l:n = prevnonblank(a:lnum)
   while l:n
     if getline(l:n) =~ '^\s*\/[/*]'
-      if (stridx(getline(l:n),'`') != -1 || getline(l:n-1)[-1:] == '\') &&
+      if (getline(l:n) =~ '`' || getline(l:n-1)[-1:] == '\') &&
             \ s:SynAt(l:n,1) =~? b:syng_str
         break
       endif
       let l:n = prevnonblank(l:n-1)
-    elseif stridx(getline(l:n), '*/') != -1 && s:SynAt(l:n,1) =~? s:syng_com
+    elseif getline(l:n) =~ '\*\/' && s:SynAt(l:n,1) =~? s:syng_com
       let l:pos = getpos('.')
       call cursor(l:n,1)
-      let l:n = search('\/\*','nbW')
+      let l:n = search('\/\*','bW')
+      while search('\/\*\|\(\*\/\)','bWp') == 1
+        let br = 0
+        for l:i in range(l:n,line('.'),-1)
+          if s:SynAt(l:i,l:i == line('.') ? col('.') : 1) !~? s:syng_com
+            let br = 1
+            break
+          endif
+        endfor
+        if br
+          break
+        endif
+        let l:n = line('.')
+      endwhile
       call setpos('.',l:pos)
     else
       break

From 7684f3cfc7d270d587c54c07e6d9c923dd859806 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 1 Jul 2017 18:28:17 -0700
Subject: [PATCH 0900/1043] magic

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bdd19c44..29d89236 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -260,8 +260,8 @@ function s:PrevCodeLine(lnum)
     elseif getline(l:n) =~ '\*\/' && s:SynAt(l:n,1) =~? s:syng_com
       let l:pos = getpos('.')
       call cursor(l:n,1)
-      let l:n = search('\/\*','bW')
-      while search('\/\*\|\(\*\/\)','bWp') == 1
+      let l:n = search('\m\/\*','bW')
+      while search('\m\/\*\|\(\*\/\)','bWp') == 1
         let br = 0
         for l:i in range(l:n,line('.'),-1)
           if s:SynAt(l:i,l:i == line('.') ? col('.') : 1) !~? s:syng_com

From 9b2a032c3bb41187a1bc803fb695a1ea564cc4f9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 2 Jul 2017 00:03:32 -0700
Subject: [PATCH 0901/1043] fix list size error with setpos()

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 29d89236..0b7c6e7c 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: June 27, 2017
+" Last Change: July 2, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -317,7 +317,7 @@ endfunction
 
 function s:DoWhile()
   if expand('<cword>') ==# 'while'
-    let l:pos = searchpos('\m\<','cbW')
+    let cpos = searchpos('\m\<','cbW')
     while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
       if !eval(s:skip_expr)
         if (s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) ?
@@ -327,7 +327,7 @@ function s:DoWhile()
         break
       endif
     endwhile
-    call setpos('.',l:pos)
+    call call('cursor',cpos)
   endif
 endfunction
 

From be46c1c4d15b63b726b39f0a64f0c47d48ec1573 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 3 Jul 2017 00:04:51 -0700
Subject: [PATCH 0902/1043] document and improve class cases (#996)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0b7c6e7c..49454484 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -354,14 +354,8 @@ endfunction
 function s:IsSwitch()
   if s:PreviousToken() !~ '[.*]'
     if s:GetPair('{','}','cbW',s:skip_expr,100)
-      if s:IsBlock()
-        let tok = s:Token()
-        if tok == '}' && s:GetPair('{','}','bW',s:skip_expr,100) || tok =~ '\K\k*'
-          return s:IsBlock() && (tok == '}' || s:Token() !=# 'class' || s:PreviousToken() == '.')
-        endif
-      else
-        return
-      endif
+      return s:IsBlock() && (s:Token() !~# '^\K\k*$' || s:Token() !=# 'class'
+            \ && s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.')
     endif
     return 1
   endif

From 603ec715630660d18ff5c83a6d4120e15a84b078 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 3 Jul 2017 10:13:18 -0700
Subject: [PATCH 0903/1043] cleaning, indent (#997)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 49454484..46608793 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -354,7 +354,7 @@ endfunction
 function s:IsSwitch()
   if s:PreviousToken() !~ '[.*]'
     if s:GetPair('{','}','cbW',s:skip_expr,100)
-      return s:IsBlock() && (s:Token() !~# '^\K\k*$' || s:Token() !=# 'class'
+      return s:IsBlock() && (s:Token() !~ '^\K\k*$' || expand('<cword>') !=# 'class'
             \ && s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.')
     endif
     return 1

From ef74079e966e102993beaede01170b2b65192342 Mon Sep 17 00:00:00 2001
From: Marc Harter <wavded@gmail.com>
Date: Wed, 5 Jul 2017 12:34:44 -0500
Subject: [PATCH 0904/1043] Add @async tag support.

Recently added: https://github.com/jsdoc3/jsdoc/blob/2f60a2c222cfad4110be9b3466a8d445c7f60256/test/fixtures/asynctag.js
---
 extras/jsdoc.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 6acb8640..a19f3a37 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -10,7 +10,7 @@ syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|
 " tags containing references
 syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
 " other tags (no extra syntax)
-syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|async\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
 syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
 syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam

From f0ce7ffa9d425e1a74ed6bfbd61686aab63cc92a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 5 Jul 2017 13:34:32 -0700
Subject: [PATCH 0905/1043] cino-W (#1000)

---
 README.md             |  1 +
 indent/javascript.vim | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 04053796..b60614f9 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,7 @@ OR if you wish to toggle concealing you may wish to bind a command such as the f
 * `:h cino-star`
 * `:h cino-(`
 * `:h cino-w`
+* `:h cino-W`
 * `:h cino-U`
 * `:h cino-m`
 * `:h cino-M`
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 46608793..ea4eca4a 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -475,11 +475,17 @@ function GetJavascriptIndent()
       let is_op = (l:line =~# s:opfirst || s:Continues(l:lnum,pline)) * s:sw()
       let b_l = s:Nat(s:IsContOne(l:lnum,b:js_cache[1],is_op) - (l:line =~ '^{')) * s:sw()
     endif
-  elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
+  elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '(' &&
+        \ (search('\m\S','nbW',num) || s:ParseCino('U'))
     let pval = s:ParseCino('(')
-    return !pval || !search('\m\S','nbW',num) && !s:ParseCino('U') ?
-          \ (s:ParseCino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :
-          \ s:Nat(num_ind + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:sw())
+    if !pval
+      let [Wval, vcol] = [s:ParseCino('W'), virtcol('.')]
+      if search('\m\S','W',num)
+        return s:ParseCino('w') ? vcol : virtcol('.')-1
+      endif
+      return Wval ? s:Nat(num_ind + Wval) : vcol
+    endif
+    return s:Nat(num_ind + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:sw())
   endif
 
   " main return

From ff5e284f4419181630f053210b06b59688f12fa4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 6 Jul 2017 14:46:14 -0700
Subject: [PATCH 0906/1043] exponentiator, operator things (#1001)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ea4eca4a..655fb8ea 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -217,7 +217,7 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\C\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
+      \ '\C\%([<>=,.?^%|*/&]\|\([-:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
@@ -466,7 +466,7 @@ function GetJavascriptIndent()
       endif
     endif
     if idx == -1 && pline[-1:] !~ '[{;]'
-      if l:line =~# '^\%(in\%(stanceof\)\=\>\|\*\)' && pline[-1:] == '}'
+      if l:line =~# '^\%(in\%(stanceof\)\=\>\|\*\*\@!\)' && pline[-1:] == '}'
         call cursor(l:lnum,strlen(pline))
         if s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
           return num_ind + s:sw()

From 243932e58f572e4c521019d922b25861014edc9e Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 26 Jun 2017 00:20:34 -0700
Subject: [PATCH 0907/1043] A ton of flow fixes

Fixes #901
Fixes #966
Fixes #983
Fixes #891
Fixes #885
Fixes #845
Fixes #792
Fixes #723
Fixes #567

This is all a bit hairy, but I think I put a big dent in a lot of the
common flow problems that have been reported. I want to sit on these
changes for a few days though to make sure I didn't cause a serious
regression.
---
 extras/flow.vim       | 29 ++++++++++++++++++++---------
 syntax/javascript.vim |  8 ++++----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index af883ac8..e8c48c69 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -2,7 +2,8 @@ syntax region  jsFlowDefinition     contained                        start=/:/
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
-syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster
+syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
 syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
@@ -10,16 +11,16 @@ syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipemp
 syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
 syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
-syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
 syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
 syntax match   jsFlowWildcard       contained /*/
 
-syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster,jsFlowArrow,jsFlowReturnParens
 syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
-syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow
+syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
@@ -30,7 +31,8 @@ syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ e
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
 syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsExpression,jsFlowGroup,jsFlowMaybe
+syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
+syntax match   jsOperator           contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type
 
@@ -42,10 +44,16 @@ syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempt
 syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
 syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise
 
-syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
+" NOTE: It appears the nextgroup was causing a ton of breakages... testing it
+" witout a nextgroup, but keeping this arround for reference incase something breaks
+" syntax match   jsFlowMaybe          contained /?/ nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject extend keepend
+syntax match   jsFlowMaybe          contained /?/
+syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
 
-syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn
-syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
+syntax region  jsFlowParenAnnotation contained start=/:/ end=/)\@=/ containedin=jsParen contains=@jsFlowCluster
+
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -62,9 +70,11 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowTypeof             PreProc
   HiLink jsFlowArray              PreProc
   HiLink jsFlowObject             PreProc
+  HiLink jsFlowExactObject        PreProc
   HiLink jsFlowParens             PreProc
   HiLink jsFlowGroup              PreProc
   HiLink jsFlowReturn             PreProc
+  HiLink jsFlowParenAnnotation    PreProc
   HiLink jsFlowReturnObject       jsFlowReturn
   HiLink jsFlowReturnArray        jsFlowArray
   HiLink jsFlowReturnParens       jsFlowParens
@@ -73,6 +83,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowClassGroup         PreProc
   HiLink jsFlowArrowArguments     PreProc
   HiLink jsFlowArrow              PreProc
+  HiLink jsFlowReturnArrow        PreProc
   HiLink jsFlowTypeStatement      PreProc
   HiLink jsFlowTypeKeyword        PreProc
   HiLink jsFlowTypeOperator       PreProc
@@ -84,7 +95,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowInterface          PreProc
   HiLink jsFlowNoise              Noise
   HiLink jsFlowObjectKey          jsObjectKey
-  HiLink jsFlowOrOperator         PreProc
+  HiLink jsFlowOrOperator         jsOperator
   HiLink jsFlowReturnOrOp         jsFlowOrOperator
   HiLink jsFlowWildcard           PreProc
   HiLink jsFlowWildcardReturn     PreProc
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4171c81e..950474e4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -41,14 +41,14 @@ syntax keyword jsBooleanFalse   false
 
 " Modules
 syntax keyword jsImport                       import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup,jsFlowImportType
-syntax keyword jsExport                       export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword
+syntax keyword jsExport                       export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword,jsFlowTypeStatement
 syntax match   jsModuleKeyword      contained /\k\+/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
 syntax keyword jsExportDefault      contained default skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsExportDefaultGroup contained default skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
 syntax match   jsModuleAsterisk     contained /\*/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAs,jsFrom
 syntax keyword jsModuleAs           contained as skipwhite skipempty nextgroup=jsModuleKeyword,jsExportDefaultGroup
 syntax keyword jsFrom               contained from skipwhite skipempty nextgroup=jsString
-syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup
+syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup,jsFlowTypeKeyword
 
 " Strings, Templates, Numbers
 syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
@@ -141,7 +141,7 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 
 " Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
-syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsAll extend fold
+syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsExpression extend fold nextgroup=jsFlowDefinition
 syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll extend fold
 syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock extend fold
 syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock extend fold
@@ -159,7 +159,7 @@ syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces s
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsComment extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
-syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment skipwhite skipempty nextgroup=jsFrom fold
+syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression

From 0353342bc6ebf08bb868b2515316e87d3815571c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 27 Jun 2017 13:35:41 -0700
Subject: [PATCH 0908/1043] Fix for jsFlowOperator

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

diff --git a/extras/flow.vim b/extras/flow.vim
index e8c48c69..c916f49d 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -32,7 +32,7 @@ syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ e
 
 syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
 syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
-syntax match   jsOperator           contained /=/ containedin=jsFlowTypeValue
+syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type
 
@@ -86,7 +86,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowReturnArrow        PreProc
   HiLink jsFlowTypeStatement      PreProc
   HiLink jsFlowTypeKeyword        PreProc
-  HiLink jsFlowTypeOperator       PreProc
+  HiLink jsFlowTypeOperator       Operator
   HiLink jsFlowMaybe              PreProc
   HiLink jsFlowReturnMaybe        PreProc
   HiLink jsFlowClassProperty      jsClassProperty

From e4870b4f5d29b1a88a44dc026da0deafbbc1064f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 28 Jun 2017 13:09:13 -0700
Subject: [PATCH 0909/1043] More fixes for flow

---
 extras/flow.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index c916f49d..fcef8a6a 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -50,7 +50,7 @@ syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ e
 syntax match   jsFlowMaybe          contained /?/
 syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
 
-syntax region  jsFlowParenAnnotation contained start=/:/ end=/)\@=/ containedin=jsParen contains=@jsFlowCluster
+syntax region  jsFlowParenAnnotation contained start=/:/ end=/[,=)]\@=/ containedin=jsParen contains=@jsFlowCluster
 
 syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow
 syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
@@ -99,5 +99,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowReturnOrOp         jsFlowOrOperator
   HiLink jsFlowWildcard           PreProc
   HiLink jsFlowWildcardReturn     PreProc
+  HiLink jsFlowImportType         PreProc
+  HiLink jsFlowTypeValue          PreProc
   delcommand HiLink
 endif

From 008e98985c588bc2264d831969ce79ea40dcd26f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 28 Jun 2017 16:26:24 -0700
Subject: [PATCH 0910/1043] Trying out some flow tweaks

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

diff --git a/extras/flow.vim b/extras/flow.vim
index fcef8a6a..4ee7b166 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -30,8 +30,8 @@ syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=
 syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
-syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
+syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeValue      contained                        start=/=/       end=/;/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type

From bc5b024846f52eeb822d682546880b96cae548c1 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Wed, 28 Jun 2017 16:31:36 -0700
Subject: [PATCH 0911/1043] A few more fixes

---
 extras/flow.vim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 4ee7b166..89fbd452 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,8 +1,8 @@
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
-syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster,jsComment
+syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster,jsComment
 syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
@@ -30,8 +30,8 @@ syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=
 syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
-syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained                        start=/=/       end=/;/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
+syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/;/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type

From dd1f74fb8e8898400d66712f44df9940252806f4 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 9 Jul 2017 16:57:50 -0700
Subject: [PATCH 0912/1043] Another quick flow patch

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 89fbd452..10020817 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -31,7 +31,7 @@ syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ e
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
 syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/;/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
+syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/[\n;]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type

From 37a68c3c7caab063e984039b9e1f7a05f8b41075 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 9 Jul 2017 20:56:07 -0700
Subject: [PATCH 0913/1043] Add fold to various flow regions

---
 extras/flow.vim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 10020817..ecdaa972 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,9 +1,9 @@
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster,jsComment
-syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster,jsComment
-syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment fold
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster,jsComment fold
+syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster,jsComment fold
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend fold
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
 syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
@@ -17,9 +17,9 @@ syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup
 syntax match   jsFlowWildcard       contained /*/
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster,jsFlowArrow,jsFlowReturnParens
-syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
-syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
-syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow
+syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
+syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
+syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
 syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
@@ -42,13 +42,13 @@ syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)
 
 syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
 syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
-syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise
+syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise fold
 
 " NOTE: It appears the nextgroup was causing a ton of breakages... testing it
 " witout a nextgroup, but keeping this arround for reference incase something breaks
 " syntax match   jsFlowMaybe          contained /?/ nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject extend keepend
 syntax match   jsFlowMaybe          contained /?/
-syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
+syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend fold
 
 syntax region  jsFlowParenAnnotation contained start=/:/ end=/[,=)]\@=/ containedin=jsParen contains=@jsFlowCluster
 

From ff851de601dfbfb13d03cf7c199e0bece08cedcb Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 14 Jul 2017 00:40:34 -0700
Subject: [PATCH 0914/1043] improve conditionals all over (#1002)

tests are only performed when relevant
---
 indent/javascript.vim | 66 +++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 655fb8ea..89692eb9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -68,7 +68,7 @@ if has('reltime')
 else
   function s:GetPair(start,end,flags,skip,...)
     return s:Nat(searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
-          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)])))
+          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,0,get(a:000,1)])))
   endfunction
 endif
 
@@ -107,7 +107,7 @@ endfunction
 
 " Optimized {skip} expr, used only once per GetJavascriptIndent() call
 function s:SkipFunc()
-  if s:top_col == 1 || line('.') < s:script_tag
+  if s:top_col == 1
     return {} " E728, used as limit condition for loops and searchpair()
   endif
   let s:top_col = col('.')
@@ -128,27 +128,26 @@ endfunction
 
 function s:AlternatePair()
   let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 2]
-  while search('\m'.pat,'bW')
-    let tok = s:SkipFunc() ? '' : s:LookingAt()
-    if tok is ''
+  while search('\m'.pat,'bW',s:script_tag)
+    if s:SkipFunc()
       continue
-    elseif tok == ';'
+    elseif s:LookingAt() == ';'
       if !l:for
-        if s:GetPair('{','}','bW','s:SkipFunc()',2000)
+        if s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
           return
         endif
+        break
       else
         let [pat, l:for] = ['[{}();]', l:for - 1]
-        continue
-      endif
-    elseif tok =~ '[])}]'
-      if s:GetPair(tr(tok,'])}','[({'), tok,'bW','s:SkipFunc()',2000)
-        continue
       endif
     else
-      return
+      let idx = stridx('])}',s:LookingAt())
+      if idx == -1
+        return
+      elseif !s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
+        break
+      endif
     endif
-    break
   endwhile
   call setpos('.',l:pos)
 endfunction
@@ -191,20 +190,21 @@ function s:__PreviousToken()
 endfunction
 
 function s:ExprCol()
+  if getline('.')[col('.')-2] == ':'
+    return 1
+  endif
   let [bal, l:pos] = [0, getpos('.')]
-  while bal < 1 && search('\m[{}?:]','bW',s:script_tag)
-    let tok = eval(s:skip_expr) ? '' : s:LookingAt()
-    if tok is ''
+  while search('\m[{}?:]','bW',s:script_tag)
+    if eval(s:skip_expr)
       continue
-    elseif tok == ':'
-      if getpos('.')[1:2] == [l:pos[1],l:pos[2]-1]
-        let bal = 1
-      else
-        let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
-      endif
-    elseif tok == '?'
+    elseif s:LookingAt() == ':'
+      let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
+    elseif s:LookingAt() == '?'
       let bal += 1
-    elseif tok == '{'
+      if bal == 1
+        break
+      endif
+    elseif s:LookingAt() == '{'
       let bal = !s:IsBlock()
       break
     elseif !s:GetPair('{','}','bW',s:skip_expr,200)
@@ -311,7 +311,7 @@ function s:OneScope(lnum)
       let kw = 'for if let while with'
     endif
   endif
-  return pline[-2:] == '=>' || index(split(kw),s:Token()) != -1 &&
+  return pline[-2:] == '=>' || count(split(kw),s:Token()) &&
         \ s:__PreviousToken() != '.' && !s:DoWhile()
 endfunction
 
@@ -338,7 +338,7 @@ function s:IsContOne(i,num,cont)
   let [l:i, l:num, b_l] = [a:i, a:num + !a:num, 0]
   let pind = a:num ? indent(a:num) + s:sw() : 0
   let ind = indent(a:i) + (a:cont ? 0 : s:sw())
-  while l:i >= l:num && (ind > pind || l:i == l:num)
+  while l:i > l:num && ind > pind || l:i == l:num
     if indent(l:i) < ind && s:OneScope(l:i)
       let b_l += 1
       let l:i = line('.')
@@ -354,8 +354,8 @@ endfunction
 function s:IsSwitch()
   if s:PreviousToken() !~ '[.*]'
     if s:GetPair('{','}','cbW',s:skip_expr,100)
-      return s:IsBlock() && (s:Token() !~ '^\K\k*$' || expand('<cword>') !=# 'class'
-            \ && s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.')
+      return s:IsBlock() && (s:Token() !~ '^\K\k*$' || expand('<cword>') !=# 'class' &&
+            \ s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.')
     endif
     return 1
   endif
@@ -431,16 +431,16 @@ function GetJavascriptIndent()
   " the containing paren, bracket, or curly. Many hacks for performance
   let [ s:script_tag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'),
         \ index([']',')','}'],l:line[0]) ]
-  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
-        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
+  if b:js_cache[0] > l:lnum && b:js_cache[0] < v:lnum ||
+        \ b:js_cache[0] == l:lnum && s:Balanced(l:lnum)
     call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [v:lnum,1])
   else
     call cursor(v:lnum,1)
     let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
     if idx != -1
-      call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+      call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
     elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-      call s:GetPair('{','}','bW','s:SkipFunc()',2000)
+      call s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
     else
       call s:AlternatePair()
     endif

From 7175ba5e6cba2b6e2cb720d81c08c00f789e6a21 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 18 Jul 2017 19:34:32 -0700
Subject: [PATCH 0915/1043] missed a condition last time

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 89692eb9..c8c88e8d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -310,8 +310,10 @@ function s:OneScope(lnum)
     else
       let kw = 'for if let while with'
     endif
+  elseif pline[-2:] == '=>'
+    return 1
   endif
-  return pline[-2:] == '=>' || count(split(kw),s:Token()) &&
+  return count(split(kw),s:Token()) &&
         \ s:__PreviousToken() != '.' && !s:DoWhile()
 endfunction
 

From 09d7c7051fa5ceff5d8ac37370ab2a7afb1350f8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 21 Jul 2017 21:24:54 -0700
Subject: [PATCH 0916/1043] faster/smaller cache access, SynId function (#1005)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c8c88e8d..1501785e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -73,11 +73,12 @@ else
 endif
 
 function s:SynAt(l,c)
-  let pos = a:l.','.a:c
-  if !has_key(s:synid_cache,pos)
-    let s:synid_cache[pos] = synIDattr(synID(a:l,a:c,0),'name')
+  let byte = line2byte(a:l) + a:c - 1
+  let pos = index(s:synid_cache[0], byte)
+  if pos == -1
+    let s:synid_cache[:] += [[byte], [synIDattr(synID(a:l, a:c, 0), 'name')]]
   endif
-  return s:synid_cache[pos]
+  return s:synid_cache[1][pos]
 endfunction
 
 function s:ParseCino(f)
@@ -396,7 +397,7 @@ endfunction
 function GetJavascriptIndent()
   let [b:js_cache, s:synid_cache, l:line, s:stack] = [
         \ get(b:,'js_cache',[0,0,0]),
-        \ {},
+        \ [[],[]],
         \ getline(v:lnum),
         \ map(synstack(v:lnum,1),"synIDattr(v:val,'name')"),
         \ ]

From fc80419fd0866173166cee47d7274e93b51d03d8 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 27 Jul 2017 17:58:44 -0700
Subject: [PATCH 0917/1043] trivial indent fixes / updates (#1007)

trivial indent fixes / non-trivial control flow updates
---
 indent/javascript.vim | 84 ++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 1501785e..da7e599c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,13 +62,13 @@ let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
 " searchpair() wrapper
 if has('reltime')
   function s:GetPair(start,end,flags,skip,time,...)
-    return s:Nat(searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
-          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time))
+    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
+          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
   endfunction
 else
   function s:GetPair(start,end,flags,skip,...)
-    return s:Nat(searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
-          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,0,get(a:000,1)])))
+    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
+          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,0,get(a:000,1)]))
   endfunction
 endif
 
@@ -109,7 +109,7 @@ endfunction
 " Optimized {skip} expr, used only once per GetJavascriptIndent() call
 function s:SkipFunc()
   if s:top_col == 1
-    return {} " E728, used as limit condition for loops and searchpair()
+    throw 'out of bounds'
   endif
   let s:top_col = col('.')
   if getline('.') =~ '\%<'.s:top_col.'c\/.\{-}\/\|\%>'.s:top_col.'c[''"]\|\\$'
@@ -128,7 +128,7 @@ function s:SkipFunc()
 endfunction
 
 function s:AlternatePair()
-  let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 2]
+  let [pat, l:for] = ['[][(){};]', 2]
   while search('\m'.pat,'bW',s:script_tag)
     if s:SkipFunc()
       continue
@@ -150,7 +150,7 @@ function s:AlternatePair()
       endif
     endif
   endwhile
-  call setpos('.',l:pos)
+  throw 'out of bounds'
 endfunction
 
 function s:Nat(int)
@@ -218,23 +218,19 @@ endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 let s:opfirst = '^' . get(g:,'javascript_opfirst',
-      \ '\C\%([<>=,.?^%|*/&]\|\([-:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
+      \ '\C\%([<>=,.?^%|/&]\|\([-:+]\)\1\@!\|\*\+\|!=\|in\%(stanceof\)\=\>\)')
 let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
 function s:Continues(ln,con)
   let tok = matchstr(a:con[-15:],s:continuation)
-  if tok isnot ''
+  if tok =~ '[a-z:]'
     call cursor(a:ln,strlen(a:con))
-    if tok =~ '[/>]'
-      return s:SynAt(a:ln,col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
-    elseif tok =~ '\l'
-      return s:PreviousToken() != '.'
-    elseif tok == ':'
-      return s:ExprCol()
-    endif
-    return 1
+    return tok == ':' ? s:ExprCol() : s:PreviousToken() != '.'
+  elseif tok !~ '[/>]'
+    return tok isnot ''
   endif
+  return s:SynAt(a:ln,strlen(a:con)) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
 endfunction
 
 function s:Trim(ln)
@@ -262,19 +258,17 @@ function s:PrevCodeLine(lnum)
       let l:pos = getpos('.')
       call cursor(l:n,1)
       let l:n = search('\m\/\*','bW')
-      while search('\m\/\*\|\(\*\/\)','bWp') == 1
-        let br = 0
-        for l:i in range(l:n,line('.'),-1)
-          if s:SynAt(l:i,l:i == line('.') ? col('.') : 1) !~? s:syng_com
-            let br = 1
-            break
-          endif
-        endfor
-        if br
-          break
-        endif
-        let l:n = line('.')
-      endwhile
+      try
+        while search('\m\/\*\|\(\*\/\)','bWp') == 1
+          for l:i in range(l:n,line('.'),-1)
+            if s:SynAt(l:i,l:i == line('.') ? col('.') : 1) !~? s:syng_com
+              throw 'to main loop'
+            endif
+          endfor
+          let l:n = line('.')
+        endwhile
+      catch
+      endtry
       call setpos('.',l:pos)
     else
       break
@@ -440,13 +434,17 @@ function GetJavascriptIndent()
   else
     call cursor(v:lnum,1)
     let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
-    if idx != -1
-      call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
-    elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-      call s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
-    else
-      call s:AlternatePair()
-    endif
+    try
+      if idx != -1
+        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
+      elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
+        call s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
+      else
+        call s:AlternatePair()
+      endif
+    catch
+      call cursor(v:lnum,1)
+    endtry
   endif
 
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:script_tag,0] : getpos('.')[1:2])
@@ -469,14 +467,18 @@ function GetJavascriptIndent()
       endif
     endif
     if idx == -1 && pline[-1:] !~ '[{;]'
-      if l:line =~# '^\%(in\%(stanceof\)\=\>\|\*\*\@!\)' && pline[-1:] == '}'
+      let sol = matchstr(l:line,s:opfirst)
+      if sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
         call cursor(l:lnum,strlen(pline))
-        if s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
+        if pline[-1:] == '}' && s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
           return num_ind + s:sw()
         endif
+        let is_op = s:sw()
+      elseif sol isnot '' || s:Continues(l:lnum,pline)
+        let is_op = s:sw()
       endif
-      let is_op = (l:line =~# s:opfirst || s:Continues(l:lnum,pline)) * s:sw()
-      let b_l = s:Nat(s:IsContOne(l:lnum,b:js_cache[1],is_op) - (l:line =~ '^{')) * s:sw()
+      let b_l = s:Nat(s:IsContOne(l:lnum,b:js_cache[1],is_op) -
+            \ (!is_op && l:line =~ '^{')) * s:sw()
     endif
   elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '(' &&
         \ (search('\m\S','nbW',num) || s:ParseCino('U'))

From 6ccc1a7139248388c9d046c5bb5562b31b9eda5d Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 31 Jul 2017 15:58:04 -0700
Subject: [PATCH 0918/1043] Fix certain flow annotations within classes

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 950474e4..a238c8e8 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -187,7 +187,7 @@ syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty ne
 syntax match   jsClassNoise             contained /\./
 syntax match   jsClassMethodType        contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
-syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsClassValue
+syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*[=:]\)\@=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
 syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
 syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs

From 8ea46f3e62fa6d03f366b281020a308625a1019c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 1 Aug 2017 01:48:16 -0700
Subject: [PATCH 0919/1043] neater/faster iterating

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index da7e599c..8e4e0306 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -258,17 +258,12 @@ function s:PrevCodeLine(lnum)
       let l:pos = getpos('.')
       call cursor(l:n,1)
       let l:n = search('\m\/\*','bW')
-      try
-        while search('\m\/\*\|\(\*\/\)','bWp') == 1
-          for l:i in range(l:n,line('.'),-1)
-            if s:SynAt(l:i,l:i == line('.') ? col('.') : 1) !~? s:syng_com
-              throw 'to main loop'
-            endif
-          endfor
-          let l:n = line('.')
-        endwhile
-      catch
-      endtry
+      while l:n == line('.') && search('\m\/\*\|\(\*\/\)','bWp') == 1
+        " /*\n/*\n */ comment region
+        let l:n = filter(range(l:n, line('.'), -1),
+            \ 'v:val == line(".") || !empty(getline(v:val)) &&'.
+            \ 's:SynAt(v:val,1) !~? s:syng_com && {}')[0]
+      endwhile
       call setpos('.',l:pos)
     else
       break

From 739562910ecaaf998395d3780f7c4ae1b345c0ee Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 3 Aug 2017 13:07:03 -0700
Subject: [PATCH 0920/1043] more simplify of PCL (#1013)

* more simplify of PCL

* this should be much faster, if even executed

* Update javascript.vim

* reflow
---
 indent/javascript.vim | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8e4e0306..d031706b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -246,29 +246,22 @@ endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
-  let l:n = prevnonblank(a:lnum)
+  let [l:multi, l:n, l:pos] = [0, prevnonblank(a:lnum), getpos('.')]
   while l:n
-    if getline(l:n) =~ '^\s*\/[/*]'
-      if (getline(l:n) =~ '`' || getline(l:n-1)[-1:] == '\') &&
-            \ s:SynAt(l:n,1) =~? b:syng_str
-        break
-      endif
+    if getline(l:n) =~ '^\s*\/[/*]' && (getline(l:n) !~ '`' &&
+          \ getline(l:n-1)[-1:] != '\' || s:SynAt(l:n,1) !~? b:syng_str)
       let l:n = prevnonblank(l:n-1)
-    elseif getline(l:n) =~ '\*\/' && s:SynAt(l:n,1) =~? s:syng_com
-      let l:pos = getpos('.')
+      continue
+    elseif l:multi || getline(l:n) =~ '\*\/'
       call cursor(l:n,1)
-      let l:n = search('\m\/\*','bW')
-      while l:n == line('.') && search('\m\/\*\|\(\*\/\)','bWp') == 1
-        " /*\n/*\n */ comment region
-        let l:n = filter(range(l:n, line('.'), -1),
-            \ 'v:val == line(".") || !empty(getline(v:val)) &&'.
-            \ 's:SynAt(v:val,1) !~? s:syng_com && {}')[0]
-      endwhile
-      call setpos('.',l:pos)
-    else
-      break
+      if search('\m\/\*\|\(\*\/\)','bWp') == 1 && s:SynAt(l:n,1) =~? s:syng_com
+        let [l:multi, l:n] = [1, line('.')]
+        continue
+      endif
     endif
+    break
   endwhile
+  call setpos('.',l:pos)
   return l:n
 endfunction
 

From 7097cdad88d172cf63f7864e841a76bb6b465fa7 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 4 Aug 2017 12:59:41 -0700
Subject: [PATCH 0921/1043] Small Flow return fix

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index ecdaa972..204fdbe5 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -22,7 +22,7 @@ syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/
 syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
 syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp
-syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
+syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword,jsFlowReturnObject
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock

From dcb4e4762bed1942200391cb50cde2993178c9a6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 5 Aug 2017 01:36:14 -0700
Subject: [PATCH 0922/1043] cleaning, small optimization? (#1015)

* cleaning, small optimization?

* comment
---
 indent/javascript.vim | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d031706b..415180cd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -106,25 +106,28 @@ function s:ParseCino(f)
   return sign * str2nr(n) / max([str2nr(divider),1])
 endfunction
 
-" Optimized {skip} expr, used only once per GetJavascriptIndent() call
+" Optimized {skip} expr, only callable from the search loop which
+" GetJavascriptIndent does to find the containing [[{(] (relies on s:vars)
 function s:SkipFunc()
   if s:top_col == 1
     throw 'out of bounds'
   endif
-  let s:top_col = col('.')
-  if getline('.') =~ '\%<'.s:top_col.'c\/.\{-}\/\|\%>'.s:top_col.'c[''"]\|\\$'
+  let s:top_col = 0
+  if s:check_in
     if eval(s:skip_expr)
-      let s:top_col = 0
+      return 1
     endif
-    return !s:top_col
-  elseif s:check_in || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
-    let s:check_in = eval(s:skip_expr)
-    if s:check_in
-      let s:top_col = 0
+    let s:check_in = 0
+  elseif getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
+    if eval(s:skip_expr)
+      let s:looksyn = line('.')
+      return 1
     endif
+  elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn) && eval(s:skip_expr)
+    let s:check_in = 1
+    return 1
   endif
-  let s:looksyn = line('.')
-  return s:check_in
+  let [s:looksyn, s:top_col] = getpos('.')[1:2]
 endfunction
 
 function s:AlternatePair()

From c5e5e201272dca331e066ed26b3491827ed377b9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 12 Aug 2017 11:02:21 -0700
Subject: [PATCH 0923/1043] refactor, mergeable (#1018)

---
 indent/javascript.vim | 103 ++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 415180cd..19ab8c94 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: July 2, 2017
+" Last Change: August 12, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -132,10 +132,8 @@ endfunction
 
 function s:AlternatePair()
   let [pat, l:for] = ['[][(){};]', 2]
-  while search('\m'.pat,'bW',s:script_tag)
-    if s:SkipFunc()
-      continue
-    elseif s:LookingAt() == ';'
+  while s:SearchLoop('\m'.pat,'bW',s:script_tag,'s:SkipFunc()')
+    if s:LookingAt() == ';'
       if !l:for
         if s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
           return
@@ -173,35 +171,41 @@ function s:PreviousToken()
   if search('\m\k\{1,}\|\S','ebW')
     if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] &&
           \ getline('.')[:col('.')-1] =~ '\/\/') && s:SynAt(line('.'),col('.')) =~? s:syng_com
-      while search('\m\S\ze\_s*\/[/*]','bW')
-        if s:SynAt(line('.'),col('.')) !~? s:syng_com
-          return s:Token()
-        endif
-      endwhile
+      if s:SearchLoop('\m\S\ze\_s*\/[/*]','bW',"s:SynAt(line('.'),col('.')) =~? s:syng_com")
+        return s:Token()
+      endif
+      call setpos('.',l:pos)
     else
       return s:Token()
     endif
-    call setpos('.',l:pos)
   endif
   return ''
 endfunction
 
-function s:__PreviousToken()
+function s:Pure(f,...)
   let l:pos = getpos('.')
-  let ret = s:PreviousToken()
+  let ret = call(a:f,a:000)
   call setpos('.',l:pos)
   return ret
 endfunction
 
+function s:SearchLoop(...)
+  let l:pos = getpos('.')
+  while call('search',a:000[:-2]) " search flags [^nc]
+    if !eval(a:000[-1])
+      return line('.')
+    endif
+  endwhile
+  call setpos('.',l:pos)
+endfunction
+
 function s:ExprCol()
   if getline('.')[col('.')-2] == ':'
     return 1
   endif
   let [bal, l:pos] = [0, getpos('.')]
-  while search('\m[{}?:]','bW',s:script_tag)
-    if eval(s:skip_expr)
-      continue
-    elseif s:LookingAt() == ':'
+  while s:SearchLoop('\m[{}?:]','bW',s:script_tag,s:skip_expr)
+    if s:LookingAt() == ':'
       let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
     elseif s:LookingAt() == '?'
       let bal += 1
@@ -287,34 +291,25 @@ function s:Balanced(lnum)
 endfunction
 
 function s:OneScope(lnum)
-  let [pline, kw] = [s:Trim(a:lnum), 'else do']
-  call cursor(a:lnum,strlen(pline))
-  if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
-    if s:PreviousToken() =~# '^\%(await\|each\)$'
-      call s:PreviousToken()
-      let kw = 'for'
-    else
-      let kw = 'for if let while with'
-    endif
-  elseif pline[-2:] == '=>'
-    return 1
+  call cursor(a:lnum,strlen(s:Trim(a:lnum)))
+  if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
+    let tok = s:PreviousToken()
+    return (tok =~# '^\%(for\|if\|let\|while\|with\)$' ||
+          \ tok =~# '^await$\|^each$' && s:PreviousToken() ==# 'for') &&
+          \ s:Pure('s:PreviousToken') != '.' && !(tok == 'while' && s:DoWhile())
+  elseif s:Token() =~# '^else$\|^do$'
+    return s:Pure('s:PreviousToken') != '.'
   endif
-  return count(split(kw),s:Token()) &&
-        \ s:__PreviousToken() != '.' && !s:DoWhile()
+  return strpart(getline('.'),col('.')-2,2) == '=>'
 endfunction
 
 function s:DoWhile()
-  if expand('<cword>') ==# 'while'
-    let cpos = searchpos('\m\<','cbW')
-    while search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
-      if !eval(s:skip_expr)
-        if (s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) ?
-              \ s:PreviousToken() : s:Token()) ==# 'do' && s:IsBlock()
-          return 1
-        endif
-        break
-      endif
-    endwhile
+  let cpos = searchpos('\m\<','cbW')
+  if s:SearchLoop('\m\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
+    if s:{s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) ?
+          \ 'Previous' : ''}Token() ==# 'do' && s:IsBlock()
+      return 1
+    endif
     call call('cursor',cpos)
   endif
 endfunction
@@ -340,13 +335,10 @@ function s:IsContOne(i,num,cont)
 endfunction
 
 function s:IsSwitch()
-  if s:PreviousToken() !~ '[.*]'
-    if s:GetPair('{','}','cbW',s:skip_expr,100)
-      return s:IsBlock() && (s:Token() !~ '^\K\k*$' || expand('<cword>') !=# 'class' &&
-            \ s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.')
-    endif
-    return 1
-  endif
+  return s:PreviousToken() !~ '[.*]' &&
+        \ (!s:GetPair('{','}','cbW',s:skip_expr,100) || s:IsBlock() &&
+        \ (s:Token() !~ '^\K\k*$' || expand('<cword>') !=# 'class' &&
+        \ s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.'))
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -357,26 +349,21 @@ function s:IsBlock()
     return tok != '{'
   elseif tok =~ '\k'
     if tok ==# 'type'
-      let l:pos = getpos('.')
-      try
-        return s:PreviousToken() !~# '^\%(im\|ex\)port$' || s:PreviousToken() == '.'
-      finally
-        call setpos('.',l:pos)
-      endtry
+      return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
-          \ ,tok) < (line('.') != l:n) || s:__PreviousToken() == '.'
+          \ ,tok) < (line('.') != l:n) || s:Pure('s:PreviousToken') == '.'
   elseif tok == '>'
     return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'
   elseif tok == '*'
-    return s:__PreviousToken() == ':'
+    return s:Pure('s:PreviousToken') == ':'
   elseif tok == ':'
     return !s:ExprCol()
   elseif tok == '/'
     return s:SynAt(line('.'),col('.')) =~? 'regex'
+  elseif tok !~ '[=~!<,.?^%|&([]'
+    return tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok
   endif
-  return tok !~ '[=~!<,.?^%|&([]' &&
-        \ (tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok)
 endfunction
 
 function GetJavascriptIndent()

From c03aee798f5caff8a445562f6decd5f24000431f Mon Sep 17 00:00:00 2001
From: Brad Fitzwater <brad.fitzwater@gmail.com>
Date: Sat, 12 Aug 2017 17:44:53 -0400
Subject: [PATCH 0924/1043] add 'mjs' extension (#1023)

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

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index d481d988..ff07f4dd 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1,4 +1,4 @@
-au BufNewFile,BufRead *.{js,jsm,es,es6},Jakefile setf javascript
+au BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setf javascript
 
 fun! s:SourceFlowSyntax()
   if !exists('javascript_plugin_flow') && !exists('b:flow_active') &&

From 3ea6ed6ac1d1d5c19fb1e29713768746be8d09d6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 16 Aug 2017 10:54:31 -0700
Subject: [PATCH 0925/1043] Trim optimize (#1024)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 19ab8c94..72c76a38 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -241,14 +241,11 @@ function s:Continues(ln,con)
 endfunction
 
 function s:Trim(ln)
-  let pline = substitute(getline(a:ln),'\s*$','','')
-  let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
-  while l:max != -1 && s:SynAt(a:ln, strlen(pline)) =~? s:syng_com
-    let pline = pline[: l:max]
-    let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
-    let pline = substitute(pline[:-2],'\s*$','','')
+  let divi = split(getline(a:ln),'\s\+$\|\S\zs\ze\s*\/[/*]')
+  while len(divi) > 1 && s:SynAt(a:ln, strlen(join(divi,''))) =~? s:syng_com
+    call remove(divi,-1)
   endwhile
-  return pline
+  return join(divi,'')
 endfunction
 
 " Find line above 'lnum' that isn't empty or in a comment

From d2ccd306f2c11f061c5284ff5d315c7cf257e32a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 17 Aug 2017 00:07:14 -0700
Subject: [PATCH 0926/1043] use generic equivalent

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 72c76a38..e7334bf2 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -232,17 +232,17 @@ let s:continuation = get(g:,'javascript_continuation',
 function s:Continues(ln,con)
   let tok = matchstr(a:con[-15:],s:continuation)
   if tok =~ '[a-z:]'
-    call cursor(a:ln,strlen(a:con))
+    call cursor(a:ln, len(a:con))
     return tok == ':' ? s:ExprCol() : s:PreviousToken() != '.'
   elseif tok !~ '[/>]'
     return tok isnot ''
   endif
-  return s:SynAt(a:ln,strlen(a:con)) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
+  return s:SynAt(a:ln, len(a:con)) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
 endfunction
 
 function s:Trim(ln)
   let divi = split(getline(a:ln),'\s\+$\|\S\zs\ze\s*\/[/*]')
-  while len(divi) > 1 && s:SynAt(a:ln, strlen(join(divi,''))) =~? s:syng_com
+  while len(divi) > 1 && s:SynAt(a:ln, len(join(divi,''))) =~? s:syng_com
     call remove(divi,-1)
   endwhile
   return join(divi,'')
@@ -288,7 +288,7 @@ function s:Balanced(lnum)
 endfunction
 
 function s:OneScope(lnum)
-  call cursor(a:lnum,strlen(s:Trim(a:lnum)))
+  call cursor(a:lnum, len(s:Trim(a:lnum)))
   if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
     let tok = s:PreviousToken()
     return (tok =~# '^\%(for\|if\|let\|while\|with\)$' ||
@@ -444,7 +444,7 @@ function GetJavascriptIndent()
     if idx == -1 && pline[-1:] !~ '[{;]'
       let sol = matchstr(l:line,s:opfirst)
       if sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
-        call cursor(l:lnum,strlen(pline))
+        call cursor(l:lnum, len(pline))
         if pline[-1:] == '}' && s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
           return num_ind + s:sw()
         endif

From c737dd7b900cb2b0a2da96941fd005ea24c52fd0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 21 Aug 2017 23:07:56 -0700
Subject: [PATCH 0927/1043] shorthand method: refactor (#1030)

---
 indent/javascript.vim | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e7334bf2..ce91645e 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -331,11 +331,14 @@ function s:IsContOne(i,num,cont)
   return b_l
 endfunction
 
+function s:Class()
+  return (s:Token() ==# 'class' || s:PreviousToken() =~# '^class$\|^extends$') &&
+        \ s:PreviousToken() != '.'
+endfunction
+
 function s:IsSwitch()
   return s:PreviousToken() !~ '[.*]' &&
-        \ (!s:GetPair('{','}','cbW',s:skip_expr,100) || s:IsBlock() &&
-        \ (s:Token() !~ '^\K\k*$' || expand('<cword>') !=# 'class' &&
-        \ s:PreviousToken() !~# '^class$\|^extends$' || s:PreviousToken() == '.'))
+        \ (!s:GetPair('{','}','cbW',s:skip_expr,100) || s:IsBlock() && !s:Class())
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -443,13 +446,18 @@ function GetJavascriptIndent()
     endif
     if idx == -1 && pline[-1:] !~ '[{;]'
       let sol = matchstr(l:line,s:opfirst)
-      if sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
-        call cursor(l:lnum, len(pline))
-        if pline[-1:] == '}' && s:GetPair('{','}','bW',s:skip_expr,200) && s:IsBlock()
+      if sol is '' || sol == '/' && s:SynAt(v:lnum,
+            \ 1 + len(getline(v:lnum)) - len(l:line)) =~? 'regex'
+        if s:Continues(l:lnum,pline)
+          let is_op = s:sw()
+        endif
+      elseif b:js_cache[2] && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
+        call call('cursor',b:js_cache[1:])
+        if s:PreviousToken() =~ '\k' && s:Class()
           return num_ind + s:sw()
         endif
         let is_op = s:sw()
-      elseif sol isnot '' || s:Continues(l:lnum,pline)
+      else
         let is_op = s:sw()
       endif
       let b_l = s:Nat(s:IsContOne(l:lnum,b:js_cache[1],is_op) -

From bc60e0d0041c4c007f6ba19fca9bdf74c474d45a Mon Sep 17 00:00:00 2001
From: Samir Talwar <samir@noodlesandwich.com>
Date: Fri, 25 Aug 2017 18:00:02 +0100
Subject: [PATCH 0928/1043] Correctly highlight function bodies with an
 unnamed, generic function.

Given the following JavaScript + Flow code:

    const foo = function<T>(x: T): void {
      // arbitrary, unrelated body
      while (true) {
        console.log(x);
      }
    }

The body won't be highlighted correctly; on my machine, it's mostly in red.

This seems to be caused by incorrectly parsing the `<T>` when the
function is unnamed. Not sure why it ends up highlighting everything in
one colour.

This commit fixes the problem. I might have missed somewhere; I looked
for `jsFuncArgs` and added it to the same places.
---
 syntax/javascript.vim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a238c8e8..910b89b3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -164,7 +164,7 @@ syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      s
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
 
-syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs
+syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup
 syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup
 syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
@@ -176,10 +176,10 @@ syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArg
 " Matches a series of arguments surrounded in parens
 syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
-exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
-exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction               '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
-exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/   skipwhite skipempty nextgroup=jsArrowFunction                    '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '').(' contains=jsArrowFuncArgs')
-exe 'syntax match jsArrowFunction /_\s*\(=>\)\@=/    skipwhite skipempty nextgroup=jsArrowFunction                    '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
+exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction                                   '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '').(' contains=jsArrowFuncArgs')
+exe 'syntax match jsArrowFunction /_\s*\(=>\)\@=/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
 
 " Classes
 syntax keyword jsClassKeyword           contained class

From 0149cb12bee2247c657504893730746d37b80d30 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 25 Aug 2017 15:45:49 -0700
Subject: [PATCH 0929/1043] Fix yield in parens

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 910b89b3..bd172b13 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -237,8 +237,8 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsStatement,jsException,jsTry,jsNoise,jsBlockLabel
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already

From 867c3ccdb14af014df4acd1d068cc6b3f47cb9e5 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 25 Aug 2017 15:46:06 -0700
Subject: [PATCH 0930/1043] Whitespace

---
 syntax/javascript.vim | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index bd172b13..fabfce28 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -101,20 +101,20 @@ exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal
 " Statement Keywords
 syntax match   jsBlockLabel              /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\s*::\@!/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
 syntax match   jsBlockLabelKey contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*\%(;\|\n\)\)\@=/
-syntax keyword jsStatement    contained with yield debugger
-syntax keyword jsStatement    contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
-syntax keyword jsConditional            if             skipwhite skipempty nextgroup=jsParenIfElse
-syntax keyword jsConditional            else           skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock
-syntax keyword jsConditional            switch         skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat                 while for      skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
-syntax keyword jsDo                     do             skipwhite skipempty nextgroup=jsRepeatBlock
+syntax keyword jsStatement     contained with yield debugger
+syntax keyword jsStatement     contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
+syntax keyword jsConditional            if              skipwhite skipempty nextgroup=jsParenIfElse
+syntax keyword jsConditional            else            skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock
+syntax keyword jsConditional            switch          skipwhite skipempty nextgroup=jsParenSwitch
+syntax keyword jsRepeat                 while for       skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
+syntax keyword jsDo                     do              skipwhite skipempty nextgroup=jsRepeatBlock
 syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
-syntax keyword jsTry                    try            skipwhite skipempty nextgroup=jsTryCatchBlock
-syntax keyword jsFinally      contained finally        skipwhite skipempty nextgroup=jsFinallyBlock
-syntax keyword jsCatch        contained catch          skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
+syntax keyword jsFinally      contained finally         skipwhite skipempty nextgroup=jsFinallyBlock
+syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
-syntax match   jsSwitchColon   contained /::\@!/       skipwhite skipempty nextgroup=jsSwitchBlock
+syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
 syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch

From ee376ba5c828dc5f5266f80636c2ad212ac4806d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 30 Aug 2017 00:01:37 -0700
Subject: [PATCH 0931/1043] reuse more code, various fixes

---
 indent/javascript.vim | 123 ++++++++++++++++--------------------------
 1 file changed, 45 insertions(+), 78 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ce91645e..94be34e5 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: August 12, 2017
+" Last Change: August 30, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -107,7 +107,7 @@ function s:ParseCino(f)
 endfunction
 
 " Optimized {skip} expr, only callable from the search loop which
-" GetJavascriptIndent does to find the containing [[{(] (relies on s:vars)
+" GetJavascriptIndent does to find the containing [[{(] (side-effects)
 function s:SkipFunc()
   if s:top_col == 1
     throw 'out of bounds'
@@ -130,12 +130,12 @@ function s:SkipFunc()
   let [s:looksyn, s:top_col] = getpos('.')[1:2]
 endfunction
 
-function s:AlternatePair()
+function s:AlternatePair(top)
   let [pat, l:for] = ['[][(){};]', 2]
-  while s:SearchLoop('\m'.pat,'bW',s:script_tag,'s:SkipFunc()')
+  while s:SearchLoop(pat,'bW',a:top,'s:SkipFunc()')
     if s:LookingAt() == ';'
       if !l:for
-        if s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
+        if s:GetPair('{','}','bW','s:SkipFunc()',2000,a:top)
           return
         endif
         break
@@ -146,7 +146,7 @@ function s:AlternatePair()
       let idx = stridx('])}',s:LookingAt())
       if idx == -1
         return
-      elseif !s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
+      elseif !s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,a:top)
         break
       endif
     endif
@@ -171,7 +171,7 @@ function s:PreviousToken()
   if search('\m\k\{1,}\|\S','ebW')
     if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] &&
           \ getline('.')[:col('.')-1] =~ '\/\/') && s:SynAt(line('.'),col('.')) =~? s:syng_com
-      if s:SearchLoop('\m\S\ze\_s*\/[/*]','bW',"s:SynAt(line('.'),col('.')) =~? s:syng_com")
+      if s:SearchLoop('\S\ze\_s*\/[/*]','bW',"s:SynAt(line('.'),col('.')) =~? s:syng_com")
         return s:Token()
       endif
       call setpos('.',l:pos)
@@ -183,30 +183,21 @@ function s:PreviousToken()
 endfunction
 
 function s:Pure(f,...)
-  let l:pos = getpos('.')
-  let ret = call(a:f,a:000)
+  let [l:pos, l:v] = [getpos('.'), call(a:f,a:000)]
   call setpos('.',l:pos)
-  return ret
+  return l:v
 endfunction
 
-function s:SearchLoop(...)
-  let l:pos = getpos('.')
-  while call('search',a:000[:-2]) " search flags [^nc]
-    if !eval(a:000[-1])
-      return line('.')
-    endif
-  endwhile
-  call setpos('.',l:pos)
+function s:SearchLoop(pat,flags,top,...)
+  let pair = insert([a:pat,a:flags], '\_$.', a:flags =~# 'b')
+  return call('s:GetPair',pair + (a:0 ? [a:1, 200, a:top] : [a:top, 200]))
 endfunction
 
 function s:ExprCol()
-  if getline('.')[col('.')-2] == ':'
-    return 1
-  endif
-  let [bal, l:pos] = [0, getpos('.')]
-  while s:SearchLoop('\m[{}?:]','bW',s:script_tag,s:skip_expr)
+  let bal = 0
+  while s:SearchLoop('[{}?]\|\_[^:]\zs::\@!','bW',s:script_tag,s:skip_expr)
     if s:LookingAt() == ':'
-      let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
+      let bal -= 1
     elseif s:LookingAt() == '?'
       let bal += 1
       if bal == 1
@@ -219,7 +210,6 @@ function s:ExprCol()
       break
     endif
   endwhile
-  call setpos('.',l:pos)
   return s:Nat(bal)
 endfunction
 
@@ -240,35 +230,6 @@ function s:Continues(ln,con)
   return s:SynAt(a:ln, len(a:con)) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
 endfunction
 
-function s:Trim(ln)
-  let divi = split(getline(a:ln),'\s\+$\|\S\zs\ze\s*\/[/*]')
-  while len(divi) > 1 && s:SynAt(a:ln, len(join(divi,''))) =~? s:syng_com
-    call remove(divi,-1)
-  endwhile
-  return join(divi,'')
-endfunction
-
-" Find line above 'lnum' that isn't empty or in a comment
-function s:PrevCodeLine(lnum)
-  let [l:multi, l:n, l:pos] = [0, prevnonblank(a:lnum), getpos('.')]
-  while l:n
-    if getline(l:n) =~ '^\s*\/[/*]' && (getline(l:n) !~ '`' &&
-          \ getline(l:n-1)[-1:] != '\' || s:SynAt(l:n,1) !~? b:syng_str)
-      let l:n = prevnonblank(l:n-1)
-      continue
-    elseif l:multi || getline(l:n) =~ '\*\/'
-      call cursor(l:n,1)
-      if search('\m\/\*\|\(\*\/\)','bWp') == 1 && s:SynAt(l:n,1) =~? s:syng_com
-        let [l:multi, l:n] = [1, line('.')]
-        continue
-      endif
-    endif
-    break
-  endwhile
-  call setpos('.',l:pos)
-  return l:n
-endfunction
-
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
   let [l:open, l:line] = [0, getline(a:lnum)]
@@ -287,8 +248,7 @@ function s:Balanced(lnum)
   return !l:open
 endfunction
 
-function s:OneScope(lnum)
-  call cursor(a:lnum, len(s:Trim(a:lnum)))
+function s:OneScope()
   if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
     let tok = s:PreviousToken()
     return (tok =~# '^\%(for\|if\|let\|while\|with\)$' ||
@@ -302,7 +262,7 @@ endfunction
 
 function s:DoWhile()
   let cpos = searchpos('\m\<','cbW')
-  if s:SearchLoop('\m\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
+  if s:SearchLoop('\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
     if s:{s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) ?
           \ 'Previous' : ''}Token() ==# 'do' && s:IsBlock()
       return 1
@@ -314,19 +274,22 @@ endfunction
 " returns braceless levels started by 'i' and above lines * &sw. 'num' is the
 " lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
 " a continued expression, which could have started in a braceless context
-function s:IsContOne(i,num,cont)
-  let [l:i, l:num, b_l] = [a:i, a:num + !a:num, 0]
+function s:IsContOne(num,cont)
+  let [l:startline, l:num, b_l] = [line('.'), a:num + !a:num, 0]
   let pind = a:num ? indent(a:num) + s:sw() : 0
-  let ind = indent(a:i) + (a:cont ? 0 : s:sw())
-  while l:i > l:num && ind > pind || l:i == l:num
-    if indent(l:i) < ind && s:OneScope(l:i)
+  let ind = indent('.') + !a:cont
+  while line('.') > l:num && ind > pind || line('.') == l:num
+    if indent('.') < ind && s:OneScope()
       let b_l += 1
-      let l:i = line('.')
-    elseif !a:cont || b_l || ind < indent(a:i)
+    elseif !a:cont || b_l || ind < indent(l:startline)
+      break
+    else
+      call cursor(0,1)
+    endif
+    let ind = min([ind, indent('.')])
+    if s:PreviousToken() is ''
       break
     endif
-    let ind = min([ind, indent(l:i)])
-    let l:i = s:PrevCodeLine(l:i - 1)
   endwhile
   return b_l
 endfunction
@@ -358,7 +321,7 @@ function s:IsBlock()
   elseif tok == '*'
     return s:Pure('s:PreviousToken') == ':'
   elseif tok == ':'
-    return !s:ExprCol()
+    return s:Pure('eval','s:PreviousToken() =~ "^\\K\\k*$" && !s:ExprCol()')
   elseif tok == '/'
     return s:SynAt(line('.'),col('.')) =~? 'regex'
   elseif tok !~ '[=~!<,.?^%|&([]'
@@ -389,10 +352,12 @@ function GetJavascriptIndent()
     endif
     return -1
   endif
-  let l:lnum = s:PrevCodeLine(v:lnum - 1)
-  if !l:lnum
+
+  call cursor(v:lnum,1)
+  if s:PreviousToken() is ''
     return
   endif
+  let [l:lnum, pline] = [line('.'), getline('.')[:col('.')-1]]
 
   let l:line = substitute(l:line,'^\s*','','')
   let l:line_raw = l:line
@@ -411,26 +376,27 @@ function GetJavascriptIndent()
     call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [v:lnum,1])
   else
     call cursor(v:lnum,1)
-    let [s:looksyn, s:check_in, s:top_col] = [v:lnum - 1, 0, 0]
+    let [s:looksyn, s:top_col, s:check_in, l:actual_top] = [v:lnum - 1,0,0,
+          \ max([s:script_tag, search('\m^.\{400,}','nbW',s:script_tag + 1) + 1])]
     try
       if idx != -1
-        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,s:script_tag)
-      elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-        call s:GetPair('{','}','bW','s:SkipFunc()',2000,s:script_tag)
+        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,l:actual_top)
+      elseif getline(v:lnum) !~ '^\S' && syns =~? 'block\|^jsobject$'
+        call s:GetPair('{','}','bW','s:SkipFunc()',2000,l:actual_top)
       else
-        call s:AlternatePair()
+        call s:AlternatePair(l:actual_top)
       endif
-    catch
+    catch /^\Cout of bounds$/
       call cursor(v:lnum,1)
     endtry
   endif
 
   let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:script_tag,0] : getpos('.')[1:2])
-  let num = b:js_cache[1]
+  let [num, s:script_tag] = [b:js_cache[1], get(l:,'actual_top',s:script_tag)]
 
   let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
   if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()
-    let [ilnum, pline] = [line('.'), s:Trim(l:lnum)]
+    let ilnum = line('.')
     if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr,100)
       if ilnum == num
         let [num, num_ind] = [line('.'), indent('.')]
@@ -460,7 +426,8 @@ function GetJavascriptIndent()
       else
         let is_op = s:sw()
       endif
-      let b_l = s:Nat(s:IsContOne(l:lnum,b:js_cache[1],is_op) -
+      call cursor(l:lnum, len(pline))
+      let b_l = s:Nat(s:IsContOne(b:js_cache[1],is_op) -
             \ (!is_op && l:line =~ '^{')) * s:sw()
     endif
   elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '(' &&

From 31232fe5320e6fd3d7495f939c63e7bd40405dc7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 3 Sep 2017 10:04:32 -0700
Subject: [PATCH 0932/1043] collection regex, various (#1035)

---
 indent/javascript.vim | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 94be34e5..73082125 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -120,7 +120,7 @@ function s:SkipFunc()
     let s:check_in = 0
   elseif getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
     if eval(s:skip_expr)
-      let s:looksyn = line('.')
+      let s:looksyn = a:firstline
       return 1
     endif
   elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn) && eval(s:skip_expr)
@@ -167,14 +167,14 @@ function s:Token()
 endfunction
 
 function s:PreviousToken()
-  let l:pos = getpos('.')
+  let l:col = col('.')
   if search('\m\k\{1,}\|\S','ebW')
-    if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] &&
+    if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != a:firstline &&
           \ getline('.')[:col('.')-1] =~ '\/\/') && s:SynAt(line('.'),col('.')) =~? s:syng_com
       if s:SearchLoop('\S\ze\_s*\/[/*]','bW',"s:SynAt(line('.'),col('.')) =~? s:syng_com")
         return s:Token()
       endif
-      call setpos('.',l:pos)
+      call cursor(a:firstline, l:col)
     else
       return s:Token()
     endif
@@ -183,9 +183,7 @@ function s:PreviousToken()
 endfunction
 
 function s:Pure(f,...)
-  let [l:pos, l:v] = [getpos('.'), call(a:f,a:000)]
-  call setpos('.',l:pos)
-  return l:v
+  return eval('[call(a:f,a:000),cursor(a:firstline,'.col('.').')][0]')
 endfunction
 
 function s:SearchLoop(pat,flags,top,...)
@@ -241,9 +239,9 @@ function s:Balanced(lnum)
         return
       endif
     endif
-    let pos = match(l:line, l:open ?
-          \ matchstr(['[][]','[()]','[{}]'],l:line[pos]) :
-          \ '[][(){}]', pos + 1)
+    let pos = match(l:line, '['.(l:open ?
+          \ strpart('][(){}', stridx('[({])}', l:line[pos]) % 3 * 2, 2) :
+          \ '][(){}').']', pos + 1)
   endwhile
   return !l:open
 endfunction
@@ -275,13 +273,13 @@ endfunction
 " lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
 " a continued expression, which could have started in a braceless context
 function s:IsContOne(num,cont)
-  let [l:startline, l:num, b_l] = [line('.'), a:num + !a:num, 0]
+  let [l:num, b_l] = [a:num + !a:num, 0]
   let pind = a:num ? indent(a:num) + s:sw() : 0
   let ind = indent('.') + !a:cont
   while line('.') > l:num && ind > pind || line('.') == l:num
     if indent('.') < ind && s:OneScope()
       let b_l += 1
-    elseif !a:cont || b_l || ind < indent(l:startline)
+    elseif !a:cont || b_l || ind < indent(a:firstline)
       break
     else
       call cursor(0,1)
@@ -306,7 +304,6 @@ endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
-  let l:n = line('.')
   let tok = s:PreviousToken()
   if match(s:stack,'\cxml\|jsx') != -1 && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
     return tok != '{'
@@ -315,7 +312,7 @@ function s:IsBlock()
       return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
-          \ ,tok) < (line('.') != l:n) || s:Pure('s:PreviousToken') == '.'
+          \ ,tok) < (line('.') != a:firstline) || s:Pure('s:PreviousToken') == '.'
   elseif tok == '>'
     return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'
   elseif tok == '*'
@@ -325,7 +322,7 @@ function s:IsBlock()
   elseif tok == '/'
     return s:SynAt(line('.'),col('.')) =~? 'regex'
   elseif tok !~ '[=~!<,.?^%|&([]'
-    return tok !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == tok
+    return tok !~ '[-+]' || line('.') != a:firstline && getline('.')[col('.')-2] == tok
   endif
 endfunction
 

From a4fd0773b99c4d0153ddf49f278613306555e22b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 5 Sep 2017 20:19:45 -0700
Subject: [PATCH 0933/1043] clean, eval string type,etc (#1036)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 73082125..895c3d03 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -183,7 +183,7 @@ function s:PreviousToken()
 endfunction
 
 function s:Pure(f,...)
-  return eval('[call(a:f,a:000),cursor(a:firstline,'.col('.').')][0]')
+  return eval("[call(a:f,a:000),cursor(a:firstline,".col('.').")][0]")
 endfunction
 
 function s:SearchLoop(pat,flags,top,...)
@@ -249,7 +249,7 @@ endfunction
 function s:OneScope()
   if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
     let tok = s:PreviousToken()
-    return (tok =~# '^\%(for\|if\|let\|while\|with\)$' ||
+    return (count(split('for if let while with'),tok) ||
           \ tok =~# '^await$\|^each$' && s:PreviousToken() ==# 'for') &&
           \ s:Pure('s:PreviousToken') != '.' && !(tok == 'while' && s:DoWhile())
   elseif s:Token() =~# '^else$\|^do$'
@@ -318,7 +318,7 @@ function s:IsBlock()
   elseif tok == '*'
     return s:Pure('s:PreviousToken') == ':'
   elseif tok == ':'
-    return s:Pure('eval','s:PreviousToken() =~ "^\\K\\k*$" && !s:ExprCol()')
+    return s:Pure('eval',"s:PreviousToken() =~ '^\\K\\k*$' && !s:ExprCol()")
   elseif tok == '/'
     return s:SynAt(line('.'),col('.')) =~? 'regex'
   elseif tok !~ '[=~!<,.?^%|&([]'

From 745344246aa6e741d0f19f060f1e1520c43a8ba6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 7 Sep 2017 13:16:21 -0700
Subject: [PATCH 0934/1043] emphasize code snippet

---
 ISSUE_TEMPLATE.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 155ea8d3..177be579 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,3 +1,8 @@
+*Include a snippet of code that we can easily copy and paste that
+replicates your bug.*
+
+<hr>
+
 If you are reporting an issue that involves any JSX (e.g.
 <div>{`${example}`}</div>), PLEASE PLEASE PLEASE make sure you have properly
 setup and are sourcing this plugin https://github.com/mxw/vim-jsx
@@ -5,8 +10,5 @@ setup and are sourcing this plugin https://github.com/mxw/vim-jsx
 WE DO NOT support JSX automatically, you need another plugin to add get this
 functionality.
 
-If applicable, include a snippet of code that we can easily copy and paste that
-replicates your bug.
-
 Make sure the bug still exists if you disable all other javascript plugins
 except the one noted above, mxw/vim-jsx

From 7da26c25b87b0addce6b2d4c45c5c4014c65bd80 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 7 Sep 2017 13:18:01 -0700
Subject: [PATCH 0935/1043] fix md

---
 ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 177be579..1f10b637 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@ replicates your bug.*
 <hr>
 
 If you are reporting an issue that involves any JSX (e.g.
-<div>{`${example}`}</div>), PLEASE PLEASE PLEASE make sure you have properly
+``<div>{`${example}`}</div>``), PLEASE PLEASE PLEASE make sure you have properly
 setup and are sourcing this plugin https://github.com/mxw/vim-jsx
 
 WE DO NOT support JSX automatically, you need another plugin to add get this

From 93d56325fd4a8d02ce299a993066ece44924edb3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 7 Sep 2017 13:28:49 -0700
Subject: [PATCH 0936/1043] Update ISSUE_TEMPLATE.md

---
 ISSUE_TEMPLATE.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 1f10b637..e33823d3 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,10 +1,9 @@
-*Include a snippet of code that we can easily copy and paste that
-replicates your bug.*
+**Mandatory:** *Included minimal reproducible example, as plain text :*
 
 <hr>
 
-If you are reporting an issue that involves any JSX (e.g.
-``<div>{`${example}`}</div>``), PLEASE PLEASE PLEASE make sure you have properly
+#### Optional: concerning jsx.
+PLEASE PLEASE PLEASE make sure you have properly
 setup and are sourcing this plugin https://github.com/mxw/vim-jsx
 
 WE DO NOT support JSX automatically, you need another plugin to add get this

From 1795998a7acd39113dfff862178dd67ab8ceb19c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 7 Sep 2017 13:31:12 -0700
Subject: [PATCH 0937/1043] Update ISSUE_TEMPLATE.md

---
 ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index e33823d3..b1ddccb1 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-**Mandatory:** *Included minimal reproducible example, as plain text :*
+*Requisite minimal reproducible example, formatted as plain text :*
 
 <hr>
 

From 7198f32def8c9e5850e07a731faf673d045c5424 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 7 Sep 2017 22:19:27 -0700
Subject: [PATCH 0938/1043] raise line length guard

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 895c3d03..c3d257a4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -374,7 +374,7 @@ function GetJavascriptIndent()
   else
     call cursor(v:lnum,1)
     let [s:looksyn, s:top_col, s:check_in, l:actual_top] = [v:lnum - 1,0,0,
-          \ max([s:script_tag, search('\m^.\{400,}','nbW',s:script_tag + 1) + 1])]
+          \ max([s:script_tag, search('\m^.\{4000,}','nbW',s:script_tag + 1) + 1])]
     try
       if idx != -1
         call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,l:actual_top)

From 00624225c6b5ae7858d1186e99540022ced92f98 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 8 Sep 2017 20:12:59 -0700
Subject: [PATCH 0939/1043] use &synmaxcol (#1039)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c3d257a4..8f932f6d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -59,16 +59,15 @@ let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
 
+let s:rel = has('reltime')
 " searchpair() wrapper
-if has('reltime')
-  function s:GetPair(start,end,flags,skip,time,...)
-    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
-          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
+if s:rel
+  function s:GetPair(start,end,flags,skip,time)
+    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,a:flags,a:skip,s:l1,a:time)
   endfunction
 else
   function s:GetPair(start,end,flags,skip,...)
-    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,
-          \ a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,0,get(a:000,1)]))
+    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,a:flags,a:skip,s:l1)
   endfunction
 endif
 
@@ -130,12 +129,12 @@ function s:SkipFunc()
   let [s:looksyn, s:top_col] = getpos('.')[1:2]
 endfunction
 
-function s:AlternatePair(top)
+function s:AlternatePair()
   let [pat, l:for] = ['[][(){};]', 2]
-  while s:SearchLoop(pat,'bW',a:top,'s:SkipFunc()')
+  while s:SearchLoop(pat,'bW','s:SkipFunc()')
     if s:LookingAt() == ';'
       if !l:for
-        if s:GetPair('{','}','bW','s:SkipFunc()',2000,a:top)
+        if s:GetPair('{','}','bW','s:SkipFunc()',2000)
           return
         endif
         break
@@ -146,7 +145,7 @@ function s:AlternatePair(top)
       let idx = stridx('])}',s:LookingAt())
       if idx == -1
         return
-      elseif !s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,a:top)
+      elseif !s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
         break
       endif
     endif
@@ -186,14 +185,14 @@ function s:Pure(f,...)
   return eval("[call(a:f,a:000),cursor(a:firstline,".col('.').")][0]")
 endfunction
 
-function s:SearchLoop(pat,flags,top,...)
+function s:SearchLoop(pat,flags,expr)
   let pair = insert([a:pat,a:flags], '\_$.', a:flags =~# 'b')
-  return call('s:GetPair',pair + (a:0 ? [a:1, 200, a:top] : [a:top, 200]))
+  return s:GetPair(pair[0],pair[1],a:flags,a:expr,200)
 endfunction
 
 function s:ExprCol()
   let bal = 0
-  while s:SearchLoop('[{}?]\|\_[^:]\zs::\@!','bW',s:script_tag,s:skip_expr)
+  while s:SearchLoop('[{}?]\|\_[^:]\zs::\@!','bW',s:skip_expr)
     if s:LookingAt() == ':'
       let bal -= 1
     elseif s:LookingAt() == '?'
@@ -350,6 +349,8 @@ function GetJavascriptIndent()
     return -1
   endif
 
+  let s:l1 = max([0,prevnonblank(v:lnum) - (s:rel ? 2000 : 1000),
+        \ get(get(b:,'hi_indent',{}),'blocklnr')])
   call cursor(v:lnum,1)
   if s:PreviousToken() is ''
     return
@@ -366,30 +367,29 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
-  let [ s:script_tag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'),
-        \ index([']',')','}'],l:line[0]) ]
+  let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] > l:lnum && b:js_cache[0] < v:lnum ||
         \ b:js_cache[0] == l:lnum && s:Balanced(l:lnum)
     call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [v:lnum,1])
   else
     call cursor(v:lnum,1)
-    let [s:looksyn, s:top_col, s:check_in, l:actual_top] = [v:lnum - 1,0,0,
-          \ max([s:script_tag, search('\m^.\{4000,}','nbW',s:script_tag + 1) + 1])]
+    let [s:looksyn, s:top_col, s:check_in, s:l1] = [v:lnum - 1,0,0,
+          \ max([s:l1, &smc ? search('\m^.\{'.&smc.',}','nbW',s:l1 + 1) + 1 : 0])]
     try
       if idx != -1
-        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000,l:actual_top)
+        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
       elseif getline(v:lnum) !~ '^\S' && syns =~? 'block\|^jsobject$'
-        call s:GetPair('{','}','bW','s:SkipFunc()',2000,l:actual_top)
+        call s:GetPair('{','}','bW','s:SkipFunc()',2000)
       else
-        call s:AlternatePair(l:actual_top)
+        call s:AlternatePair()
       endif
     catch /^\Cout of bounds$/
       call cursor(v:lnum,1)
     endtry
   endif
 
-  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:script_tag,0] : getpos('.')[1:2])
-  let [num, s:script_tag] = [b:js_cache[1], get(l:,'actual_top',s:script_tag)]
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
+  let num = b:js_cache[1]
 
   let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
   if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()
@@ -427,7 +427,7 @@ function GetJavascriptIndent()
       let b_l = s:Nat(s:IsContOne(b:js_cache[1],is_op) -
             \ (!is_op && l:line =~ '^{')) * s:sw()
     endif
-  elseif idx == -1 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '(' &&
+  elseif idx == -1 && getline(num)[b:js_cache[2]-1] == '(' && &cino =~ '(' &&
         \ (search('\m\S','nbW',num) || s:ParseCino('U'))
     let pval = s:ParseCino('(')
     if !pval
@@ -437,12 +437,12 @@ function GetJavascriptIndent()
       endif
       return Wval ? s:Nat(num_ind + Wval) : vcol
     endif
-    return s:Nat(num_ind + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:sw())
+    return s:Nat(num_ind + pval + searchpair('\m(','','\m)','nbrmW',s:skip_expr,num) * s:sw())
   endif
 
   " main return
   if l:line =~ '^[])}]\|^|}'
-    if l:line_raw[0] == ')' && getline(b:js_cache[1])[b:js_cache[2]-1] == '('
+    if l:line_raw[0] == ')' && getline(num)[b:js_cache[2]-1] == '('
       if s:ParseCino('M')
         return indent(l:lnum)
       elseif &cino =~# 'm' && !s:ParseCino('m')

From 9c394500060a17218d06aa0a834f9e9b6e0573bc Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 11 Sep 2017 00:04:56 -0700
Subject: [PATCH 0940/1043] clean (#1041)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8f932f6d..a0ca7b68 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -81,28 +81,22 @@ function s:SynAt(l,c)
 endfunction
 
 function s:ParseCino(f)
-  let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
-  if cin == -1
-    return
-  endif
-  let [sign, cstr] = &cino[cin+1] == '-' ? [-1, &cino[cin+2:]] : [1, &cino[cin+1:]]
+  let [divider, n, cstr] = [0] +
+        \ matchlist(&cino,'\v%(.*,)=%(%d'.char2nr(a:f).'(-)=([.s0-9]*))=')[1:2]
   for c in split(cstr,'\zs')
     if c == '.' && !divider
       let divider = 1
     elseif c ==# 's'
-      if n is ''
-        let n = s:sw()
-      else
-        let n = str2nr(n) * s:sw()
+      if n !~ '\d'
+        return n . s:sw()
       endif
+      let n = str2nr(n) * s:sw()
       break
-    elseif c =~ '\d'
-      let [n, divider] .= [c, 0]
     else
-      break
+      let [n, divider] .= [c, 0]
     endif
   endfor
-  return sign * str2nr(n) / max([str2nr(divider),1])
+  return str2nr(n) / max([str2nr(divider),1])
 endfunction
 
 " Optimized {skip} expr, only callable from the search loop which
@@ -186,8 +180,7 @@ function s:Pure(f,...)
 endfunction
 
 function s:SearchLoop(pat,flags,expr)
-  let pair = insert([a:pat,a:flags], '\_$.', a:flags =~# 'b')
-  return s:GetPair(pair[0],pair[1],a:flags,a:expr,200)
+  return call('s:GetPair',insert([a:pat,a:flags,a:expr,200], '\_$.', a:flags =~# 'b'))
 endfunction
 
 function s:ExprCol()
@@ -238,9 +231,8 @@ function s:Balanced(lnum)
         return
       endif
     endif
-    let pos = match(l:line, '['.(l:open ?
-          \ strpart('][(){}', stridx('[({])}', l:line[pos]) % 3 * 2, 2) :
-          \ '][(){}').']', pos + 1)
+    let pos = match(l:line, !l:open ? '[][(){}]' : '()' =~ l:line[pos] ?
+          \ '[()]' : '{}' =~ l:line[pos] ? '[{}]' : '[][]', pos + 1)
   endwhile
   return !l:open
 endfunction
@@ -304,7 +296,7 @@ endfunction
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
 function s:IsBlock()
   let tok = s:PreviousToken()
-  if match(s:stack,'\cxml\|jsx') != -1 && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
+  if join(s:stack) =~? 'xml\|jsx' && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
     return tok != '{'
   elseif tok =~ '\k'
     if tok ==# 'type'
@@ -326,23 +318,20 @@ function s:IsBlock()
 endfunction
 
 function GetJavascriptIndent()
-  let [b:js_cache, s:synid_cache, l:line, s:stack] = [
-        \ get(b:,'js_cache',[0,0,0]),
-        \ [[],[]],
-        \ getline(v:lnum),
-        \ map(synstack(v:lnum,1),"synIDattr(v:val,'name')"),
-        \ ]
+  let b:js_cache = get(b:,'js_cache',[0,0,0])
+  let s:synid_cache = [[],[]]
+  let l:line = getline(v:lnum)
   " use synstack as it validates syn state and works in an empty line
-  let syns = get(s:stack,-1,'')
+  let s:stack = [''] + map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
 
   " start with strings,comments,etc.
-  if syns =~? s:syng_com
+  if s:stack[-1] =~? s:syng_com
     if l:line =~ '^\s*\*'
       return cindent(v:lnum)
     elseif l:line !~ '^\s*\/[/*]'
       return -1
     endif
-  elseif syns =~? b:syng_str
+  elseif s:stack[-1] =~? b:syng_str
     if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
       let b:js_cache[0] = v:lnum
     endif
@@ -378,7 +367,7 @@ function GetJavascriptIndent()
     try
       if idx != -1
         call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
-      elseif getline(v:lnum) !~ '^\S' && syns =~? 'block\|^jsobject$'
+      elseif getline(v:lnum) !~ '^\S' && s:stack[-1] =~? 'block\|^jsobject$'
         call s:GetPair('{','}','bW','s:SkipFunc()',2000)
       else
         call s:AlternatePair()

From c217c783bd185d84fe7cee6d97b9b65e77ac3fe4 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 11 Sep 2017 19:18:45 -0700
Subject: [PATCH 0941/1043] misc (#1042)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a0ca7b68..f2347dfc 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -63,11 +63,11 @@ let s:rel = has('reltime')
 " searchpair() wrapper
 if s:rel
   function s:GetPair(start,end,flags,skip,time)
-    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,a:flags,a:skip,s:l1,a:time)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1,a:time)
   endfunction
 else
   function s:GetPair(start,end,flags,skip,...)
-    return searchpair('\m'.(a:start == '[' ? '\[' : a:start),'','\m'.a:end,a:flags,a:skip,s:l1)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1)
   endfunction
 endif
 
@@ -81,8 +81,8 @@ function s:SynAt(l,c)
 endfunction
 
 function s:ParseCino(f)
-  let [divider, n, cstr] = [0] +
-        \ matchlist(&cino,'\v%(.*,)=%(%d'.char2nr(a:f).'(-)=([.s0-9]*))=')[1:2]
+  let [divider, n, cstr] = [0] + matchlist(&cino,
+        \ '\%(.*,\)\=\%(\%d'.char2nr(a:f).'\(-\)\=\([.s0-9]*\)\)\=')[1:2]
   for c in split(cstr,'\zs')
     if c == '.' && !divider
       let divider = 1
@@ -139,7 +139,7 @@ function s:AlternatePair()
       let idx = stridx('])}',s:LookingAt())
       if idx == -1
         return
-      elseif !s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+      elseif !s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
         break
       endif
     endif
@@ -366,7 +366,7 @@ function GetJavascriptIndent()
           \ max([s:l1, &smc ? search('\m^.\{'.&smc.',}','nbW',s:l1 + 1) + 1 : 0])]
     try
       if idx != -1
-        call s:GetPair('[({'[idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+        call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
       elseif getline(v:lnum) !~ '^\S' && s:stack[-1] =~? 'block\|^jsobject$'
         call s:GetPair('{','}','bW','s:SkipFunc()',2000)
       else
@@ -413,11 +413,9 @@ function GetJavascriptIndent()
         let is_op = s:sw()
       endif
       call cursor(l:lnum, len(pline))
-      let b_l = s:Nat(s:IsContOne(b:js_cache[1],is_op) -
-            \ (!is_op && l:line =~ '^{')) * s:sw()
+      let b_l = s:Nat(s:IsContOne(b:js_cache[1],is_op) - (!is_op && l:line =~ '^{')) * s:sw()
     endif
-  elseif idx == -1 && getline(num)[b:js_cache[2]-1] == '(' && &cino =~ '(' &&
-        \ (search('\m\S','nbW',num) || s:ParseCino('U'))
+  elseif idx.s:LookingAt().&cino =~ '^-1(.*(' && (search('\m\S','nbW',num) || s:ParseCino('U'))
     let pval = s:ParseCino('(')
     if !pval
       let [Wval, vcol] = [s:ParseCino('W'), virtcol('.')]

From 7043d1030c1583fd7347654616daa71d885f4e27 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 13 Sep 2017 21:32:58 -0700
Subject: [PATCH 0942/1043] more code erasing (#1043)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f2347dfc..12cd5569 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -55,9 +55,9 @@ endif
 " matches before pos.
 let s:z = has('patch-7.4.984') ? 'z' : ''
 
-let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
+let s:in_comm = s:skip_expr[:-14] . "'comment\\|doc'"
 
 let s:rel = has('reltime')
 " searchpair() wrapper
@@ -162,9 +162,8 @@ endfunction
 function s:PreviousToken()
   let l:col = col('.')
   if search('\m\k\{1,}\|\S','ebW')
-    if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != a:firstline &&
-          \ getline('.')[:col('.')-1] =~ '\/\/') && s:SynAt(line('.'),col('.')) =~? s:syng_com
-      if s:SearchLoop('\S\ze\_s*\/[/*]','bW',"s:SynAt(line('.'),col('.')) =~? s:syng_com")
+    if search('\m\*\%#\/\|\/\/\%<'.a:firstline.'l','nbW',line('.')) && eval(s:in_comm)
+      if s:SearchLoop('\S\ze\_s*\/[/*]','bW',s:in_comm)
         return s:Token()
       endif
       call cursor(a:firstline, l:col)
@@ -325,7 +324,7 @@ function GetJavascriptIndent()
   let s:stack = [''] + map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
 
   " start with strings,comments,etc.
-  if s:stack[-1] =~? s:syng_com
+  if s:stack[-1] =~? 'comment\|doc'
     if l:line =~ '^\s*\*'
       return cindent(v:lnum)
     elseif l:line !~ '^\s*\/[/*]'

From 6f3d40cfc742a6d4f63c531f93bf890e409b6ed0 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 14 Sep 2017 09:49:18 -0700
Subject: [PATCH 0943/1043] fix 'of' keyword in IsBlock() (#1044)

* fix 'of' keyword in IsBlock()

* fix fix

* class tells

* for
---
 indent/javascript.vim | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 12cd5569..5e62db5b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -300,8 +300,11 @@ function s:IsBlock()
   elseif tok =~ '\k'
     if tok ==# 'type'
       return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
+    elseif tok ==# 'of'
+      return s:Pure('eval',"!s:GetPair('[[({]','[])}]','bW',s:skip_expr,200) || s:LookingAt() != '(' ||"
+            \ ."s:{s:PreviousToken() ==# 'await' ? 'Previous' : ''}Token() !=# 'for' || s:PreviousToken() == '.'")
     endif
-    return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
+    return index(split('return const let import export extends yield default delete var await void typeof throw case new in instanceof')
           \ ,tok) < (line('.') != a:firstline) || s:Pure('s:PreviousToken') == '.'
   elseif tok == '>'
     return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'

From a32b7b0492ef64ee6e0aadd5d977c2dc461f7d4a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 14 Sep 2017 19:24:02 -0700
Subject: [PATCH 0944/1043] remove timeout arg (#1045)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5e62db5b..5e0284ef 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,11 +62,11 @@ let s:in_comm = s:skip_expr[:-14] . "'comment\\|doc'"
 let s:rel = has('reltime')
 " searchpair() wrapper
 if s:rel
-  function s:GetPair(start,end,flags,skip,time)
-    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1,a:time)
+  function s:GetPair(start,end,flags,skip)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1,a:skip ==# 's:SkipFunc()' ? 2000 : 200)
   endfunction
 else
-  function s:GetPair(start,end,flags,skip,...)
+  function s:GetPair(start,end,flags,skip)
     return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1)
   endfunction
 endif
@@ -128,7 +128,7 @@ function s:AlternatePair()
   while s:SearchLoop(pat,'bW','s:SkipFunc()')
     if s:LookingAt() == ';'
       if !l:for
-        if s:GetPair('{','}','bW','s:SkipFunc()',2000)
+        if s:GetPair('{','}','bW','s:SkipFunc()')
           return
         endif
         break
@@ -139,7 +139,7 @@ function s:AlternatePair()
       let idx = stridx('])}',s:LookingAt())
       if idx == -1
         return
-      elseif !s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+      elseif !s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
         break
       endif
     endif
@@ -179,7 +179,7 @@ function s:Pure(f,...)
 endfunction
 
 function s:SearchLoop(pat,flags,expr)
-  return call('s:GetPair',insert([a:pat,a:flags,a:expr,200], '\_$.', a:flags =~# 'b'))
+  return s:GetPair(a:pat,'\_$.',a:flags,a:expr)
 endfunction
 
 function s:ExprCol()
@@ -195,7 +195,7 @@ function s:ExprCol()
     elseif s:LookingAt() == '{'
       let bal = !s:IsBlock()
       break
-    elseif !s:GetPair('{','}','bW',s:skip_expr,200)
+    elseif !s:GetPair('{','}','bW',s:skip_expr)
       break
     endif
   endwhile
@@ -237,7 +237,7 @@ function s:Balanced(lnum)
 endfunction
 
 function s:OneScope()
-  if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100)
+  if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr)
     let tok = s:PreviousToken()
     return (count(split('for if let while with'),tok) ||
           \ tok =~# '^await$\|^each$' && s:PreviousToken() ==# 'for') &&
@@ -251,7 +251,7 @@ endfunction
 function s:DoWhile()
   let cpos = searchpos('\m\<','cbW')
   if s:SearchLoop('\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
-    if s:{s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr,200) ?
+    if s:{s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) ?
           \ 'Previous' : ''}Token() ==# 'do' && s:IsBlock()
       return 1
     endif
@@ -289,7 +289,7 @@ endfunction
 
 function s:IsSwitch()
   return s:PreviousToken() !~ '[.*]' &&
-        \ (!s:GetPair('{','}','cbW',s:skip_expr,100) || s:IsBlock() && !s:Class())
+        \ (!s:GetPair('{','}','cbW',s:skip_expr) || s:IsBlock() && !s:Class())
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -301,7 +301,7 @@ function s:IsBlock()
     if tok ==# 'type'
       return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
     elseif tok ==# 'of'
-      return s:Pure('eval',"!s:GetPair('[[({]','[])}]','bW',s:skip_expr,200) || s:LookingAt() != '(' ||"
+      return s:Pure('eval',"!s:GetPair('[[({]','[])}]','bW',s:skip_expr) || s:LookingAt() != '(' ||"
             \ ."s:{s:PreviousToken() ==# 'await' ? 'Previous' : ''}Token() !=# 'for' || s:PreviousToken() == '.'")
     endif
     return index(split('return const let import export extends yield default delete var await void typeof throw case new in instanceof')
@@ -368,9 +368,9 @@ function GetJavascriptIndent()
           \ max([s:l1, &smc ? search('\m^.\{'.&smc.',}','nbW',s:l1 + 1) + 1 : 0])]
     try
       if idx != -1
-        call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()',2000)
+        call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
       elseif getline(v:lnum) !~ '^\S' && s:stack[-1] =~? 'block\|^jsobject$'
-        call s:GetPair('{','}','bW','s:SkipFunc()',2000)
+        call s:GetPair('{','}','bW','s:SkipFunc()')
       else
         call s:AlternatePair()
       endif
@@ -385,7 +385,7 @@ function GetJavascriptIndent()
   let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
   if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()
     let ilnum = line('.')
-    if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr,100)
+    if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
       if ilnum == num
         let [num, num_ind] = [line('.'), indent('.')]
       endif

From aca57d9a81ff1ac8b5730fd5989a15a490245153 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 16 Sep 2017 00:22:34 -0700
Subject: [PATCH 0945/1043] keep number type, clean

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 5e0284ef..6ba89c44 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -88,7 +88,7 @@ function s:ParseCino(f)
       let divider = 1
     elseif c ==# 's'
       if n !~ '\d'
-        return n . s:sw()
+        return n . s:sw() + 0
       endif
       let n = str2nr(n) * s:sw()
       break
@@ -358,12 +358,12 @@ function GetJavascriptIndent()
   endif
 
   " the containing paren, bracket, or curly. Many hacks for performance
+  call cursor(v:lnum,1)
   let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] > l:lnum && b:js_cache[0] < v:lnum ||
         \ b:js_cache[0] == l:lnum && s:Balanced(l:lnum)
-    call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [v:lnum,1])
+    call call('cursor',b:js_cache[1:])
   else
-    call cursor(v:lnum,1)
     let [s:looksyn, s:top_col, s:check_in, s:l1] = [v:lnum - 1,0,0,
           \ max([s:l1, &smc ? search('\m^.\{'.&smc.',}','nbW',s:l1 + 1) + 1 : 0])]
     try

From 7709a995b82ed8a6145a76aa289b7831df52d388 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 16 Sep 2017 01:05:48 -0700
Subject: [PATCH 0946/1043] unneed (#1046)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 6ba89c44..e58dbd7c 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -377,10 +377,10 @@ function GetJavascriptIndent()
     catch /^\Cout of bounds$/
       call cursor(v:lnum,1)
     endtry
+    let b:js_cache[1:] = line('.') == v:lnum ? [0,0] : getpos('.')[1:2]
   endif
 
-  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
-  let num = b:js_cache[1]
+  let [b:js_cache[0], num] = [v:lnum, b:js_cache[1]]
 
   let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
   if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()

From 465bff5459170565f90c978505b0889571ebeb38 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 16 Sep 2017 12:37:32 -0700
Subject: [PATCH 0947/1043] use l:var

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e58dbd7c..ce896a32 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -383,9 +383,9 @@ function GetJavascriptIndent()
   let [b:js_cache[0], num] = [v:lnum, b:js_cache[1]]
 
   let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
-  if !b:js_cache[2] || s:LookingAt() == '{' && s:IsBlock()
+  if !num || s:LookingAt() == '{' && s:IsBlock()
     let ilnum = line('.')
-    if b:js_cache[2] && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
+    if num && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
       if ilnum == num
         let [num, num_ind] = [line('.'), indent('.')]
       endif
@@ -405,7 +405,7 @@ function GetJavascriptIndent()
         if s:Continues(l:lnum,pline)
           let is_op = s:sw()
         endif
-      elseif b:js_cache[2] && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
+      elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
         call call('cursor',b:js_cache[1:])
         if s:PreviousToken() =~ '\k' && s:Class()
           return num_ind + s:sw()

From aeb10fb7678267559cd8517be369d6cc6239b0d9 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 18 Sep 2017 10:52:55 -0700
Subject: [PATCH 0948/1043] date, to submit to vim/vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ce896a32..bb266961 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: August 30, 2017
+" Last Change: September 18, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')

From 9bb06bf1c677177b2a9bd803ffd7154624d7e1b6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 18 Sep 2017 11:13:12 -0700
Subject: [PATCH 0949/1043] Update javascript.vim

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index bb266961..28617162 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -259,9 +259,9 @@ function s:DoWhile()
   endif
 endfunction
 
-" returns braceless levels started by 'i' and above lines * &sw. 'num' is the
-" lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
-" a continued expression, which could have started in a braceless context
+" returns total offset from braceless contexts. 'num' is the lineNr which
+" encloses the entire context, 'cont' if whether a:firstline is a continued
+" expression, which could have started in a braceless context
 function s:IsContOne(num,cont)
   let [l:num, b_l] = [a:num + !a:num, 0]
   let pind = a:num ? indent(a:num) + s:sw() : 0

From 1ff6ac3b5728f6ffd664d2d56a39467b31ea016c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 25 Sep 2017 09:31:49 -0700
Subject: [PATCH 0950/1043] fix class method name (#1049)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 28617162..c8b127b6 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -282,14 +282,11 @@ function s:IsContOne(num,cont)
   return b_l
 endfunction
 
-function s:Class()
-  return (s:Token() ==# 'class' || s:PreviousToken() =~# '^class$\|^extends$') &&
-        \ s:PreviousToken() != '.'
-endfunction
-
 function s:IsSwitch()
   return s:PreviousToken() !~ '[.*]' &&
-        \ (!s:GetPair('{','}','cbW',s:skip_expr) || s:IsBlock() && !s:Class())
+        \ (!s:GetPair('{','}','cbW',s:skip_expr) || s:IsBlock() &&
+        \ (s:Token() !=# 'class' && s:PreviousToken() !~# '^class$\|^extends$' ||
+        \ s:PreviousToken() == '.'))
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -406,8 +403,11 @@ function GetJavascriptIndent()
           let is_op = s:sw()
         endif
       elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
-        call call('cursor',b:js_cache[1:])
-        if s:PreviousToken() =~ '\k' && s:Class()
+        call cursor(l:lnum, len(pline))
+        if s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) &&
+              \ s:PreviousToken() == ')' && s:GetPair('(',')','bW',s:skip_expr) &&
+              \ (s:PreviousToken() == ']' || s:Token() =~ '\k' &&
+              \ s:{s:PreviousToken() == '*' ? 'Previous' : ''}Token() !=# 'function')
           return num_ind + s:sw()
         endif
         let is_op = s:sw()

From de388ef09c0256b4bdcd82544912b60c34c4d423 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 25 Sep 2017 09:42:37 -0700
Subject: [PATCH 0951/1043] bugfix: skipexpr

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index c8b127b6..7dda1754 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -113,7 +113,6 @@ function s:SkipFunc()
     let s:check_in = 0
   elseif getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
     if eval(s:skip_expr)
-      let s:looksyn = a:firstline
       return 1
     endif
   elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn) && eval(s:skip_expr)

From bc86cbb38ce9ca9c38f224b2d3aec19183d4dea7 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 26 Sep 2017 11:49:02 -0700
Subject: [PATCH 0952/1043] forward parse for switch statement (#1051)

* forward parse for switch statement

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 7dda1754..ea98f9de 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -282,10 +282,8 @@ function s:IsContOne(num,cont)
 endfunction
 
 function s:IsSwitch()
-  return s:PreviousToken() !~ '[.*]' &&
-        \ (!s:GetPair('{','}','cbW',s:skip_expr) || s:IsBlock() &&
-        \ (s:Token() !=# 'class' && s:PreviousToken() !~# '^class$\|^extends$' ||
-        \ s:PreviousToken() == '.'))
+  call call('cursor',b:js_cache[1:])
+  return search('\m\C\%#.\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>','nWc'.s:z)
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader

From 9802bca510dcfe5526bafea3851a3023805e019f Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 27 Sep 2017 14:04:55 -0700
Subject: [PATCH 0953/1043] fill cache holes (#1052)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index ea98f9de..9bafbee7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -119,6 +119,7 @@ function s:SkipFunc()
     let s:check_in = 1
     return 1
   endif
+  let s:synid_cache[:] += [[line2byte('.') + col('.') - 1], ['']]
   let [s:looksyn, s:top_col] = getpos('.')[1:2]
 endfunction
 

From 30dcd712aa77fee8f196297d32263e237c1cc1a6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 28 Sep 2017 01:22:44 -0700
Subject: [PATCH 0954/1043] nonstandard multichar ops (#1054)

refactor
---
 indent/javascript.vim | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9bafbee7..cb501bfe 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -184,22 +184,26 @@ endfunction
 
 function s:ExprCol()
   let bal = 0
-  while s:SearchLoop('[{}?]\|\_[^:]\zs::\@!','bW',s:skip_expr)
+  while s:SearchLoop('[{}?:]','bW',s:skip_expr)
     if s:LookingAt() == ':'
+      if getline('.')[col('.')-2] == ':'
+        call cursor(0,col('.')-1)
+        continue
+      endif
       let bal -= 1
     elseif s:LookingAt() == '?'
-      let bal += 1
-      if bal == 1
-        break
+      if getline('.')[col('.'):col('.')+1] =~ '^\.\d\@!'
+        continue
+      elseif !bal
+        return 1
       endif
+      let bal += 1
     elseif s:LookingAt() == '{'
-      let bal = !s:IsBlock()
-      break
+      return !s:IsBlock()
     elseif !s:GetPair('{','}','bW',s:skip_expr)
       break
     endif
   endwhile
-  return s:Nat(bal)
 endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.

From fcef6389a764b20b268b25dc3ce11eddbd484be6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 28 Sep 2017 01:36:29 -0700
Subject: [PATCH 0955/1043] missed

---
 indent/javascript.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cb501bfe..30b29763 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -183,6 +183,9 @@ function s:SearchLoop(pat,flags,expr)
 endfunction
 
 function s:ExprCol()
+  if getline('.')[col('.')-2] == ':'
+    return 1
+  endif
   let bal = 0
   while s:SearchLoop('[{}?:]','bW',s:skip_expr)
     if s:LookingAt() == ':'

From e5769400addcc952032d90d5b751b2a794089c1d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 2 Oct 2017 10:27:41 -0700
Subject: [PATCH 0956/1043] cleanup of syntax regexes (#1057)

---
 syntax/javascript.vim | 120 ++++++++++++++++++++----------------------
 1 file changed, 56 insertions(+), 64 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index fabfce28..911441cb 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -24,17 +24,17 @@ syntax sync fromstart
 " syntax case ignore
 syntax case match
 
-syntax match   jsNoise          /[:,\;]\{1}/
-syntax match   jsNoise          /[\.]\{1}/ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
-syntax match   jsObjectProp     contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/
-syntax match   jsFuncCall       /\k\+\%(\s*(\)\@=/
+syntax match   jsNoise          /[:,;]/
+syntax match   jsNoise          /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
+syntax match   jsObjectProp     contained /\<\K\k*/
+syntax match   jsFuncCall       /\<\K\k*\ze\s*(/
 syntax match   jsParensError    /[)}\]]/
 
 " Program Keywords
 syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
-syntax match   jsVariableDef    contained /\k\+/ skipwhite skipempty nextgroup=jsFlowDefinition
+syntax match   jsVariableDef    contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFlowDefinition
 syntax keyword jsOperator       delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
-syntax match   jsOperator       /[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}/ skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsOperator       "[-!|&+<>=%/*~^]" skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       /::/ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
 syntax keyword jsBooleanFalse   false
@@ -42,7 +42,7 @@ syntax keyword jsBooleanFalse   false
 " Modules
 syntax keyword jsImport                       import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup,jsFlowImportType
 syntax keyword jsExport                       export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword,jsFlowTypeStatement
-syntax match   jsModuleKeyword      contained /\k\+/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
+syntax match   jsModuleKeyword      contained /\<\K\k*/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
 syntax keyword jsExportDefault      contained default skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsExportDefaultGroup contained default skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
 syntax match   jsModuleAsterisk     contained /\*/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAs,jsFrom
@@ -51,44 +51,37 @@ syntax keyword jsFrom               contained from skipwhite skipempty nextgroup
 syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup,jsFlowTypeKeyword
 
 " Strings, Templates, Numbers
-syntax region  jsString           start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend
-syntax region  jsString           start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateExpression,jsSpecial,@Spell extend
-syntax match   jsTaggedTemplate   /\k\+\%(`\)\@=/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\<\d\+\%([eE][+-]\=\d\+\)\=\>\|\<0[bB][01]\+\>\|\<0[oO]\o\+\>\|\<0[xX]\x\+\>/
+syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend
+syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial,@Spell extend
+syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
+syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/
 syntax keyword jsNumber           Infinity
-syntax match   jsFloat            /\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
+syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
 
 " Regular Expressions
-syntax match   jsSpecial            contained "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)"
+syntax match   jsSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{4,5}})|c\u|.)"
 syntax region  jsTemplateExpression contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression keepend
-syntax region  jsRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+
-syntax match   jsRegexpBoundary     contained "\v%(\<@![\^$]|\\[bB])"
-syntax match   jsRegexpBackRef      contained "\v\\[1-9][0-9]*"
-syntax match   jsRegexpQuantifier   contained "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??"
-syntax match   jsRegexpOr           contained "\v\<@!\|"
-syntax match   jsRegexpMod          contained "\v\(@<=\?[:=!>]"
-syntax region  jsRegexpGroup        contained start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-if v:version > 703 || v:version == 603 && has("patch1088")
-  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@50<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@50<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimyu]\{,5}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
-else
-  syntax region  jsRegexpString   start=+\%(\%(\%(return\|case\)\s\+\)\@<=\|\%(\%([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\%(\\.\|[^]]\)*\]+ end=+/[gimyu]\{,5}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
-endif
+syntax region  jsRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+ contains=jsSpecial
+syntax match   jsRegexpBoundary     contained "\v\c[$^]|\\b"
+syntax match   jsRegexpBackRef      contained "\v\\[1-9]\d*"
+syntax match   jsRegexpQuantifier   contained "\v[^\\]%([?*+]|\{\d+%(,\d*)?})\??"lc=1
+syntax match   jsRegexpOr           contained "|"
+syntax match   jsRegexpMod          contained "\v\(\?[:=!>]"lc=1
+syntax region  jsRegexpGroup        contained start="[^\\]("lc=1 skip="\\.\|\[\(\\.\|[^]]\+\)\]" end=")" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax region  jsRegexpString   start=+\%(\%(\<return\|\<typeof\|\_[^)\]'"[:blank:][:alnum:]_$]\)\s*\)\@<=/\ze[^*/]+ skip=+\\.\|\[[^]]\{1,}\]+ end=+/[gimyus]\{,6}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
 " Objects
-syntax match   jsObjectKey         contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
+syntax match   jsObjectKey         contained /\<\K\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
 syntax match   jsObjectColon       contained /:/ skipwhite skipempty
-syntax region  jsObjectKeyString   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsObjectKeyString   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
 syntax match   jsObjectSeparator   contained /,/
-syntax region  jsObjectValue       contained matchgroup=jsNoise start=/:/ end=/\%(,\|}\)\@=/ contains=@jsExpression extend
-syntax match   jsObjectFuncName    contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>[\r\n\t ]*(\@=/ skipwhite skipempty nextgroup=jsFuncArgs
-syntax match   jsFunctionKey       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/
-syntax match   jsObjectMethodType  contained /\%(get\|set\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsObjectFuncName
-syntax region  jsObjectStringKey   contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
-syntax region  jsObjectStringKey   contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
+syntax region  jsObjectValue       contained matchgroup=jsNoise start=/:/ end=/[,}]\@=/ contains=@jsExpression extend
+syntax match   jsObjectFuncName    contained /\<\K\k*\ze\_s*(/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsFunctionKey       contained /\<\K\k*\ze\s*:\s*function\>/
+syntax match   jsObjectMethodType  contained /\<[gs]et\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsObjectFuncName
+syntax region  jsObjectStringKey   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
 exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
 exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '').' skipwhite skipempty nextgroup=@jsExpression'
@@ -99,8 +92,8 @@ exe 'syntax keyword jsThis      this             '.(exists('g:javascript_conceal
 exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
 
 " Statement Keywords
-syntax match   jsBlockLabel              /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\s*::\@!/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
-syntax match   jsBlockLabelKey contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*\%(;\|\n\)\)\@=/
+syntax match   jsBlockLabel              /\<\K\k*\s*::\@!/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
+syntax match   jsBlockLabelKey contained /\<\K\k*\ze\s*\_[;]/
 syntax keyword jsStatement     contained with yield debugger
 syntax keyword jsStatement     contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
 syntax keyword jsConditional            if              skipwhite skipempty nextgroup=jsParenIfElse
@@ -162,68 +155,67 @@ syntax region  jsBlock                        matchgroup=jsBraces              s
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
-syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|[\}]\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
+syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|}\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup
-syntax match   jsFuncName             contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup
+syntax match   jsFuncName             contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup
 syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
 syntax keyword jsArguments            contained arguments
 syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenRepeat
 
 " Matches a single keyword argument with no parens
-syntax match   jsArrowFuncArgs  /\k\+\s*\%(=>\)\@=/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
+syntax match   jsArrowFuncArgs  /\<\K\k*\ze\s*=>/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
 " Matches a series of arguments surrounded in parens
-syntax match   jsArrowFuncArgs  /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
+syntax match   jsArrowFuncArgs  /([^()]*)\ze\s*=>/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction                                   '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
-exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '').(' contains=jsArrowFuncArgs')
-exe 'syntax match jsArrowFunction /_\s*\(=>\)\@=/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
+exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '').(' contains=jsArrowFuncArgs')
+exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
 
 " Classes
 syntax keyword jsClassKeyword           contained class
 syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodType        contained /\%(get\|set\|static\)\%( \k\+\)\@=/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsFuncName,jsClassProperty
+syntax match   jsClassMethodType        contained /\<\%([gs]et\|static\)\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
-syntax match   jsClassProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*[=:]\)\@=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
-syntax region  jsClassValue             contained start=/=/ end=/\%(;\|}\|\n\)\@=/ contains=@jsExpression
+syntax match   jsClassProperty          contained /\<\K\k*\ze\s*=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
+syntax region  jsClassValue             contained start=/=/ end=/\_[;}]\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
-syntax match   jsClassFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\%(\s*(\)\@=/ skipwhite skipempty nextgroup=jsFuncArgs
-syntax region  jsClassStringKey         contained start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
-syntax region  jsClassStringKey         contained start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*(/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsClassStringKey         contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
 
 " Destructuring
-syntax match   jsDestructuringPropertyValue     contained /\<[0-9a-zA-Z_$]*\>/
-syntax match   jsDestructuringProperty          contained /\<[0-9a-zA-Z_$]*\>\(\s*=\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValue
-syntax match   jsDestructuringAssignment        contained /\<[0-9a-zA-Z_$]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsDestructuringValueAssignment
+syntax match   jsDestructuringPropertyValue     contained /\k\+/
+syntax match   jsDestructuringProperty          contained /\k\+\ze\s*=/ skipwhite skipempty nextgroup=jsDestructuringValue
+syntax match   jsDestructuringAssignment        contained /\k\+\ze\s*:/ skipwhite skipempty nextgroup=jsDestructuringValueAssignment
 syntax region  jsDestructuringValue             contained start=/=/ end=/[,}\]]\@=/ contains=@jsExpression extend
 syntax region  jsDestructuringValueAssignment   contained start=/:/ end=/[,}=]\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise skipwhite skipempty nextgroup=jsDestructuringValue extend
-syntax match   jsDestructuringNoise             contained /[,\[\]]/
+syntax match   jsDestructuringNoise             contained /[,[\]]/
 syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringNoise extend fold
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
-syntax region  jsComment        start=/\/\// end=/$/ contains=jsCommentTodo,@Spell extend keepend
-syntax region  jsComment        start=/\/\*/  end=/\*\// contains=jsCommentTodo,@Spell fold extend keepend
+syntax region  jsComment        start=+//+ end=/$/ contains=jsCommentTodo,@Spell extend keepend
+syntax region  jsComment        start=+/\*+  end=+\*/+ contains=jsCommentTodo,@Spell fold extend keepend
 syntax region  jsEnvComment     start=/\%^#!/ end=/$/ display
 
 " Specialized Comments - These are special comment regexes that are used in
 " odd places that maintain the proper nextgroup functionality. It sucks we
 " can't make jsComment a skippable type of group for nextgroup
-syntax region  jsCommentFunction    contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend keepend
-syntax region  jsCommentFunction    contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn fold extend keepend
-syntax region  jsCommentClass       contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup extend keepend
-syntax region  jsCommentClass       contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup fold extend keepend
-syntax region  jsCommentIfElse      contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock extend keepend
-syntax region  jsCommentIfElse      contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock fold extend keepend
-syntax region  jsCommentRepeat      contained start=/\/\// end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock extend keepend
-syntax region  jsCommentRepeat      contained start=/\/\*/ end=/\*\// contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock fold extend keepend
+syntax region  jsCommentFunction    contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend keepend
+syntax region  jsCommentFunction    contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn fold extend keepend
+syntax region  jsCommentClass       contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup extend keepend
+syntax region  jsCommentClass       contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup fold extend keepend
+syntax region  jsCommentIfElse      contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock extend keepend
+syntax region  jsCommentIfElse      contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock fold extend keepend
+syntax region  jsCommentRepeat      contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock extend keepend
+syntax region  jsCommentRepeat      contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock fold extend keepend
 
 " Decorators
 syntax match   jsDecorator                    /^\s*@/ nextgroup=jsDecoratorFunction
-syntax match   jsDecoratorFunction  contained /[a-zA-Z_][a-zA-Z0-9_.]*/ nextgroup=jsParenDecorator
+syntax match   jsDecoratorFunction  contained /\h[a-zA-Z0-9_.]*/ nextgroup=jsParenDecorator
 
 if exists("javascript_plugin_jsdoc")
   runtime extras/jsdoc.vim

From b58952e978a9d40752eb8d54e8e9e8015fe1f5e2 Mon Sep 17 00:00:00 2001
From: Peter Herbert <p-herbert@users.noreply.github.com>
Date: Fri, 6 Oct 2017 17:45:52 -0700
Subject: [PATCH 0957/1043] (fix) Match no argument arrow functions (#1059)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 911441cb..e487b25a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -171,7 +171,7 @@ syntax match   jsArrowFuncArgs  /([^()]*)\ze\s*=>/ contains=jsFuncArgs skipempty
 
 exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction                                   '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
-exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '').(' contains=jsArrowFuncArgs')
+exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
 exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
 
 " Classes

From 3ed61c9d46f0803e6e62f8d6aa10b9e2f0d8e048 Mon Sep 17 00:00:00 2001
From: Nick Peeples <nick.peeples@gmail.com>
Date: Wed, 11 Oct 2017 12:04:00 -0500
Subject: [PATCH 0958/1043] adding optional chaining operator (#1053)

---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e487b25a..a4623543 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -156,6 +156,7 @@ syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        s
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|}\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsOperator       /?\.\ze\_D/
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup
 syntax match   jsFuncName             contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup

From 9404db5b8a0dac1f78798fde2b8b46392e3f3a60 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 12 Oct 2017 17:26:59 -0700
Subject: [PATCH 0959/1043] clean: remove cursor call (#1060)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 30b29763..70b60cb5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -215,15 +215,14 @@ let s:opfirst = '^' . get(g:,'javascript_opfirst',
 let s:continuation = get(g:,'javascript_continuation',
       \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
 
-function s:Continues(ln,con)
-  let tok = matchstr(a:con[-15:],s:continuation)
+function s:Continues()
+  let tok = matchstr(strpart(getline('.'),col('.')-15,15),s:continuation)
   if tok =~ '[a-z:]'
-    call cursor(a:ln, len(a:con))
     return tok == ':' ? s:ExprCol() : s:PreviousToken() != '.'
   elseif tok !~ '[/>]'
     return tok isnot ''
   endif
-  return s:SynAt(a:ln, len(a:con)) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
+  return s:SynAt(line('.'),col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
@@ -269,9 +268,9 @@ endfunction
 " returns total offset from braceless contexts. 'num' is the lineNr which
 " encloses the entire context, 'cont' if whether a:firstline is a continued
 " expression, which could have started in a braceless context
-function s:IsContOne(num,cont)
-  let [l:num, b_l] = [a:num + !a:num, 0]
-  let pind = a:num ? indent(a:num) + s:sw() : 0
+function s:IsContOne(cont)
+  let [l:num, b_l] = [b:js_cache[1] + !b:js_cache[1], 0]
+  let pind = b:js_cache[1] ? indent(b:js_cache[1]) + s:sw() : 0
   let ind = indent('.') + !a:cont
   while line('.') > l:num && ind > pind || line('.') == l:num
     if indent('.') < ind && s:OneScope()
@@ -401,26 +400,24 @@ function GetJavascriptIndent()
       endif
     endif
     if idx == -1 && pline[-1:] !~ '[{;]'
+      call cursor(l:lnum, len(pline))
       let sol = matchstr(l:line,s:opfirst)
       if sol is '' || sol == '/' && s:SynAt(v:lnum,
             \ 1 + len(getline(v:lnum)) - len(l:line)) =~? 'regex'
-        if s:Continues(l:lnum,pline)
+        if s:Continues()
           let is_op = s:sw()
         endif
-      elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
-        call cursor(l:lnum, len(pline))
-        if s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) &&
-              \ s:PreviousToken() == ')' && s:GetPair('(',')','bW',s:skip_expr) &&
-              \ (s:PreviousToken() == ']' || s:Token() =~ '\k' &&
-              \ s:{s:PreviousToken() == '*' ? 'Previous' : ''}Token() !=# 'function')
-          return num_ind + s:sw()
-        endif
-        let is_op = s:sw()
+      elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$' &&
+            \ s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) &&
+            \ s:PreviousToken() == ')' && s:GetPair('(',')','bW',s:skip_expr) &&
+            \ (s:PreviousToken() == ']' || s:LookingAt() =~ '\k' &&
+            \ s:{s:PreviousToken() == '*' ? 'Previous' : ''}Token() !=# 'function')
+        return num_ind + s:sw()
       else
         let is_op = s:sw()
       endif
       call cursor(l:lnum, len(pline))
-      let b_l = s:Nat(s:IsContOne(b:js_cache[1],is_op) - (!is_op && l:line =~ '^{')) * s:sw()
+      let b_l = s:Nat(s:IsContOne(is_op) - (!is_op && l:line =~ '^{')) * s:sw()
     endif
   elseif idx.s:LookingAt().&cino =~ '^-1(.*(' && (search('\m\S','nbW',num) || s:ParseCino('U'))
     let pval = s:ParseCino('(')

From e55c27ea81132888fb05b439e8ab9c222bc41ed0 Mon Sep 17 00:00:00 2001
From: Caleb Bassi <calebjbassi@gmail.com>
Date: Fri, 13 Oct 2017 07:48:42 -0700
Subject: [PATCH 0960/1043] Changed recommended foldmethod setting in README
 (#1061)

* Changed recommended foldmethod setting in README

* Fixed autocommand by including in an 'au' group

* Update README.md
---
 README.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b60614f9..b9ac49f4 100644
--- a/README.md
+++ b/README.md
@@ -51,14 +51,16 @@ Default Value: 0
 
 -----------------
 
-```
-set foldmethod=syntax
+```vim
+augroup javascript_folding
+    au!
+    au FileType javascript setlocal foldmethod=syntax
+augroup END
 ```
 
-Enables code folding based on our syntax file.
+Enables code folding for javascript based on our syntax file.
 
-Please note this can have a dramatic effect on performance and because it is a
-global vim option, we do not set it ourselves.
+Please note this can have a dramatic effect on performance.
 
 
 ## Concealing Characters

From 4bd734e3bc188efca2002c1d2391c53918379e28 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 18 Oct 2017 17:28:19 -0700
Subject: [PATCH 0961/1043] more accurate do->while (#1062)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 70b60cb5..13727827 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -256,13 +256,19 @@ endfunction
 
 function s:DoWhile()
   let cpos = searchpos('\m\<','cbW')
-  if s:SearchLoop('\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
-    if s:{s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) ?
-          \ 'Previous' : ''}Token() ==# 'do' && s:IsBlock()
-      return 1
+  while s:SearchLoop('\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
+    if s:LookingAt() =~ '\a'
+      if s:Pure('s:IsBlock')
+        if s:LookingAt() ==# 'd'
+          return 1
+        endif
+        break
+      endif
+    elseif s:LookingAt() != '}' || !s:GetPair('{','}','bW',s:skip_expr)
+      break
     endif
-    call call('cursor',cpos)
-  endif
+  endwhile
+  call call('cursor',cpos)
 endfunction
 
 " returns total offset from braceless contexts. 'num' is the lineNr which

From 7145139cf0af5a87b7cbdd405e27f550a7c9f390 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 31 Oct 2017 07:47:19 -0700
Subject: [PATCH 0962/1043] jsx context fix (#1068)

* match vs index(split())

* actually, jsx fix

* convention
---
 indent/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 13727827..2187b3c4 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -303,6 +303,7 @@ endfunction
 function s:IsBlock()
   let tok = s:PreviousToken()
   if join(s:stack) =~? 'xml\|jsx' && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
+    let s:in_jsx = 1
     return tok != '{'
   elseif tok =~ '\k'
     if tok ==# 'type'
@@ -389,10 +390,10 @@ function GetJavascriptIndent()
 
   let [b:js_cache[0], num] = [v:lnum, b:js_cache[1]]
 
-  let [num_ind, is_op, b_l, l:switch_offset] = [s:Nat(indent(num)),0,0,0]
+  let [num_ind, is_op, b_l, l:switch_offset, s:in_jsx] = [s:Nat(indent(num)),0,0,0,0]
   if !num || s:LookingAt() == '{' && s:IsBlock()
     let ilnum = line('.')
-    if num && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
+    if num && !s:in_jsx && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
       if ilnum == num
         let [num, num_ind] = [line('.'), indent('.')]
       endif

From 3b21b5bade24c651e172784dead19e589aa3798e Mon Sep 17 00:00:00 2001
From: Florian Breisch <florian.breisch@mindkeeper.solutions>
Date: Tue, 31 Oct 2017 17:42:55 +0100
Subject: [PATCH 0963/1043] Add WeakSet to syntax keywords (#1069)

Add [WeakSet](https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/WeakSet) to the list of jsGlobalObjects keywords.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a4623543..455c83f4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -110,7 +110,7 @@ syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
+syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set WeakSet RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
 syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
 syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From 0f1f71f2f22fdf62e8eb9e1c226db5939edf4472 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 1 Nov 2017 18:02:04 -0700
Subject: [PATCH 0964/1043] PToken() optimize (#1070)

---
 indent/javascript.vim | 46 ++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2187b3c4..42744725 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -26,11 +26,6 @@ setlocal indentkeys+=0],0)
 let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 
 " Regex of syntax group names that are or delimit string or are comments.
-let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
-let b:syng_str = get(b:,'syng_str','string\|template\|special')
-" template strings may want to be excluded when editing graphql:
-" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
-" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')
@@ -40,6 +35,19 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!'
+let s:syng_str = 'string\|template\|special'
+" template strings may want to be excluded when editing graphql:
+" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
+" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
+let s:js_cache = [0,0,0]
+
+function s:GetVars()
+  for svar in ['syng_strcom', 'syng_str', 'js_cache']
+    let b:{svar} = get(b:,svar,copy(s:{svar}))
+  endfor
+endfunction
+
 " Get shiftwidth value
 if exists('*shiftwidth')
   function s:sw()
@@ -159,19 +167,29 @@ function s:Token()
   return s:LookingAt() =~ '\k' ? expand('<cword>') : s:LookingAt()
 endfunction
 
-function s:PreviousToken()
-  let l:col = col('.')
+function s:PreviousToken(...)
+  let [l:pos, tok] = [getpos('.'), '']
   if search('\m\k\{1,}\|\S','ebW')
-    if search('\m\*\%#\/\|\/\/\%<'.a:firstline.'l','nbW',line('.')) && eval(s:in_comm)
-      if s:SearchLoop('\S\ze\_s*\/[/*]','bW',s:in_comm)
-        return s:Token()
+    if getline('.')[col('.')-2:col('.')-1] == '*/'
+      if eval(s:in_comm) && !s:SearchLoop('\S\ze\_s*\/[/*]','bW',s:in_comm)
+        call setpos('.',l:pos)
+      else
+        let tok = s:Token()
       endif
-      call cursor(a:firstline, l:col)
     else
-      return s:Token()
+      let two = a:0 || line('.') != l:pos[1] ? strridx(getline('.')[:col('.')],'//') + 1 : 0
+      if two && eval(s:in_comm)
+        call cursor(0,two)
+        let tok = s:PreviousToken(1)
+        if tok is ''
+          call setpos('.',l:pos)
+        endif
+      else
+        let tok = s:Token()
+      endif
     endif
   endif
-  return ''
+  return tok
 endfunction
 
 function s:Pure(f,...)
@@ -328,7 +346,7 @@ function s:IsBlock()
 endfunction
 
 function GetJavascriptIndent()
-  let b:js_cache = get(b:,'js_cache',[0,0,0])
+  call s:GetVars()
   let s:synid_cache = [[],[]]
   let l:line = getline(v:lnum)
   " use synstack as it validates syn state and works in an empty line

From 77e4bf814c53a4f2c23d4c4d5a4ef718d013a4db Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 1 Nov 2017 20:18:05 -0700
Subject: [PATCH 0965/1043] one time sourced

so b: vars only created for first buffer
---
 indent/javascript.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 42744725..9a4623a7 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -12,7 +12,8 @@ let b:did_indent = 1
 
 " indent correctly if inside <script>
 " vim/vim@690afe1 for the switch from cindent
-let b:html_indent_script1 = 'inc'
+" overridden with b:html_indent_script1
+call extend(g:,{'html_indent_script1': 'inc'},'keep')
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()

From 4a8f6f7149e0be685402c32adb2a1cbedadf03fe Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 2 Nov 2017 06:20:08 -0700
Subject: [PATCH 0966/1043] b var making

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9a4623a7..e585ccfc 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -36,17 +36,15 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!'
-let s:syng_str = 'string\|template\|special'
+let s:bvars = {
+      \ 'syng_strcom': 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!',
+      \ 'syng_str': 'string\|template\|special' }
 " template strings may want to be excluded when editing graphql:
 " au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
 " au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
-let s:js_cache = [0,0,0]
 
 function s:GetVars()
-  for svar in ['syng_strcom', 'syng_str', 'js_cache']
-    let b:{svar} = get(b:,svar,copy(s:{svar}))
-  endfor
+  call extend(b:,extend(s:bvars,{'js_cache': [0,0,0]}),'keep')
 endfunction
 
 " Get shiftwidth value

From 8eba141579a0735b0e9640f7ca6cda78512a2857 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 3 Nov 2017 10:39:44 -0700
Subject: [PATCH 0967/1043] move comment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e585ccfc..2bdecd54 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -26,8 +26,6 @@ setlocal indentkeys+=0],0)
 
 let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 
-" Regex of syntax group names that are or delimit string or are comments.
-
 " Only define the function once.
 if exists('*GetJavascriptIndent')
   finish
@@ -36,6 +34,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+" Regex of syntax group names that are or delimit string or are comments.
 let s:bvars = {
       \ 'syng_strcom': 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!',
       \ 'syng_str': 'string\|template\|special' }

From cea724c0e1a330fff1d38018667a748c26559a57 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 6 Nov 2017 08:53:24 -0800
Subject: [PATCH 0968/1043] move html var decl

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 2bdecd54..01962176 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -10,11 +10,6 @@ if exists('b:did_indent')
 endif
 let b:did_indent = 1
 
-" indent correctly if inside <script>
-" vim/vim@690afe1 for the switch from cindent
-" overridden with b:html_indent_script1
-call extend(g:,{'html_indent_script1': 'inc'},'keep')
-
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
 setlocal autoindent nolisp nosmartindent
@@ -34,6 +29,11 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+" indent correctly if inside <script>
+" vim/vim@690afe1 for the switch from cindent
+" overridden with b:html_indent_script1
+call extend(g:,{'html_indent_script1': 'inc'},'keep')
+
 " Regex of syntax group names that are or delimit string or are comments.
 let s:bvars = {
       \ 'syng_strcom': 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!',

From 1f65d0dbd20abaa2a57e1fc0d87115fc1817db4b Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 14 Nov 2017 13:52:20 -0800
Subject: [PATCH 0969/1043] remove unneeded redeclaration

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 01962176..83505f29 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -111,7 +111,6 @@ function s:SkipFunc()
   if s:top_col == 1
     throw 'out of bounds'
   endif
-  let s:top_col = 0
   if s:check_in
     if eval(s:skip_expr)
       return 1

From b2935feeb0567c62394d22b898117da7d8f5096a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Tue, 14 Nov 2017 13:53:44 -0800
Subject: [PATCH 0970/1043] make elseif

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 83505f29..631fdc43 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -110,8 +110,7 @@ endfunction
 function s:SkipFunc()
   if s:top_col == 1
     throw 'out of bounds'
-  endif
-  if s:check_in
+  elseif s:check_in
     if eval(s:skip_expr)
       return 1
     endif

From a0e1442d86a070331c800107fbee6394ee6d3d08 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 15 Nov 2017 14:10:03 -0800
Subject: [PATCH 0971/1043] cleaning (#1079)

* cleaning

* 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 631fdc43..b85fb995 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -454,10 +454,10 @@ function GetJavascriptIndent()
 
   " main return
   if l:line =~ '^[])}]\|^|}'
-    if l:line_raw[0] == ')' && getline(num)[b:js_cache[2]-1] == '('
+    if l:line_raw[0] == ')'
       if s:ParseCino('M')
         return indent(l:lnum)
-      elseif &cino =~# 'm' && !s:ParseCino('m')
+      elseif num && &cino =~# 'm' && !s:ParseCino('m')
         return virtcol('.') - 1
       endif
     endif

From 85804bbfc30e2d4ce63d7ae7aa218e083c701f74 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 24 Nov 2017 18:09:07 -0800
Subject: [PATCH 0972/1043] optimize

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b85fb995..337d3505 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -240,18 +240,18 @@ function s:Continues()
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
-function s:Balanced(lnum)
-  let [l:open, l:line] = [0, getline(a:lnum)]
-  let pos = match(l:line, '[][(){}]')
+function s:Balanced(lnum,line)
+  let l:open = 0
+  let pos = match(a:line, '[][(){}]')
   while pos != -1
     if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
-      let l:open += match(' ' . l:line[pos],'[[({]')
+      let l:open += match(' ' . a:line[pos],'[[({]')
       if l:open < 0
         return
       endif
     endif
-    let pos = match(l:line, !l:open ? '[][(){}]' : '()' =~ l:line[pos] ?
-          \ '[()]' : '{}' =~ l:line[pos] ? '[{}]' : '[][]', pos + 1)
+    let pos = match(a:line, !l:open ? '[][(){}]' : '()' =~ a:line[pos] ?
+          \ '[()]' : '{}' =~ a:line[pos] ? '[{}]' : '[][]', pos + 1)
   endwhile
   return !l:open
 endfunction
@@ -356,7 +356,7 @@ function GetJavascriptIndent()
       return -1
     endif
   elseif s:stack[-1] =~? b:syng_str
-    if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
+    if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1,getline(v:lnum-1))
       let b:js_cache[0] = v:lnum
     endif
     return -1
@@ -383,7 +383,7 @@ function GetJavascriptIndent()
   call cursor(v:lnum,1)
   let idx = index([']',')','}'],l:line[0])
   if b:js_cache[0] > l:lnum && b:js_cache[0] < v:lnum ||
-        \ b:js_cache[0] == l:lnum && s:Balanced(l:lnum)
+        \ b:js_cache[0] == l:lnum && s:Balanced(l:lnum,pline)
     call call('cursor',b:js_cache[1:])
   else
     let [s:looksyn, s:top_col, s:check_in, s:l1] = [v:lnum - 1,0,0,

From f973b6f8419f44f86947be1345b423b28e0d3f8c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 27 Nov 2017 16:23:28 -0800
Subject: [PATCH 0973/1043] Fix jsObjectKey for keys that start with numbers

I have the feeling this is something that changed in the spec and is no
longer an issue.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 455c83f4..7aa799dc 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -72,7 +72,7 @@ syntax region  jsRegexpString   start=+\%(\%(\<return\|\<typeof\|\_[^)\]'"[:blan
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
 " Objects
-syntax match   jsObjectKey         contained /\<\K\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
+syntax match   jsObjectKey         contained /\<\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
 syntax match   jsObjectColon       contained /:/ skipwhite skipempty
 syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend

From 0922d26d1477421d213f82ad4224c959b4c2357e Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 27 Nov 2017 23:36:44 -0800
Subject: [PATCH 0974/1043] dont re-add to cache (#1081)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 337d3505..a6753865 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -119,11 +119,14 @@ function s:SkipFunc()
     if eval(s:skip_expr)
       return 1
     endif
-  elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn) && eval(s:skip_expr)
-    let s:check_in = 1
-    return 1
+  elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
+    if eval(s:skip_expr)
+      let s:check_in = 1
+      return 1
+    endif
+  else
+    let s:synid_cache[:] += [[line2byte('.') + col('.') - 1], ['']]
   endif
-  let s:synid_cache[:] += [[line2byte('.') + col('.') - 1], ['']]
   let [s:looksyn, s:top_col] = getpos('.')[1:2]
 endfunction
 

From ee990797a1027ed260069c787f33c76a0b309ce6 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 4 Dec 2017 08:15:15 -0800
Subject: [PATCH 0975/1043] fix chaining arrows scope (#1087)

---
 indent/javascript.vim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a6753865..9e9e03bd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -267,8 +267,13 @@ function s:OneScope()
           \ s:Pure('s:PreviousToken') != '.' && !(tok == 'while' && s:DoWhile())
   elseif s:Token() =~# '^else$\|^do$'
     return s:Pure('s:PreviousToken') != '.'
+  elseif strpart(getline('.'),col('.')-2,2) == '=>'
+    call cursor(0,col('.')-1)
+    if s:PreviousToken() == ')'
+      return s:GetPair('(', ')', 'bW', s:skip_expr)
+    endif
+    return 1
   endif
-  return strpart(getline('.'),col('.')-2,2) == '=>'
 endfunction
 
 function s:DoWhile()

From f3bf70a849867c36ffb8eb060c6d970d747ff270 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 4 Dec 2017 08:18:02 -0800
Subject: [PATCH 0976/1043] date

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 9e9e03bd..f3bf96aa 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: September 18, 2017
+" Last Change: December 4, 2017
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')

From 7c73d8e1f9ce020ee8ea2ab0af60e9f8fef6c90d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 9 Dec 2017 12:00:31 -0800
Subject: [PATCH 0977/1043] better conditional for comment

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index f3bf96aa..0961c37b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -358,10 +358,8 @@ function GetJavascriptIndent()
 
   " start with strings,comments,etc.
   if s:stack[-1] =~? 'comment\|doc'
-    if l:line =~ '^\s*\*'
-      return cindent(v:lnum)
-    elseif l:line !~ '^\s*\/[/*]'
-      return -1
+    if l:line !~ '^\s*\/[/*]'
+      return l:line =~ '^\s*\*' ? cindent(v:lnum) : -1
     endif
   elseif s:stack[-1] =~? b:syng_str
     if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1,getline(v:lnum-1))

From 4c0a554423df72ecb8d13b143afa7a4cfcb994ec Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Wed, 10 Jan 2018 22:57:58 -0800
Subject: [PATCH 0978/1043] matchend

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0961c37b..e4cf6866 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -248,7 +248,7 @@ function s:Balanced(lnum,line)
   let pos = match(a:line, '[][(){}]')
   while pos != -1
     if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
-      let l:open += match(' ' . a:line[pos],'[[({]')
+      let l:open += matchend(a:line[pos],'[[({]')
       if l:open < 0
         return
       endif

From d3d8a9772777b4fe27bfad0049f0a8a0399e9882 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 27 Jan 2018 13:51:02 -0800
Subject: [PATCH 0979/1043] cleaning (#1096)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index e4cf6866..a87d8e20 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -269,10 +269,7 @@ function s:OneScope()
     return s:Pure('s:PreviousToken') != '.'
   elseif strpart(getline('.'),col('.')-2,2) == '=>'
     call cursor(0,col('.')-1)
-    if s:PreviousToken() == ')'
-      return s:GetPair('(', ')', 'bW', s:skip_expr)
-    endif
-    return 1
+    return s:PreviousToken() != ')' || s:GetPair('(', ')', 'bW', s:skip_expr)
   endif
 endfunction
 
@@ -374,7 +371,7 @@ function GetJavascriptIndent()
   if s:PreviousToken() is ''
     return
   endif
-  let [l:lnum, pline] = [line('.'), getline('.')[:col('.')-1]]
+  let [l:lnum, lcol, pline] = getpos('.')[1:2] + [getline('.')[:col('.')-1]]
 
   let l:line = substitute(l:line,'^\s*','','')
   let l:line_raw = l:line
@@ -427,7 +424,7 @@ function GetJavascriptIndent()
       endif
     endif
     if idx == -1 && pline[-1:] !~ '[{;]'
-      call cursor(l:lnum, len(pline))
+      call cursor(l:lnum, lcol)
       let sol = matchstr(l:line,s:opfirst)
       if sol is '' || sol == '/' && s:SynAt(v:lnum,
             \ 1 + len(getline(v:lnum)) - len(l:line)) =~? 'regex'
@@ -443,10 +440,11 @@ function GetJavascriptIndent()
       else
         let is_op = s:sw()
       endif
-      call cursor(l:lnum, len(pline))
+      call cursor(l:lnum, lcol)
       let b_l = s:Nat(s:IsContOne(is_op) - (!is_op && l:line =~ '^{')) * s:sw()
     endif
-  elseif idx.s:LookingAt().&cino =~ '^-1(.*(' && (search('\m\S','nbW',num) || s:ParseCino('U'))
+  elseif idx == -1 && s:LookingAt() == '(' && &cino =~ '(' &&
+        \ (search('\m\S','nbW',num) || s:ParseCino('U'))
     let pval = s:ParseCino('(')
     if !pval
       let [Wval, vcol] = [s:ParseCino('W'), virtcol('.')]

From e110653ae74065f4dee48867713e12627a2d8509 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Feb 2018 18:14:06 -0800
Subject: [PATCH 0980/1043] fix for unnested js in <script>

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index a87d8e20..859f0b97 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -469,7 +469,11 @@ function GetJavascriptIndent()
   elseif num
     return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
   endif
-  return b_l + is_op
+  let ret = b_l + is_op
+  if !ret && exists('b:hi_indent.blocklnr')
+    return indent(b:hi_indent.blocklnr) + s:sw()
+  endif
+  return ret
 endfunction
 
 let &cpo = s:cpo_save

From 44581860e1fe9daf1f58c7c9e38964540386c62c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 2 Feb 2018 18:24:49 -0800
Subject: [PATCH 0981/1043] improve last commit

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 859f0b97..3d69f883 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -469,11 +469,11 @@ function GetJavascriptIndent()
   elseif num
     return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
   endif
-  let ret = b_l + is_op
-  if !ret && exists('b:hi_indent.blocklnr')
-    return indent(b:hi_indent.blocklnr) + s:sw()
+  let nest = get(get(b:,'hi_indent',{}),'blocklnr')
+  if nest
+    return indent(nest) + s:sw() + b_l + is_op
   endif
-  return ret
+  return b_l + is_op
 endfunction
 
 let &cpo = s:cpo_save

From 73f3d0f2c22d3bb90fafb40cbcf4ae7cf596c71c Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sat, 3 Feb 2018 02:22:49 -0800
Subject: [PATCH 0982/1043] don't move cursor to find case statement (#1097)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 3d69f883..80ad79f9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -314,8 +314,8 @@ function s:IsContOne(cont)
 endfunction
 
 function s:IsSwitch()
-  call call('cursor',b:js_cache[1:])
-  return search('\m\C\%#.\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>','nWc'.s:z)
+  return search('\m\C\%'.join(b:js_cache[1:],'l\%').
+        \ 'c{\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>','nW'.s:z)
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader

From f71693e2784594a378930e261955a85ea37dd03d Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Feb 2018 21:39:19 -0800
Subject: [PATCH 0983/1043] cleanup (#1099)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 80ad79f9..d0ac3849 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -294,9 +294,9 @@ endfunction
 " encloses the entire context, 'cont' if whether a:firstline is a continued
 " expression, which could have started in a braceless context
 function s:IsContOne(cont)
-  let [l:num, b_l] = [b:js_cache[1] + !b:js_cache[1], 0]
-  let pind = b:js_cache[1] ? indent(b:js_cache[1]) + s:sw() : 0
-  let ind = indent('.') + !a:cont
+  let [l:num, pind] = b:js_cache[1] ?
+        \ [b:js_cache[1], indent(b:js_cache[1]) + s:sw()] : [1,0]
+  let [ind, b_l] = [indent('.') + !a:cont, 0]
   while line('.') > l:num && ind > pind || line('.') == l:num
     if indent('.') < ind && s:OneScope()
       let b_l += 1

From 0a53417deb524675b2d95bb50f678efa9dfcd658 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 15 Feb 2018 02:39:33 -0800
Subject: [PATCH 0984/1043] cleaning (#1102)

---
 indent/javascript.vim | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d0ac3849..52dcd01d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -206,18 +206,15 @@ function s:ExprCol()
   let bal = 0
   while s:SearchLoop('[{}?:]','bW',s:skip_expr)
     if s:LookingAt() == ':'
-      if getline('.')[col('.')-2] == ':'
-        call cursor(0,col('.')-1)
-        continue
-      endif
-      let bal -= 1
+      let bal -= !search('\m:\%#','bW')
     elseif s:LookingAt() == '?'
       if getline('.')[col('.'):col('.')+1] =~ '^\.\d\@!'
-        continue
+        " ?. conditional chain, not ternary start
       elseif !bal
         return 1
+      else
+        let bal += 1
       endif
-      let bal += 1
     elseif s:LookingAt() == '{'
       return !s:IsBlock()
     elseif !s:GetPair('{','}','bW',s:skip_expr)
@@ -365,8 +362,8 @@ function GetJavascriptIndent()
     return -1
   endif
 
-  let s:l1 = max([0,prevnonblank(v:lnum) - (s:rel ? 2000 : 1000),
-        \ get(get(b:,'hi_indent',{}),'blocklnr')])
+  let nest = get(get(b:,'hi_indent',{}),'blocklnr')
+  let s:l1 = max([0, prevnonblank(v:lnum) - (s:rel ? 2000 : 1000), nest])
   call cursor(v:lnum,1)
   if s:PreviousToken() is ''
     return
@@ -468,9 +465,7 @@ function GetJavascriptIndent()
     return num_ind
   elseif num
     return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
-  endif
-  let nest = get(get(b:,'hi_indent',{}),'blocklnr')
-  if nest
+  elseif nest
     return indent(nest) + s:sw() + b_l + is_op
   endif
   return b_l + is_op

From 89fcb6bfcada1c4256284723778d128342b48350 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Thu, 15 Feb 2018 17:19:00 -0800
Subject: [PATCH 0985/1043] conform to html option

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 52dcd01d..4fa75a7d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -466,7 +466,7 @@ function GetJavascriptIndent()
   elseif num
     return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
   elseif nest
-    return indent(nest) + s:sw() + b_l + is_op
+    return indent(nextnonblank(nest+1)) + b_l + is_op
   endif
   return b_l + is_op
 endfunction

From da614c14f3472d9c1ce4acf0ce018f2e04df6fd7 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 2 Mar 2018 15:15:03 -0800
Subject: [PATCH 0986/1043] Fix #1105

jsDestructuringPropertyComputed did not have nextgroup properly defined.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7aa799dc..4cf8cae5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -194,7 +194,7 @@ syntax match   jsDestructuringAssignment        contained /\k\+\ze\s*:/ skipwhit
 syntax region  jsDestructuringValue             contained start=/=/ end=/[,}\]]\@=/ contains=@jsExpression extend
 syntax region  jsDestructuringValueAssignment   contained start=/:/ end=/[,}=]\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise skipwhite skipempty nextgroup=jsDestructuringValue extend
 syntax match   jsDestructuringNoise             contained /[,[\]]/
-syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringNoise extend fold
+syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsDestructuringBraces start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringValueAssignment,jsDestructuringNoise extend fold
 
 " Comments
 syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD

From da18e870aee1532a668ebc3e1653eb12c18ef7de Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 2 Mar 2018 15:19:31 -0800
Subject: [PATCH 0987/1043] Additional destructuring fix for objects within
 arrays

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4cf8cae5..31d08af9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -149,7 +149,7 @@ syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       s
 syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsComment extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsComment extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold

From 3e0b1af8c2b2b613add52d782b29f325c6a414e3 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Sun, 4 Mar 2018 20:24:33 -0800
Subject: [PATCH 0988/1043] use printf instead of '.' (#1106)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 4fa75a7d..cb605a66 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -311,8 +311,8 @@ function s:IsContOne(cont)
 endfunction
 
 function s:IsSwitch()
-  return search('\m\C\%'.join(b:js_cache[1:],'l\%').
-        \ 'c{\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>','nW'.s:z)
+  return search(printf('\m\C\%%%dl\%%%dc%s',b:js_cache[1],b:js_cache[2],
+        \ '{\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>'),'nW'.s:z)
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader

From 50ff80aebd6e864367192267293dedf5facab635 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 23 Mar 2018 18:08:21 -0700
Subject: [PATCH 0989/1043] other randoms (#1112)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index cb605a66..07223912 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -86,9 +86,13 @@ function s:SynAt(l,c)
   return s:synid_cache[1][pos]
 endfunction
 
-function s:ParseCino(f)
-  let [divider, n, cstr] = [0] + matchlist(&cino,
-        \ '\%(.*,\)\=\%(\%d'.char2nr(a:f).'\(-\)\=\([.s0-9]*\)\)\=')[1:2]
+function g:ParseCino(f)
+  let i = strridx(&cino,a:f)
+  if i == -1
+    return
+  endif
+  let [divider, n] = [0, &cino[i+1] == '-']
+  let [cstr, n] = [&cino[i+n+1 : stridx(&cino,',',i)], n ? '-' : '']
   for c in split(cstr,'\zs')
     if c == '.' && !divider
       let divider = 1
@@ -371,7 +375,7 @@ function GetJavascriptIndent()
   let [l:lnum, lcol, pline] = getpos('.')[1:2] + [getline('.')[:col('.')-1]]
 
   let l:line = substitute(l:line,'^\s*','','')
-  let l:line_raw = l:line
+  let l:line_s = l:line[0]
   if l:line[:1] == '/*'
     let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
   endif
@@ -445,7 +449,7 @@ function GetJavascriptIndent()
     let pval = s:ParseCino('(')
     if !pval
       let [Wval, vcol] = [s:ParseCino('W'), virtcol('.')]
-      if search('\m\S','W',num)
+      if search('\m'.get(g:,'javascript_indent_W_pat','\S'),'W',num)
         return s:ParseCino('w') ? vcol : virtcol('.')-1
       endif
       return Wval ? s:Nat(num_ind + Wval) : vcol
@@ -455,7 +459,7 @@ function GetJavascriptIndent()
 
   " main return
   if l:line =~ '^[])}]\|^|}'
-    if l:line_raw[0] == ')'
+    if l:line_s == ')'
       if s:ParseCino('M')
         return indent(l:lnum)
       elseif num && &cino =~# 'm' && !s:ParseCino('m')

From 405dc805462e71a7df81ea201e949e52069fd470 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Fri, 30 Mar 2018 23:03:38 -0700
Subject: [PATCH 0990/1043] fix scope

and rf
---
 indent/javascript.vim | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 07223912..8066fa3b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -86,13 +86,10 @@ function s:SynAt(l,c)
   return s:synid_cache[1][pos]
 endfunction
 
-function g:ParseCino(f)
-  let i = strridx(&cino,a:f)
-  if i == -1
-    return
-  endif
-  let [divider, n] = [0, &cino[i+1] == '-']
-  let [cstr, n] = [&cino[i+n+1 : stridx(&cino,',',i)], n ? '-' : '']
+function s:ParseCino(f)
+  try | let [divider, n, cstr] = [0] + matchlist(&cino,
+        \ '\%(.*,\)\=\%(\%d'.char2nr(a:f).'\(-\)\=\([.s0-9]*\)\)')[1:2]
+  catch | return | endtry
   for c in split(cstr,'\zs')
     if c == '.' && !divider
       let divider = 1

From 42f8c02b4091885a62d602549af56f79b010a0d1 Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 2 Apr 2018 22:40:38 -0700
Subject: [PATCH 0991/1043] rf Cino Again (#1118)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 8066fa3b..d9463d66 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -87,23 +87,22 @@ function s:SynAt(l,c)
 endfunction
 
 function s:ParseCino(f)
-  try | let [divider, n, cstr] = [0] + matchlist(&cino,
-        \ '\%(.*,\)\=\%(\%d'.char2nr(a:f).'\(-\)\=\([.s0-9]*\)\)')[1:2]
-  catch | return | endtry
-  for c in split(cstr,'\zs')
-    if c == '.' && !divider
+  let [s, n, divider] = [strridx(&cino, a:f)+1, '', 0]
+  while s && &cino[ s ] =~ '[^,]'
+    if &cino[ s ] == '.'
       let divider = 1
-    elseif c ==# 's'
+    elseif &cino[ s ] ==# 's'
       if n !~ '\d'
         return n . s:sw() + 0
       endif
       let n = str2nr(n) * s:sw()
       break
     else
-      let [n, divider] .= [c, 0]
+      let [n, divider] .= [&cino[ s ], 0]
     endif
-  endfor
-  return str2nr(n) / max([str2nr(divider),1])
+    let s += 1
+  endwhile
+  return str2nr(n) / max([divider, 1])
 endfunction
 
 " Optimized {skip} expr, only callable from the search loop which

From c99c96bdf12b5a5749c9bbdb977b070e14c15eb3 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 6 Apr 2018 19:34:50 -0700
Subject: [PATCH 0992/1043] Small flow fix for static class item definitions

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 31d08af9..4c6e059e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -179,12 +179,12 @@ exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=j
 syntax keyword jsClassKeyword           contained class
 syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassMethodType        contained /\<\%([gs]et\|static\)\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsFuncName,jsClassProperty
+syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*(/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsClassMethodType        contained /\<\%([gs]et\|static\)\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsClassFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<\K\k*\ze\s*=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
 syntax region  jsClassValue             contained start=/=/ end=/\_[;}]\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
-syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*(/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsClassStringKey         contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
 
 " Destructuring

From 35da051bf3c2c1427a9d55f4e2a0438fe0521dda Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 22 Apr 2018 23:46:33 -0700
Subject: [PATCH 0993/1043] [flow] Add support for generic types in class
 functions

---
 extras/flow.vim       | 6 ++++--
 syntax/javascript.vim | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 204fdbe5..7739aa3f 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -27,8 +27,9 @@ syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ e
 syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock
 
-syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
-syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+syntax region  jsFlowFunctionGroup      contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsFlowClassGroup         contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+syntax region  jsFlowClassFunctionGroup contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 
 syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
 syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/[\n;]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
@@ -81,6 +82,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowReturnGroup        jsFlowGroup
   HiLink jsFlowFunctionGroup      PreProc
   HiLink jsFlowClassGroup         PreProc
+  HiLink jsFlowClassFunctionGroup PreProc
   HiLink jsFlowArrowArguments     PreProc
   HiLink jsFlowArrow              PreProc
   HiLink jsFlowReturnArrow        PreProc
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4c6e059e..953d2905 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -179,7 +179,7 @@ exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=j
 syntax keyword jsClassKeyword           contained class
 syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsClassNoise             contained /\./
-syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*(/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*[(<]/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowClassFunctionGroup
 syntax match   jsClassMethodType        contained /\<\%([gs]et\|static\)\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsClassFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
 syntax match   jsClassProperty          contained /\<\K\k*\ze\s*=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef

From ddaa14d982a9214f92579ad5d48f334077bcf800 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 26 May 2018 15:35:34 -0700
Subject: [PATCH 0994/1043] Fix for return statements

Fixes #1126
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 953d2905..a26e31ad 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -84,7 +84,7 @@ syntax match   jsObjectMethodType  contained /\<[gs]et\ze\s\+\K\k*/ skipwhite sk
 syntax region  jsObjectStringKey   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
 exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
-exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '').' skipwhite skipempty nextgroup=@jsExpression'
+exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '').' skipwhite nextgroup=@jsExpression'
 exe 'syntax keyword jsUndefined undefined        '.(exists('g:javascript_conceal_undefined') ? 'conceal cchar='.g:javascript_conceal_undefined  : '')
 exe 'syntax keyword jsNan       NaN              '.(exists('g:javascript_conceal_NaN')       ? 'conceal cchar='.g:javascript_conceal_NaN        : '')
 exe 'syntax keyword jsPrototype prototype        '.(exists('g:javascript_conceal_prototype') ? 'conceal cchar='.g:javascript_conceal_prototype  : '')

From c0a5e4c059487e6a3b2a7a3cce7e6fe88427f3a4 Mon Sep 17 00:00:00 2001
From: Chris Morgan <me@chrismorgan.info>
Date: Sun, 27 May 2018 23:51:47 +1000
Subject: [PATCH 0995/1043] Make a distinct group for keyword operators

In the stock Vim javascript syntax file, `new`, `delete`, `instanceof`
and `typeof` belong to syntax group `javaScriptOperator`, while symbol
operators have no syntax group. But this package was highlighting
keyword and symbol operators alike.

With this change, users can choose to return to highlighting keyword but
not symbol operators, with this in their `after/syntax/javascript.vim`:

    hi link jsOperatorKeyword Operator
    hi clear jsOperator
---
 syntax/javascript.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a26e31ad..52b9ae24 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -33,7 +33,7 @@ syntax match   jsParensError    /[)}\]]/
 " Program Keywords
 syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
 syntax match   jsVariableDef    contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFlowDefinition
-syntax keyword jsOperator       delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsOperatorKeyword delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       "[-!|&+<>=%/*~^]" skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       /::/ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
@@ -230,7 +230,7 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsOperatorKeyword,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement
 syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel
 
 " Define the default highlighting.
@@ -290,6 +290,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsArguments            Special
   HiLink jsError                Error
   HiLink jsParensError          Error
+  HiLink jsOperatorKeyword      jsOperator
   HiLink jsOperator             Operator
   HiLink jsOf                   Operator
   HiLink jsStorageClass         StorageClass

From 9ae77ce2181ce9b18a813c9586244fdf6696e568 Mon Sep 17 00:00:00 2001
From: Jake Zimmerman <zimmerman.jake@gmail.com>
Date: Tue, 29 May 2018 21:22:25 -0700
Subject: [PATCH 0996/1043] Highlight Flow opaque keyboard

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 7739aa3f..4852ceb8 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -31,7 +31,7 @@ syntax region  jsFlowFunctionGroup      contained matchgroup=jsFlowNoise start=/
 syntax region  jsFlowClassGroup         contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 syntax region  jsFlowClassFunctionGroup contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 
-syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeStatement                                   start=/\(opaque\s\+\)\?type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
 syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/[\n;]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/

From 935125e2c481a65d344b11ddfdb2e5f903e24e72 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 12 Jun 2018 15:05:08 -0700
Subject: [PATCH 0997/1043] [flow] Add import typeof support

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 4852ceb8..6ec2ca7e 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -13,7 +13,7 @@ syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
-syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
+syntax keyword jsFlowImportType     contained type typeof skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
 syntax match   jsFlowWildcard       contained /*/
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster,jsFlowArrow,jsFlowReturnParens

From bc773caf2f7bae1619618c7a0a51a81dd7eb435f Mon Sep 17 00:00:00 2001
From: Paul Loyd <pavelko95@gmail.com>
Date: Wed, 18 Oct 2017 20:41:51 +0300
Subject: [PATCH 0998/1043] Flow return array fix

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 6ec2ca7e..77035779 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -21,7 +21,7 @@ syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/
 syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
 syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
 syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
-syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp
+syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArray
 syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword,jsFlowReturnObject
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster

From 2b9dc9249ae81e66722cebf7f0d4b5b5d8b1cdcf Mon Sep 17 00:00:00 2001
From: slicklash <slicklash@gmail.com>
Date: Fri, 29 Jun 2018 11:30:33 +0300
Subject: [PATCH 0999/1043] add support for object shorthand properties (#1116)

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 52b9ae24..5d133a1f 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -72,6 +72,7 @@ syntax region  jsRegexpString   start=+\%(\%(\<return\|\<typeof\|\_[^)\]'"[:blan
 syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
 
 " Objects
+syntax match   jsObjectShorthandProp contained /\<\k*\ze\s*/ skipwhite skipempty nextgroup=jsObjectSeparator
 syntax match   jsObjectKey         contained /\<\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
 syntax match   jsObjectColon       contained /:/ skipwhite skipempty
 syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
@@ -150,7 +151,7 @@ syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        s
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsComment extend fold
-syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
+syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
@@ -341,6 +342,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsParensDecorator      jsParens
   HiLink jsFuncArgOperator      jsFuncArgs
   HiLink jsClassProperty        jsObjectKey
+  HiLink jsObjectShorthandProp  jsObjectKey
   HiLink jsSpreadOperator       Operator
   HiLink jsRestOperator         Operator
   HiLink jsRestExpression       jsFuncArgs

From ae09dff631276f75f55f87362e5e9bf578d570a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Griepenburg?= <joegriepen@gmail.com>
Date: Fri, 29 Jun 2018 18:36:40 +1000
Subject: [PATCH 1000/1043] feat(function-call): color fn call like fn name
 (#1104)

---
 syntax/javascript.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5d133a1f..49c60cef 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -286,6 +286,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsGenerator            jsFunction
   HiLink jsArrowFuncArgs        jsFuncArgs
   HiLink jsFuncName             Function
+  HiLink jsFuncCall             Function
   HiLink jsClassFuncName        jsFuncName
   HiLink jsObjectFuncName       Function
   HiLink jsArguments            Special

From 0dc985d807bb6a1a235a59f5908a6d97265d9a73 Mon Sep 17 00:00:00 2001
From: Arno Jernej <kirk1h@gmail.com>
Date: Sat, 11 Mar 2017 23:56:25 +0100
Subject: [PATCH 1001/1043] Add jsDot, jsObjectColon syntax groups

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 49c60cef..a2fcdf68 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -25,7 +25,7 @@ syntax sync fromstart
 syntax case match
 
 syntax match   jsNoise          /[:,;]/
-syntax match   jsNoise          /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
+syntax match   jsDot            /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
 syntax match   jsObjectProp     contained /\<\K\k*/
 syntax match   jsFuncCall       /\<\K\k*\ze\s*(/
 syntax match   jsParensError    /[)}\]]/
@@ -74,11 +74,10 @@ syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBa
 " Objects
 syntax match   jsObjectShorthandProp contained /\<\k*\ze\s*/ skipwhite skipempty nextgroup=jsObjectSeparator
 syntax match   jsObjectKey         contained /\<\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
-syntax match   jsObjectColon       contained /:/ skipwhite skipempty
 syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
 syntax match   jsObjectSeparator   contained /,/
-syntax region  jsObjectValue       contained matchgroup=jsNoise start=/:/ end=/[,}]\@=/ contains=@jsExpression extend
+syntax region  jsObjectValue       contained matchgroup=jsObjectColon start=/:/ end=/[,}]\@=/ contains=@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<\K\k*\ze\_s*(/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<\K\k*\ze\s*:\s*function\>/
 syntax match   jsObjectMethodType  contained /\<[gs]et\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsObjectFuncName
@@ -231,7 +230,7 @@ if exists("javascript_plugin_flow")
   runtime extras/flow.vim
 endif
 
-syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsOperatorKeyword,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsOperatorKeyword,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement,jsDot
 syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel
 
 " Define the default highlighting.
@@ -309,6 +308,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBooleanFalse         Boolean
   HiLink jsObjectColon          jsNoise
   HiLink jsNoise                Noise
+  HiLink jsDot                  Noise
   HiLink jsBrackets             Noise
   HiLink jsParens               Noise
   HiLink jsBraces               Noise

From dab53c55a6e17be954a8ace7bafc4a3b5def7f2f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 29 Jun 2018 01:48:19 -0700
Subject: [PATCH 1002/1043] Fix nested array destructuring

Fixes #1130
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a2fcdf68..25203daa 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -149,7 +149,7 @@ syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       s
 syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsComment extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold

From 92e2d715da26eca4aaf6477a7d777655b55ae84c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 29 Jun 2018 02:18:38 -0700
Subject: [PATCH 1003/1043] Only change syn-iskeyword if js filetype

Fixes #1111

Not sure there's a perfect fix in any sense of the word here, since we
are competing against another filetype's changes to `syn iskeyword`.
There's no perfect world, but at the very least we don't clobber the
main syntax file that is sourcing ours
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 25203daa..9225c21e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -13,7 +13,7 @@ if !exists("main_syntax")
 endif
 
 " Dollar sign is permitted anywhere in an identifier
-if v:version > 704 || v:version == 704 && has('patch1142')
+if (v:version > 704 || v:version == 704 && has('patch1142')) && main_syntax == 'javascript'
   syntax iskeyword @,48-57,_,192-255,$
 else
   setlocal iskeyword+=$

From 1bd5009e8b429534d6509acd86cc0b59456166b3 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 29 Jun 2018 01:17:04 -0700
Subject: [PATCH 1004/1043] Tweak ftdetect stuff

I actually think we don't need to be so smart or fancy with this, and in
fact would prefer to keep it simple.  Just focus on whether they have
the plugin on or not.  I fear adding the autocmd is not very useful and
could have performance implications
---
 ftdetect/javascript.vim | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index ff07f4dd..b69b7faf 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1,14 +1,5 @@
 au BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setf javascript
 
-fun! s:SourceFlowSyntax()
-  if !exists('javascript_plugin_flow') && !exists('b:flow_active') &&
-        \ search('\v\C%^\_s*%(//\s*|/\*[ \t\n*]*)\@flow>','nw')
-    runtime extras/flow.vim
-    let b:flow_active = 1
-  endif
-endfun
-au FileType javascript au BufRead,BufWritePost <buffer> call s:SourceFlowSyntax()
-
 fun! s:SelectJavascript()
   if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
     set ft=javascript

From b47c99e06fa698abab95c6d5f381d8134906fcab Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 29 Jun 2018 01:20:13 -0700
Subject: [PATCH 1005/1043] Improve autocmd handling

Thes autocommands should be in a group that clears themselves when the
file is re-sourced so we don't re-source things and cause duplicate
events.
---
 ftdetect/javascript.vim | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index b69b7faf..1130f97b 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -1,8 +1,11 @@
-au BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setf javascript
-
 fun! s:SelectJavascript()
   if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
     set ft=javascript
   endif
 endfun
-au BufNewFile,BufRead * call s:SelectJavascript()
+
+augroup javascript_syntax_detection
+  autocmd!
+  autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript
+  autocmd BufNewFile,BufRead * call s:SelectJavascript()
+augroup END

From 54b0c4e16da2614a82bb3864ff188d72d39dc15f Mon Sep 17 00:00:00 2001
From: Bennie Swart <bennieswart@gmail.com>
Date: Mon, 2 Jul 2018 23:00:06 +0200
Subject: [PATCH 1006/1043] Make inheritDoc match inheritdoc also (#1134)

---
 extras/jsdoc.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index a19f3a37..b1b588f7 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -10,7 +10,7 @@ syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|
 " tags containing references
 syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
 " other tags (no extra syntax)
-syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|async\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|async\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inherit[dD]oc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
 syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
 syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam

From 39e332a3c36c0115e1eab85c34cf121b7585869d Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 14 Jul 2018 13:34:23 -0700
Subject: [PATCH 1007/1043] [flow] Fix destructoring annotations

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 9225c21e..7cebb7e0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -148,8 +148,8 @@ syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      s
 syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment extend fold
+syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold

From f3e1d775891f8188fb5403600c87ff3f9a5aadca Mon Sep 17 00:00:00 2001
From: Chin Leung <chin@dnwnetwork.com>
Date: Fri, 29 Sep 2017 09:59:07 -0400
Subject: [PATCH 1008/1043] Added more operator conceal

---
 syntax/javascript.vim | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7cebb7e0..aa982637 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -174,6 +174,15 @@ exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGene
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction                                   '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
 exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
+exe 'syntax match jsComparison /==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_double_equal') ? 'conceal cchar=' . g:javascript_conceal_double_equal : '')
+exe 'syntax match jsComparison /===/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_triple_equal') ? 'conceal cchar=' . g:javascript_conceal_triple_equal : '')
+exe 'syntax match jsComparison /||/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_or_comparison') ? 'conceal cchar=' . g:javascript_conceal_or_operator : '')
+exe 'syntax match jsComparison /&&/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_and_operator : '')
+exe 'syntax match jsComparison /!/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_not_operator : '')
+exe 'syntax match jsComparison />=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_greater_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_greater_equal_operator : '')
+exe 'syntax match jsComparison /<=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_less_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_less_equal_operator : '')
+exe 'syntax match jsComparison /!=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_equal_operator : '')
+exe 'syntax match jsComparison /!==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_strict_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_strict_equal_operator : '')
 
 " Classes
 syntax keyword jsClassKeyword           contained class

From d915428d87be37585eca8c590e76124aa9418af0 Mon Sep 17 00:00:00 2001
From: Chin Leung <chin@w3genie.com>
Date: Fri, 29 Jun 2018 09:32:31 -0400
Subject: [PATCH 1009/1043] Documented new conceal options

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index b9ac49f4..e688ce46 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,15 @@ variables:
     let g:javascript_conceal_arrow_function       = "⇒"
     let g:javascript_conceal_noarg_arrow_function = "🞅"
     let g:javascript_conceal_underscore_arrow_function = "🞅"
+    let g:javascript_conceal_double_equal = "≈"
+    let g:javascript_conceal_triple_equal = "≡"
+    let g:javascript_conceal_or_operator = "∨"
+    let g:javascript_conceal_and_operator = "∧"
+    let g:javascript_conceal_not_operator = "¬"
+    let g:javascript_conceal_greater_equal_operator = "≥"
+    let g:javascript_conceal_less_equal_operator = "≤"
+    let g:javascript_conceal_not_equal_operator = "≠"
+    let g:javascript_conceal_not_strict_equal_operator = "≢"
 
 
 You can enable concealing within VIM with:

From f727323e77604497faeeaf5f054e2440bd825175 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 21 Aug 2018 15:41:14 -0700
Subject: [PATCH 1010/1043] Revert "Documented new conceal options"

This reverts commit d915428d87be37585eca8c590e76124aa9418af0.
---
 README.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/README.md b/README.md
index e688ce46..b9ac49f4 100644
--- a/README.md
+++ b/README.md
@@ -80,15 +80,6 @@ variables:
     let g:javascript_conceal_arrow_function       = "⇒"
     let g:javascript_conceal_noarg_arrow_function = "🞅"
     let g:javascript_conceal_underscore_arrow_function = "🞅"
-    let g:javascript_conceal_double_equal = "≈"
-    let g:javascript_conceal_triple_equal = "≡"
-    let g:javascript_conceal_or_operator = "∨"
-    let g:javascript_conceal_and_operator = "∧"
-    let g:javascript_conceal_not_operator = "¬"
-    let g:javascript_conceal_greater_equal_operator = "≥"
-    let g:javascript_conceal_less_equal_operator = "≤"
-    let g:javascript_conceal_not_equal_operator = "≠"
-    let g:javascript_conceal_not_strict_equal_operator = "≢"
 
 
 You can enable concealing within VIM with:

From 237372e531d5a591e50748fb3d65ffcf333198a8 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 21 Aug 2018 15:41:31 -0700
Subject: [PATCH 1011/1043] Revert "Added more operator conceal"

This reverts commit f3e1d775891f8188fb5403600c87ff3f9a5aadca.
---
 syntax/javascript.vim | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index aa982637..7cebb7e0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -174,15 +174,6 @@ exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGene
 exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction                                   '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
 exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
-exe 'syntax match jsComparison /==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_double_equal') ? 'conceal cchar=' . g:javascript_conceal_double_equal : '')
-exe 'syntax match jsComparison /===/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_triple_equal') ? 'conceal cchar=' . g:javascript_conceal_triple_equal : '')
-exe 'syntax match jsComparison /||/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_or_comparison') ? 'conceal cchar=' . g:javascript_conceal_or_operator : '')
-exe 'syntax match jsComparison /&&/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_and_operator : '')
-exe 'syntax match jsComparison /!/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_not_operator : '')
-exe 'syntax match jsComparison />=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_greater_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_greater_equal_operator : '')
-exe 'syntax match jsComparison /<=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_less_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_less_equal_operator : '')
-exe 'syntax match jsComparison /!=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_equal_operator : '')
-exe 'syntax match jsComparison /!==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_strict_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_strict_equal_operator : '')
 
 " Classes
 syntax keyword jsClassKeyword           contained class

From dd84369d731bcb8feee0901cbb9b63a2b219bf28 Mon Sep 17 00:00:00 2001
From: Adrian <adrianhelvik100@gmail.com>
Date: Wed, 29 Aug 2018 19:27:39 +0200
Subject: [PATCH 1012/1043] Fixes #1123 (#1141)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 7cebb7e0..25e4132e 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -51,7 +51,7 @@ syntax keyword jsFrom               contained from skipwhite skipempty nextgroup
 syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup,jsFlowTypeKeyword
 
 " Strings, Templates, Numbers
-syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend
+syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial,@Spell extend
 syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial,@Spell extend
 syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
 syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/

From 7201a3b27caa491e697ec9c1bdb63b10623beae1 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sat, 15 Dec 2018 20:21:28 -0800
Subject: [PATCH 1013/1043] Fix flow parens in maybe types

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 77035779..17faa5be 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -22,7 +22,7 @@ syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/
 syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
 syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArray
-syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword,jsFlowReturnObject
+syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword,jsFlowReturnObject,jsFlowReturnParens
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock

From 8608bbb42f8d816996a1b29388a779555f224f5c Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 23 Dec 2018 02:51:49 -0700
Subject: [PATCH 1014/1043] Concealed whitespace cleanup

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 25e4132e..c08d36f2 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -170,10 +170,10 @@ syntax match   jsArrowFuncArgs  /\<\K\k*\ze\s*=>/ skipwhite contains=jsFuncArgs
 " Matches a series of arguments surrounded in parens
 syntax match   jsArrowFuncArgs  /([^()]*)\ze\s*=>/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
-exe 'syntax match jsFunction /\<function\>/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
-exe 'syntax match jsArrowFunction /=>/      skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction                                   '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
-exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
-exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction                                        '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
+exe 'syntax match jsFunction /\<function\>/      skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsArrowFunction /=>/           skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
+exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
 
 " Classes
 syntax keyword jsClassKeyword           contained class

From 50c135735611946707d04757fdc0cde5537659ae Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Sun, 23 Dec 2018 02:52:20 -0700
Subject: [PATCH 1015/1043] More whitespace tweaks

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c08d36f2..f08a063a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -170,7 +170,7 @@ syntax match   jsArrowFuncArgs  /\<\K\k*\ze\s*=>/ skipwhite contains=jsFuncArgs
 " Matches a series of arguments surrounded in parens
 syntax match   jsArrowFuncArgs  /([^()]*)\ze\s*=>/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
 
-exe 'syntax match jsFunction /\<function\>/      skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function')       ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsFunction /\<function\>/      skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
 exe 'syntax match jsArrowFunction /=>/           skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
 exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
 exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')

From 32a39ac9f3af36d7708869e60f4e9118143735bd Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Thu, 7 Feb 2019 23:26:24 -0800
Subject: [PATCH 1016/1043] Potential bugfix for jsFlowTypeValue end match

---
 extras/flow.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 17faa5be..949b024f 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -32,7 +32,7 @@ syntax region  jsFlowClassGroup         contained matchgroup=jsFlowNoise start=/
 syntax region  jsFlowClassFunctionGroup contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 
 syntax region  jsFlowTypeStatement                                   start=/\(opaque\s\+\)\?type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/[\n;]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
+syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/ end=/\%(;\|\n\%(\s*|\)\@!\)/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type

From 9648f31ffbc99e6339a7cc52347892255651d9dd Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 8 Feb 2019 01:03:55 -0800
Subject: [PATCH 1017/1043] Misc flow fixes

* Fixed typeof in return statements
* Fixed some double `skipwhite` statements
* Fixes #1159
---
 extras/flow.vim | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 949b024f..5290654b 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -6,7 +6,7 @@ syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/
 syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend fold
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
-syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
+syntax keyword jsFlowTypeof         contained typeof skipempty skipwhite nextgroup=jsFlowTypeCustom,jsFlowType
 syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
 syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
 syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
@@ -26,6 +26,7 @@ syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
 syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock
+syntax keyword jsFlowTypeofReturn   contained typeof skipempty skipwhite nextgroup=@jsFlowReturnCluster
 
 syntax region  jsFlowFunctionGroup      contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup         contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
@@ -41,8 +42,8 @@ syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgr
 syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowClassDef containedin=jsClassBlock
 syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassValue
 
-syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
-syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
+syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipwhite nextgroup=jsFlowDeclareBlock contains=jsString
+syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipwhite nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
 syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise fold
 
 " NOTE: It appears the nextgroup was causing a ton of breakages... testing it
@@ -53,7 +54,7 @@ syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ e
 
 syntax region  jsFlowParenAnnotation contained start=/:/ end=/[,=)]\@=/ containedin=jsParen contains=@jsFlowCluster
 
-syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow,jsFlowTypeofReturn
 syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
 
 if version >= 508 || !exists("did_javascript_syn_inits")
@@ -69,6 +70,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowType               Type
   HiLink jsFlowTypeCustom         PreProc
   HiLink jsFlowTypeof             PreProc
+  HiLink jsFlowTypeofReturn       PreProc
   HiLink jsFlowArray              PreProc
   HiLink jsFlowObject             PreProc
   HiLink jsFlowExactObject        PreProc

From 7b978de215d864cf6138275e237a5c1d055556a1 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 8 Feb 2019 01:14:51 -0800
Subject: [PATCH 1018/1043] Small fix for invalid ternary detection

This was done mostly to help with crazy flow annotations since the
ternary region would cause cascading syntax breakage.  Also, a statement
like `?:` is a syntax error.

I considered adding 0 or more whitespace check as well, but I found in
practice this actually becomes annoying if you you are someone who sets
up ternary boundaries first and then fills them in after, since it won't
detect the ternary right away.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f08a063a..e170f8d0 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -155,7 +155,7 @@ syntax region  jsBlock                        matchgroup=jsBraces              s
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
-syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|}\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
+syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?:\@!/  end=/\%(:\|}\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       /?\.\ze\_D/
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup

From 1afdf2eb3d6f7cbcc74b238535fa21213ee3839f Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeus@users.noreply.github.com>
Date: Mon, 25 Feb 2019 11:39:26 -0800
Subject: [PATCH 1019/1043] Misc flow fixes (#1161)

The biggest feature upgrade here is actual support for generics in
function calls.

Additionally I took a chance to improve other areas of generic support,
as well as fix a bunch of other random bugs I found that are too much to
document here.

It's possible these changes may have other unintended consequences, so
I will sit on this PR for a few days before merging.
---
 extras/flow.vim | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/extras/flow.vim b/extras/flow.vim
index 5290654b..b34d7101 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -3,13 +3,14 @@ syntax region  jsFlowArgumentDef    contained                        start=/:/
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment fold
 syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster,jsComment fold
 syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster,jsComment fold
-syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend fold
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster nextgroup=jsFlowArrow skipwhite keepend extend fold
 syntax match   jsFlowNoise          contained /[:;,<>]/
 syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
 syntax keyword jsFlowTypeof         contained typeof skipempty skipwhite nextgroup=jsFlowTypeCustom,jsFlowType
-syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
-syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
-syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
+syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGeneric
+syntax region  jsFlowGeneric                  matchgroup=jsFlowNoise start=/\k\@<=</ end=/>/ contains=@jsFlowCluster containedin=@jsExpression,jsFlowDeclareBlock
+syntax region  jsFlowGeneric        contained matchgroup=jsFlowNoise start=/</ end=/>(\@=/ oneline contains=@jsFlowCluster containedin=@jsExpression,jsFlowDeclareBlock
+syntax region  jsFlowObjectGeneric  contained matchgroup=jsFlowNoise start=/\k\@<=</ end=/>/ contains=@jsFlowCluster nextgroup=jsFuncArgs
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
@@ -17,7 +18,7 @@ syntax keyword jsFlowImportType     contained type typeof skipwhite skipempty ne
 syntax match   jsFlowWildcard       contained /*/
 
 syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster,jsFlowArrow,jsFlowReturnParens
-syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
+syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp extend fold
 syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
 syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
 syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
@@ -31,9 +32,10 @@ syntax keyword jsFlowTypeofReturn   contained typeof skipempty skipwhite nextgro
 syntax region  jsFlowFunctionGroup      contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup         contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 syntax region  jsFlowClassFunctionGroup contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsFlowObjectFuncName contained /\<\K\k*<\@=/ skipwhite skipempty nextgroup=jsFlowObjectGeneric containedin=jsObject
 
 syntax region  jsFlowTypeStatement                                   start=/\(opaque\s\+\)\?type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/ end=/\%(;\|\n\%(\s*|\)\@!\)/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
+syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/ end=/\%(;\|\n\%(\s*|\)\@!\)/ contains=@jsFlowCluster,jsFlowGeneric,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type
@@ -42,20 +44,17 @@ syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgr
 syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowClassDef containedin=jsClassBlock
 syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassValue
 
-syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipwhite nextgroup=jsFlowDeclareBlock contains=jsString
+syntax region  jsFlowModule         contained start=/module/ end=/\%({\|:\)\@=/ skipempty skipwhite nextgroup=jsFlowDeclareBlock contains=jsString
 syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipwhite nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
 syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise fold
 
-" NOTE: It appears the nextgroup was causing a ton of breakages... testing it
-" witout a nextgroup, but keeping this arround for reference incase something breaks
-" syntax match   jsFlowMaybe          contained /?/ nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject extend keepend
 syntax match   jsFlowMaybe          contained /?/
-syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend fold
+syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsFlowObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise,jsFlowParens,jsFlowGeneric keepend fold
 
 syntax region  jsFlowParenAnnotation contained start=/:/ end=/[,=)]\@=/ containedin=jsParen contains=@jsFlowCluster
 
 syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow,jsFlowTypeofReturn
-syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGeneric,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -75,17 +74,17 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObject             PreProc
   HiLink jsFlowExactObject        PreProc
   HiLink jsFlowParens             PreProc
-  HiLink jsFlowGroup              PreProc
+  HiLink jsFlowGeneric            PreProc
+  HiLink jsFlowObjectGeneric      jsFlowGeneric
   HiLink jsFlowReturn             PreProc
   HiLink jsFlowParenAnnotation    PreProc
   HiLink jsFlowReturnObject       jsFlowReturn
   HiLink jsFlowReturnArray        jsFlowArray
   HiLink jsFlowReturnParens       jsFlowParens
-  HiLink jsFlowReturnGroup        jsFlowGroup
+  HiLink jsFlowReturnGroup        jsFlowGeneric
   HiLink jsFlowFunctionGroup      PreProc
   HiLink jsFlowClassGroup         PreProc
   HiLink jsFlowClassFunctionGroup PreProc
-  HiLink jsFlowArrowArguments     PreProc
   HiLink jsFlowArrow              PreProc
   HiLink jsFlowReturnArrow        PreProc
   HiLink jsFlowTypeStatement      PreProc
@@ -105,5 +104,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowWildcardReturn     PreProc
   HiLink jsFlowImportType         PreProc
   HiLink jsFlowTypeValue          PreProc
+  HiLink jsFlowObjectFuncName     jsObjectFuncName
   delcommand HiLink
 endif

From 8450f06ec2c22bf33934728953b722a3847bbc18 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 25 Feb 2019 12:33:55 -0800
Subject: [PATCH 1020/1043] Fix return statements in top level scope

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index e170f8d0..0272fa62 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -136,8 +136,8 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsExpression extend fold nextgroup=jsFlowDefinition
 syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock,jsReturn extend fold
+syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock,jsReturn extend fold
 syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold

From 24c896e13d9241024bdb79f48e811748654d7ba2 Mon Sep 17 00:00:00 2001
From: Camron Flanders <camron.flanders@gmail.com>
Date: Tue, 26 Mar 2019 14:12:23 -0500
Subject: [PATCH 1021/1043] add support for @yields (#1163)

---
 extras/jsdoc.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index b1b588f7..92c4b8b2 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -6,7 +6,7 @@ syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|cla
 " tags containing type and param
 syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\|typedef\)\>" skipwhite nextgroup=jsDocType
 " tags containing type but no param
-syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|return\|returns\|yields\)\>" skipwhite nextgroup=jsDocTypeNoParam
 " tags containing references
 syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
 " other tags (no extra syntax)

From 1ade6f06b02e6ed2d643c4118cb6d44985dae22b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeus@users.noreply.github.com>
Date: Mon, 15 Apr 2019 10:42:52 -0700
Subject: [PATCH 1022/1043] Adding support for nullish operator (#1165)

---
 syntax/javascript.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 0272fa62..5b12be76 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -156,7 +156,9 @@ syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        s
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
 syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
 syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?:\@!/  end=/\%(:\|}\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
-syntax match   jsOperator       /?\.\ze\_D/
+" These must occur here or they will be override by jsTernaryIf
+syntax match   jsOperator           /?\.\ze\_D/
+syntax match   jsOperator           /??/ skipwhite skipempty nextgroup=@jsExpression
 
 syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup
 syntax match   jsFuncName             contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup

From ee445807a71ee6933cd6cbcd74940bc288815793 Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Tue, 16 Apr 2019 14:11:09 -0700
Subject: [PATCH 1023/1043] Fix inconsitency with DestructuringNoise

Fixes #1166
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 5b12be76..11bf0dae 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -149,7 +149,7 @@ syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       s
 syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
-syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsDestructuringNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold

From 8a599c5e84bb064e2345867332ecbcc252e3b04a Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 24 Jun 2019 15:44:23 -0700
Subject: [PATCH 1024/1043] Bugfix for regexes that have `/` in
 jsRegexpCharClass

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 11bf0dae..44bae673 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -61,7 +61,7 @@ syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=
 " Regular Expressions
 syntax match   jsSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{4,5}})|c\u|.)"
 syntax region  jsTemplateExpression contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression keepend
-syntax region  jsRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+ contains=jsSpecial
+syntax region  jsRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+ contains=jsSpecial extend
 syntax match   jsRegexpBoundary     contained "\v\c[$^]|\\b"
 syntax match   jsRegexpBackRef      contained "\v\\[1-9]\d*"
 syntax match   jsRegexpQuantifier   contained "\v[^\\]%([?*+]|\{\d+%(,\d*)?})\??"lc=1

From 7cc6baebaf0065fd8c31cc9216c87bfa543eb71a Mon Sep 17 00:00:00 2001
From: Chris Paul <chrispetrunoff@me.com>
Date: Mon, 8 Jul 2019 14:58:46 -0700
Subject: [PATCH 1025/1043] laggy indent in object (#1175)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index d9463d66..b759f0a8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -392,7 +392,9 @@ function GetJavascriptIndent()
       if idx != -1
         call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
       elseif getline(v:lnum) !~ '^\S' && s:stack[-1] =~? 'block\|^jsobject$'
-        call s:GetPair('{','}','bW','s:SkipFunc()')
+        if !s:GetPair('{','}','bW','s:SkipFunc()') && s:stack[-1] ==# 'jsObject'
+          return indent(l:lnum)
+        endif
       else
         call s:AlternatePair()
       endif

From b6c8c8419240bdd29b5eb51a47d488fd390deed5 Mon Sep 17 00:00:00 2001
From: Nicholas Asimov <nicholas@asimov.me>
Date: Thu, 15 Aug 2019 00:37:01 +0300
Subject: [PATCH 1026/1043] Fix ftdetect interfering with other plugins (#1183)

This is from the help doc :help ftdetect:

Note that there is no "augroup" command, this has already been done
when sourcing your file.  You could also use the pattern "*" and then
check the contents of the file to recognize it.

Reference:
https://github.com/Kuniwak/vint/issues/264
https://github.com/fatih/vim-go/pull/1645
---
 ftdetect/javascript.vim | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index 1130f97b..6c4105e4 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -4,8 +4,5 @@ fun! s:SelectJavascript()
   endif
 endfun
 
-augroup javascript_syntax_detection
-  autocmd!
-  autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript
-  autocmd BufNewFile,BufRead * call s:SelectJavascript()
-augroup END
+autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript
+autocmd BufNewFile,BufRead * call s:SelectJavascript()

From e7b3739c9f326e6cf7889730cbc99310f8178c1d Mon Sep 17 00:00:00 2001
From: Amirali Esmaeili <esmailiamirali@gmail.com>
Date: Mon, 11 Nov 2019 11:12:49 +0330
Subject: [PATCH 1027/1043] Add flow syntax filetype (#1189)

* Add flow syntax filetype

Closes #1186

* Add flow ftdetect
---
 ftdetect/flow.vim | 1 +
 syntax/flow.vim   | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 ftdetect/flow.vim
 create mode 100644 syntax/flow.vim

diff --git a/ftdetect/flow.vim b/ftdetect/flow.vim
new file mode 100644
index 00000000..3f1ea65b
--- /dev/null
+++ b/ftdetect/flow.vim
@@ -0,0 +1 @@
+autocmd BufNewFile,BufRead *.flow setfiletype flow
diff --git a/syntax/flow.vim b/syntax/flow.vim
new file mode 100644
index 00000000..3f972183
--- /dev/null
+++ b/syntax/flow.vim
@@ -0,0 +1,2 @@
+runtime syntax/javascript.vim
+runtime extras/flow.vim

From 27a67497c99432f00e715988f2958bfeaf4418eb Mon Sep 17 00:00:00 2001
From: Luiz Ribeiro <luizribeiro@gmail.com>
Date: Mon, 11 Nov 2019 02:47:32 -0500
Subject: [PATCH 1028/1043] Fix highlighting of template strings within objects
 (#1177) (#1184)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 44bae673..92294ce9 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -150,7 +150,7 @@ syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        s
 syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsDestructuringNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
-syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
+syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword,jsTemplateString extend fold
 syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
 syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
 syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression

From 6370e7d84f1e993ef8d02e1facb2521fe8d7f768 Mon Sep 17 00:00:00 2001
From: Lajos Koszti <ajnasz@ajnasz.hu>
Date: Mon, 11 Nov 2019 08:52:49 +0100
Subject: [PATCH 1029/1043] Add Refelect and BigInt* global objects (#1190)

Also sorted them alphabetically
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 92294ce9..c8daec93 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -110,7 +110,7 @@ syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set WeakSet RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
+syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
 syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
 syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From 2e4a8c485cdf601bb2f2761ea68c09750a0b82e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20R=C3=A8gne?=
 <regseb@users.noreply.github.com>
Date: Mon, 11 Nov 2019 08:53:27 +0100
Subject: [PATCH 1030/1043] Add guide to install with native package manager
 (#1187)

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index b9ac49f4..06419b2a 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,12 @@ improved indentation.
 
 ## Installation
 
+### Install with native package manager
+
+      git clone https://github.com/pangloss/vim-javascript.git ~/.vim/pack/vim-javascript/start/vim-javascript
+
+since Vim 8.
+
 ### Install with [pathogen](https://github.com/tpope/vim-pathogen)
 
       git clone https://github.com/pangloss/vim-javascript.git ~/.vim/bundle/vim-javascript

From db595656304959dcc3805cf63ea9a430e3f01e8f Mon Sep 17 00:00:00 2001
From: Corbin Hesse <4355830+corbinhesse@users.noreply.github.com>
Date: Thu, 23 Jan 2020 21:23:35 -0600
Subject: [PATCH 1031/1043] feat: Add `NOTE` to `jsCommentTodo` (#1198)

Highlight `NOTE` to mention in documentation or JSDoc
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index c8daec93..4d1a7e50 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -199,7 +199,7 @@ syntax match   jsDestructuringNoise             contained /[,[\]]/
 syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsDestructuringBraces start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringValueAssignment,jsDestructuringNoise extend fold
 
 " Comments
-syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
+syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD NOTE
 syntax region  jsComment        start=+//+ end=/$/ contains=jsCommentTodo,@Spell extend keepend
 syntax region  jsComment        start=+/\*+  end=+\*/+ contains=jsCommentTodo,@Spell fold extend keepend
 syntax region  jsEnvComment     start=/\%^#!/ end=/$/ display

From c3966153e81bc3766b1627e6ab0cd53333b61c1e Mon Sep 17 00:00:00 2001
From: Tobias Witt <ich@dwgadf.de>
Date: Mon, 13 Apr 2020 22:24:01 +0200
Subject: [PATCH 1032/1043] Fix matching of jsClassProperty without an initial
 value (#1202)

Given the following code

```javascript
class Foo {
  bar;

  baz = 'biz';
}
```

The `baz` is properly matched as a `jsClassProperty` but `bar is
`jsClassBody`. The regex for `jsClassProperty` was requiring the `=`
that followed the property name. The changes allow value less
properties by allowing either `;` or `=` to follow the name.
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 4d1a7e50..3b3689b2 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -184,7 +184,7 @@ syntax match   jsClassNoise             contained /\./
 syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*[(<]/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowClassFunctionGroup
 syntax match   jsClassMethodType        contained /\<\%([gs]et\|static\)\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsClassFuncName,jsClassProperty
 syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
-syntax match   jsClassProperty          contained /\<\K\k*\ze\s*=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
+syntax match   jsClassProperty          contained /\<\K\k*\ze\s*[=;]/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
 syntax region  jsClassValue             contained start=/=/ end=/\_[;}]\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
 syntax region  jsClassStringKey         contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs

From 92a2b46bf37bd5cd2fe421ff850728420895801b Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Mon, 27 Apr 2020 15:15:43 -0700
Subject: [PATCH 1033/1043] Disable spelling in basically everything except
 comments

---
 syntax/javascript.vim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3b3689b2..6a13434a 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -51,8 +51,8 @@ syntax keyword jsFrom               contained from skipwhite skipempty nextgroup
 syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup,jsFlowTypeKeyword
 
 " Strings, Templates, Numbers
-syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial,@Spell extend
-syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial,@Spell extend
+syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial extend
+syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
 syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
 syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/
 syntax keyword jsNumber           Infinity
@@ -74,14 +74,14 @@ syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBa
 " Objects
 syntax match   jsObjectShorthandProp contained /\<\k*\ze\s*/ skipwhite skipempty nextgroup=jsObjectSeparator
 syntax match   jsObjectKey         contained /\<\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial skipwhite skipempty nextgroup=jsObjectValue
 syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
 syntax match   jsObjectSeparator   contained /,/
 syntax region  jsObjectValue       contained matchgroup=jsObjectColon start=/:/ end=/[,}]\@=/ contains=@jsExpression extend
 syntax match   jsObjectFuncName    contained /\<\K\k*\ze\_s*(/ skipwhite skipempty nextgroup=jsFuncArgs
 syntax match   jsFunctionKey       contained /\<\K\k*\ze\s*:\s*function\>/
 syntax match   jsObjectMethodType  contained /\<[gs]et\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsObjectFuncName
-syntax region  jsObjectStringKey   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
+syntax region  jsObjectStringKey   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
 
 exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
 exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '').' skipwhite nextgroup=@jsExpression'
@@ -187,7 +187,7 @@ syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<ext
 syntax match   jsClassProperty          contained /\<\K\k*\ze\s*[=;]/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
 syntax region  jsClassValue             contained start=/=/ end=/\_[;}]\@=/ contains=@jsExpression
 syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
-syntax region  jsClassStringKey         contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsClassStringKey         contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial extend skipwhite skipempty nextgroup=jsFuncArgs
 
 " Destructuring
 syntax match   jsDestructuringPropertyValue     contained /\k\+/

From 3c90d0cc37bb8b78422f647e62587f498a5dd7bd Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Mon, 11 May 2020 12:28:27 -0400
Subject: [PATCH 1034/1043] Add `.cjs` file extension support (#1207)

As of Node 13.2.0, the `--experimental-modules` flag was removed making
usage of ES modules available by default. As part of the Node ES modules
support, they allow a package to define their default module type (which
is how `.js` files are interpretted) and also allow using either `.cjs`
or `.mjs` to explicitly declare a given file is of one format or the
other.

We already had the `.mjs` extension supported so this adds `.cjs` to
round out support for Node's ES module system.

References:

* [v13.2.0 release post unflagging `--experimental-modules`](https://nodejs.org/en/blog/release/v13.2.0/)
* [v14 documentation of ES Modules](https://nodejs.org/api/esm.html)
---
 ftdetect/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
index 6c4105e4..00487326 100644
--- a/ftdetect/javascript.vim
+++ b/ftdetect/javascript.vim
@@ -4,5 +4,5 @@ fun! s:SelectJavascript()
   endif
 endfun
 
-autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript
+autocmd BufNewFile,BufRead *.{js,mjs,cjs,jsm,es,es6},Jakefile setfiletype javascript
 autocmd BufNewFile,BufRead * call s:SelectJavascript()

From c7593e69bf64c3157b50cd0aea257c5abb8ae6a0 Mon Sep 17 00:00:00 2001
From: Thomas Step <tstep916@gmail.com>
Date: Mon, 8 Mar 2021 21:15:31 -0600
Subject: [PATCH 1035/1043] jsCatch can be followed by jsParenCatch or
 jsTryCatchBlock. (#1230)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 6a13434a..a2bf96c5 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -104,7 +104,7 @@ syntax keyword jsDo                     do              skipwhite skipempty next
 syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
 syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
 syntax keyword jsFinally      contained finally         skipwhite skipempty nextgroup=jsFinallyBlock
-syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch,jsTryCatchBlock
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock

From 585ad542834fd3d9e47e0ef59abafd69c696c80d Mon Sep 17 00:00:00 2001
From: Amadeus Demarzi <amadeusdemarzi@gmail.com>
Date: Fri, 2 Apr 2021 15:26:49 -0700
Subject: [PATCH 1036/1043] Add support for _ in hex numbers

Fixes #1232

I am not going for a super accurate fix, just enough to not break syntax
highlighting in a valid use case
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a2bf96c5..d1a72071 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -54,7 +54,7 @@ syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=
 syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial extend
 syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
 syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/
+syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\%(\x\|_\)\+\)\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
 

From 3dc959f098029fafcb9add91397cfb65184cf066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Vieira?= <vieira+github@yubo.be>
Date: Thu, 20 May 2021 04:59:13 +0100
Subject: [PATCH 1037/1043] Add WeakRef (#1238)

Add syntax highlightling to WeakRef as defined in tc39/proposal-weakrefs
---
 syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d1a72071..3e91bc72 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -110,7 +110,7 @@ syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
+syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakRef WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
 syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
 syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From f8345cdb6734aefa5c0f9cb128c9efd005410a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Vieira?= <vieira@yubo.be>
Date: Sun, 23 May 2021 19:54:21 +0100
Subject: [PATCH 1038/1043] Add BigInt (#1239)

Add syntax highlighting to BigInt literals and to the BigInt built-in object as defined in tc39/proposal-bigint.
---
 syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 3e91bc72..76c575ee 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -54,7 +54,7 @@ syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=
 syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial extend
 syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
 syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\%(\x\|_\)\+\)\>/
+syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\%(\x\|_\)\+\)n\=\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
 
@@ -110,7 +110,7 @@ syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakRef WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
+syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakRef WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
 syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
 syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError

From d6e137563c47fb59f26ed25d044c0c7532304f18 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 25 Sep 2021 13:57:08 +1000
Subject: [PATCH 1039/1043] Add missing lisp option to b:undo_indent (#1242)

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

diff --git a/indent/javascript.vim b/indent/javascript.vim
index b759f0a8..b754e282 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -19,7 +19,7 @@ setlocal indentkeys+=0],0)
 "       "+norm! gg=G" '+%print' '+:q!' testfile.js \
 "       | diff -uBZ testfile.js -
 
-let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< lisp<'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')

From 67a3435bf670018ea0b561e018f28c966812cdf0 Mon Sep 17 00:00:00 2001
From: Lassi Pulkkinen <lassi@pulk.fi>
Date: Tue, 2 Aug 2022 20:45:40 +0300
Subject: [PATCH 1040/1043] Better distinguish statements from expressions
 (#1249)

Fixes incorrect highlighting of blocks as objects.
---
 syntax/javascript.vim | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 76c575ee..d482feb4 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -24,7 +24,8 @@ syntax sync fromstart
 " syntax case ignore
 syntax case match
 
-syntax match   jsNoise          /[:,;]/
+syntax match   jsNoise          /[:;]/
+syntax match   jsNoise          /,/ skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsDot            /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
 syntax match   jsObjectProp     contained /\<\K\k*/
 syntax match   jsFuncCall       /\<\K\k*\ze\s*(/
@@ -33,7 +34,8 @@ syntax match   jsParensError    /[)}\]]/
 " Program Keywords
 syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
 syntax match   jsVariableDef    contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFlowDefinition
-syntax keyword jsOperatorKeyword delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsOperatorKeyword delete instanceof typeof void new in skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsOf             of skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       "[-!|&+<>=%/*~^]" skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       /::/ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
@@ -99,7 +101,8 @@ syntax keyword jsStatement     contained break continue skipwhite skipempty next
 syntax keyword jsConditional            if              skipwhite skipempty nextgroup=jsParenIfElse
 syntax keyword jsConditional            else            skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock
 syntax keyword jsConditional            switch          skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat                 while for       skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
+syntax keyword jsWhile                  while           skipwhite skipempty nextgroup=jsParenWhile
+syntax keyword jsFor                    for             skipwhite skipempty nextgroup=jsParenFor,jsForAwait
 syntax keyword jsDo                     do              skipwhite skipempty nextgroup=jsRepeatBlock
 syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
 syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
@@ -135,19 +138,20 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 " Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsExpression extend fold nextgroup=jsFlowDefinition
-syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock,jsReturn extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock,jsReturn extend fold
-syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
+syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsExpression extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsExpression skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock,jsReturn extend fold
+syntax region  jsParenWhile         contained matchgroup=jsParensWhile         start=/(/  end=/)/  contains=@jsExpression skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock,jsReturn extend fold
+syntax region  jsParenFor           contained matchgroup=jsParensFor           start=/(/  end=/)/  contains=@jsExpression,jsStorageClass,jsOf skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock,jsReturn extend fold
+syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsExpression skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsAsyncKeyword,jsNoise extend fold
-syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll,jsBlock skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
-syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
-syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
+syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsSwitchCase extend fold
+syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsDestructuringNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword,jsTemplateString extend fold
@@ -165,7 +169,7 @@ syntax match   jsFuncName             contained /\<\K\k*/ skipwhite skipempty ne
 syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
 syntax keyword jsArguments            contained arguments
-syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenRepeat
+syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenFor
 
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\<\K\k*\ze\s*=>/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
@@ -233,7 +237,7 @@ if exists("javascript_plugin_flow")
 endif
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsOperatorKeyword,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement,jsDot
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsWhile,jsFor,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel,jsBlock
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -248,6 +252,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsComment              Comment
   HiLink jsEnvComment           PreProc
   HiLink jsParensIfElse         jsParens
+  HiLink jsParensWhile          jsParensRepeat
+  HiLink jsParensFor            jsParensRepeat
   HiLink jsParensRepeat         jsParens
   HiLink jsParensSwitch         jsParens
   HiLink jsParensCatch          jsParens
@@ -273,6 +279,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBranch               Conditional
   HiLink jsLabel                Label
   HiLink jsReturn               Statement
+  HiLink jsWhile                jsRepeat
+  HiLink jsFor                  jsRepeat
   HiLink jsRepeat               Repeat
   HiLink jsDo                   Repeat
   HiLink jsStatement            Statement

From cf8872405b059428ffbabe0d5f624b496d92e338 Mon Sep 17 00:00:00 2001
From: JR Halchak <jonathan@halchak.email>
Date: Mon, 15 Aug 2022 04:07:28 -0400
Subject: [PATCH 1041/1043] Add tilde ~ to jsDocParam for inner members (#1250)

Added a tilde to the jsDocParam syntax match to support jsdoc3 namepaths style (i.e. when creating a typedef for an inner member).
See https://jsdoc.app/tags-typedef.html

Co-authored-by: Jonathan Halchak <jonathan.halchack@annalect.com>
---
 extras/jsdoc.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 92c4b8b2..a7189d1b 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -18,7 +18,8 @@ syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRe
 syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
 syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
 syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\~\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
+
 syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
 if version >= 508 || !exists("did_javascript_syn_inits")

From c470ce1399a544fe587eab950f571c83cccfbbdc Mon Sep 17 00:00:00 2001
From: Steven Hall <Hallzy.18@gmail.com>
Date: Mon, 15 Aug 2022 01:08:39 -0700
Subject: [PATCH 1042/1043] Allow newlines between function name and parens for
 function call (#1244)

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

diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index d482feb4..02b0c78c 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -28,7 +28,7 @@ syntax match   jsNoise          /[:;]/
 syntax match   jsNoise          /,/ skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsDot            /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
 syntax match   jsObjectProp     contained /\<\K\k*/
-syntax match   jsFuncCall       /\<\K\k*\ze\s*(/
+syntax match   jsFuncCall       /\<\K\k*\ze[\s\n]*(/
 syntax match   jsParensError    /[)}\]]/
 
 " Program Keywords

From b26c9edb3563e02f5c0b20580f7cf9743e95b157 Mon Sep 17 00:00:00 2001
From: Jay Kuri <jayk@ionzero.com>
Date: Fri, 21 Mar 2025 11:26:47 -0600
Subject: [PATCH 1043/1043] Revise README to include a warning about
 foldmethod=syntax hanging during paste in some terminals (#1258)

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 06419b2a..81accf8c 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,9 @@ augroup END
 
 Enables code folding for javascript based on our syntax file.
 
-Please note this can have a dramatic effect on performance.
+Please note this can have a dramatic effect on performance. In some terminals
+this may cause hangs during pasting. If you are affected by this, using
+a different foldmethod (such as indent) may provide a better experience.
 
 
 ## Concealing Characters