github-linguist 5.3.3 → 6.0.0

data/grammars/source.dmf.json

@@ -1,39 +1,27 @@
 {
-  "fileTypes": [
-    "dmf"
-  ],
   "name": "Dream Maker Interface",
+  "scopeName": "source.dmf",
   "patterns": [
     {
-      "match": "((#?\\b[0-9a-fA-F]*)|\\b(([0-9]+(,|x)?[0-9]*)|(\\.[0-9]+)))\\b",
-      "name": "constant.numeric.dm"
+      "name": "constant.numeric.dm",
+      "match": "((#?\\b[0-9a-fA-F]*)|\\b(([0-9]+(,|x)?[0-9]*)|(\\.[0-9]+)))\\b"
     },
     {
-      "match": "(^(macro|menu)|(\\b(window|elem)))\\b",
-      "name": "storage.type.dm"
+      "name": "storage.type.dm",
+      "match": "(^(macro|menu)|(\\b(window|elem)))\\b"
     },
     {
-      "match": "\\b(true|false|none)\\b",
-      "name": "variable.language.dm"
+      "name": "variable.language.dm",
+      "match": "\\b(true|false|none)\\b"
     },
     {
-      "match": "\\b([A-Z_]+)\\b",
-      "name": "constant.language.dm"
+      "name": "constant.language.dm",
+      "match": "\\b([A-Z_]+)\\b"
     },
     {
+      "name": "string.quoted.double.dm",
       "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.dm"
-        }
-      },
       "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.dm"
-        }
-      },
-      "name": "string.quoted.double.dm",
       "patterns": [
         {
           "include": "#string_escaped_char"
@@ -41,43 +29,42 @@
         {
           "include": "#string_embedded_expression"
         }
-      ]
-    },
-    {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.dm"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.dm"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.single.dm",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
           "include": "#string_escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "(?x)\n    \t\t(?:  ^                                 # begin-of-line\n    \t\t  |\n    \t\t     (?: (?= \\s )           (?<!else|new|return) (?<=\\w)      #  or word + space before name\n    \t\t       | (?= \\s*[A-Za-z_] ) (?<!&&)       (?<=[*&>])   #  or type modifier before name\n    \t\t     )\n    \t\t)\n    \t\t(\\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()\n    \t\t(\n    \t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ |                  # actual name\n    \t\t\t(?: (?<=operator) (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) )  # if it is a C++ operator\n    \t\t)\n    \t\t \\s*(?=\\()",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.function.leading.dm"
-        },
-        "3": {
-          "name": "entity.name.function.dm"
-        },
-        "4": {
-          "name": "punctuation.definition.parameters.dm"
+        "0": {
+          "name": "punctuation.definition.string.begin.dm"
         }
       },
-      "end": "(?<=\\})|(?=#)|(;)?",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.dm"
+        }
+      }
+    },
+    {
       "name": "meta.function.dm",
+      "begin": "(?x)\n    \t\t(?:  ^                                 # begin-of-line\n    \t\t  |\n    \t\t     (?: (?= \\s )           (?\u003c!else|new|return) (?\u003c=\\w)      #  or word + space before name\n    \t\t       | (?= \\s*[A-Za-z_] ) (?\u003c!\u0026\u0026)       (?\u003c=[*\u0026\u003e])   #  or type modifier before name\n    \t\t     )\n    \t\t)\n    \t\t(\\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\\s*\\()\n    \t\t(\n    \t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ |                  # actual name\n    \t\t\t(?: (?\u003c=operator) (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )  # if it is a C++ operator\n    \t\t)\n    \t\t \\s*(?=\\()",
+      "end": "(?\u003c=\\})|(?=#)|(;)?",
       "patterns": [
         {
           "include": "#comments"
@@ -86,14 +73,24 @@
           "include": "#parens"
         },
         {
-          "match": "\\bconst\\b",
-          "name": "storage.modifier.dm"
+          "name": "storage.modifier.dm",
+          "match": "\\bconst\\b"
         },
         {
           "include": "#block"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.function.leading.dm"
+        },
+        "3": {
+          "name": "entity.name.function.dm"
+        },
+        "4": {
+          "name": "punctuation.definition.parameters.dm"
+        }
+      }
     }
