From f627c582650eb31f096b3454c97d039ea8981176 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Sat, 11 May 2019 18:04:32 -0400
Subject: [PATCH 01/16] add operator matching for vscode

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 2 ++
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 3d0aad9..9d3f9e2 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -12,6 +12,8 @@ patterns:
   name: keyword.other.kit
 - match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
   name: storage.type.kit
+- match: (=|==|<=|>=|!=|-|\+|--|\+\+|\*|\||>|<|<<|>>|&)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
+  name: keyword.operator.kit
 
 - name: keyword.control.arrow.kit
   match: =\>
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index 94fdc8f..0a412d3 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -38,6 +38,12 @@
         <key>name</key>
         <string>storage.type.kit</string>
       </dict>
+      <dict>
+        <key>match</key>
+        <string>(=|==|<=|>=|!=|-|\+|--|\+\+|\*|\||>|<|<<|>>|&)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
+        <key>name</key>
+        <string>keyword.operator.kit</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>keyword.control.arrow.kit</string>

From ef9cf1aefd0ab35e920809c17f798117fa85d4e4 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Sun, 12 May 2019 01:25:08 -0400
Subject: [PATCH 02/16] add function matching and separate logical operators

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage |  6 +++++-
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 9d3f9e2..4af0898 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -12,8 +12,10 @@ patterns:
   name: keyword.other.kit
 - match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
   name: storage.type.kit
