From 4ec94e9525818ba3aabe05c00dd1bc4465f27e96 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 11 Oct 2016 18:04:04 +0200
Subject: [PATCH] [coffeescript] update grammar, add script

---
 extensions/coffeescript/package.json          |    5 +-
 .../syntaxes/CoffeeScript.tmLanguage          | 1214 -----------------
 .../coffeescript/syntaxes/coffeescript.json   |  668 +++++++++
 .../colorize-results/test-regex_coffee.json   |   79 +-
 .../test/colorize-results/test_coffee.json    |   77 +-
 5 files changed, 750 insertions(+), 1293 deletions(-)
 delete mode 100644 extensions/coffeescript/syntaxes/CoffeeScript.tmLanguage
 create mode 100644 extensions/coffeescript/syntaxes/coffeescript.json

diff --git a/extensions/coffeescript/package.json b/extensions/coffeescript/package.json
index d75312ee3cd..f957b842f7b 100644
--- a/extensions/coffeescript/package.json
+++ b/extensions/coffeescript/package.json
@@ -3,6 +3,9 @@
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/coffee-script.tmbundle Syntaxes/CoffeeScript.tmLanguage ./syntaxes/coffeescript.json"
+	},
 	"contributes": {
 		"languages": [{
 			"id": "coffeescript",
@@ -13,7 +16,7 @@
 		"grammars": [{
 			"language": "coffeescript",
 			"scopeName": "source.coffee",
-			"path": "./syntaxes/CoffeeScript.tmLanguage"
+			"path": "./syntaxes/coffeescript.json"
 		}],
 		"debuggers": [{
 			"type": "node",
diff --git a/extensions/coffeescript/syntaxes/CoffeeScript.tmLanguage b/extensions/coffeescript/syntaxes/CoffeeScript.tmLanguage
deleted file mode 100644
index f2588d68d3e..00000000000
--- a/extensions/coffeescript/syntaxes/CoffeeScript.tmLanguage
+++ /dev/null
@@ -1,1214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>comment</key>
-	<string>CoffeeScript</string>
-	<key>fileTypes</key>
-	<array>
-		<string>coffee</string>
-		<string>Cakefile</string>
-		<string>coffee.erb</string>
-	</array>
-	<key>injections</key>
-	<dict>
-		<key>string.regexp.block.coffee</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_coffee</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#embedded_comment</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>keyEquivalent</key>
-	<string>^~C</string>
-	<key>name</key>
-	<string>CoffeeScript</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>captures</key>
-							<dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>variable.parameter.function.coffee</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.separator.key-value.coffee</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>string.quoted.double.coffee</string>
-								</dict>
-								<key>4</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.begin.coffee</string>
-								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.end.coffee</string>
-								</dict>
-								<key>6</key>
-								<dict>
-									<key>name</key>
-									<string>string.quoted.single.coffee</string>
-								</dict>
-								<key>7</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.begin.coffee</string>
-								</dict>
-								<key>8</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.end.coffee</string>
-								</dict>
-							</dict>
-							<key>match</key>
-							<string>(?x)
-								([^()\s,]+)
-								\s+(=)\s+
-								(?:
-									((")[^"]*("))
-								  | ((')[^']*('))
-								)</string>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>[^()\s,]+</string>
-							<key>name</key>
-							<string>variable.parameter.function.coffee</string>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>,</string>
-							<key>name</key>
-							<string>punctuation.separator.arguments.coffee</string>
-						</dict>
-					</array>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.coffee</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.coffee</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: a -&gt; … </string>
-			<key>match</key>
-			<string>(\()([^()]*?)(\))\s*([=-]&gt;)</string>
-			<key>name</key>
-			<string>meta.inline.function.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.new.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.type.instance.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(new)\s+(\w+(?:\.\w*)*)</string>
-			<key>name</key>
-			<string>meta.class.instance.constructor</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'''</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'''</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.heredoc.coffee</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"""</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"""</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.heredoc.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escape.coffee</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>`</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>`</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.interpolated.javascript.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>(?x)
-						\\
-						(
-							x\h{2}
-						  | [0-2][0-7]{0,2}
-						  | 3[0-6][0-7]
-						  | 37[0-7]?
-						  | [4-7][0-7]?
-						  | .
-						)</string>
-					<key>name</key>
-					<string>constant.character.escape.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&lt;!#)###(?!#)</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>###(?:[ \t]*\n)</string>
-			<key>name</key>
-			<string>comment.block.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>@\w*</string>
-					<key>name</key>
-					<string>storage.type.annotation.coffeescript</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(#)(?!\{)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\n</string>
-			<key>name</key>
-			<string>comment.line.number-sign.coffee</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>/{3}</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(/{3})[imgy]{0,4}</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.block.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.js.regexp</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>/(?![\s=/*+{}?])(?=.*/[igmy]{0,4}(?![a-zA-Z0-9]))</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(/)[igmy]{0,4}(?![a-zA-Z0-9])</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.js.regexp</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b
-				(?&lt;![\.\$])
-				(
-					break
-				  | by
-				  | catch
-				  | continue
-				  | else
-				  | finally
-				  | for
-				  | in
-				  | of
-				  | if
-				  | return
-				  | switch
-				  | then
-				  | throw
-				  | try
-				  | unless
-				  | when
-				  | while
-				  | until
-				  | loop
-				  | do
-				  | (?&lt;=for)\s+own
-				)
-				(?!\s*:)
-				\b
-			</string>
-			<key>name</key>
-			<string>keyword.control.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				and=
-			  | or=
-			  | !
-			  | %
-			  | &amp;
-			  | \^
-			  | \*
-			  | \/
-			  | (\-)?\-(?!&gt;)
-			  | \+\+
-			  | \+
-			  | ~
-			  | ==
-			  | =(?!&gt;)
-			  | !=
-			  | &lt;=
-			  | &gt;=
-			  | &lt;&lt;=
-			  | &gt;&gt;=
-			  | &gt;&gt;&gt;=
-			  | &lt;&gt;
-			  | &lt;
-			  | &gt;
-			  | !
-			  | &amp;&amp;
-			  | \.\.(\.)?
-			  | \?
-			  | \|
-			  | \|\|
-			  | \:
-			  | \*=
-			  | (?&lt;!\()/=
-			  | %=
-			  | \+=
-			  | \-=
-			  | &amp;=
-			  | \^=
-			  | \b(?&lt;![\.\$])(instanceof|new|delete|typeof|and|or|is|isnt|not|super)\b
-			</string>
-			<key>name</key>
-			<string>keyword.operator.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>variable.other.assignment.coffee</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.key-value</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?x)
-				(?:
-					([a-zA-Z\$_](\w|\$|\.)*)
-					\s*
-					(?!\::)
-					((:)|(=)(?!&gt;))
-					(?!
-						(
-							\s*\(.*\)
-						)?
-						\s*
-						([=-]&gt;)
-					)
-				)</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?x)
-				(?&lt;=\s|^)
-				([\[\{])
-				(?=.*?[\]\}]\s+[:=])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>([\]\}]\s*[:=])</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.variable.assignment.destructured.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#variable_name</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#instance_variable</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#single_quoted_string</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#double_quoted_string</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#numeric</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.coffee</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.coffee</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>captures</key>
-							<dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>variable.parameter.function.coffee</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.separator.key-value.coffee</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>string.quoted.double.coffee</string>
-								</dict>
-								<key>4</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.begin.coffee</string>
-								</dict>
-								<key>5</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.end.coffee</string>
-								</dict>
-								<key>6</key>
-								<dict>
-									<key>name</key>
-									<string>string.quoted.single.coffee</string>
-								</dict>
-								<key>7</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.begin.coffee</string>
-								</dict>
-								<key>8</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.string.end.coffee</string>
-								</dict>
-							</dict>
-							<key>match</key>
-							<string>(?x)
-								([^()\s,]+)
-								\s+(=)\s+
-								(?:
-									((")[^"]*("))
-								  | ((')[^']*('))
-								)</string>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>[^()\s,]+</string>
-							<key>name</key>
-							<string>variable.parameter.function.coffee</string>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>,</string>
-							<key>name</key>
-							<string>punctuation.separator.arguments.coffee</string>
-						</dict>
-					</array>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.coffee</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?x)
-				(?&lt;=^|\s)
-				(?=@?[a-zA-Z\$_])
-				(
-					@?[a-zA-Z\$_](\w|\$|:|\.)*
-					\s*
-					(?=
-						[:=]
-						(\s*(\()(.*)(\)))?
-						\s*
-						([=-]&gt;)
-					)
-				)
-			</string>
-			<key>name</key>
-			<string>meta.function.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>[=-]&gt;</string>
-			<key>name</key>
-			<string>storage.type.function.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b
-				(?&lt;!\.)
-				(true|on|yes)
-				(?!\s*[:=])
-				\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.true.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b
-				(?&lt;!\.)
-				(false|off|no)
-				(?!\s*[:=])
-				\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.false.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b
-				(?&lt;!\.)
-				null
-				(?!\s*[:=])
-				\b</string>
-			<key>name</key>
-			<string>constant.language.null.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b
-				(?&lt;!\.)
-				(this|extends)
-				(?!\s*[:=])
-				\b</string>
-			<key>name</key>
-			<string>variable.language.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.class.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.inheritance.coffee</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.inherited-class.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?x)
-					(class\b)
-					(?:
-						\s+(extends)\s+
-						(@?[a-zA-Z\$\._][\w\.]*)
-					)</string>
-			<key>name</key>
-			<string>meta.class.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.class.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.type.class.coffee</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.inheritance.coffee</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.inherited-class.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?x)
-					(class\b)
-					\s+
-					(@?[a-zA-Z\$_][\w\.]*)?
-					(?:
-						\s+(extends)\s+
-						(@?[a-zA-Z\$\._][\w\.]*)
-					)?</string>
-			<key>name</key>
-			<string>meta.class.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(debugger|\\)\b</string>
-			<key>name</key>
-			<string>keyword.other.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b(
-					Array
-				  | ArrayBuffer
-				  | Blob
-				  | Boolean
-				  | Date
-				  | document
-				  | Function
-				  | Int(8|16|32|64)Array
-				  | Math
-				  | Map
-				  | Number
-				  | Object
-				  | Proxy
-				  | RegExp
-				  | Set
-				  | String
-				  | WeakMap
-				  | window
-				  | Uint(8|16|32|64)Array
-				  | XMLHttpRequest
-				)\b</string>
-			<key>name</key>
-			<string>support.class.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(console)\b</string>
-			<key>name</key>
-			<string>entity.name.type.object.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>((?&lt;=console\.)(debug|warn|info|log|error|time|timeEnd|assert))\b</string>
-			<key>name</key>
-			<string>support.function.console.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b(
-					decodeURI(Component)?
-				  | encodeURI(Component)?
-				  | eval
-				  | parse(Float|Int)
-				  | require
-				)\b</string>
-			<key>name</key>
-			<string>support.function.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				(
-					(?&lt;=\.)
-					(
-						apply
-					  | call
-					  | concat
-					  | every
-					  | filter
-					  | forEach
-					  | from
-					  | hasOwnProperty
-					  | indexOf
-					  | isPrototypeOf
-					  | join
-					  | lastIndexOf
-					  | map
-					  | of
-					  | pop
-					  | propertyIsEnumerable
-					  | push
-					  | reduce(Right)?
-					  | reverse
-					  | shift
-					  | slice
-					  | some
-					  | sort
-					  | splice
-					  | to(Locale)?String
-					  | unshift
-					  | valueOf
-					)
-				)\b</string>
-			<key>name</key>
-			<string>support.function.method.array.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>((?&lt;=Array\.)(isArray))\b</string>
-			<key>name</key>
-			<string>support.function.static.array.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				(
-					(?&lt;=Object\.)
-					(
-						create
-					  | definePropert(ies|y)
-					  | freeze
-					  | getOwnProperty(Descriptors?|Names)
-					  | getProperty(Descriptor|Names)
-					  | getPrototypeOf
-					  | is(Extensible|Frozen|Sealed)?
-					  | isnt
-					  | keys
-					  | preventExtensions
-					  | seal
-					)
-				)\b</string>
-			<key>name</key>
-			<string>support.function.static.object.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				(
-					(?&lt;=Math\.)
-					(
-						abs
-					  | acos
-					  | acosh
-					  | asin
-					  | asinh
-					  | atan
-					  | atan2
-					  | atanh
-					  | ceil
-					  | cos
-					  | cosh
-					  | exp
-					  | expm1
-					  | floor
-					  | hypot
-					  | log
-					  | log10
-					  | log1p
-					  | log2
-					  | max
-					  | min
-					  | pow
-					  | random
-					  | round
-					  | sign
-					  | sin
-					  | sinh
-					  | sqrt
-					  | tan
-					  | tanh
-					  | trunc
-					)
-				)\b</string>
-			<key>name</key>
-			<string>support.function.static.math.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				(
-					(?&lt;=Number\.)
-					(
-						is(Finite|Integer|NaN)
-					  | toInteger
-					)
-				)\b</string>
-			<key>name</key>
-			<string>support.function.static.number.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(Infinity|NaN|undefined)\b</string>
-			<key>name</key>
-			<string>constant.language.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\;</string>
-			<key>name</key>
-			<string>punctuation.terminator.statement.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>,[ |\t]*</string>
-			<key>name</key>
-			<string>meta.delimiter.object.comma.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\.</string>
-			<key>name</key>
-			<string>meta.delimiter.method.period.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\{|\}</string>
-			<key>name</key>
-			<string>meta.brace.curly.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\(|\)</string>
-			<key>name</key>
-			<string>meta.brace.round.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\[|\]\s*</string>
-			<key>name</key>
-			<string>meta.brace.square.coffee</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#instance_variable</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#single_quoted_string</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#double_quoted_string</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#numeric</string>
-		</dict>
-	</array>
-	<key>repository</key>
-	<dict>
-		<key>double_quoted_string</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>"</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.begin.coffee</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>"</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.end.coffee</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>string.quoted.double.coffee</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>(?x)
-								\\(
-									x\h{2}
-								  | [0-2][0-7]{0,2}
-								  | 3[0-6][0-7]
-								  | 37[0-7]?
-								  | [4-7][0-7]?
-								  | .
-								)</string>
-							<key>name</key>
-							<string>constant.character.escape.coffee</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#interpolated_coffee</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>embedded_comment</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.comment.coffee</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(?&lt;!\\)(#).*$\n?</string>
-					<key>name</key>
-					<string>comment.line.number-sign.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<key>instance_variable</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.variable.coffee</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(@)([a-zA-Z_\$]\w*)?</string>
-					<key>name</key>
-					<string>variable.other.readwrite.instance.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<key>interpolated_coffee</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>#\{</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.embedded.begin.coffee</string>
-						</dict>
-					</dict>
-					<key>contentName</key>
-					<string>source.coffee</string>
-					<key>end</key>
-					<string>(\})</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.embedded.end.coffee</string>
-						</dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>source.coffee</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>meta.embedded.line.coffee</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>numeric</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>(?x)
-						(?&lt;!\$)\b
-						(
-							(0([box])[0-9a-fA-F]+)
-						  | ([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?)
-						)\b</string>
-					<key>name</key>
-					<string>constant.numeric.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<key>single_quoted_string</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>'</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.begin.coffee</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>'</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.end.coffee</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>string.quoted.single.coffee</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>(?x)
-								\\(
-									x\h{2}
-								  | [0-2][0-7]{0,2}
-								  | 3[0-6][0-7]?
-								  | 37[0-7]?
-								  | [4-7][0-7]?
-								  | .
-								)</string>
-							<key>name</key>
-							<string>constant.character.escape.coffee</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>variable_name</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>([a-zA-Z\$_]\w*(\.\w+)*)</string>
-					<key>name</key>
-					<string>variable.other.assignment.coffee</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>scopeName</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>5B520980-A7D5-4E10-8582-1A4C889A8DE5</string>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/extensions/coffeescript/syntaxes/coffeescript.json b/extensions/coffeescript/syntaxes/coffeescript.json
new file mode 100644
index 00000000000..2ab6ca68c3d
--- /dev/null
+++ b/extensions/coffeescript/syntaxes/coffeescript.json
@@ -0,0 +1,668 @@
+{
+	"comment": "CoffeeScript",
+	"fileTypes": [
+		"coffee",
+		"Cakefile",
+		"coffee.erb",
+		"cake",
+		"cjsx",
+		"cson",
+		"iced"
+	],
+	"injections": {
+		"string.regexp.block.coffee": {
+			"patterns": [
+				{
+					"include": "#interpolated_coffee"
+				},
+				{
+					"include": "#embedded_comment"
+				}
+			]
+		}
+	},
+	"keyEquivalent": "^~C",
+	"name": "CoffeeScript",
+	"patterns": [
+		{
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.parameters.begin.coffee"
+				},
+				"2": {
+					"patterns": [
+						{
+							"captures": {
+								"1": {
+									"name": "variable.parameter.function.coffee"
+								},
+								"2": {
+									"name": "punctuation.separator.key-value.coffee"
+								},
+								"3": {
+									"name": "string.quoted.double.coffee"
+								},
+								"4": {
+									"name": "punctuation.definition.string.begin.coffee"
+								},
+								"5": {
+									"name": "punctuation.definition.string.end.coffee"
+								},
+								"6": {
+									"name": "string.quoted.single.coffee"
+								},
+								"7": {
+									"name": "punctuation.definition.string.begin.coffee"
+								},
+								"8": {
+									"name": "punctuation.definition.string.end.coffee"
+								}
+							},
+							"match": "(?x)\n\t\t\t\t\t\t\t\t([^()\\s,]+)\n\t\t\t\t\t\t\t\t\\s+(=)\\s+\n\t\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t\t((\")[^\"]*(\"))\n\t\t\t\t\t\t\t\t  | ((')[^']*('))\n\t\t\t\t\t\t\t\t)"
+						},
+						{
+							"match": "[^()\\s,]+",
+							"name": "variable.parameter.function.coffee"
+						},
+						{
+							"match": ",",
+							"name": "punctuation.separator.arguments.coffee"
+						}
+					]
+				},
+				"3": {
+					"name": "punctuation.definition.parameters.begin.coffee"
+				},
+				"4": {
+					"name": "storage.type.function.coffee"
+				}
+			},
+			"comment": "match stuff like: a -> … ",
+			"match": "(\\()([^()]*?)(\\))\\s*([=-]>)",
+			"name": "meta.inline.function.coffee"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "keyword.operator.new.coffee"
+				},
+				"4": {
+					"name": "storage.type.class.coffee"
+				},
+				"6": {
+					"name": "entity.name.type.instance.coffee"
+				},
+				"7": {
+					"name": "entity.name.type.instance.coffee"
+				}
+			},
+			"match": "(new)\\s+(((class)(\\s+(\\w+(?:\\.\\w*)*))?)|(\\w+(?:\\.\\w*)*))",
+			"name": "meta.class.instance.constructor"
+		},
+		{
+			"begin": "'''",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "'''",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.unquoted.heredoc.coffee"
+		},
+		{
+			"begin": "\"\"\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "\"\"\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.quoted.double.heredoc.coffee",
+			"patterns": [
+				{
+					"match": "\\\\.",
+					"name": "constant.character.escape.coffee"
+				},
+				{
+					"include": "#interpolated_coffee"
+				}
+			]
+		},
+		{
+			"begin": "(?=`)",
+			"end": "(?<=`)",
+			"name": "meta.embedded.line.coffee",
+			"patterns": [
+				{
+					"begin": "`",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.coffee"
+						}
+					},
+					"contentName": "source.js",
+					"end": "(`)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.coffee"
+						},
+						"1": {
+							"name": "source.js"
+						}
+					},
+					"name": "string.other.embedded.javascript.coffee",
+					"patterns": [
+						{
+							"include": "source.js"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?<!#)###(?!#)",
+			"captures": {
+				"0": {
+					"name": "punctuation.definition.comment.coffee"
+				}
+			},
+			"end": "###(?:[ \\t]*\\n)",
+			"name": "comment.block.coffee",
+			"patterns": [
+				{
+					"match": "(?<=^|\\s)@\\w*(?=\\s)",
+					"name": "storage.type.annotation.coffeescript"
+				}
+			]
+		},
+		{
+			"begin": "(^[ \\t]+)?(?=#)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.coffee"
+				}
+			},
+			"end": "(?!\\G)",
+			"patterns": [
+				{
+					"begin": "#",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.coffee"
+						}
+					},
+					"end": "\\n",
+					"name": "comment.line.number-sign.coffee"
+				}
+			]
+		},
+		{
+			"begin": "/{3}",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "(/{3})[imgy]{0,4}",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.regexp.block.coffee",
+			"patterns": [
+				{
+					"include": "source.js.regexp"
+				}
+			]
+		},
+		{
+			"begin": "/(?![\\s=/*+{}?])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.coffee"
+				}
+			},
+			"end": "(/)[igmy]{0,4}(?![a-zA-Z0-9])",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.end.coffee"
+				}
+			},
+			"name": "string.regexp.coffee",
+			"patterns": [
+				{
+					"include": "source.js.regexp"
+				}
+			]
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b\n\t\t\t\t(?<![\\.\\$])\n\t\t\t\t(\n\t\t\t\t\tbreak\n\t\t\t\t  | by\n\t\t\t\t  | catch\n\t\t\t\t  | continue\n\t\t\t\t  | else\n\t\t\t\t  | finally\n\t\t\t\t  | for\n\t\t\t\t  | in\n\t\t\t\t  | of\n\t\t\t\t  | if\n\t\t\t\t  | return\n\t\t\t\t  | switch\n\t\t\t\t  | then\n\t\t\t\t  | throw\n\t\t\t\t  | try\n\t\t\t\t  | unless\n\t\t\t\t  | when\n\t\t\t\t  | while\n\t\t\t\t  | until\n\t\t\t\t  | loop\n\t\t\t\t  | do\n\t\t\t\t  | (?<=for)\\s+own\n\t\t\t\t)\n\t\t\t\t(?!\\s*:)\n\t\t\t\t\\b\n\t\t\t",
+			"name": "keyword.control.coffee"
+		},
+		{
+			"match": "(?x)\n                  (and|or|<<|>>>?|(?<!\\()\\/|[=!<>*%+\\-&^])?=(?!>)\n                | [!%^*\\/~?:]\n                | \\-?\\-(?!>)\n                | \\+\\+?\n                | <>\n                | <\n                | >\n                | &&?\n                | \\.\\.\\.?\n                | \\|\\|?\n                | \\b(?<![\\.\\$])(instanceof|new|delete|typeof|and|or|is|isnt|not|super)(?!\\s*:)\\b\n\t\t\t",
+			"name": "keyword.operator.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b\n\t\t\t\t(?<![\\.\\$])\n\t\t\t\t(\n\t\t\t\t\t  case\n                    | default\n                    | function\n                    | var\n                    | void\n                    | with\n                    | const\n                    | let\n                    | enum\n                    | export\n                    | import\n                    | native\n                    | __hasProp\n                    | __extends\n                    | __slice\n                    | __bind\n                    | __indexOf\n                    | implements\n                    | interface\n                    | package\n                    | private\n                    | protected\n                    | public\n                    | static\n                    | yield\n                )\n\t\t\t\t(?!\\s*:)\n\t\t\t\t\\b\n\t\t\t",
+			"name": "keyword.other.reserved.coffee"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "variable.other.assignment.coffee"
+				},
+				"4": {
+					"name": "punctuation.separator.key-value"
+				},
+				"5": {
+					"name": "keyword.operator.coffee"
+				}
+			},
+			"match": "(?x)\n\t\t\t\t(?:\n\t\t\t\t\t([a-zA-Z\\$_](\\w|\\$|\\.)*)\n\t\t\t\t\t\\s*\n\t\t\t\t\t(?!\\::)\n\t\t\t\t\t((:)|((?:or|and|[-+/&%*?])?=)(?![>=]))\n\t\t\t\t\t(?!\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\\s*\\(.*\\)\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t\\s*\n\t\t\t\t\t\t([=-]>)\n\t\t\t\t\t)\n\t\t\t\t)"
+		},
+		{
+			"begin": "(?<=\\s|^)(\\{)(?=.+?\\}\\s+[:=])",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.coffee"
+				}
+			},
+			"end": "(\\}\\s*[:=])",
+			"endCaptures": {
+				"0": {
+					"name": "keyword.operator.coffee"
+				}
+			},
+			"name": "meta.variable.assignment.destructured.object.coffee",
+			"patterns": [
+				{
+					"include": "#variable_name"
+				},
+				{
+					"include": "#instance_variable"
+				},
+				{
+					"include": "#single_quoted_string"
+				},
+				{
+					"include": "#double_quoted_string"
+				},
+				{
+					"include": "#numeric"
+				}
+			]
+		},
+		{
+			"begin": "(?<=\\s|^)(\\[)(?=.+?\\]\\s+[:=])",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.coffee"
+				}
+			},
+			"end": "(\\]\\s*[:=])",
+			"endCaptures": {
+				"0": {
+					"name": "keyword.operator.coffee"
+				}
+			},
+			"name": "meta.variable.assignment.destructured.array.coffee",
+			"patterns": [
+				{
+					"include": "#variable_name"
+				},
+				{
+					"include": "#instance_variable"
+				},
+				{
+					"include": "#single_quoted_string"
+				},
+				{
+					"include": "#double_quoted_string"
+				},
+				{
+					"include": "#numeric"
+				}
+			]
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "entity.name.function.coffee"
+				},
+				"4": {
+					"name": "punctuation.definition.parameters.begin.coffee"
+				},
+				"5": {
+					"patterns": [
+						{
+							"captures": {
+								"1": {
+									"name": "variable.parameter.function.coffee"
+								},
+								"2": {
+									"name": "punctuation.separator.key-value.coffee"
+								},
+								"3": {
+									"name": "string.quoted.double.coffee"
+								},
+								"4": {
+									"name": "punctuation.definition.string.begin.coffee"
+								},
+								"5": {
+									"name": "punctuation.definition.string.end.coffee"
+								},
+								"6": {
+									"name": "string.quoted.single.coffee"
+								},
+								"7": {
+									"name": "punctuation.definition.string.begin.coffee"
+								},
+								"8": {
+									"name": "punctuation.definition.string.end.coffee"
+								}
+							},
+							"match": "(?x)\n\t\t\t\t\t\t\t\t([^()\\s,]+)\n\t\t\t\t\t\t\t\t\\s+(=)\\s+\n\t\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t\t((\")[^\"]*(\"))\n\t\t\t\t\t\t\t\t  | ((')[^']*('))\n\t\t\t\t\t\t\t\t)"
+						},
+						{
+							"match": "[^()\\s,]+",
+							"name": "variable.parameter.function.coffee"
+						},
+						{
+							"match": ",",
+							"name": "punctuation.separator.arguments.coffee"
+						}
+					]
+				},
+				"6": {
+					"name": "punctuation.definition.parameters.begin.coffee"
+				},
+				"7": {
+					"name": "storage.type.function.coffee"
+				}
+			},
+			"match": "(?x)\n\t\t\t\t(?<=^|\\s)\n\t\t\t\t(?=@?[a-zA-Z\\$_])\n\t\t\t\t(\n\t\t\t\t\t@?[a-zA-Z\\$_](\\w|\\$|:|\\.)*\n\t\t\t\t\t\\s*\n\t\t\t\t\t(?=\n\t\t\t\t\t\t[:=]\n\t\t\t\t\t\t(\\s*(\\()(.*)(\\)))?\n\t\t\t\t\t\t\\s*\n\t\t\t\t\t\t([=-]>)\n\t\t\t\t\t)\n\t\t\t\t)\n\t\t\t",
+			"name": "meta.function.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b\n\t\t\t\t(?<!\\.|::)\n\t\t\t\t(true|on|yes)\n\t\t\t\t(?!\\s*[:=][^=])\n\t\t\t\t\\b",
+			"name": "constant.language.boolean.true.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b\n\t\t\t\t(?<!\\.|::)\n\t\t\t\t(false|off|no)\n\t\t\t\t(?!\\s*[:=][^=])\n\t\t\t\t\\b",
+			"name": "constant.language.boolean.false.coffee"
+		},
+		{
+			"match": "@?\\b(?!class|subclass|extends|decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require)\\w+(?=\\s+(?!(of|in|then|is|isnt|and|or|for|else|when|not|if)\\s)(?=(@?\\w+|\\->|\\-\\d|\\[|\\{|\"|'))|(?=\\())",
+			"name": "entity.name.function.coffee"
+		},
+		{
+			"match": "[=-]>",
+			"name": "storage.type.function.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b\n\t\t\t\t(?<!\\.|::)\n\t\t\t\tnull\n\t\t\t\t(?!\\s*[:=][^=])\n\t\t\t\t\\b",
+			"name": "constant.language.null.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b\n\t\t\t\t(?<!\\.|::)\n\t\t\t\t(extends)\n\t\t\t\t(?!\\s*[:=][^=])\n\t\t\t\t\\b",
+			"name": "variable.language.coffee"
+		},
+		{
+			"match": "\\b(?<!\\.)this(?!\\s*[:=])\\b",
+			"name": "variable.language.this.coffee"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "storage.type.class.coffee"
+				},
+				"2": {
+					"name": "keyword.control.inheritance.coffee"
+				},
+				"3": {
+					"name": "entity.other.inherited-class.coffee"
+				}
+			},
+			"match": "(?x)\n\t\t\t\t\t(?<=\\s|^|\\[|\\()\n                    (class\\b)\n\t\t\t\t\t(?:\n\t\t\t\t\t\t\\s+(extends)\\s+\n\t\t\t\t\t\t(@?[a-zA-Z\\$\\._][\\w\\.]*)\n\t\t\t\t\t)",
+			"name": "meta.class.coffee"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "storage.type.class.coffee"
+				},
+				"2": {
+					"name": "entity.name.type.class.coffee"
+				},
+				"3": {
+					"name": "keyword.control.inheritance.coffee"
+				},
+				"4": {
+					"name": "entity.other.inherited-class.coffee"
+				}
+			},
+			"match": "(?x)\n\t\t\t        (?<=\\s|^|\\[|\\()\n\t\t\t\t\t(class\\b)\n\t\t\t\t\t\\s+\n\t\t\t\t\t(@?[a-zA-Z\\$_][\\w\\.]*)?\n\t\t\t\t\t(?:\n\t\t\t\t\t\t\\s+(extends)\\s+\n\t\t\t\t\t\t(@?[a-zA-Z\\$\\._][\\w\\.]*)\n\t\t\t\t\t)?",
+			"name": "meta.class.coffee"
+		},
+		{
+			"match": "\\b(debugger|\\\\)\\b",
+			"name": "keyword.other.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b(\n\t\t\t\t\tArray\n\t\t\t\t  | ArrayBuffer\n\t\t\t\t  | Blob\n\t\t\t\t  | Boolean\n\t\t\t\t  | Date\n\t\t\t\t  | document\n\t\t\t\t  | Function\n\t\t\t\t  | Int(8|16|32|64)Array\n\t\t\t\t  | Math\n\t\t\t\t  | Map\n\t\t\t\t  | Number\n\t\t\t\t  | Object\n\t\t\t\t  | Proxy\n\t\t\t\t  | RegExp\n\t\t\t\t  | Set\n\t\t\t\t  | String\n\t\t\t\t  | WeakMap\n\t\t\t\t  | window\n\t\t\t\t  | Uint(8|16|32|64)Array\n\t\t\t\t  | XMLHttpRequest\n\t\t\t\t)\\b",
+			"name": "support.class.coffee"
+		},
+		{
+			"match": "\\b(console)\\b",
+			"name": "entity.name.type.object.coffee"
+		},
+		{
+			"match": "((?<=console\\.)(debug|warn|info|log|error|time|timeEnd|assert))\\b",
+			"name": "support.function.console.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t\\b(\n\t\t\t\t\tdecodeURI(Component)?\n\t\t\t\t  | encodeURI(Component)?\n\t\t\t\t  | eval\n\t\t\t\t  | parse(Float|Int)\n\t\t\t\t  | require\n\t\t\t\t)\\b",
+			"name": "support.function.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t(\n\t\t\t\t\t(?<=\\.)\n\t\t\t\t\t(\n\t\t\t\t\t\tapply\n\t\t\t\t\t  | call\n\t\t\t\t\t  | concat\n\t\t\t\t\t  | every\n\t\t\t\t\t  | filter\n\t\t\t\t\t  | forEach\n\t\t\t\t\t  | from\n\t\t\t\t\t  | hasOwnProperty\n\t\t\t\t\t  | indexOf\n\t\t\t\t\t  | isPrototypeOf\n\t\t\t\t\t  | join\n\t\t\t\t\t  | lastIndexOf\n\t\t\t\t\t  | map\n\t\t\t\t\t  | of\n\t\t\t\t\t  | pop\n\t\t\t\t\t  | propertyIsEnumerable\n\t\t\t\t\t  | push\n\t\t\t\t\t  | reduce(Right)?\n\t\t\t\t\t  | reverse\n\t\t\t\t\t  | shift\n\t\t\t\t\t  | slice\n\t\t\t\t\t  | some\n\t\t\t\t\t  | sort\n\t\t\t\t\t  | splice\n\t\t\t\t\t  | to(Locale)?String\n\t\t\t\t\t  | unshift\n\t\t\t\t\t  | valueOf\n\t\t\t\t\t)\n\t\t\t\t)\\b",
+			"name": "support.function.method.array.coffee"
+		},
+		{
+			"match": "((?<=Array\\.)(isArray))\\b",
+			"name": "support.function.static.array.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t(\n\t\t\t\t\t(?<=Object\\.)\n\t\t\t\t\t(\n\t\t\t\t\t\tcreate\n\t\t\t\t\t  | definePropert(ies|y)\n\t\t\t\t\t  | freeze\n\t\t\t\t\t  | getOwnProperty(Descriptors?|Names)\n\t\t\t\t\t  | getProperty(Descriptor|Names)\n\t\t\t\t\t  | getPrototypeOf\n\t\t\t\t\t  | is(Extensible|Frozen|Sealed)?\n\t\t\t\t\t  | isnt\n\t\t\t\t\t  | keys\n\t\t\t\t\t  | preventExtensions\n\t\t\t\t\t  | seal\n\t\t\t\t\t)\n\t\t\t\t)\\b",
+			"name": "support.function.static.object.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t(\n\t\t\t\t\t(?<=Math\\.)\n\t\t\t\t\t(\n\t\t\t\t\t\tabs\n\t\t\t\t\t  | acos\n\t\t\t\t\t  | acosh\n\t\t\t\t\t  | asin\n\t\t\t\t\t  | asinh\n\t\t\t\t\t  | atan\n\t\t\t\t\t  | atan2\n\t\t\t\t\t  | atanh\n\t\t\t\t\t  | ceil\n\t\t\t\t\t  | cos\n\t\t\t\t\t  | cosh\n\t\t\t\t\t  | exp\n\t\t\t\t\t  | expm1\n\t\t\t\t\t  | floor\n\t\t\t\t\t  | hypot\n\t\t\t\t\t  | log\n\t\t\t\t\t  | log10\n\t\t\t\t\t  | log1p\n\t\t\t\t\t  | log2\n\t\t\t\t\t  | max\n\t\t\t\t\t  | min\n\t\t\t\t\t  | pow\n\t\t\t\t\t  | random\n\t\t\t\t\t  | round\n\t\t\t\t\t  | sign\n\t\t\t\t\t  | sin\n\t\t\t\t\t  | sinh\n\t\t\t\t\t  | sqrt\n\t\t\t\t\t  | tan\n\t\t\t\t\t  | tanh\n\t\t\t\t\t  | trunc\n\t\t\t\t\t)\n\t\t\t\t)\\b",
+			"name": "support.function.static.math.coffee"
+		},
+		{
+			"match": "(?x)\n\t\t\t\t(\n\t\t\t\t\t(?<=Number\\.)\n\t\t\t\t\t(\n\t\t\t\t\t\tis(Finite|Integer|NaN)\n\t\t\t\t\t  | toInteger\n\t\t\t\t\t)\n\t\t\t\t)\\b",
+			"name": "support.function.static.number.coffee"
+		},
+		{
+			"match": "\\b(Infinity|NaN|undefined)\\b",
+			"name": "constant.language.coffee"
+		},
+		{
+			"match": "\\;",
+			"name": "punctuation.terminator.statement.coffee"
+		},
+		{
+			"match": ",",
+			"name": "meta.delimiter.object.comma.coffee"
+		},
+		{
+			"match": "\\.",
+			"name": "meta.delimiter.method.period.coffee"
+		},
+		{
+			"match": "\\{|\\}",
+			"name": "meta.brace.curly.coffee"
+		},
+		{
+			"match": "\\(|\\)",
+			"name": "meta.brace.round.coffee"
+		},
+		{
+			"match": "\\[|\\]\\s*",
+			"name": "meta.brace.square.coffee"
+		},
+		{
+			"include": "#instance_variable"
+		},
+		{
+			"include": "#single_quoted_string"
+		},
+		{
+			"include": "#double_quoted_string"
+		},
+		{
+			"include": "#numeric"
+		}
+	],
+	"repository": {
+		"double_quoted_string": {
+			"patterns": [
+				{
+					"begin": "\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.coffee"
+						}
+					},
+					"end": "\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.coffee"
+						}
+					},
+					"name": "string.quoted.double.coffee",
+					"patterns": [
+						{
+							"match": "(?x)\n\t\t\t\t\t\t\t\t\\\\(\n\t\t\t\t\t\t\t\t\tx\\h{2}\n\t\t\t\t\t\t\t\t  | [0-2][0-7]{0,2}\n\t\t\t\t\t\t\t\t  | 3[0-6][0-7]\n\t\t\t\t\t\t\t\t  | 37[0-7]?\n\t\t\t\t\t\t\t\t  | [4-7][0-7]?\n\t\t\t\t\t\t\t\t  | .\n\t\t\t\t\t\t\t\t)",
+							"name": "constant.character.escape.coffee"
+						},
+						{
+							"include": "#interpolated_coffee"
+						}
+					]
+				}
+			]
+		},
+		"embedded_comment": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.coffee"
+						}
+					},
+					"match": "(?<!\\\\)(#).*$\\n?",
+					"name": "comment.line.number-sign.coffee"
+				}
+			]
+		},
+		"instance_variable": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.coffee"
+						}
+					},
+					"match": "(@)([a-zA-Z_\\$]\\w*)?",
+					"name": "variable.other.readwrite.instance.coffee"
+				}
+			]
+		},
+		"interpolated_coffee": {
+			"patterns": [
+				{
+					"begin": "#\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.embedded.begin.coffee"
+						}
+					},
+					"contentName": "source.coffee",
+					"end": "(\\})",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.embedded.end.coffee"
+						},
+						"1": {
+							"name": "source.coffee"
+						}
+					},
+					"name": "meta.embedded.line.coffee",
+					"patterns": [
+						{
+							"include": "$self"
+						}
+					]
+				}
+			]
+		},
+		"numeric": {
+			"patterns": [
+				{
+					"match": "(?x)\n\t\t\t\t\t\t(?<!\\$)\\b\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(0([box])[0-9a-fA-F]+)\n\t\t\t\t\t\t  | ([0-9]+(\\.[0-9]+)?(e[+\\-]?[0-9]+)?)\n\t\t\t\t\t\t)\\b",
+					"name": "constant.numeric.coffee"
+				}
+			]
+		},
+		"single_quoted_string": {
+			"patterns": [
+				{
+					"begin": "'",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.coffee"
+						}
+					},
+					"end": "'",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.coffee"
+						}
+					},
+					"name": "string.quoted.single.coffee",
+					"patterns": [
+						{
+							"match": "(?x)\n\t\t\t\t\t\t\t\t\\\\(\n\t\t\t\t\t\t\t\t\tx\\h{2}\n\t\t\t\t\t\t\t\t  | [0-2][0-7]{0,2}\n\t\t\t\t\t\t\t\t  | 3[0-6][0-7]?\n\t\t\t\t\t\t\t\t  | 37[0-7]?\n\t\t\t\t\t\t\t\t  | [4-7][0-7]?\n\t\t\t\t\t\t\t\t  | .\n\t\t\t\t\t\t\t\t)",
+							"name": "constant.character.escape.coffee"
+						}
+					]
+				}
+			]
+		},
+		"variable_name": {
+			"patterns": [
+				{
+					"match": "([a-zA-Z\\$_]\\w*(\\.\\w+)*)",
+					"name": "variable.other.assignment.coffee"
+				}
+			]
+		}
+	},
+	"scopeName": "source.coffee",
+	"uuid": "5B520980-A7D5-4E10-8582-1A4C889A8DE5",
+	"version": "https://github.com/textmate/coffee-script.tmbundle/commit/da28450cf18a73595e298535c93c8370ae06994c"
+}
\ No newline at end of file
diff --git a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
index b52e5ea3296..a46186267e5 100644
--- a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
+++ b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json
@@ -208,72 +208,6 @@
 			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.constant.numeric rgb(181, 206, 168)"
 		}
 	},