-  ],
-  "scopeName": "source.dmf"
-}
+  ]
+}

data/grammars/source.dockerfile.json

@@ -1,14 +1,13 @@
 {
-  "fileTypes": [
-    "Dockerfile"
-  ],
   "name": "Dockerfile",
+  "scopeName": "source.dockerfile",
   "patterns": [
     {
-      "match": "\\\\.",
-      "name": "constant.character.escaped.dockerfile"
+      "name": "constant.character.escaped.dockerfile",
+      "match": "\\\\."
     },
     {
+      "match": "^\\s*(?:(ONBUILD)\\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\\s",
       "captures": {
         "1": {
           "name": "keyword.control.dockerfile"
@@ -16,10 +15,10 @@
         "2": {
           "name": "keyword.other.special-method.dockerfile"
         }
-      },
-      "match": "^\\s*(?:(ONBUILD)\\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\\s"
+      }
     },
     {
+      "match": "^\\s*(?:(ONBUILD)\\s+)?(CMD|ENTRYPOINT)\\s",
       "captures": {
         "1": {
           "name": "keyword.operator.dockerfile"
@@ -27,52 +26,52 @@
         "2": {
           "name": "keyword.other.special-method.dockerfile"
         }
-      },
-      "match": "^\\s*(?:(ONBUILD)\\s+)?(CMD|ENTRYPOINT)\\s"
+      }
     },
     {
+      "name": "string.quoted.double.dockerfile",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escaped.dockerfile",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.dockerfile"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.dockerfile"
         }
-      },
-      "name": "string.quoted.double.dockerfile",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escaped.dockerfile"
-        }
-      ]
+      }
     },
     {
+      "name": "string.quoted.single.dockerfile",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escaped.dockerfile",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.dockerfile"
         }
       },
-      "end": "'",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.dockerfile"
         }
-      },
-      "name": "string.quoted.single.dockerfile",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escaped.dockerfile"
-        }
-      ]
+      }
     },
     {
+      "match": "^(\\s*)((#).*$\\n?)",
       "captures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.dockerfile"
@@ -83,11 +82,7 @@
         "3": {
           "name": "punctuation.definition.comment.dockerfile"
         }
-      },
-      "comment": "comment.line",
-      "match": "^(\\s*)((#).*$\\n?)"
+      }
     }
-  ],
-  "scopeName": "source.dockerfile",
-  "uuid": "a39d8795-59d2-49af-aa00-fe74ee29576e"
-}
+  ]
+}

data/grammars/source.dot.json

