Fix Async and Iterator modifiers to be contextual

peters-ben-0007 · Aug 4, 2017 · 3c9329a · 3c9329a
1 parent 9c9b760
commit 3c9329a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/vbdotnet.JSON-tmLanguage b/vbdotnet.JSON-tmLanguage
@@ -39,6 +39,7 @@
   "repository": {
     "keyword-a": {
         "name": "keyword.other.vbnet",
+        "match": "(?i)(?<![.!])(AddHandler|AddressOf|Aggregate|Alias|And|AndAlso|Ansi|As|Ascending|Assembly|Async(?=\\s+(Sub|Function))|Auto|Await)\\b",
         "comment": "keywords A"
     },
     "keyword-b": {
@@ -78,6 +79,7 @@
     },
     "keyword-i": {
         "name": "keyword.other.vbnet",
+        "match": "(?i)(?<![.!])(If|Implements|Imports|In|(?<=Option)\\s+Infer|Inherits|Integer|Interface|Into|Is|IsNot|Iterator(?=\\s+(Function|Property)))\\b",
         "comment": "keywords I"
     },
     "keyword-j": {

diff --git a/vbdotnet.tmLanguage b/vbdotnet.tmLanguage
@@ -213,6 +213,7 @@
 			<key>comment</key>
 			<string>keywords A</string>
 			<key>match</key>
+			<string>(?i)(?&lt;![.!])(AddHandler|AddressOf|Aggregate|Alias|And|AndAlso|Ansi|As|Ascending|Assembly|Async(?=\s+(Sub|Function))|Auto|Await)\b</string>
 			<key>name</key>
 			<string>keyword.other.vbnet</string>
 		</dict>
@@ -284,6 +285,7 @@
 			<key>comment</key>
 			<string>keywords I</string>
 			<key>match</key>
+			<string>(?i)(?&lt;![.!])(If|Implements|Imports|In|(?&lt;=Option)\s+Infer|Inherits|Integer|Interface|Into|Is|IsNot|Iterator(?=\s+(Function|Property)))\b</string>
 			<key>name</key>
 			<string>keyword.other.vbnet</string>
 		</dict>