-- match: (=|==|<=|>=|!=|-|\+|--|\+\+|\*|\||>|<|<<|>>|&)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
+- match: (=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
   name: keyword.operator.kit
+- match: ==|<=|>=|!=|>|<|\||&
+  name: keyword.operator.logical.kit
 
 - name: keyword.control.arrow.kit
   match: =\>
@@ -58,5 +60,7 @@ patterns:
   begin: '\#\['
   end: '\]'
 
+- name: variable.function.kit
+  match: \b[a-z_][A-Za-z0-9_]*(?=\()\b
 - name: variable.parameter.kit
   match: \b[a-z_][A-Za-z0-9_]*\b
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index 0a412d3..eb61abc 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -40,10 +40,16 @@
       </dict>
       <dict>
         <key>match</key>
-        <string>(=|==|<=|>=|!=|-|\+|--|\+\+|\*|\||>|<|<<|>>|&)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
+        <string>(=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
         <key>name</key>
         <string>keyword.operator.kit</string>
       </dict>
+      <dict>
+        <key>match</key>
+        <string>==|<=|>=|!=|>|<|\||&</string>
+        <key>name</key>
+        <string>keyword.operator.logical.kit</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>keyword.control.arrow.kit</string>
@@ -149,6 +155,12 @@
         <key>end</key>
         <string>\]</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>variable.function.kit</string>
+        <key>match</key>
+        <string>\b[a-z_][A-Za-z0-9_]*(?=\()\b</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>variable.parameter.kit</string>

From 40b506191af6600a51dc04daba693a0c4aef8fc6 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Sun, 12 May 2019 02:55:17 -0400
Subject: [PATCH 03/16] reorder =>, kw.operator, and kw.operator.logical to
 match correctly

also reordered name and match in a few patterns so that they are all name followed by match
---
 .../syntaxes/kit.YAML-tmLanguage              | 30 ++++++++--------
 utils/vscode-kitlang/syntaxes/kit.tmLanguage  | 36 +++++++++++--------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 4af0898..0a5b266 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -4,21 +4,21 @@ scopeName: source.kit
 uuid: 4fc8848b-af63-4ac5-850f-8e6b00a45004
 
 patterns:
-- match: \b(import|include|function|implement|specialize|var|using)\b
-  name: keyword.control.kit
-- match: \b(private|public|static|const|inline)\b
-  name: storage.modifier.kit
-- match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b
-  name: keyword.other.kit
-- match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
-  name: storage.type.kit
-- match: (=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
-  name: keyword.operator.kit
-- match: ==|<=|>=|!=|>|<|\||&
-  name: keyword.operator.logical.kit
-
+- name: keyword.control.kit
+  match: \b(import|include|function|implement|specialize|var|using)\b
+- name: storage.modifier.kit
+  match: \b(private|public|static|const|inline)\b
+- name: keyword.other.kit
+  match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b
+- name: storage.type.kit
+  match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
 - name: keyword.control.arrow.kit
   match: =\>
+- name: keyword.operator.logical.kit
+  match: ==|<=|>=|!=|>|<|\||&
+- name: keyword.operator.kit
+  match: (=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
+
 
 - name: support.type.kit
   match: '\b[A-Z][a-zA-Z0-9_]*\b'
@@ -45,7 +45,9 @@ patterns:
 - name: string.quoted.double.kit
   match: '"(\.|[^"])*"'
 - name: string.quoted.single.kit
-  match: '''(\.|[^\''])*'''
+  match: ''(\.|[^\'])*''
+- name: constant.character.escape
+  match: (\\[abefnrtv\\\'\"?])|(\\[01234567]{1,3})|(\\x[0123456789aAbBcCdDeEfF]{2})|(\\u[0123456789aAbBcCdDeEfF]{4})|(\\U[0123456789aAbBcCdDeEfF]{8})
 
 - name: comment.line.double-slash.kit
   match: "(//).*$\n?"
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index eb61abc..61ff1a2 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -15,46 +15,46 @@
     <key>patterns</key>
     <array>
       <dict>
-        <key>match</key>
-        <string>\b(import|include|function|implement|specialize|var|using)\b</string>
         <key>name</key>
         <string>keyword.control.kit</string>
+        <key>match</key>
+        <string>\b(import|include|function|implement|specialize|var|using)\b</string>
       </dict>
       <dict>
-        <key>match</key>
-        <string>\b(private|public|static|const|inline)\b</string>
         <key>name</key>
         <string>storage.modifier.kit</string>
+        <key>match</key>
+        <string>\b(private|public|static|const|inline)\b</string>
       </dict>
       <dict>
-        <key>match</key>
-        <string>\b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b</string>
         <key>name</key>
         <string>keyword.other.kit</string>
+        <key>match</key>
+        <string>\b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b</string>
       </dict>
       <dict>
-        <key>match</key>
-        <string>\b(struct|enum|union|abstract|rule|rules|typedef|trait)\b</string>
         <key>name</key>
         <string>storage.type.kit</string>
+        <key>match</key>
+        <string>\b(struct|enum|union|abstract|rule|rules|typedef|trait)\b</string>
       </dict>
       <dict>
-        <key>match</key>
-        <string>(=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
         <key>name</key>
-        <string>keyword.operator.kit</string>
+        <string>keyword.control.arrow.kit</string>
+        <key>match</key>
+        <string>=></string>
       </dict>
       <dict>
-        <key>match</key>
-        <string>==|<=|>=|!=|>|<|\||&</string>
         <key>name</key>
         <string>keyword.operator.logical.kit</string>
+        <key>match</key>
+        <string>==|<=|>=|!=|>|<|\||&</string>
       </dict>
       <dict>
         <key>name</key>
-        <string>keyword.control.arrow.kit</string>
+        <string>keyword.operator.kit</string>
         <key>match</key>
-        <string>=\&gt;</string>
+        <string>(=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
       </dict>
       <dict>
         <key>name</key>
@@ -126,6 +126,12 @@
         <key>match</key>
         <string>'(\.|[^\'])*'</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>constant.character.escape</string>
+        <key>match</key>
+        <string>(\\[abefnrtv\\\'\"?])|(\\[01234567]{1,3})|(\\x[0123456789aAbBcCdDeEfF]{2})|(\\u[0123456789aAbBcCdDeEfF]{4})|(\\U[0123456789aAbBcCdDeEfF]{8})</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>comment.line.double-slash.kit</string>

From cfa2d7d5615c3e8e7cb2ecb334b0a85b488537c0 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Wed, 15 May 2019 21:59:40 -0400
Subject: [PATCH 04/16] fix: `<<=` was highlighted as a logical operator

also added `%`
---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 4 +++-
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 0a5b266..66f79dc 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -14,10 +14,12 @@ patterns:
   match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
 - name: keyword.control.arrow.kit
   match: =\>
+- name: keyword.operator.kit
+  match: <<=|>>=
 - name: keyword.operator.logical.kit
   match: ==|<=|>=|!=|>|<|\||&
 - name: keyword.operator.kit
-  match: (=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
+  match: (=|-|\+|--|\+\+|\*|<<|>>|%)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
 
 
 - name: support.type.kit
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index 61ff1a2..e47d59d 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -44,6 +44,12 @@
         <key>match</key>
         <string>=></string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>keyword.operator.kit</string>
+        <key>match</key>
+        <string><<=|>>=</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>keyword.operator.logical.kit</string>
@@ -54,7 +60,7 @@
         <key>name</key>
         <string>keyword.operator.kit</string>
         <key>match</key>
-        <string>(=|-|\+|--|\+\+|\*|<<|>>)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
+        <string>(=|-|\+|--|\+\+|\*|<<|>>|%)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
       </dict>
       <dict>
         <key>name</key>

From d1b8418b46bd69595753aed84a0577287fb7fec0 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Thu, 16 May 2019 11:26:36 -0400
Subject: [PATCH 05/16] fixed and/or, added bitwise operators i had missed

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 4 ++--
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 66f79dc..9090113 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -17,9 +17,9 @@ patterns:
 - name: keyword.operator.kit
   match: <<=|>>=
 - name: keyword.operator.logical.kit
-  match: ==|<=|>=|!=|>|<|\||&
+  match: ==|<=|>=|!=|>|<|\|\||&&|!
 - name: keyword.operator.kit
-  match: (=|-|\+|--|\+\+|\*|<<|>>|%)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
+  match: (=|-|\+|--|\+\+|\*|<<|>>|%|&|\^|\||\~)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
 
 
 - name: support.type.kit
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index e47d59d..c32362d 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -54,13 +54,13 @@
         <key>name</key>
         <string>keyword.operator.logical.kit</string>
         <key>match</key>
-        <string>==|<=|>=|!=|>|<|\||&</string>
+        <string>==|<=|>=|!=|>|<|\|\||&&|!</string>
       </dict>
       <dict>
         <key>name</key>
         <string>keyword.operator.kit</string>
         <key>match</key>
-        <string>(=|-|\+|--|\+\+|\*|<<|>>|%)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
+        <string>(=|-|\+|--|\+\+|\*|<<|>>|%|&|\^|\||\~)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
       </dict>
       <dict>
         <key>name</key>

From c92adfb563b9be85b581a786ce1dd3f9369a5fb9 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Thu, 16 May 2019 15:43:57 -0400
Subject: [PATCH 06/16] re-add highlighting for /, fix match scope for << and
 >>

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 4 ++--
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 9090113..46e36b1 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -15,11 +15,11 @@ patterns:
 - name: keyword.control.arrow.kit
   match: =\>
 - name: keyword.operator.kit
-  match: <<=|>>=
+  match: <<=|>>=|<<|>>
 - name: keyword.operator.logical.kit
   match: ==|<=|>=|!=|>|<|\|\||&&|!
 - name: keyword.operator.kit
-  match: (=|-|\+|--|\+\+|\*|<<|>>|%|&|\^|\||\~)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
+  match: (=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
 
 
 - name: support.type.kit
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index c32362d..391cd69 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -48,7 +48,7 @@
         <key>name</key>
         <string>keyword.operator.kit</string>
         <key>match</key>
-        <string><<=|>>=</string>
+        <string><<=|>>=|<<|>></string>
       </dict>
       <dict>
         <key>name</key>
@@ -60,7 +60,7 @@
         <key>name</key>
         <string>keyword.operator.kit</string>
         <key>match</key>
-        <string>(=|-|\+|--|\+\+|\*|<<|>>|%|&|\^|\||\~)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
+        <string>(=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
       </dict>
       <dict>
         <key>name</key>

From 98a9f2eed23a46b1624930d6b45df3362a748c3f Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Thu, 16 May 2019 15:51:43 -0400
Subject: [PATCH 07/16] make sure // comments don't highlight like operators

also removed character escape matching that didn't seem to work because I had not intended to commit it previously
---
 .../syntaxes/kit.YAML-tmLanguage              | 15 ++++----
 utils/vscode-kitlang/syntaxes/kit.tmLanguage  | 36 ++++++++-----------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 46e36b1..3664175 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -12,6 +12,13 @@ patterns:
   match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b
 - name: storage.type.kit
   match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
+
+- name: comment.line.double-slash.kit
+  match: "(//).*$\n?"
+- name: comment.block.kit
+  begin: '/\*'
+  end: '\*/'
+
 - name: keyword.control.arrow.kit
   match: =\>
 - name: keyword.operator.kit
@@ -48,14 +55,6 @@ patterns:
   match: '"(\.|[^"])*"'
 - name: string.quoted.single.kit
   match: ''(\.|[^\'])*''
-- name: constant.character.escape
-  match: (\\[abefnrtv\\\'\"?])|(\\[01234567]{1,3})|(\\x[0123456789aAbBcCdDeEfF]{2})|(\\u[0123456789aAbBcCdDeEfF]{4})|(\\U[0123456789aAbBcCdDeEfF]{8})
-
-- name: comment.line.double-slash.kit
-  match: "(//).*$\n?"
-- name: comment.block.kit
-  begin: '/\*'
-  end: '\*/'
 
 - name: constant.language.kit
   match: \b(true|false|null)\b
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index 391cd69..df504f5 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -38,6 +38,21 @@
         <key>match</key>
         <string>\b(struct|enum|union|abstract|rule|rules|typedef|trait)\b</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>comment.line.double-slash.kit</string>
+        <key>match</key>
+        <string>(//).*$
+?</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>comment.block.kit</string>
+        <key>begin</key>
+        <string>/\*</string>
+        <key>end</key>
+        <string>\*/</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>keyword.control.arrow.kit</string>
@@ -132,27 +147,6 @@
         <key>match</key>
         <string>'(\.|[^\'])*'</string>
       </dict>
-      <dict>
-        <key>name</key>
-        <string>constant.character.escape</string>
-        <key>match</key>
-        <string>(\\[abefnrtv\\\'\"?])|(\\[01234567]{1,3})|(\\x[0123456789aAbBcCdDeEfF]{2})|(\\u[0123456789aAbBcCdDeEfF]{4})|(\\U[0123456789aAbBcCdDeEfF]{8})</string>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>comment.line.double-slash.kit</string>
-        <key>match</key>
-        <string>(//).*$
-?</string>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>comment.block.kit</string>
-        <key>begin</key>
-        <string>/\*</string>
-        <key>end</key>
-        <string>\*/</string>
-      </dict>
       <dict>
         <key>name</key>
         <string>constant.language.kit</string>

From c7cb24731ac0256ad238621a6b7492301e4c482f Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Fri, 17 May 2019 00:18:33 -0400
Subject: [PATCH 08/16] add highlighting for inline c code

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 4 +++-
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 3664175..7ec16fa 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -28,7 +28,6 @@ patterns:
 - name: keyword.operator.kit
   match: (=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
 
-
 - name: support.type.kit
   match: '\b[A-Z][a-zA-Z0-9_]*\b'
 - name: variable.language.kit
@@ -59,6 +58,9 @@ patterns:
 - name: constant.language.kit
   match: \b(true|false|null)\b
 
+- name: keyword.operator.expression
+  match: (```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)
+
 - name: markup.heading.metadata.kit
   begin: '\#\['
   end: '\]'
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index df504f5..8710edd 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -153,6 +153,12 @@
         <key>match</key>
         <string>\b(true|false|null)\b</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>keyword.operator.expression</string>
+        <key>match</key>
+        <string>(```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>markup.heading.metadata.kit</string>

From 02d543f48b265861a756f26423c1d43b26fca57c Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Sun, 19 May 2019 01:14:16 -0400
Subject: [PATCH 09/16] reorder type and this/Self to correctly highlight

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 4 ++--
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 7ec16fa..4f14983 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -28,10 +28,10 @@ patterns:
 - name: keyword.operator.kit
   match: (=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
 
-- name: support.type.kit
-  match: '\b[A-Z][a-zA-Z0-9_]*\b'
 - name: variable.language.kit
   match: \b(this|Self)\b
+- name: support.type.kit
+  match: '\b[A-Z][a-zA-Z0-9_]*\b'
 - name: invalid.illegal.macro.kit
   match: '\$[A-Za-z0-9_]+\b'
 - name: invalid.illegal.macro.kit
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index 8710edd..b36a302 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -79,15 +79,15 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>support.type.kit</string>
+        <string>variable.language.kit</string>
         <key>match</key>
-        <string>\b[A-Z][a-zA-Z0-9_]*\b</string>
+        <string>\b(this|Self)\b</string>
       </dict>
       <dict>
         <key>name</key>
-        <string>variable.language.kit</string>
+        <string>support.type.kit</string>
         <key>match</key>
-        <string>\b(this|Self)\b</string>
+        <string>\b[A-Z][a-zA-Z0-9_]*\b</string>
       </dict>
       <dict>
         <key>name</key>

From 0fe01673e9b07bd3603048ead0bf8e2db3dbc40c Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Sun, 19 May 2019 14:37:02 -0400
Subject: [PATCH 10/16] add matching for comma, colon, semicolon

---
 .../syntaxes/kit.YAML-tmLanguage              |  8 +++++++-
 utils/vscode-kitlang/syntaxes/kit.tmLanguage  | 20 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 4f14983..dc1e6f5 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -58,8 +58,14 @@ patterns:
 - name: constant.language.kit
   match: \b(true|false|null)\b
 
-- name: keyword.operator.expression
+- name: keyword.operator.expression.kit
   match: (```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)
+- name: punctuation.separator.comma.kit
+  match: ,
+- name: punctuation.separator.colon.kit
+  match: :
+- name: punctuation.separator.semicolon.kit
+  match: ;
 
 - name: markup.heading.metadata.kit
   begin: '\#\['
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index b36a302..6d53bb0 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -155,10 +155,28 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>keyword.operator.expression</string>
+        <string>keyword.operator.expression.kit</string>
         <key>match</key>
         <string>(```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.separator.comma.kit</string>
+        <key>match</key>
+        <string>,</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.separator.colon.kit</string>
+        <key>match</key>
+        <string>:</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.separator.semicolon.kit</string>
+        <key>match</key>
+        <string>;</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>markup.heading.metadata.kit</string>

From 87fcedff8e9958ab8f313363aff1a8d4952ed1a5 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Mon, 24 Jun 2019 17:10:29 -0400
Subject: [PATCH 11/16] update with latest files from
 https://github.com/AlexPoulsen/kit-vscode

---
 .../syntaxes/kit.YAML-tmLanguage              |  16 +-
 utils/vscode-kitlang/syntaxes/kit.tmLanguage  | 291 ++++++++++++++++--
 2 files changed, 270 insertions(+), 37 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index dc1e6f5..754e54d 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -9,7 +9,7 @@ patterns:
 - name: storage.modifier.kit
   match: \b(private|public|static|const|inline)\b
 - name: keyword.other.kit
-  match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b
+  match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof|continue|break)\b
 - name: storage.type.kit
   match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
 
@@ -26,12 +26,18 @@ patterns:
 - name: keyword.operator.logical.kit
   match: ==|<=|>=|!=|>|<|\|\||&&|!
 - name: keyword.operator.kit
-  match: (=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|(\.{3})|((?<=[^\.])\.(?=[^\.]))
+  match: (=|==|<=|>=|!=|-|\+|--|\+\+|\*|\||>|<|<<|>>|&)|((?<=[^\.])\.\.\.(?=[^\.]))|((?<=[^\.])\.(?=[^\.]))
 
 - name: variable.language.kit
   match: \b(this|Self)\b
 - name: support.type.kit
   match: '\b[A-Z][a-zA-Z0-9_]*\b'
+- name: punctuation.separator.comma.kit
+  match: ,
+- name: punctuation.separator.colon.kit
+  match: :
+- name: punctuation.separator.semicolon.kit
+  match: ;
 - name: invalid.illegal.macro.kit
   match: '\$[A-Za-z0-9_]+\b'
 - name: invalid.illegal.macro.kit
@@ -60,12 +66,6 @@ patterns:
 
 - name: keyword.operator.expression.kit
   match: (```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)
-- name: punctuation.separator.comma.kit
-  match: ,
-- name: punctuation.separator.colon.kit
-  match: :
-- name: punctuation.separator.semicolon.kit
-  match: ;
 
 - name: markup.heading.metadata.kit
   begin: '\#\['
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index 6d53bb0..6b13925 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -14,29 +14,107 @@
     <string>4fc8848b-af63-4ac5-850f-8e6b00a45004</string>
     <key>patterns</key>
     <array>
+      <dict>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.kit</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.function.kit</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>6</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>8</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>9</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>10</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>12</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.return.kit</string>
+          </dict>
+          <key>13</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.return.kit</string>
+          </dict>
+          <key>14</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.return.kit</string>
+          </dict>
+          <key>7</key>
+          <dict>
+            <key>name</key>
+            <string>punctuation.separator.comma.kit</string>
+          </dict>
+          <key>11</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.arrow.kit</string>
+          </dict>
+        </dict>
+        <key>match</key>
+        <string>\b((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>keyword.control.kit</string>
         <key>match</key>
-        <string>\b(import|include|function|implement|specialize|var|using)\b</string>
+        <string>\b(import|include|function|implement|specialize|using|macro|rule|rules|typedef|trait)\b</string>
       </dict>
       <dict>
         <key>name</key>
         <string>storage.modifier.kit</string>
         <key>match</key>
-        <string>\b(private|public|static|const|inline)\b</string>
+        <string>\b(private|public|static|inline)\b</string>
       </dict>
       <dict>
         <key>name</key>
         <string>keyword.other.kit</string>
         <key>match</key>
-        <string>\b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b</string>
+        <string>\b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof|continue|break)\b</string>
       </dict>
       <dict>
         <key>name</key>
         <string>storage.type.kit</string>
         <key>match</key>
-        <string>\b(struct|enum|union|abstract|rule|rules|typedef|trait)\b</string>
+        <string>\b(struct|enum|union|abstract|var|const)\b</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>comment.line.debug.kit</string>
+        <key>match</key>
+        <string>(?:[\t ]*)(?'line'\/\/ printf.*)</string>
       </dict>
       <dict>
         <key>name</key>
@@ -63,19 +141,25 @@
         <key>name</key>
         <string>keyword.operator.kit</string>
         <key>match</key>
-        <string><<=|>>=|<<|>></string>
+        <string>(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])(<<=|>>=|<<|>>)(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])</string>
       </dict>
       <dict>
         <key>name</key>
         <string>keyword.operator.logical.kit</string>
         <key>match</key>
-        <string>==|<=|>=|!=|>|<|\|\||&&|!</string>
+        <string>(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])(==|<=|>=|!=|>|<|\|\||&&|!)(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])</string>
       </dict>
       <dict>
         <key>name</key>
         <string>keyword.operator.kit</string>
         <key>match</key>
-        <string>(=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|(\.{3})|((?<=[^\.])\.(?=[^\.]))</string>
+        <string>(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])((=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|((?<=[^\.])\.\.\.(?=[^\.]))|((?<=[^\.])\.(?=[^\.])))(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>keyword.operator.custom.kit</string>
+        <key>match</key>
+        <string>[\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.]+</string>
       </dict>
       <dict>
         <key>name</key>
@@ -87,21 +171,31 @@
         <key>name</key>
         <string>support.type.kit</string>
         <key>match</key>
-        <string>\b[A-Z][a-zA-Z0-9_]*\b</string>
+        <string>\b((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_]*)\b</string>
       </dict>
       <dict>
         <key>name</key>
-        <string>invalid.illegal.macro.kit</string>
+        <string>punctuation.separator.comma.kit</string>
         <key>match</key>
-        <string>\$[A-Za-z0-9_]+\b</string>
+        <string>,</string>
       </dict>
       <dict>
         <key>name</key>
-        <string>invalid.illegal.macro.kit</string>
-        <key>begin</key>
-        <string>\$\{</string>
-        <key>end</key>
-        <string>\}</string>
+        <string>punctuation.separator.colon.kit</string>
+        <key>match</key>
+        <string>:</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.separator.semicolon.kit</string>
+        <key>match</key>
+        <string>;</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.bracket.kit</string>
+        <key>match</key>
+        <string>\[|\]</string>
       </dict>
       <dict>
         <key>name</key>
@@ -139,13 +233,19 @@
         <key>name</key>
         <string>string.quoted.double.kit</string>
         <key>match</key>
-        <string>"(\.|[^"])*"</string>
+        <string>"(?:\\"|[^"])*"</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>string.character.kit</string>
+        <key>match</key>
+        <string>c((\'.\')|(\'\\[abefnrtv\\\'\"?]\')|(\'\\[01234567]{1,3}\')|(\'\\x[0123456789aAbBcCdDeEfF]{2}\'))</string>
       </dict>
       <dict>
         <key>name</key>
         <string>string.quoted.single.kit</string>
         <key>match</key>
-        <string>'(\.|[^\'])*'</string>
+        <string>'(?:\\'|[^'])*'</string>
       </dict>
       <dict>
         <key>name</key>
@@ -161,29 +261,29 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>punctuation.separator.comma.kit</string>
-        <key>match</key>
-        <string>,</string>
+        <string>markup.heading.metadata.kit</string>
+        <key>begin</key>
+        <string>\#\[</string>
+        <key>end</key>
+        <string>\]</string>
       </dict>
       <dict>
         <key>name</key>
-        <string>punctuation.separator.colon.kit</string>
+        <string>variable.function.print.kit</string>
         <key>match</key>
-        <string>:</string>
+        <string>(\bprintf(?=\()\b)|((?<!function )\bprint[a-zA-Z0-9_]*(?=\()\b)</string>
       </dict>
       <dict>
         <key>name</key>
-        <string>punctuation.separator.semicolon.kit</string>
+        <string>variable.function.constructor.kit</string>
         <key>match</key>
-        <string>;</string>
+        <string>(?<=\.)\bnew[a-zA-Z0-9_]*(?=\()\b</string>
       </dict>
       <dict>
         <key>name</key>
-        <string>markup.heading.metadata.kit</string>
-        <key>begin</key>
-        <string>\#\[</string>
-        <key>end</key>
-        <string>\]</string>
+        <string>variable.function.allocation.kit</string>
+        <key>match</key>
+        <string>(?<!function )((\bmalloc(?=\())|(\balloc(?=\())|(\brealloc(?=\())|(\bfree(?=\())|(\bcalloc(?=\()))</string>
       </dict>
       <dict>
         <key>name</key>
@@ -197,6 +297,139 @@
         <key>match</key>
         <string>\b[a-z_][A-Za-z0-9_]*\b</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>meta.preprocessor.rewrite.identifier.kit</string>
+        <key>match</key>
+        <string>\$[A-Za-z0-9_]+\b</string>
+      </dict>
+      <dict>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.dollarsign.kit</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.variable.kit</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.colon.kit</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>6</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>7</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>8</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.dollarsign.kit</string>
+          </dict>
+          <key>9</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.dollarsign.kit</string>
+          </dict>
+          <key>10</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.variable.kit</string>
+          </dict>
+          <key>11</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.colon.kit</string>
+          </dict>
+          <key>12</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.kit</string>
+          </dict>
+          <key>14</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.function.kit</string>
+          </dict>
+          <key>16</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>17</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>18</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>19</key>
+          <dict>
+            <key>name</key>
+            <string>punctuation.separator.comma.kit</string>
+          </dict>
+          <key>20</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>21</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>22</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.input.kit</string>
+          </dict>
+          <key>23</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.arrow.kit</string>
+          </dict>
+          <key>24</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.return.kit</string>
+          </dict>
+          <key>25</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.return.kit</string>
+          </dict>
+          <key>26</key>
+          <dict>
+            <key>name</key>
+            <string>support.type.function.return.kit</string>
+          </dict>
+          <key>27</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.dollarsign.kit</string>
+          </dict>
+        </dict>
+        <key>match</key>
+        <string>(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]\(\)]*)(\})|(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})</string>
+      </dict>
     </array>
   </dict>
 </plist>

From 3619e2ddbc7038b01b8af6fd05cedf63830d8985 Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Wed, 10 Jul 2019 16:25:31 -0400
Subject: [PATCH 12/16] add assignment operators to operator regex

otherwise they are highlighted as custom operators
---
 utils/vscode-kitlang/syntaxes/kit.tmLanguage | 38 ++++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index 6b13925..d7f3d97 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -131,6 +131,24 @@
         <key>end</key>
         <string>\*/</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.separator.comma.kit</string>
+        <key>match</key>
+        <string>,</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.separator.colon.kit</string>
+        <key>match</key>
+        <string>:</string>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>punctuation.separator.semicolon.kit</string>
+        <key>match</key>
+        <string>;</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>keyword.control.arrow.kit</string>
@@ -153,7 +171,7 @@
         <key>name</key>
         <string>keyword.operator.kit</string>
         <key>match</key>
-        <string>(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])((=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/)|((?<=[^\.])\.\.\.(?=[^\.]))|((?<=[^\.])\.(?=[^\.])))(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])</string>
+        <string>(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])((=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/|-=|\+=|\*=|\/=|%=)|((?<=[^\.])\.\.\.(?=[^\.]))|((?<=[^\.])\.(?=[^\.])))(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])</string>
       </dict>
       <dict>
         <key>name</key>
@@ -173,24 +191,6 @@
         <key>match</key>
         <string>\b((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_]*)\b</string>
       </dict>
-      <dict>
-        <key>name</key>
-        <string>punctuation.separator.comma.kit</string>
-        <key>match</key>
-        <string>,</string>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>punctuation.separator.colon.kit</string>
-        <key>match</key>
-        <string>:</string>
-      </dict>
-      <dict>
-        <key>name</key>
-        <string>punctuation.separator.semicolon.kit</string>
-        <key>match</key>
-        <string>;</string>
-      </dict>
       <dict>
         <key>name</key>
         <string>punctuation.bracket.kit</string>

From 35d26232af144b9a3be4311c5d47f117b5ad8eaa Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Wed, 10 Jul 2019 16:26:53 -0400
Subject: [PATCH 13/16] improve rewrite rule matching

a lot changed and i did it weeks ago, i don't remember exactly why it changed
---
 utils/vscode-kitlang/syntaxes/kit.tmLanguage | 85 +++++++++++++++-----
 1 file changed, 63 insertions(+), 22 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index d7f3d97..cfecd3c 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -267,6 +267,12 @@
         <key>end</key>
         <string>\]</string>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>variable.function.main.kit</string>
+        <key>match</key>
+        <string>((?<=function )\bmain(?=\()\b)</string>
+      </dict>
       <dict>
         <key>name</key>
         <string>variable.function.print.kit</string>
@@ -321,114 +327,149 @@
             <key>name</key>
             <string>meta.preprocessor.rewrite.colon.kit</string>
           </dict>
-          <key>5</key>
+          <key>6</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.type.kit</string>
           </dict>
-          <key>6</key>
+          <key>7</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.type.kit</string>
           </dict>
-          <key>7</key>
+          <key>8</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.type.kit</string>
           </dict>
-          <key>8</key>
+          <key>9</key>
+          <dict>
+            <key>name</key>
+            <string>punctuation.separator.comma.kit</string>
+          </dict>
+          <key>10</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>11</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>12</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>14</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>15</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>16</key>
+          <dict>
+            <key>name</key>
+            <string>meta.preprocessor.rewrite.type.kit</string>
+          </dict>
+          <key>17</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.dollarsign.kit</string>
           </dict>
-          <key>9</key>
+          <key>18</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.dollarsign.kit</string>
           </dict>
-          <key>10</key>
+          <key>19</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.variable.kit</string>
           </dict>
-          <key>11</key>
+          <key>20</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.colon.kit</string>
           </dict>
-          <key>12</key>
+          <key>21</key>
           <dict>
             <key>name</key>
             <string>support.type.function.kit</string>
           </dict>
-          <key>14</key>
+          <key>23</key>
           <dict>
             <key>name</key>
             <string>support.type.function.function.kit</string>
           </dict>
-          <key>16</key>
+          <key>25</key>
           <dict>
             <key>name</key>
             <string>support.type.function.input.kit</string>
           </dict>
-          <key>17</key>
+          <key>26</key>
           <dict>
             <key>name</key>
             <string>support.type.function.input.kit</string>
           </dict>
-          <key>18</key>
+          <key>27</key>
           <dict>
             <key>name</key>
             <string>support.type.function.input.kit</string>
           </dict>
-          <key>19</key>
+          <key>28</key>
           <dict>
             <key>name</key>
             <string>punctuation.separator.comma.kit</string>
           </dict>
-          <key>20</key>
+          <key>29</key>
           <dict>
             <key>name</key>
             <string>support.type.function.input.kit</string>
           </dict>
-          <key>21</key>
+          <key>30</key>
           <dict>
             <key>name</key>
             <string>support.type.function.input.kit</string>
           </dict>
-          <key>22</key>
+          <key>31</key>
           <dict>
             <key>name</key>
             <string>support.type.function.input.kit</string>
           </dict>
-          <key>23</key>
+          <key>32</key>
           <dict>
             <key>name</key>
             <string>keyword.control.arrow.kit</string>
           </dict>
-          <key>24</key>
+          <key>33</key>
           <dict>
             <key>name</key>
             <string>support.type.function.return.kit</string>
           </dict>
-          <key>25</key>
+          <key>34</key>
           <dict>
             <key>name</key>
             <string>support.type.function.return.kit</string>
           </dict>
-          <key>26</key>
+          <key>35</key>
           <dict>
             <key>name</key>
             <string>support.type.function.return.kit</string>
           </dict>
-          <key>27</key>
+          <key>36</key>
           <dict>
             <key>name</key>
             <string>meta.preprocessor.rewrite.dollarsign.kit</string>
           </dict>
         </dict>
         <key>match</key>
-        <string>(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]\(\)]*)(\})|(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})</string>
+        <string>(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)(\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\)|((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})|(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})</string>
       </dict>
     </array>
   </dict>

From 8c6d87b61b7120adcce89f5c2665c9e7a3c57f4b Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Wed, 10 Jul 2019 16:27:22 -0400
Subject: [PATCH 14/16] copy over changes from .tmLanguage to .YAML-tmLanguage

---
 .../syntaxes/kit.YAML-tmLanguage              | 173 ++++++++++++++----
 1 file changed, 134 insertions(+), 39 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 754e54d..f0358df 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -1,77 +1,172 @@
-fileTypes: ["kit"]
+fileTypes: [kit]
 name: Kit
 scopeName: source.kit
 uuid: 4fc8848b-af63-4ac5-850f-8e6b00a45004
-
 patterns:
+- captures:
+  '1':
+    name: support.type.function.kit
+  '2':
+    name: support.type.function.function.kit
+  '4':
+    name: support.type.function.input.kit
+  '5':
+    name: support.type.function.input.kit
+  '6':
+    name: support.type.function.input.kit
+  '7':
+    name: punctuation.separator.comma.kit
+  '8':
+    name: support.type.function.input.kit
+  '9':
+    name: support.type.function.input.kit
+  '10':
+    name: support.type.function.input.kit
+  '11':
+    name: keyword.control.arrow.kit
+  '12':
+    name: support.type.function.return.kit
+  '13':
+    name: support.type.function.return.kit
+  '14':
+    name: support.type.function.return.kit
+  match: '\b((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))'
 - name: keyword.control.kit
-  match: \b(import|include|function|implement|specialize|var|using)\b
+  match: \b(import|include|function|implement|specialize|using|macro|rule|rules|typedef|trait)\b
 - name: storage.modifier.kit
-  match: \b(private|public|static|const|inline)\b
+  match: \b(private|public|static|inline)\b
 - name: keyword.other.kit
   match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof|continue|break)\b
 - name: storage.type.kit
-  match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
-
+  match: \b(struct|enum|union|abstract|var|const)\b
+- name: comment.line.debug.kit
+  match: '(?:[\t ]*)(?''line''\/\/ printf.*)'
 - name: comment.line.double-slash.kit
   match: "(//).*$\n?"
 - name: comment.block.kit
   begin: '/\*'
   end: '\*/'
-
+- name: punctuation.separator.comma.kit
+  match: ','
+- name: punctuation.separator.colon.kit
+  match: ':'
+- name: punctuation.separator.semicolon.kit
+  match: ;
 - name: keyword.control.arrow.kit
-  match: =\>
+  match: '=>'
 - name: keyword.operator.kit
-  match: <<=|>>=|<<|>>
+  match: '(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])(<<=|>>=|<<|>>)(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])'
 - name: keyword.operator.logical.kit
-  match: ==|<=|>=|!=|>|<|\|\||&&|!
+  match: '(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])(==|<=|>=|!=|>|<|\|\||&&|!)(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])'
 - name: keyword.operator.kit
-  match: (=|==|<=|>=|!=|-|\+|--|\+\+|\*|\||>|<|<<|>>|&)|((?<=[^\.])\.\.\.(?=[^\.]))|((?<=[^\.])\.(?=[^\.]))
-
+  match: '(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])((=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/|-=|\+=|\*=|\/=|%=)|((?<=[^\.])\.\.\.(?=[^\.]))|((?<=[^\.])\.(?=[^\.])))(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])'
+- name: keyword.operator.custom.kit
+  match: '[\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.]+'
 - name: variable.language.kit
   match: \b(this|Self)\b
 - name: support.type.kit
-  match: '\b[A-Z][a-zA-Z0-9_]*\b'
-- name: punctuation.separator.comma.kit
-  match: ,
-- name: punctuation.separator.colon.kit
-  match: :
-- name: punctuation.separator.semicolon.kit
-  match: ;
-- name: invalid.illegal.macro.kit
-  match: '\$[A-Za-z0-9_]+\b'
-- name: invalid.illegal.macro.kit
-  begin: '\$\{'
-  end: '\}'
-
+  match: '\b((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_]*)\b'
+- name: punctuation.bracket.kit
+  match: '\[|\]'
 - name: constant.numeric.decimal.kit
-  match: \b-?[0-9]+(\.[0-9]+)?(_([ui](8|16|32|64)|f(32|64)))?\b
+  match: '\b-?[0-9]+(\.[0-9]+)?(_([ui](8|16|32|64)|f(32|64)))?\b'
 - name: constant.numeric.octal.kit
-  match: \b-?0o[0-7]+(_([ui](8|16|32|64)|f(32|64)))?\b
+  match: '\b-?0o[0-7]+(_([ui](8|16|32|64)|f(32|64)))?\b'
 - name: constant.numeric.hex.kit
-  match: \b-?0x[0-9a-f]+(_([ui](8|16|32|64)|f(32|64)))?\b
+  match: '\b-?0x[0-9a-f]+(_([ui](8|16|32|64)|f(32|64)))?\b'
 - name: constant.numeric.bin.kit
-  match: \b-?0b[01]+(_([ui](8|16|32|64)|f(32|64)))?\b
-
+  match: '\b-?0b[01]+(_([ui](8|16|32|64)|f(32|64)))?\b'
 - name: string.quoted.block.kit
   begin: '"""'
   end: '"""'
 - name: string.quoted.double.kit
-  match: '"(\.|[^"])*"'
+  match: '"(?:\\"|[^"])*"'
+- name: string.character.kit
+  match: 'c((\''.\'')|(\''\\[abefnrtv\\\''\"?]\'')|(\''\\[01234567]{1,3}\'')|(\''\\x[0123456789aAbBcCdDeEfF]{2}\''))'
 - name: string.quoted.single.kit
-  match: ''(\.|[^\'])*''
-
+  match: '''(?:\\''|[^''])*'''
 - name: constant.language.kit
   match: \b(true|false|null)\b
-
 - name: keyword.operator.expression.kit
-  match: (```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)
-
+  match: '(```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)'
 - name: markup.heading.metadata.kit
   begin: '\#\['
   end: '\]'
-
+- name: variable.function.main.kit
+  match: '((?<=function )\bmain(?=\()\b)'
+- name: variable.function.print.kit
+  match: '(\bprintf(?=\()\b)|((?<!function )\bprint[a-zA-Z0-9_]*(?=\()\b)'
+- name: variable.function.constructor.kit
+  match: '(?<=\.)\bnew[a-zA-Z0-9_]*(?=\()\b'
+- name: variable.function.allocation.kit
+  match: '(?<!function )((\bmalloc(?=\())|(\balloc(?=\())|(\brealloc(?=\())|(\bfree(?=\())|(\bcalloc(?=\()))'
 - name: variable.function.kit
-  match: \b[a-z_][A-Za-z0-9_]*(?=\()\b
+  match: '\b[a-z_][A-Za-z0-9_]*(?=\()\b'
 - name: variable.parameter.kit
-  match: \b[a-z_][A-Za-z0-9_]*\b
+  match: '\b[a-z_][A-Za-z0-9_]*\b'
+- name: meta.preprocessor.rewrite.identifier.kit
+  match: '\$[A-Za-z0-9_]+\b'
+- captures:
+  '1':
+    name: meta.preprocessor.rewrite.dollarsign.kit
+  '2':
+    name: meta.preprocessor.rewrite.variable.kit
+  '3':
+    name: meta.preprocessor.rewrite.colon.kit
+  '6':
+    name: meta.preprocessor.rewrite.type.kit
+  '7':
+    name: meta.preprocessor.rewrite.type.kit
+  '8':
+    name: meta.preprocessor.rewrite.type.kit
+  '9':
+    name: punctuation.separator.comma.kit
+  '10':
+    name: meta.preprocessor.rewrite.type.kit
+  '11':
+    name: meta.preprocessor.rewrite.type.kit
+  '12':
+    name: meta.preprocessor.rewrite.type.kit
+  '14':
+    name: meta.preprocessor.rewrite.type.kit
+  '15':
+    name: meta.preprocessor.rewrite.type.kit
+  '16':
+    name: meta.preprocessor.rewrite.type.kit
+  '17':
+    name: meta.preprocessor.rewrite.dollarsign.kit
+  '18':
+    name: meta.preprocessor.rewrite.dollarsign.kit
+  '19':
+    name: meta.preprocessor.rewrite.variable.kit
+  '20':
+    name: meta.preprocessor.rewrite.colon.kit
+  '21':
+    name: support.type.function.kit
+  '23':
+    name: support.type.function.function.kit
+  '25':
+    name: support.type.function.input.kit
+  '26':
+    name: support.type.function.input.kit
+  '27':
+    name: support.type.function.input.kit
+  '28':
+    name: punctuation.separator.comma.kit
+  '29':
+    name: support.type.function.input.kit
+  '30':
+    name: support.type.function.input.kit
+  '31':
+    name: support.type.function.input.kit
+  '32':
+    name: keyword.control.arrow.kit
+  '33':
+    name: support.type.function.return.kit
+  '34':
+    name: support.type.function.return.kit
+  '35':
+    name: support.type.function.return.kit
+  '36':
+    name: meta.preprocessor.rewrite.dollarsign.kit
+  match: '(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)(\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\)|((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})|(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})'

From 150a38fbfae08eae1455bb9f1f84a755305f46eb Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Wed, 10 Jul 2019 22:37:43 -0400
Subject: [PATCH 15/16] add support for generic functions

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 2 +-
 utils/vscode-kitlang/syntaxes/kit.tmLanguage      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index f0358df..20cce44 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -101,7 +101,7 @@ patterns:
 - name: variable.function.allocation.kit
   match: '(?<!function )((\bmalloc(?=\())|(\balloc(?=\())|(\brealloc(?=\())|(\bfree(?=\())|(\bcalloc(?=\()))'
 - name: variable.function.kit
-  match: '\b[a-z_][A-Za-z0-9_]*(?=\()\b'
+  match: '(((?<=function )\b[a-z_][A-Za-z0-9_]*(?=\[[A-Z][A-Za-z0-9_]*\]\()))|(\b[a-z_][A-Za-z0-9_]*(?=\()\b)'
 - name: variable.parameter.kit
   match: '\b[a-z_][A-Za-z0-9_]*\b'
 - name: meta.preprocessor.rewrite.identifier.kit
diff --git a/utils/vscode-kitlang/syntaxes/kit.tmLanguage b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
index cfecd3c..2b65590 100644
--- a/utils/vscode-kitlang/syntaxes/kit.tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.tmLanguage
@@ -295,7 +295,7 @@
         <key>name</key>
         <string>variable.function.kit</string>
         <key>match</key>
-        <string>\b[a-z_][A-Za-z0-9_]*(?=\()\b</string>
+        <string>(((?<=function )\b[a-z_][A-Za-z0-9_]*(?=\[[A-Z][A-Za-z0-9_]*\]\()))|(\b[a-z_][A-Za-z0-9_]*(?=\()\b)</string>
       </dict>
       <dict>
         <key>name</key>

From 91ae7f3c1e2a2e50dd778c1622d3b721ce8e54ae Mon Sep 17 00:00:00 2001
From: Alex Poulsen <AlexPoulsen@users.noreply.github.com>
Date: Wed, 10 Jul 2019 22:39:15 -0400
Subject: [PATCH 16/16] add quotes in yaml

---
 utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
index 20cce44..f91603c 100644
--- a/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
+++ b/utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
@@ -1,4 +1,4 @@
-fileTypes: [kit]
+fileTypes: ["kit"]
 name: Kit
 scopeName: source.kit
 uuid: 4fc8848b-af63-4ac5-850f-8e6b00a45004