@@ -1,13 +1,9 @@
 {
-  "fileTypes": [
-    "dot",
-    "DOT"
-  ],
-  "firstLineMatch": "digraph.*",
-  "keyEquivalent": "^~G",
   "name": "Graphviz (DOT)",
+  "scopeName": "source.dot",
   "patterns": [
     {
+      "match": " ?(digraph)[ \\t]+([A-Za-z0-9]+) ?(\\{)",
       "captures": {
         "1": {
           "name": "storage.type.dot"
@@ -18,109 +14,104 @@
         "4": {
           "name": "punctuation.section.dot"
         }
-      },
-      "comment": "named digraph declaration: \"digraph NAME {\"",
-      "match": " ?(digraph)[ \\t]+([A-Za-z0-9]+) ?(\\{)"
+      }
     },
     {
-      "comment": "edge definition: <- -> --",
-      "match": "(<|-)(>|-)",
-      "name": "keyword.operator.dot"
+      "name": "keyword.operator.dot",
+      "match": "(\u003c|-)(\u003e|-)"
     },
     {
-      "match": "\\b(node|edge|graph|digraph|subgraph|strict)\\b",
-      "name": "storage.type.dot"
+      "name": "storage.type.dot",
+      "match": "\\b(node|edge|graph|digraph|subgraph|strict)\\b"
     },
     {
-      "match": "\\b(bottomlabel|color|comment|distortion|fillcolor|fixedsize|fontcolor|fontname|fontsize|group|height|label|layer|orientation|peripheries|regular|shape|shapefile|sides|skew|style|toplabel|URL|width|z)\\b",
-      "name": "support.constant.attribute.node.dot"
+      "name": "support.constant.attribute.node.dot",
+      "match": "\\b(bottomlabel|color|comment|distortion|fillcolor|fixedsize|fontcolor|fontname|fontsize|group|height|label|layer|orientation|peripheries|regular|shape|shapefile|sides|skew|style|toplabel|URL|width|z)\\b"
     },
     {
-      "match": "\\b(arrowhead|arrowsize|arrowtail|color|comment|constraint|decorate|dir|fontcolor|fontname|fontsize|headlabel|headport|headURL|label|labelangle|labeldistance|labelfloat|labelcolor|labelfontname|labelfontsize|layer|lhead|ltail|minlen|samehead|sametail|splines|style|taillabel|tailport|tailURL|weight)\\b",
-      "name": "support.constant.attribute.edge.dot"
+      "name": "support.constant.attribute.edge.dot",
+      "match": "\\b(arrowhead|arrowsize|arrowtail|color|comment|constraint|decorate|dir|fontcolor|fontname|fontsize|headlabel|headport|headURL|label|labelangle|labeldistance|labelfloat|labelcolor|labelfontname|labelfontsize|layer|lhead|ltail|minlen|samehead|sametail|splines|style|taillabel|tailport|tailURL|weight)\\b"
     },
     {
-      "match": "\\b(bgcolor|center|clusterrank|color|comment|compound|concentrate|fillcolor|fontname|fontpath|fontsize|label|labeljust|labelloc|layers|margin|mclimit|nodesep|nslimit|nslimit1|ordering|orientation|page|pagedir|quantum|rank|rankdir|ranksep|ratio|remincross|rotate|samplepoints|searchsize|size|style|URL)\\b",
-      "name": "support.constant.attribute.graph.dot"
+      "name": "support.constant.attribute.graph.dot",
+      "match": "\\b(bgcolor|center|clusterrank|color|comment|compound|concentrate|fillcolor|fontname|fontpath|fontsize|label|labeljust|labelloc|layers|margin|mclimit|nodesep|nslimit|nslimit1|ordering|orientation|page|pagedir|quantum|rank|rankdir|ranksep|ratio|remincross|rotate|samplepoints|searchsize|size|style|URL)\\b"
     },
     {
-      "match": "\\b(box|polygon|ellipse|circle|point|egg|triangle|plaintext|diamond|trapezium|parallelogram|house|pentagon|hexagon|septagon|octagon|doublecircle|doubleoctagon|tripleoctagon|invtriangle|invtrapezium|invhouse|Mdiamond|Msquare|Mcircle|rect|rectangle|none|note|tab|folder|box3d|component|max|min|same)\\b",
-      "name": "variable.other.dot"
+      "name": "variable.other.dot",
+      "match": "\\b(box|polygon|ellipse|circle|point|egg|triangle|plaintext|diamond|trapezium|parallelogram|house|pentagon|hexagon|septagon|octagon|doublecircle|doubleoctagon|tripleoctagon|invtriangle|invtrapezium|invhouse|Mdiamond|Msquare|Mcircle|rect|rectangle|none|note|tab|folder|box3d|component|max|min|same)\\b"
     },
     {
+      "name": "string.quoted.double.dot",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.dot",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.dot"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.dot"
         }
-      },
-      "name": "string.quoted.double.dot",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.dot"
-        }
-      ]
+      }
     },
     {
       "begin": "(^[ \\t]+)?(?=//)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.dot"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.double-slash.dot",
           "begin": "//",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.dot"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-slash.dot"
+          }
         }
