github-linguist 5.3.3 → 6.0.0

data/grammars/source.r.json

@@ -1,15 +1,10 @@
 {
-  "fileTypes": [
-    "R",
-    "r",
-    "s",
-    "S",
-    "Rprofile"
-  ],
-  "keyEquivalent": "^~R",
   "name": "R",
+  "scopeName": "source.r",
   "patterns": [
     {
+      "name": "comment.line.pragma-mark.r",
+      "match": "^(#pragma[ \\t]+mark)[ \\t](.*)",
       "captures": {
         "1": {
           "name": "comment.line.pragma.r"
@@ -17,114 +12,114 @@
         "2": {
           "name": "entity.name.pragma.name.r"
         }
-      },
-      "match": "^(#pragma[ \\t]+mark)[ \\t](.*)",
-      "name": "comment.line.pragma-mark.r"
+      }
     },
     {
       "begin": "(^[ \\t]+)?(?=#)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.r"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.r",
           "begin": "#",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.r"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.r"
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.r"
         }
-      ]
+      }
     },
     {
-      "match": "\\b(logical|numeric|character|complex|matrix|array|data\\.frame|list|factor)(?=\\s*\\()",
-      "name": "storage.type.r"
+      "name": "storage.type.r",
+      "match": "\\b(logical|numeric|character|complex|matrix|array|data\\.frame|list|factor)(?=\\s*\\()"
     },
     {
-      "match": "\\b(function|if|break|next|repeat|else|for|return|switch|while|in|invisible)\\b",
-      "name": "keyword.control.r"
+      "name": "keyword.control.r",
+      "match": "\\b(function|if|break|next|repeat|else|for|return|switch|while|in|invisible)\\b"
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(i|L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
-      "name": "constant.numeric.r"
+      "name": "constant.numeric.r",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(i|L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
     },
     {
-      "match": "\\b(T|F|TRUE|FALSE|NULL|NA|Inf|NaN)\\b",
-      "name": "constant.language.r"
+      "name": "constant.language.r",
+      "match": "\\b(T|F|TRUE|FALSE|NULL|NA|Inf|NaN)\\b"
     },
     {
-      "match": "\\b(pi|letters|LETTERS|month\\.abb|month\\.name)\\b",
-      "name": "support.constant.misc.r"
+      "name": "support.constant.misc.r",
+      "match": "\\b(pi|letters|LETTERS|month\\.abb|month\\.name)\\b"
     },
     {
-      "match": "(\\-|\\+|\\*|\\/|%\\/%|%%|%\\*%|%in%|%o%|%x%|\\^)",
-      "name": "keyword.operator.arithmetic.r"
+      "name": "keyword.operator.arithmetic.r",
+      "match": "(\\-|\\+|\\*|\\/|%\\/%|%%|%\\*%|%in%|%o%|%x%|\\^)"
     },
     {
-      "match": "(=|<-|<<-|->|->>)",
-      "name": "keyword.operator.assignment.r"
+      "name": "keyword.operator.assignment.r",
+      "match": "(=|\u003c-|\u003c\u003c-|-\u003e|-\u003e\u003e)"
     },
     {
-      "match": "(==|!=|<>|<|>|<=|>=)",
-      "name": "keyword.operator.comparison.r"
+      "name": "keyword.operator.comparison.r",
+      "match": "(==|!=|\u003c\u003e|\u003c|\u003e|\u003c=|\u003e=)"
     },
     {
-      "match": "(!|&{1,2}|[|]{1,2})",
-      "name": "keyword.operator.logical.r"
+      "name": "keyword.operator.logical.r",
+      "match": "(!|\u0026{1,2}|[|]{1,2})"
     },
     {
-      "match": "(\\.\\.\\.|\\$|@|:|\\~)",
-      "name": "keyword.other.r"
+      "name": "keyword.other.r",
+      "match": "(\\.\\.\\.|\\$|@|:|\\~)"
     },
     {
+      "name": "string.quoted.double.r",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.r",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.r"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.r"
         }
-      },
-      "name": "string.quoted.double.r",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.r"
-        }
-      ]
+      }
     },
     {
+      "name": "string.quoted.single.r",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.r",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.r"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.r"
         }
-      },
-      "name": "string.quoted.single.r",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.r"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.function.r",
+      "match": "([[:alpha:].][[:alnum:]._]*)\\s*(\u003c-)\\s*(function)",
       "captures": {
         "1": {
           "name": "entity.name.function.r"
@@ -135,11 +130,11 @@
         "3": {
           "name": "keyword.control.r"
         }
-      },
-      "match": "([[:alpha:].][[:alnum:]._]*)\\s*(<-)\\s*(function)",
-      "name": "meta.function.r"
+      }
     },
     {
+      "name": "meta.method.declaration.r",
+      "match": "(setMethod|setReplaceMethod|setGeneric|setGroupGeneric|setClass)\\s*\\(\\s*([[:alpha:]\\d]+\\s*=\\s*)?(\"|\\x{27})([a-zA-Z._\\[\\$@][a-zA-Z0-9._\\[]*?)\\3.*",
       "captures": {
         "1": {
           "name": "entity.name.tag.r"
@@ -147,14 +142,13 @@
         "4": {
           "name": "entity.name.type.r"
         }
-      },
-      "match": "(setMethod|setReplaceMethod|setGeneric|setGroupGeneric|setClass)\\s*\\(\\s*([[:alpha:]\\d]+\\s*=\\s*)?(\"|\\x{27})([a-zA-Z._\\[\\$@][a-zA-Z0-9._\\[]*?)\\3.*",
-      "name": "meta.method.declaration.r"
+      }
     },
     {
       "match": "([[:alpha:].][[:alnum:]._]*)\\s*\\("
     },
     {
+      "match": "([[:alpha:].][[:alnum:]._]*)\\s*(=)(?=[^=])",
       "captures": {
         "1": {
           "name": "variable.parameter.r"
@@ -162,42 +156,39 @@
         "2": {
           "name": "keyword.operator.assignment.r"
         }
-      },
-      "match": "([[:alpha:].][[:alnum:]._]*)\\s*(=)(?=[^=])"
+      }
     },
     {
-      "match": "\\b([\\d_][[:alnum:]._]+)\\b",
-      "name": "invalid.illegal.variable.other.r"
+      "name": "invalid.illegal.variable.other.r",
+      "match": "\\b([\\d_][[:alnum:]._]+)\\b"
     },
     {
-      "match": "\\b([[:alnum:]_]+)(?=::)",
-      "name": "entity.namespace.r"
+      "name": "entity.namespace.r",
+      "match": "\\b([[:alnum:]_]+)(?=::)"
     },
     {
-      "match": "\\b([[:alnum:]._]+)\\b",
-      "name": "variable.other.r"
+      "name": "variable.other.r",
+      "match": "\\b([[:alnum:]._]+)\\b"
     },
     {
+      "name": "meta.block.r",
       "begin": "\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "source.r"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.block.begin.r"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.r"
         }
