Merge pull request #295 from JuliaEditorSupport/sp/typegroup

feat: add support for typegroup syntax

Author: pfitzseb

grammars/julia.cson

@@ -267,7 +267,7 @@ repository:
   keyword:
     patterns: [
       {
-        match: '\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b'
+        match: '\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|typegroup|module|baremodule|where)\\b'
         name: 'keyword.other.julia'
       }
       {

grammars/julia.json

@@ -299,7 +299,7 @@
     "keyword": {
       "patterns": [
         {
-          "match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
+          "match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|typegroup|module|baremodule|where)\\b",
           "name": "keyword.other.julia"
         },
         {

template/julia.json

@@ -299,7 +299,7 @@
     "keyword": {
       "patterns": [
         {
-          "match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
+          "match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|typegroup|module|baremodule|where)\\b",
           "name": "keyword.other.julia"
         },
         {

test/test.js

@@ -3786,6 +3786,31 @@ describe('Julia grammar', function () {
             },
         ])
     })
+    it("tokenizes typegroup", function () {
+        const tokens = tokenize(grammar, 'typegroup\nstruct Foo end\nend')
+        compareTokens(tokens, [
+            {
+                value: 'typegroup',
+                scopes: ["keyword.other.julia"]
+            },
+            {
+                value: '\n',
+                scopes: []
+            },
+            {
+                value: 'struct',
+                scopes: ["keyword.other.julia"]
+            },
+            {
+                value: ' Foo ',
+                scopes: []
+            },
+            {
+                value: 'end',
+                scopes: ["keyword.control.end.julia"]
+            },
+        ])
+    })
 })
 
 describe('Julia-Console', function () {

variants/julia_vscode.json

@@ -299,7 +299,7 @@
     "keyword": {
       "patterns": [
         {
-          "match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
+          "match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|typegroup|module|baremodule|where)\\b",
           "name": "keyword.other.julia"
         },
         {