-      ]
-    },
-    {
-      "begin": "(^[ \\t]+)?(?=#)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.dot"
         }
-      },
+      }
+    },
+    {
+      "begin": "(^[ \\t]+)?(?=#)",
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.dot",
           "begin": "#",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.dot"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.dot"
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.dot"
         }
-      ]
+      }
     },
     {
+      "name": "comment.block.dot",
       "begin": "/\\*",
+      "end": "\\*/",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.dot"
         }
-      },
-      "end": "\\*/",
-      "name": "comment.block.dot"
+      }
     }
-  ],
-  "scopeName": "source.dot",
-  "uuid": "1A53D54E-6B1D-11D9-A006-000D93589AF6"
-}
+  ]
+}

data/grammars/source.dylan.json

@@ -1,14 +1,11 @@
 {
-  "fileTypes": [
-    "dylan"
-  ],
-  "keyEquivalent": "^~D",
   "name": "Dylan",
+  "scopeName": "source.dylan",
   "patterns": [
     {
-      "begin": "(?<=^|\\s|\\()/\\*",
-      "end": "\\*/",
       "name": "comment.block.dylan",
+      "begin": "(?\u003c=^|\\s|\\()/\\*",
+      "end": "\\*/",
       "patterns": [
         {
           "include": "#comment-block"
@@ -17,38 +14,40 @@
     },
     {
       "begin": "(^[ \\t]+)?(?=//)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.dylan"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.double-slash.dylan",
           "begin": "//",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.dylan"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-slash.dylan"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.dylan"
+        }
+      }
     },
     {
-      "begin": "^(module|synopsis|author|copyright|version|files|executable|library):",
+      "name": "keyword.control.preprocessor.dylan",
       "contentName": "meta.preprocessor.dylan",
+      "begin": "^(module|synopsis|author|copyright|version|files|executable|library):",
       "end": "^\\s*$",
-      "name": "keyword.control.preprocessor.dylan",
       "patterns": [
         {
-          "match": "^(module|synopsis|author|copyright|version|files|executable|library):",
-          "name": "keyword.control.preprocessor.dylan"
+          "name": "keyword.control.preprocessor.dylan",
+          "match": "^(module|synopsis|author|copyright|version|files|executable|library):"
         }
       ]
     },
     {
+      "name": "meta.function.dylan",
+      "match": "^(define)\\s+((?:(?:sealed|open|inline[-a-z]*)\\s+)+)?(?:(domain)|(method|function|generic)\\s+)([\\\\_A-Za-z0-9/!?*%$\\-\\\u003c\\\u003e=]*)",
       "captures": {
         "1": {
           "name": "keyword.other.dylan"
@@ -65,11 +64,11 @@
         "5": {
           "name": "entity.name.function.dylan"
         }
-      },
-      "match": "^(define)\\s+((?:(?:sealed|open|inline[-a-z]*)\\s+)+)?(?:(domain)|(method|function|generic)\\s+)([\\\\_A-Za-z0-9/!?*%$\\-\\<\\>=]*)",
-      "name": "meta.function.dylan"
+      }
     },
     {
+      "name": "meta.class.dylan",
+      "match": "^(define)\\s+((?:(?:sealed|open|abstract|concrete|primary|free)\\s+)+)?(class)\\s+([_A-Za-z0-9/!?*%$\\-\\\u003c\\\u003e]*)",
       "captures": {
         "1": {
           "name": "keyword.other.dylan"
@@ -83,11 +82,11 @@
         "4": {
           "name": "entity.name.type.dylan"
         }
-      },
-      "match": "^(define)\\s+((?:(?:sealed|open|abstract|concrete|primary|free)\\s+)+)?(class)\\s+([_A-Za-z0-9/!?*%$\\-\\<\\>]*)",
-      "name": "meta.class.dylan"
+      }
     },
     {
+      "name": "meta.namespace.dylan",
+      "match": "^(define)\\s+((library|module)\\s+[_A-Za-z0-9/!?*%$\\-\\\u003c\\\u003e]+)",
       "captures": {
         "1": {
           "name": "keyword.other.dylan"
@@ -98,11 +97,11 @@
         "3": {
           "name": "storage.type.namespace.dylan"
         }
-      },
-      "match": "^(define)\\s+((library|module)\\s+[_A-Za-z0-9/!?*%$\\-\\<\\>]+)",
-      "name": "meta.namespace.dylan"
+      }
     },
     {
+      "name": "meta.variable.dylan",
+      "match": "^(define)\\s+(constant|variable)\\s+([_A-Za-z0-9/!?*%$\\-\\\u003c\\\u003e]+)",
       "captures": {
         "1": {
           "name": "keyword.other.dylan"
@@ -113,11 +112,11 @@
         "3": {
           "name": "entity.name.other.dylan"
         }
-      },
-      "match": "^(define)\\s+(constant|variable)\\s+([_A-Za-z0-9/!?*%$\\-\\<\\>]+)",
-      "name": "meta.variable.dylan"
+      }
     },
     {
+      "name": "meta.macro.dylan",
+      "match": "^(define)\\s+(macro)\\s+([_A-Za-z0-9/!?*%$\\-\\\u003c\\\u003e]+)",
       "captures": {
         "1": {
           "name": "keyword.other.dylan"
@@ -128,11 +127,11 @@
         "3": {
           "name": "entity.name.other.dylan"
         }
-      },
-      "match": "^(define)\\s+(macro)\\s+([_A-Za-z0-9/!?*%$\\-\\<\\>]+)",
-      "name": "meta.macro.dylan"
+      }
     },
     {
+      "name": "meta.definition.dylan",
+      "match": "^(define)\\s+([_A-Za-z0-9/!?*%$\\-\\\u003c\\\u003e\\s]+)",
       "captures": {
         "1": {
           "name": "keyword.other.dylan"
@@ -140,26 +139,24 @@
         "2": {
           "name": "entity.name.other.dylan"
         }
-      },
-      "match": "^(define)\\s+([_A-Za-z0-9/!?*%$\\-\\<\\>\\s]+)",
-      "name": "meta.definition.dylan"
+      }
     },
     {
-      "match": "(#t|#f|#next|#rest|#key|#all-keys|#include)",
-      "name": "constant.language.dylan"
+      "name": "constant.language.dylan",
+      "match": "(#t|#f|#next|#rest|#key|#all-keys|#include)"
     },
     {
-      "match": "\\b((#x[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
-      "name": "constant.numeric.dylan"
+      "name": "constant.numeric.dylan",
+      "match": "\\b((#x[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b"
     },
     {
-      "match": "'(\\\\<[0-9a-fA-F]*>|\\\\.|.)'",
-      "name": "constant.character.dylan"
+      "name": "constant.character.dylan",
+      "match": "'(\\\\\u003c[0-9a-fA-F]*\u003e|\\\\.|.)'"
     },
     {
+      "name": "string.quoted.double.dylan",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.dylan",
       "patterns": [
         {
           "include": "#escape"
@@ -167,51 +164,49 @@
       ]
     },
     {
+      "name": "string.quoted.other.dylan",
       "begin": "(#)\"",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.operator.dylan"
-        }
-      },
       "end": "\"",
-      "name": "string.quoted.other.dylan",
       "patterns": [
         {
           "include": "#escape"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.dylan"
+        }
+      }
     },
     {
-      "match": "(?<=^|[,.()\\s])(above|afterwards|begin|below|block|by|case|cleanup|else|elseif|exception|finally|for|from|keyed-by|if|in|otherwise|select|then|to|unless|until:?|using|when|while:?)(?=$|[;,()\\s])",
-      "name": "keyword.control.dylan"
+      "name": "keyword.control.dylan",
+      "match": "(?\u003c=^|[,.()\\s])(above|afterwards|begin|below|block|by|case|cleanup|else|elseif|exception|finally|for|from|keyed-by|if|in|otherwise|select|then|to|unless|until:?|using|when|while:?)(?=$|[;,()\\s])"
     },
     {
-      "match": "(?<=^|[,;\\s])end(?=$|[;,)\\s])",
-      "name": "keyword.control.dylan"
+      "name": "keyword.control.dylan",
+      "match": "(?\u003c=^|[,;\\s])end(?=$|[;,)\\s])"
     },
     {
-      "match": "(?<=^|[,.(\\s])(class|constant|create|default:|define|each-subclass|exclude:|export|export:|function|generic|import:|inherited|init-function:|init-keyword:|init-value:|instance|keyword|let(\\s+handler)?|library|local|macro|method|module|prefix:|rename:|required|required-init-keyword:|sealed|setter:|slot|type:|use|variable|virtual)(?=$|[;,.()\\s])",
-      "name": "keyword.other.dylan"
+      "name": "keyword.other.dylan",
+      "match": "(?\u003c=^|[,.(\\s])(class|constant|create|default:|define|each-subclass|exclude:|export|export:|function|generic|import:|inherited|init-function:|init-keyword:|init-value:|instance|keyword|let(\\s+handler)?|library|local|macro|method|module|prefix:|rename:|required|required-init-keyword:|sealed|setter:|slot|type:|use|variable|virtual)(?=$|[;,.()\\s])"
     },
     {
-      "match": "<(abort|array|boolean|byte-string|character|class|collection|complex|condition|deque|double-float|empty-list|error|explicit-key-collection|extended-float|float|function|generic-function|integer|list|method|mutable-collection|mutable-explicit-key-collection|mutable-sequence|number|object-table|object|pair|range|rational|real|restart|sealed-object-error|sequence|serious-condition|simple-error|simple-object-vector|simple-restart|simple-vector|simple-warning|single-float|singleton|stretchy-collection|stretchy-vector|string|symbol|table|type-error|type|unicode-string|vector|warning)>",
-      "name": "support.class.dylan"
+      "name": "support.class.dylan",
+      "match": "\u003c(abort|array|boolean|byte-string|character|class|collection|complex|condition|deque|double-float|empty-list|error|explicit-key-collection|extended-float|float|function|generic-function|integer|list|method|mutable-collection|mutable-explicit-key-collection|mutable-sequence|number|object-table|object|pair|range|rational|real|restart|sealed-object-error|sequence|serious-condition|simple-error|simple-object-vector|simple-restart|simple-vector|simple-warning|single-float|singleton|stretchy-collection|stretchy-vector|string|symbol|table|type-error|type|unicode-string|vector|warning)\u003e"
     },
     {
-      "match": "(?<=^|[~,.(\\[\\s])(abort|abs|add|add!|add-method|add-new|add-new!|all-superclasses|always|any\\?|applicable-method\\?|apply|aref|aref-setter|as|as-lowercase|as-lowercase!|as-uppercase|as-uppercase!|ash|backward-iteration-protocol|break|ceiling|ceiling/|cerror|check-type|choose|choose-by|complement|compose|concatenate|concatenate-as|condition-format-arguments|condition-format-string|conjoin|copy-sequence|curry|default-handler|dimension|dimensions|direct-subclasses|direct-superclasses|disjoin|do|do-handlers|element|element-setter|empty\\?|error|even\\?|every\\?|false-or|fill!|find-key|find-method|first|first-setter|floor|floor/|forward-iteration-protocol|function-arguments|function-return-values|function-specializers|gcd|generic-function-mandatory-keywords|generic-function-methods|head|head-setter|identity|initialize|instance\\?|integral\\?|intersection|key-sequence|key-test|last|last-setter|lcm|limited|list|logand|logbit\\?|logior|lognot|logxor|make|map|map-as|map-into|max|member\\?|merge-hash-codes|min|modulo|negative|negative\\?|next-method|object-class|object-hash|odd\\?|one-of|pair|pop|pop-last|positive\\?|push|push-last|range|rank|rcurry|reduce|reduce1|remainder|remove|remove!|remove-duplicates|remove-duplicates!|remove-key!|remove-method|replace-elements!|replace-subsequence!|restart-query|return-allowed\\?|return-description|return-query|reverse|reverse!|round|round/|row-major-index|second|second-setter|shallow-copy|signal|singleton|size|size-setter|slot-initialized\\?|sort|sort!|sorted-applicable-methods|subsequence-position|subtype\\?|table-protocol|tail|tail-setter|third|third-setter|truncate|truncate/|type-error-expected-type|type-error-value|type-for-copy|type-union|union|values|vector|zero\\?)(?=$|[;,.()\\s\\]])",
-      "name": "support.function.dylan"
+      "name": "support.function.dylan",
+      "match": "(?\u003c=^|[~,.(\\[\\s])(abort|abs|add|add!|add-method|add-new|add-new!|all-superclasses|always|any\\?|applicable-method\\?|apply|aref|aref-setter|as|as-lowercase|as-lowercase!|as-uppercase|as-uppercase!|ash|backward-iteration-protocol|break|ceiling|ceiling/|cerror|check-type|choose|choose-by|complement|compose|concatenate|concatenate-as|condition-format-arguments|condition-format-string|conjoin|copy-sequence|curry|default-handler|dimension|dimensions|direct-subclasses|direct-superclasses|disjoin|do|do-handlers|element|element-setter|empty\\?|error|even\\?|every\\?|false-or|fill!|find-key|find-method|first|first-setter|floor|floor/|forward-iteration-protocol|function-arguments|function-return-values|function-specializers|gcd|generic-function-mandatory-keywords|generic-function-methods|head|head-setter|identity|initialize|instance\\?|integral\\?|intersection|key-sequence|key-test|last|last-setter|lcm|limited|list|logand|logbit\\?|logior|lognot|logxor|make|map|map-as|map-into|max|member\\?|merge-hash-codes|min|modulo|negative|negative\\?|next-method|object-class|object-hash|odd\\?|one-of|pair|pop|pop-last|positive\\?|push|push-last|range|rank|rcurry|reduce|reduce1|remainder|remove|remove!|remove-duplicates|remove-duplicates!|remove-key!|remove-method|replace-elements!|replace-subsequence!|restart-query|return-allowed\\?|return-description|return-query|reverse|reverse!|round|round/|row-major-index|second|second-setter|shallow-copy|signal|singleton|size|size-setter|slot-initialized\\?|sort|sort!|sorted-applicable-methods|subsequence-position|subtype\\?|table-protocol|tail|tail-setter|third|third-setter|truncate|truncate/|type-error-expected-type|type-error-value|type-for-copy|type-union|union|values|vector|zero\\?)(?=$|[;,.()\\s\\]])"
     }
   ],
   "repository": {
     "comment-block": {
-      "begin": "(?<=^|\\s|\\()/\\*",
+      "begin": "(?\u003c=^|\\s|\\()/\\*",
       "end": "\\*/"
     },
     "escape": {
-      "match": "\\\\(<[0-9a-fA-F]*>|.)",
-      "name": "constant.character.escape.dylan"
+      "name": "constant.character.escape.dylan",
+      "match": "\\\\(\u003c[0-9a-fA-F]*\u003e|.)"
     }
-  },
-  "scopeName": "source.dylan",
-  "uuid": "475B8369-3520-4B4C-BBA1-1D1229C6F397"
-}
+  }
+}