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 01/82] 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 02/82] 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 03/82] 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 04/82] 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 05/82] 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 06/82] 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 07/82] 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 08/82] 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 09/82] 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 10/82] 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 11/82] 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 12/82] 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 13/82] 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 14/82] 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 15/82] 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 16/82] 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 17/82] 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 18/82] 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 19/82] 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 20/82] 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 21/82] 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 22/82] 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 23/82] 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 24/82] 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 25/82] 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 26/82] 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 27/82] 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 28/82] 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 29/82] 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 30/82] 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 31/82] 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 32/82] [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 33/82] 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 34/82] 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 35/82] 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 36/82] [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 37/82] 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 38/82] 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 39/82] 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 40/82] 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 41/82] 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 42/82] 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 43/82] 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 44/82] 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 45/82] 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 46/82] [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 47/82] 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 48/82] 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 49/82] 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 50/82] 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 51/82] 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 52/82] 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 53/82] 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 54/82] 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 55/82] 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 56/82] 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 57/82] 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 58/82] 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 59/82] 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 60/82] 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 61/82] 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 62/82] 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 63/82] 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 64/82] 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 65/82] 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 66/82] 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 67/82] 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 68/82] 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 69/82] 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 70/82] 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 71/82] 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 72/82] 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 73/82] 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 74/82] 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 75/82] 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 76/82] 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 77/82] 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 78/82] 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 79/82] 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 80/82] 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 81/82] 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 82/82] 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