-      },
-      "name": "meta.block.r",
-      "patterns": [
-        {
-          "include": "source.r"
-        }
-      ]
+      }
     }
-  ],
-  "scopeName": "source.r",
-  "uuid": "B2E6B78D-6E70-11D9-A369-000D93B3A10E"
-}
+  ]
+}

data/grammars/source.racket.json

@@ -1,30 +1,11 @@
 {
   "name": "Racket (soegaard)",
   "scopeName": "source.racket",
-  "fileTypes": [
-    "rkt"
-  ],
-  "uuid": "c5160d97-e918-473b-a594-3d22afffc0a7",
-  "repository": {
-    "multilinecomment": {
-      "begin": "\\#\\|",
-      "end": "\\|\\#",
-      "name": "comment",
-      "contentName": "comment",
-      "patterns": [
-        {
-          "include": "#multilinecomment",
-          "name": "comment"
-        }
-      ]
-    }
-  },
   "patterns": [
     {
       "include": "#multilinecomment"
     },
     {
-      "comment": "strings, byte strings, regular expressions",
       "name": "constant",
       "begin": "(\\#px|\\#rx)?(\\#)?\\\"",
       "end": "\\\"",
@@ -36,84 +17,82 @@
       ]
     },
     {
-      "comment": "booleans",
       "name": "constant",
       "match": "((\\#[tT])|(\\#[fF])|(\\#true)|(\\#false))(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "character datum",
       "name": "constant",
       "match": "((((?i)((\\#\\\\null)|(\\#\\\\nul)|(\\#\\\\backspace)|(\\#\\\\tab)|(\\#\\\\newline)|(\\#\\\\linefeed)|(\\#\\\\vtab)|(\\#\\\\page)|(\\#\\\\return)|(\\#\\\\space)|(\\#\\\\rubout))(?-i)))|(\\#\\\\(([0-7]){1,3}))|(\\#\\\\u(([0-9abcdefABCDEF]){1,4}))|(\\#\\\\U(([0-9abcdefABCDEF]){1,8}))|(\\#\\\\.(?=[^[:alpha:]])))"
     },
     {
-      "comment": "general binary number",
       "name": "constant",
       "match": "((\\#[bBeEiI])*(\\#[ei])?(((((((\\+)|(\\-)))?((([0-1])+)|(([0-1])+\\/([0-1])+)))|(((((\\+)|(\\-)))?((([0-1])+)|(([0-1])+\\/([0-1])+)))?((\\+)|(\\-))(((([0-1])+)|(([0-1])+\\/([0-1])+)))?i)))|((((((((\\+)|(\\-)))?((([0-1])+(\\#)*(\\.)?(\\#)*)|((([0-1])+)?\\.([0-1])+(\\#)*)|(([0-1])+(\\#)*\\/([0-1])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-1])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))|(((((((((\\+)|(\\-)))?((([0-1])+(\\#)*(\\.)?(\\#)*)|((([0-1])+)?\\.([0-1])+(\\#)*)|(([0-1])+(\\#)*\\/([0-1])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-1])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))?((\\+)|(\\-))(((((([0-1])+(\\#)*(\\.)?(\\#)*)|((([0-1])+)?\\.([0-1])+(\\#)*)|(([0-1])+(\\#)*\\/([0-1])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-1])+))?)|((((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))?i)|((((((\\+)|(\\-)))?((([0-1])+(\\#)*(\\.)?(\\#)*)|((([0-1])+)?\\.([0-1])+(\\#)*)|(([0-1])+(\\#)*\\/([0-1])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-1])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f)))))@(((((\\+)|(\\-)))?((([0-1])+(\\#)*(\\.)?(\\#)*)|((([0-1])+)?\\.([0-1])+(\\#)*)|(([0-1])+(\\#)*\\/([0-1])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-1])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))))))))(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "general octal number",
       "name": "constant",
       "match": "((\\#[oOeEiI])*(\\#[ei])?(((((((\\+)|(\\-)))?((([0-7])+)|(([0-7])+\\/([0-7])+)))|(((((\\+)|(\\-)))?((([0-7])+)|(([0-7])+\\/([0-7])+)))?((\\+)|(\\-))(((([0-7])+)|(([0-7])+\\/([0-7])+)))?i)))|((((((((\\+)|(\\-)))?((([0-7])+(\\#)*(\\.)?(\\#)*)|((([0-7])+)?\\.([0-7])+(\\#)*)|(([0-7])+(\\#)*\\/([0-7])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-7])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))|(((((((((\\+)|(\\-)))?((([0-7])+(\\#)*(\\.)?(\\#)*)|((([0-7])+)?\\.([0-7])+(\\#)*)|(([0-7])+(\\#)*\\/([0-7])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-7])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))?((\\+)|(\\-))(((((([0-7])+(\\#)*(\\.)?(\\#)*)|((([0-7])+)?\\.([0-7])+(\\#)*)|(([0-7])+(\\#)*\\/([0-7])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-7])+))?)|((((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))?i)|((((((\\+)|(\\-)))?((([0-7])+(\\#)*(\\.)?(\\#)*)|((([0-7])+)?\\.([0-7])+(\\#)*)|(([0-7])+(\\#)*\\/([0-7])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-7])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f)))))@(((((\\+)|(\\-)))?((([0-7])+(\\#)*(\\.)?(\\#)*)|((([0-7])+)?\\.([0-7])+(\\#)*)|(([0-7])+(\\#)*\\/([0-7])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-7])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))))))))(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "general decimal number",
       "name": "constant",
       "match": "((\\#[dDeEiI])*(\\#[ei])?(((((((\\+)|(\\-)))?((([0-9])+)|(([0-9])+\\/([0-9])+)))|(((((\\+)|(\\-)))?((([0-9])+)|(([0-9])+\\/([0-9])+)))?((\\+)|(\\-))(((([0-9])+)|(([0-9])+\\/([0-9])+)))?i)))|((((((((\\+)|(\\-)))?((([0-9])+(\\#)*(\\.)?(\\#)*)|((([0-9])+)?\\.([0-9])+(\\#)*)|(([0-9])+(\\#)*\\/([0-9])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-9])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))|(((((((((\\+)|(\\-)))?((([0-9])+(\\#)*(\\.)?(\\#)*)|((([0-9])+)?\\.([0-9])+(\\#)*)|(([0-9])+(\\#)*\\/([0-9])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-9])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))?((\\+)|(\\-))(((((([0-9])+(\\#)*(\\.)?(\\#)*)|((([0-9])+)?\\.([0-9])+(\\#)*)|(([0-9])+(\\#)*\\/([0-9])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-9])+))?)|((((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))?i)|((((((\\+)|(\\-)))?((([0-9])+(\\#)*(\\.)?(\\#)*)|((([0-9])+)?\\.([0-9])+(\\#)*)|(([0-9])+(\\#)*\\/([0-9])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-9])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f)))))@(((((\\+)|(\\-)))?((([0-9])+(\\#)*(\\.)?(\\#)*)|((([0-9])+)?\\.([0-9])+(\\#)*)|(([0-9])+(\\#)*\\/([0-9])+(\\#)*))(([sldef](((\\+)|(\\-)))?([0-9])+))?)|(((\\+)|(\\-))(((inf\\.0)|(nan\\.0)|(inf\\.f)|(nan\\.f))))))))))))(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "general hexadecimal number",
       "name": "constant",
       "match": "(\\#([xXeEiI])*(\\#[ei])?(((((((\\+)|(\\-)))?((([0-9abcdefABCDEF])+)|(([0-9abcdefABCDEF])+\\/([0-9abcdefABCDEF])+)))|(((((\\+)|(\\-)))?((([0-9abcdefABCDEF])+)|(([0-9abcdefABCDEF])+\\/([0-9abcdefABCDEF])+)))?((\\+)|(\\-))(((([0-9abcdefABCDEF])+)|(([0-9abcdefABCDEF])+\\/([0-9abcdefABCDEF])+)))?i)))|((((((((\\+)|(\\-)))?((([0-9abcdefABCDEF])+(\\#)*(\\.)?(\\#)*)|((([0-9abcdefABCDEF])+)?\\.([0-9abcdefABCDEF])+(\\#)*)|(([0-9abcdefABCDEF])+(\\#)*\\/([0-9abcdefABCDEF])+(\\#)*))(([sl](((\\+)|(\\-)))?([0-9abcdefABCDEF])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT]))))|(((((((((\\+)|(\\-)))?((([0-9abcdefABCDEF])+(\\#)*(\\.)?(\\#)*)|((([0-9abcdefABCDEF])+)?\\.([0-9abcdefABCDEF])+(\\#)*)|(([0-9abcdefABCDEF])+(\\#)*\\/([0-9abcdefABCDEF])+(\\#)*))(([sl](((\\+)|(\\-)))?([0-9abcdefABCDEF])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT]))))?((\\+)|(\\-))(((((([0-9abcdefABCDEF])+(\\#)*(\\.)?(\\#)*)|((([0-9abcdefABCDEF])+)?\\.([0-9abcdefABCDEF])+(\\#)*)|(([0-9abcdefABCDEF])+(\\#)*\\/([0-9abcdefABCDEF])+(\\#)*))(([sl](((\\+)|(\\-)))?([0-9abcdefABCDEF])+))?)|((((inf\\.)|(nan\\.))[0ftT]))))?i)|((((((\\+)|(\\-)))?((([0-9abcdefABCDEF])+(\\#)*(\\.)?(\\#)*)|((([0-9abcdefABCDEF])+)?\\.([0-9abcdefABCDEF])+(\\#)*)|(([0-9abcdefABCDEF])+(\\#)*\\/([0-9abcdefABCDEF])+(\\#)*))(([sl](((\\+)|(\\-)))?([0-9abcdefABCDEF])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT])))@(((((\\+)|(\\-)))?((([0-9abcdefABCDEF])+(\\#)*(\\.)?(\\#)*)|((([0-9abcdefABCDEF])+)?\\.([0-9abcdefABCDEF])+(\\#)*)|(([0-9abcdefABCDEF])+(\\#)*\\/([0-9abcdefABCDEF])+(\\#)*))(([sl](((\\+)|(\\-)))?([0-9abcdefABCDEF])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT]))))))))))(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "extflonum",
       "name": "constant",
       "match": "(((\\#[bB](((((\\+)|(\\-)))?((([0-1])+(\\#)*(\\.)?(\\#)*)|((([0-1])+)?\\.([0-1])+(\\#)*)|(([0-1])+(\\#)*\\/([0-1])+(\\#)*))(([tT](((\\+)|(\\-)))?([0-1])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT]))))|(\\#[oO](((((\\+)|(\\-)))?((([0-7])+(\\#)*(\\.)?(\\#)*)|((([0-7])+)?\\.([0-7])+(\\#)*)|(([0-7])+(\\#)*\\/([0-7])+(\\#)*))(([tT](((\\+)|(\\-)))?([0-7])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT]))))|(\\#[xX](((((\\+)|(\\-)))?((([0-9abcdefABCDEF])+(\\#)*(\\.)?(\\#)*)|((([0-9abcdefABCDEF])+)?\\.([0-9abcdefABCDEF])+(\\#)*)|(([0-9abcdefABCDEF])+(\\#)*\\/([0-9abcdefABCDEF])+(\\#)*))(([tT](((\\+)|(\\-)))?([0-9abcdefABCDEF])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT]))))|((\\#[bB])?(((((\\+)|(\\-)))?((([0-9])+(\\#)*(\\.)?(\\#)*)|((([0-9])+)?\\.([0-9])+(\\#)*)|(([0-9])+(\\#)*\\/([0-9])+(\\#)*))(([tT](((\\+)|(\\-)))?([0-9])+))?)|(((\\+)|(\\-))(((inf\\.)|(nan\\.))[0ftT]))))))(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "void",
       "name": "constant",
       "match": "\\#void(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "symbol",
       "name": "constant",
       "match": "\\'([^#()\\[\\]{}\",'`; \\s]([^()\\[\\]{}\",'`;\\ \\s])*)"
     },
     {
-      "comment": "quoted empty list",
       "name": "constant",
       "match": "\\'\\(\\)"
     },
     {
-      "comment": "keyword",
       "name": "constant",
       "match": "\\#\\:([^#()\\[\\]{}\",'`; \\s]([^()\\[\\]{}\",'`;\\ \\s])*)"
     },
     {
-      "comment": "syntax-quoted identifiers",
       "name": "constant",
       "match": "\\#\\'([^#()\\[\\]{}\",'`; \\s]([^()\\[\\]{}\",'`;\\ \\s])*)"
     },
     {
-      "comment": "syntax in the racket language",
       "name": "entity.name",
-      "match": "(\\#\\%app|\\#\\%datum|\\#\\%declare|\\#\\%expression|\\#\\%module\\-begin|\\#\\%plain\\-app|\\#\\%plain\\-lambda|\\#\\%plain\\-module\\-begin|\\#\\%printing\\-module\\-begin|\\#\\%provide|\\#\\%require|\\#\\%stratified\\-body|\\#\\%top|\\#\\%top\\-interaction|\\#\\%variable\\-reference|\\->|\\->\\*|\\->\\*m|\\->d|\\->dm|\\->i|\\->m|\\.\\.\\.|\\:do\\-in|==|=>|_|absent|abstract|all\\-defined\\-out|all\\-from\\-out|and|any|augment|augment\\*|augment\\-final|augment\\-final\\*|augride|augride\\*|begin|begin\\-for\\-syntax|begin0|case|case\\->|case\\->m|case\\-lambda|class|class\\*|class\\-field\\-accessor|class\\-field\\-mutator|class/c|class/derived|combine\\-in|combine\\-out|command\\-line|compound\\-unit|compound\\-unit/infer|cond|contract|contract\\-out|contract\\-struct|contracted|define|define\\-compound\\-unit|define\\-compound\\-unit/infer|define\\-contract\\-struct|define\\-custom\\-hash\\-types|define\\-custom\\-set\\-types|define\\-for\\-syntax|define\\-local\\-member\\-name|define\\-logger|define\\-match\\-expander|define\\-member\\-name|define\\-module\\-boundary\\-contract|define\\-namespace\\-anchor|define\\-opt/c|define\\-sequence\\-syntax|define\\-serializable\\-class|define\\-serializable\\-class\\*|define\\-signature|define\\-signature\\-form|define\\-struct|define\\-struct/contract|define\\-struct/derived|define\\-syntax|define\\-syntax\\-rule|define\\-syntaxes|define\\-unit|define\\-unit\\-binding|define\\-unit\\-from\\-context|define\\-unit/contract|define\\-unit/new\\-import\\-export|define\\-unit/s|define\\-values|define\\-values\\-for\\-export|define\\-values\\-for\\-syntax|define\\-values/invoke\\-unit|define\\-values/invoke\\-unit/infer|define/augment|define/augment\\-final|define/augride|define/contract|define/final\\-prop|define/match|define/overment|define/override|define/override\\-final|define/private|define/public|define/public\\-final|define/pubment|define/subexpression\\-pos\\-prop|delay|delay/idle|delay/name|delay/strict|delay/sync|delay/thread|do|else|except|except\\-in|except\\-out|export|extends|failure\\-cont|false|false/c|field|field\\-bound\\?|file|flat\\-murec\\-contract|flat\\-rec\\-contract|for|for\\*|for\\*/and|for\\*/first|for\\*/fold|for\\*/fold/derived|for\\*/hash|for\\*/hasheq|for\\*/hasheqv|for\\*/last|for\\*/list|for\\*/lists|for\\*/mutable\\-set|for\\*/mutable\\-seteq|for\\*/mutable\\-seteqv|for\\*/or|for\\*/product|for\\*/set|for\\*/seteq|for\\*/seteqv|for\\*/sum|for\\*/vector|for\\*/weak\\-set|for\\*/weak\\-seteq|for\\*/weak\\-seteqv|for\\-label|for\\-meta|for\\-syntax|for\\-template|for/and|for/first|for/fold|for/fold/derived|for/hash|for/hasheq|for/hasheqv|for/last|for/list|for/lists|for/mutable\\-set|for/mutable\\-seteq|for/mutable\\-seteqv|for/or|for/product|for/set|for/seteq|for/seteqv|for/sum|for/vector|for/weak\\-set|for/weak\\-seteq|for/weak\\-seteqv|gen\\:custom\\-write|gen\\:dict|gen\\:equal\\+hash|gen\\:set|gen\\:stream|generic|get\\-field|if|implies|import|include|include\\-at/relative\\-to|include\\-at/relative\\-to/reader|include/reader|inherit|inherit\\-field|inherit/inner|inherit/super|init|init\\-depend|init\\-field|init\\-rest|inner|inspect|instantiate|interface|interface\\*|invariant\\-assertion|invoke\\-unit|invoke\\-unit/infer|lambda|lazy|let|let\\*|let\\*\\-values|let\\-syntax|let\\-syntaxes|let\\-values|let/cc|let/ec|letrec|letrec\\-syntax|letrec\\-syntaxes|letrec\\-syntaxes\\+values|letrec\\-values|lib|link|local|local\\-require|log\\-debug|log\\-error|log\\-fatal|log\\-info|log\\-warning|match|match\\*|match\\*/derived|match\\-define|match\\-define\\-values|match\\-lambda|match\\-lambda\\*|match\\-lambda\\*\\*|match\\-let|match\\-let\\*|match\\-let\\*\\-values|match\\-let\\-values|match\\-letrec|match/derived|match/values|member\\-name\\-key|method\\-contract\\?|mixin|module|module\\*|module\\+|nand|new|nor|object\\-contract|object/c|only|only\\-in|only\\-meta\\-in|open|opt/c|or|overment|overment\\*|override|override\\*|override\\-final|override\\-final\\*|parameterize|parameterize\\*|parameterize\\-break|parametric\\->/c|place|place\\*|planet|prefix|prefix\\-in|prefix\\-out|private|private\\*|prompt\\-tag/c|protect\\-out|provide|provide\\-signature\\-elements|provide/contract|public|public\\*|public\\-final|public\\-final\\*|pubment|pubment\\*|quasiquote|quasisyntax|quasisyntax/loc|quote|quote\\-syntax|quote\\-syntax/prune|recontract\\-out|recursive\\-contract|relative\\-in|rename|rename\\-in|rename\\-inner|rename\\-out|rename\\-super|require|send|send\\*|send\\+|send\\-generic|send/apply|send/keyword\\-apply|set!|set!\\-values|set\\-field!|shared|stream|stream\\-cons|struct|struct\\*|struct\\-copy|struct\\-field\\-index|struct\\-out|struct/c|struct/ctc|struct/dc|submod|super|super\\-instantiate|super\\-make\\-object|super\\-new|syntax|syntax\\-case|syntax\\-case\\*|syntax\\-id\\-rules|syntax\\-rules|syntax/loc|tag|this|this\\%|thunk|thunk\\*|time|unconstrained\\-domain\\->|unit|unit\\-from\\-context|unit/c|unit/new\\-import\\-export|unit/s|unless|unquote|unquote\\-splicing|unsyntax|unsyntax\\-splicing|values/drop|when|with\\-continuation\\-mark|with\\-contract|with\\-handlers|with\\-handlers\\*|with\\-method|with\\-syntax|λ)(?=[()\\[\\]{}\",'`;\\ \\s])"
+      "match": "(\\#\\%app|\\#\\%datum|\\#\\%declare|\\#\\%expression|\\#\\%module\\-begin|\\#\\%plain\\-app|\\#\\%plain\\-lambda|\\#\\%plain\\-module\\-begin|\\#\\%printing\\-module\\-begin|\\#\\%provide|\\#\\%require|\\#\\%stratified\\-body|\\#\\%top|\\#\\%top\\-interaction|\\#\\%variable\\-reference|\\-\u003e|\\-\u003e\\*|\\-\u003e\\*m|\\-\u003ed|\\-\u003edm|\\-\u003ei|\\-\u003em|\\.\\.\\.|\\:do\\-in|==|=\u003e|_|absent|abstract|all\\-defined\\-out|all\\-from\\-out|and|any|augment|augment\\*|augment\\-final|augment\\-final\\*|augride|augride\\*|begin|begin\\-for\\-syntax|begin0|case|case\\-\u003e|case\\-\u003em|case\\-lambda|class|class\\*|class\\-field\\-accessor|class\\-field\\-mutator|class/c|class/derived|combine\\-in|combine\\-out|command\\-line|compound\\-unit|compound\\-unit/infer|cond|contract|contract\\-out|contract\\-struct|contracted|define|define\\-compound\\-unit|define\\-compound\\-unit/infer|define\\-contract\\-struct|define\\-custom\\-hash\\-types|define\\-custom\\-set\\-types|define\\-for\\-syntax|define\\-local\\-member\\-name|define\\-logger|define\\-match\\-expander|define\\-member\\-name|define\\-module\\-boundary\\-contract|define\\-namespace\\-anchor|define\\-opt/c|define\\-sequence\\-syntax|define\\-serializable\\-class|define\\-serializable\\-class\\*|define\\-signature|define\\-signature\\-form|define\\-struct|define\\-struct/contract|define\\-struct/derived|define\\-syntax|define\\-syntax\\-rule|define\\-syntaxes|define\\-unit|define\\-unit\\-binding|define\\-unit\\-from\\-context|define\\-unit/contract|define\\-unit/new\\-import\\-export|define\\-unit/s|define\\-values|define\\-values\\-for\\-export|define\\-values\\-for\\-syntax|define\\-values/invoke\\-unit|define\\-values/invoke\\-unit/infer|define/augment|define/augment\\-final|define/augride|define/contract|define/final\\-prop|define/match|define/overment|define/override|define/override\\-final|define/private|define/public|define/public\\-final|define/pubment|define/subexpression\\-pos\\-prop|delay|delay/idle|delay/name|delay/strict|delay/sync|delay/thread|do|else|except|except\\-in|except\\-out|export|extends|failure\\-cont|false|false/c|field|field\\-bound\\?|file|flat\\-murec\\-contract|flat\\-rec\\-contract|for|for\\*|for\\*/and|for\\*/first|for\\*/fold|for\\*/fold/derived|for\\*/hash|for\\*/hasheq|for\\*/hasheqv|for\\*/last|for\\*/list|for\\*/lists|for\\*/mutable\\-set|for\\*/mutable\\-seteq|for\\*/mutable\\-seteqv|for\\*/or|for\\*/product|for\\*/set|for\\*/seteq|for\\*/seteqv|for\\*/sum|for\\*/vector|for\\*/weak\\-set|for\\*/weak\\-seteq|for\\*/weak\\-seteqv|for\\-label|for\\-meta|for\\-syntax|for\\-template|for/and|for/first|for/fold|for/fold/derived|for/hash|for/hasheq|for/hasheqv|for/last|for/list|for/lists|for/mutable\\-set|for/mutable\\-seteq|for/mutable\\-seteqv|for/or|for/product|for/set|for/seteq|for/seteqv|for/sum|for/vector|for/weak\\-set|for/weak\\-seteq|for/weak\\-seteqv|gen\\:custom\\-write|gen\\:dict|gen\\:equal\\+hash|gen\\:set|gen\\:stream|generic|get\\-field|if|implies|import|include|include\\-at/relative\\-to|include\\-at/relative\\-to/reader|include/reader|inherit|inherit\\-field|inherit/inner|inherit/super|init|init\\-depend|init\\-field|init\\-rest|inner|inspect|instantiate|interface|interface\\*|invariant\\-assertion|invoke\\-unit|invoke\\-unit/infer|lambda|lazy|let|let\\*|let\\*\\-values|let\\-syntax|let\\-syntaxes|let\\-values|let/cc|let/ec|letrec|letrec\\-syntax|letrec\\-syntaxes|letrec\\-syntaxes\\+values|letrec\\-values|lib|link|local|local\\-require|log\\-debug|log\\-error|log\\-fatal|log\\-info|log\\-warning|match|match\\*|match\\*/derived|match\\-define|match\\-define\\-values|match\\-lambda|match\\-lambda\\*|match\\-lambda\\*\\*|match\\-let|match\\-let\\*|match\\-let\\*\\-values|match\\-let\\-values|match\\-letrec|match/derived|match/values|member\\-name\\-key|method\\-contract\\?|mixin|module|module\\*|module\\+|nand|new|nor|object\\-contract|object/c|only|only\\-in|only\\-meta\\-in|open|opt/c|or|overment|overment\\*|override|override\\*|override\\-final|override\\-final\\*|parameterize|parameterize\\*|parameterize\\-break|parametric\\-\u003e/c|place|place\\*|planet|prefix|prefix\\-in|prefix\\-out|private|private\\*|prompt\\-tag/c|protect\\-out|provide|provide\\-signature\\-elements|provide/contract|public|public\\*|public\\-final|public\\-final\\*|pubment|pubment\\*|quasiquote|quasisyntax|quasisyntax/loc|quote|quote\\-syntax|quote\\-syntax/prune|recontract\\-out|recursive\\-contract|relative\\-in|rename|rename\\-in|rename\\-inner|rename\\-out|rename\\-super|require|send|send\\*|send\\+|send\\-generic|send/apply|send/keyword\\-apply|set!|set!\\-values|set\\-field!|shared|stream|stream\\-cons|struct|struct\\*|struct\\-copy|struct\\-field\\-index|struct\\-out|struct/c|struct/ctc|struct/dc|submod|super|super\\-instantiate|super\\-make\\-object|super\\-new|syntax|syntax\\-case|syntax\\-case\\*|syntax\\-id\\-rules|syntax\\-rules|syntax/loc|tag|this|this\\%|thunk|thunk\\*|time|unconstrained\\-domain\\-\u003e|unit|unit\\-from\\-context|unit/c|unit/new\\-import\\-export|unit/s|unless|unquote|unquote\\-splicing|unsyntax|unsyntax\\-splicing|values/drop|when|with\\-continuation\\-mark|with\\-contract|with\\-handlers|with\\-handlers\\*|with\\-method|with\\-syntax|λ)(?=[()\\[\\]{}\",'`;\\ \\s])"
     },
     {
-      "comment": "identifiers",
       "name": "none",
       "match": "([^#()\\[\\]{}\",'`; \\s]([^()\\[\\]{}\",'`;\\ \\s])*)"
     },
     {
-      "comment": "; comments begins with ; and extends to the end of the line",
       "name": "comment",
       "match": ";.*$"
     },
     {
-      "comment": null,
       "name": "comment",
       "match": "\\#;"
     }
-  ]
-}
+  ],
+  "repository": {
+    "multilinecomment": {
+      "name": "comment",
+      "contentName": "comment",
+      "begin": "\\#\\|",
+      "end": "\\|\\#",
+      "patterns": [
+        {
+          "name": "comment",
+          "include": "#multilinecomment"
+        }
+      ]
+    }
+  }
+}

