From f12061ea8890918dec77424cee37c837d7dba173 Mon Sep 17 00:00:00 2001
From: Elliot Thomas <elliot@raziel.dev>
Date: Wed, 2 Oct 2019 09:50:46 +0100
Subject: [PATCH] ES6 - ES2019 additions

symbol.operator: Spread/rest operator.
statement: Generator function, Promise resolve and reject.
type: New built-in types, including section for TypedArrays.
constant.string: Template literal.
---
 runtime/syntax/javascript.yaml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/runtime/syntax/javascript.yaml b/runtime/syntax/javascript.yaml
index 244ad811..f60d9063 100644
--- a/runtime/syntax/javascript.yaml
+++ b/runtime/syntax/javascript.yaml
@@ -15,16 +15,19 @@ rules:
     - symbol.brackets: "(\\{|\\})"
     - symbol.brackets: "(\\(|\\))"
     - symbol.brackets: "(\\[|\\])"
-    - symbol.operator: "[-+/*=<>!~%?:&|]"
-    - statement: "\\b(async|await|break|case|catch|const|continue|debugger|default|delete|do|else|export|finally)\\b"
-    - statement: "\\b(for|function|class|extends|get|if|import|from|in|of|instanceof|let|new|return|set)\\b"
-    - statement: "\\b(super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
+    - symbol.operator: "([-+/*=<>!~%?:&|]|[.]{3})"
+    - statement: "\\b(async|await|break|case|catch|const|continue|debugger|default)\\b"
+    - statement: "\\b(delete|do|else|export|finally|for|function\\*?|class|extends)\\b"
+    - statement: "\\b(get|if|import|from|in|of|instanceof|let|new|reject|resolve|return)\\b"
+    - statement: "\\b(set|super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
     # reserved but unassigned
     - error: "\\b(enum|implements|interface|package|private|protected|public|TODO)"
     - constant: "\\b(null|undefined|NaN)\\b"
     - constant: "\\b(true|false)\\b"
-    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Math)\\b"
-    - type: "\\b(Number|Object|RegExp|String)\\b"
+    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Generator|Map|Math)\\b"
+    - type: "\\b(Number|Object|Promise|Proxy|Reflect|RegExp|Set|String|Symbol|WeakMap|WeakSet)\\b"
+    - type: "\\b(BigInt64Array|BigUint64Array|Float32Array|Float64Array|Int16Array)\\b"
+    - type: "\\b(Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray)\\b"
     # - constant: "/[^*]([^/]|(\\\\/))*[^\\\\]/[gim]*"
     - constant: "\\\\[0-7][0-7]?[0-7]?|\\\\x[0-9a-fA-F]+|\\\\[bfnrt'\"\\?\\\\]"
     - comment: "^#!.*/(env +)?node( |$)"
@@ -49,6 +52,7 @@ rules:
         end: "`"
         rules:
             - constant.specialChar: "\\\\."
+            - identifier: "\\x24\\{.*?\\}"
 
     - comment:
         start: "//"