-	{
-		"c": "/",
-		"t": "coffee.keyword.operator",
-		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword.operator rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword.operator rgb(0, 0, 0)",
-			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword.operator rgb(212, 212, 212)"
-		}
-	},
-	{
-		"c": "3",
-		"t": "coffee.constant.numeric",
-		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.numeric rgb(181, 206, 168)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.numeric rgb(9, 136, 90)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.constant.numeric rgb(181, 206, 168)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.constant.numeric rgb(9, 136, 90)",
-			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.constant.numeric rgb(181, 206, 168)"
-		}
-	},
-	{
-		"c": "a",
-		"t": "assignment.coffee.other.variable",
-		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
-			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs .token rgb(0, 0, 0)",
-			"hc_black": ".hc-black .token rgb(255, 255, 255)"
-		}
-	},
-	{
-		"c": " ",
-		"t": "",
-		"r": {
-			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs .token rgb(0, 0, 0)",
-			"hc_black": ".hc-black .token rgb(255, 255, 255)"
-		}
-	},
-	{
-		"c": "=",
-		"t": "coffee.keyword.operator",
-		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword.operator rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword.operator rgb(0, 0, 0)",
-			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword.operator rgb(212, 212, 212)"
-		}
-	},
-	{
-		"c": " b",
-		"t": "",
-		"r": {
-			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs .token rgb(0, 0, 0)",
-			"hc_black": ".hc-black .token rgb(255, 255, 255)"
-		}
-	},
 	{
 		"c": "/",
 		"t": "begin.coffee.definition.punctuation.regexp.string",
@@ -286,7 +220,18 @@
 		}
 	},
 	{
-		"c": "c ",
+		"c": "3",
+		"t": "coffee.regexp.string",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string.regexp rgb(209, 105, 105)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.regexp rgb(129, 31, 63)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.string.regexp rgb(209, 105, 105)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.string.regexp rgb(129, 31, 63)",
+			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.string.regexp rgb(209, 105, 105)"
+		}
+	},
+	{
+		"c": "a = b/c ",
 		"t": "coffee.regexp.string",
 		"r": {
 			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string.regexp rgb(209, 105, 105)",
diff --git a/extensions/coffeescript/test/colorize-results/test_coffee.json b/extensions/coffeescript/test/colorize-results/test_coffee.json
index 7178436bcaf..09379d95562 100644
--- a/extensions/coffeescript/test/colorize-results/test_coffee.json
+++ b/extensions/coffeescript/test/colorize-results/test_coffee.json
@@ -242,7 +242,29 @@
 		}
 	},
 	{
-		"c": "    alert ",
+		"c": "    ",
+		"t": "",
+		"r": {
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": "alert",
+		"t": "coffee.entity.function.name",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function rgb(220, 220, 170)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function rgb(121, 94, 38)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.entity.name.function rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": " ",
 		"t": "",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -484,7 +506,29 @@
 		}
 	},
 	{
-		"c": "    alert ",
+		"c": "    ",
+		"t": "",
+		"r": {
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": "alert",
+		"t": "coffee.entity.function.name",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function rgb(220, 220, 170)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function rgb(121, 94, 38)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.entity.name.function rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": " ",
 		"t": "",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -704,7 +748,7 @@
 		}
 	},
 	{
-		"c": " onTheRoad",
+		"c": " ",
 		"t": "",
 		"r": {
 			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -714,6 +758,17 @@
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
+	{
+		"c": "onTheRoad",
+		"t": "coffee.entity.function.name",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function rgb(220, 220, 170)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function rgb(121, 94, 38)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.entity.name.function rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
 	{
 		"c": "()",
 		"t": "brace.coffee.meta.round",
@@ -749,11 +804,11 @@
 	},
 	{
 		"c": "drive",
-		"t": "",
+		"t": "coffee.entity.function.name",
 		"r": {
-			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function rgb(220, 220, 170)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function rgb(121, 94, 38)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.entity.name.function rgb(212, 212, 212)",
 			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
@@ -1112,11 +1167,11 @@
 	},
 	{
 		"c": "drive",
-		"t": "",
+		"t": "coffee.entity.function.name",
 		"r": {
-			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.function rgb(220, 220, 170)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.function rgb(121, 94, 38)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.entity.name.function rgb(212, 212, 212)",
 			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}