data/grammars/source.rascal.json

@@ -1,8 +1,6 @@
 {
-  "fileTypes": [
-    "rsc"
-  ],
   "name": "Rascal",
+  "scopeName": "source.rascal",
   "patterns": [
     {
       "include": "#top_level"
@@ -12,7 +10,9 @@
     "annotation": {
       "patterns": [
         {
+          "name": "comment.block.annotation.rascal",
           "begin": "(@[^ {]+)({)",
+          "end": "(})",
           "beginCaptures": {
             "1": {
               "name": "storage.type.annotation.block.rascal"
@@ -21,31 +21,29 @@
               "name": "punctuation.annotation-argument.begin.rascal"
             }
           },
-          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.annotation-argument.end.rascal"
             }
-          },
-          "name": "comment.block.annotation.rascal"
+          }
         },
         {
+          "name": "meta.annotation.inline.rascal",
+          "match": "(@[A-Za-z_0-9]+)",
           "captures": {
             "1": {
               "name": "storage.type.annotation.inline.rascal"
             }
-          },
-          "match": "(@[A-Za-z_0-9]+)",
-          "name": "meta.annotation.inline.rascal"
+          }
         }
       ]
     },
     "char_set": {
       "patterns": [
         {
+          "name": "punctuation.other.lexicalcharset.rascal",
           "begin": "\\[",
           "end": "\\]",
-          "name": "punctuation.other.lexicalcharset.rascal",
           "patterns": [
             {
               "include": "#string_escape"
@@ -57,27 +55,22 @@
     "comment": {
       "patterns": [
         {
-          "match": "//.*$\\n?",
-          "name": "comment.line.double-slash.rascal"
+          "name": "comment.line.double-slash.rascal",
+          "match": "//.*$\\n?"
         },
         {
+          "name": "comment.block.rascal",
           "begin": "/\\*",
-          "end": "\\*/",
-          "name": "comment.block.rascal"
+          "end": "\\*/"
         }
       ]
     },
     "regex": {
       "patterns": [
         {
-          "begin": "/(?!/|*)",
-          "end": "/([dims]*)",
-          "endCaptures": {
-            "1": {
-              "name": "storage.modifier.regex.rascal"
-            }
-          },
           "name": "string.regexp.rascal",
+          "begin": "/(?!/|\\*)",
+          "end": "/([dims]*)",
           "patterns": [
             {
               "include": "#regex_escape"
@@ -85,24 +78,29 @@
             {
               "include": "#string_interpolation"
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "storage.modifier.regex.rascal"
+            }
+          }
         }
       ]
     },
     "regex_escape": {
       "patterns": [
         {
-          "match": "\\\\(/|<|>|\\\\)",
-          "name": "constant.character.escape.regex.rascal"
+          "name": "constant.character.escape.regex.rascal",
+          "match": "\\\\(/|\u003c|\u003e|\\\\)"
         }
       ]
     },
     "string": {
       "patterns": [
         {
+          "name": "string.quoted.single.rascal",
           "begin": "'",
           "end": "'",
-          "name": "string.quoted.single.rascal",
           "patterns": [
             {
               "include": "#string_escape"
@@ -110,9 +108,9 @@
           ]
         },
         {
+          "name": "string.quoted.double.rascal",
           "begin": "\"",
           "end": "\"",
-          "name": "string.quoted.double.rascal",
           "patterns": [
             {
               "include": "#string_escape"
@@ -123,9 +121,9 @@
           ]
         },
         {
+          "name": "string.interpolated.rascal",
           "begin": "`",
           "end": "`",
-          "name": "string.interpolated.rascal",
           "patterns": [
             {
               "include": "#string_interpolation"
@@ -140,61 +138,53 @@
     "string_escape": {
       "patterns": [
         {
-          "match": "\\\\(\\\"|\\'|<|>|\\\\|[bnfrt])",
-          "name": "constant.character.escape.ordinary.rascal"
+          "name": "constant.character.escape.ordinary.rascal",
+          "match": "\\\\(\\\"|\\'|\u003c|\u003e|\\\\|[bnfrt])"
         },
         {
-          "match": "\\\\(u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f] |U(0[0-9 A-F a-f]|10)[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f] |a[0-7][0-9A-Fa-f] )",
-          "name": "constant.character.escape.unicode.rascal"
+          "name": "constant.character.escape.unicode.rascal",
+          "match": "\\\\(u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f] |U(0[0-9 A-F a-f]|10)[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f] |a[0-7][0-9A-Fa-f] )"
         }
       ]
     },
     "string_interpolation": {
       "patterns": [
         {
-          "begin": "(<)",
+          "name": "support.interpolated-string.rascal",
+          "begin": "(\u003c)",
+          "end": "(\u003e)",
+          "patterns": [
+            {
+              "include": "#top_level"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.interpolation.begin.rascal"
             }
           },
-          "end": "(>)",
           "endCaptures": {
             "2": {
               "name": "punctuation.interpolation.end.rascal"
             }
-          },
-          "name": "support.interpolated-string.rascal",
-          "patterns": [
-            {
-              "include": "#top_level"
-            }
-          ]
+          }
         }
       ]
     },
     "syntax_escape": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|<|>|`)",
-          "name": "constant.character.escape.syntax.rascal"
+          "name": "constant.character.escape.syntax.rascal",
+          "match": "\\\\(\\\\|\u003c|\u003e|`)"
         }
       ]
     },
     "top_level": {
       "patterns": [
         {
+          "name": "punctuation.other.syntactic.rascal",
           "begin": "(lexical|syntax)\\s+([a-zA-Z][A-Za-z_0-9]*)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.rascal"
-            },
-            "2": {
-              "name": "entity.name.type.rascal"
-            }
-          },
           "end": ";",
-          "name": "punctuation.other.syntactic.rascal",
           "patterns": [
             {
               "include": "#char_set"
@@ -211,44 +201,52 @@
             {
               "include": "#annotation"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control.rascal"
+            },
+            "2": {
+              "name": "entity.name.type.rascal"
+            }
+          }
         },
         {
-          "match": "(?<![A-Za-z_])(0(?![0-9a-z_A-Z])|[1-9][0-9]*(?![0-9a-z_A-Z]))",
-          "name": "constant.numeric.decimal.rascal"
+          "name": "constant.numeric.decimal.rascal",
+          "match": "(?\u003c![A-Za-z_])(0(?![0-9a-z_A-Z])|[1-9][0-9]*(?![0-9a-z_A-Z]))"
         },
         {
-          "match": "(?<![A-Za-z_])0[Xx][0-9A-Fa-f]+(?![0-9a-z_A-Z])",
-          "name": "constant.numeric.hex.rascal"
+          "name": "constant.numeric.hex.rascal",
+          "match": "(?\u003c![A-Za-z_])0[Xx][0-9A-Fa-f]+(?![0-9a-z_A-Z])"
         },
         {
-          "match": "(?<![A-Za-z_])0[0-7]+(?![0-9a-z_A-Z])",
-          "name": "constant.numeric.octal.rascal"
+          "name": "constant.numeric.octal.rascal",
+          "match": "(?\u003c![A-Za-z_])0[0-7]+(?![0-9a-z_A-Z])"
         },
         {
+          "name": "string.other.datetime.rascal",
           "begin": "\\\\$",
-          "end": "\\\\$",
-          "name": "string.other.datetime.rascal"
+          "end": "\\\\$"
         },
         {
-          "match": "(?<![A-Za-z_]) ([0-9]+[dDfF] |[0-9]+[eE][+\\-]?[0-9]+[dDfF]? |[0-9]+\\.(?!\\.)[0-9]*[dDfF]? |[0-9]+\\.[0-9]*[eE][+\\-]?[0-9]+[dDfF]? |\\.(?!\\.)[0-9]+[dDfF]? |\\.(?!\\.)[0-9]+[eE][+\\-]?[0-9]+[dDfF]? )",
-          "name": "constant.numeric.real.rascal"
+          "name": "constant.numeric.real.rascal",
+          "match": "(?\u003c![A-Za-z_]) ([0-9]+[dDfF] |[0-9]+[eE][+\\-]?[0-9]+[dDfF]? |[0-9]+\\.(?!\\.)[0-9]*[dDfF]? |[0-9]+\\.[0-9]*[eE][+\\-]?[0-9]+[dDfF]? |\\.(?!\\.)[0-9]+[dDfF]? |\\.(?!\\.)[0-9]+[eE][+\\-]?[0-9]+[dDfF]? )"
         },
         {
-          "match": "\\b(true|false)\\b",
-          "name": "constant.language.bool.rascal"
+          "name": "constant.language.bool.rascal",
+          "match": "\\b(true|false)\\b"
         },
         {
-          "match": "(?<![A-Za-z_])([0-9][0-9]*r|[1-9][0-9]*r[0-9][0-9]*(?![0-9a-z_A-Z]))",
-          "name": "constant.numeric.rational.rascal"
+          "name": "constant.numeric.rational.rascal",
+          "match": "(?\u003c![A-Za-z_])([0-9][0-9]*r|[1-9][0-9]*r[0-9][0-9]*(?![0-9a-z_A-Z]))"
         },
         {
-          "match": "\\b(syntax|keyword|lexical|break|continue|finally|private|fail|filter|if|tag|extend|append|non-assoc|assoc|test|anno|layout|data|join|it|bracket|in|import|all|solve|try|catch|notin|else|insert|switch|return|case|while|throws|visit|for|assert|default|map|alias|any|module|mod|public|one|throw|start)\\b",
-          "name": "keyword.control.rascal"
+          "name": "keyword.control.rascal",
+          "match": "\\b(syntax|keyword|lexical|break|continue|finally|private|fail|filter|if|tag|extend|append|non-assoc|assoc|test|anno|layout|data|join|it|bracket|in|import|all|solve|try|catch|notin|else|insert|switch|return|case|while|throws|visit|for|assert|default|map|alias|any|module|mod|public|one|throw|start)\\b"
         },
         {
-          "match": "\\b(value|loc|node|num|type|bag|int|rat|rel|lrel|real|tuple|str|bool|void|datetime|set|map|list)\\b",
-          "name": "support.type.basic.rascal"
+          "name": "support.type.basic.rascal",
+          "match": "\\b(value|loc|node|num|type|bag|int|rat|rel|lrel|real|tuple|str|bool|void|datetime|set|map|list)\\b"
         },
         {
           "include": "#string"
@@ -263,24 +261,23 @@
           "include": "#comment"
         },
         {
-          "match": "\\b[a-zA-Z][A-Za-z_0-9]*\\b",
-          "name": "variable.other.ordinary.rascal"
+          "name": "variable.other.ordinary.rascal",
+          "match": "\\b[a-zA-Z][A-Za-z_0-9]*\\b"
         },
         {
-          "match": "\\\\(syntax|keyword|lexical|break|continue|finally|private|fail|filter|if|tag|extend|append|non-assoc|assoc|test|anno|layout|data|join|it|bracket|in|import|all|solve|try|catch|notin|else|insert|switch|return|case|while|throws|visit|for|assert|default|map|alias|any|module|mod|public|one|throw|start|value|loc|node|num|type|bag|int|rat|rel|lrel|real|tuple|str|bool|void|datetime|set|map|list)",
-          "name": "variable.other.escaped-keyword.rascal"
+          "name": "variable.other.escaped-keyword.rascal",
+          "match": "\\\\(syntax|keyword|lexical|break|continue|finally|private|fail|filter|if|tag|extend|append|non-assoc|assoc|test|anno|layout|data|join|it|bracket|in|import|all|solve|try|catch|notin|else|insert|switch|return|case|while|throws|visit|for|assert|default|map|alias|any|module|mod|public|one|throw|start|value|loc|node|num|type|bag|int|rat|rel|lrel|real|tuple|str|bool|void|datetime|set|map|list)"
         },
         {
+          "name": "string.other.url.rascal",
+          "match": "\\|([0-9a-z_A-Z.\\-_~:/?#\\[\\]@!$\u0026'()*+,;=`])+\\|",
           "captures": {
             "1": {
               "name": "markup.underline.link.rascal"
             }
-          },
-          "match": "\\|([0-9a-z_A-Z.\\-_~:/?#\\[\\]@!$&'()*+,;=`])+\\|",
-          "name": "string.other.url.rascal"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.rascal"
-}
+  }
+}