github-linguist 5.3.3 → 6.0.0

data/grammars/source.essl.json

@@ -1,50 +1,37 @@
 {
-  "fileTypes": [
-    "essl",
-    "f.essl",
-    "v.essl",
-    "_v.essl",
-    "_f.essl",
-    "_vs.essl",
-    "_fs.essl"
-  ],
-  "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~G",
   "name": "ESSL",
+  "scopeName": "source.essl",
   "patterns": [
     {
-      "match": "\\b(break|continue|discard|do|else|for|if|return|while)\\b",
-      "name": "keyword.control.essl"
+      "name": "keyword.control.essl",
+      "match": "\\b(break|continue|discard|do|else|for|if|return|while)\\b"
     },
     {
-      "match": "\\b(void|mat2|mat3|mat4|vec2|vec3|vec4|ivec2|ivec3|ivec4|bvec2|bvec3|bvec4|sampler2D|samplerCube|struct)\\b",
-      "name": "storage.type.essl"
+      "name": "storage.type.essl",
+      "match": "\\b(void|mat2|mat3|mat4|vec2|vec3|vec4|ivec2|ivec3|ivec4|bvec2|bvec3|bvec4|sampler2D|samplerCube|struct)\\b"
     },
     {
-      "match": "\\b(attribute|const|in|inout|out|uniform|varying|invariant|lowp|mediump|highp|precision)\\b",
-      "name": "storage.modifier.essl"
+      "name": "storage.modifier.essl",
+      "match": "\\b(attribute|const|in|inout|out|uniform|varying|invariant|lowp|mediump|highp|precision)\\b"
     },
     {
-      "match": "\\b(gl_Position|gl_PointSize|gl_FragCoord|gl_FrontFacing|gl_FragColor|gl_FragData|gl_PointCoord)\\b",
-      "name": "support.variable.essl"
+      "name": "support.variable.essl",
+      "match": "\\b(gl_Position|gl_PointSize|gl_FragCoord|gl_FrontFacing|gl_FragColor|gl_FragData|gl_PointCoord)\\b"
     },
     {
-      "match": "\\b(gl_MaxVertexAttribs|gl_MaxVertexUniformVectors|gl_MaxVaryingVectors|gl_MaxVertexTextureImageUnits|gl_MaxCombinedTextureImageUnits|gl_MaxTextureImageUnits|gl_MaxFragmentUniformVectors|gl_MaxDrawBuffers|gl_DepthRange|__VERSION__|GL_ES)\\b",
-      "name": "support.constant.essl"
+      "name": "support.constant.essl",
+      "match": "\\b(gl_MaxVertexAttribs|gl_MaxVertexUniformVectors|gl_MaxVaryingVectors|gl_MaxVertexTextureImageUnits|gl_MaxCombinedTextureImageUnits|gl_MaxTextureImageUnits|gl_MaxFragmentUniformVectors|gl_MaxDrawBuffers|gl_DepthRange|__VERSION__|GL_ES)\\b"
     },
     {
-      "match": "\\b(radians|degrees|sin|cos|tan|asin|acos|atan|atan|pow|exp|log|exp2|log2|sqrt|inversesqrt|abs|sign|floor|ceil|fract|mod|mod|min|max|clamp|mix|step|smoothstep|length|distance|dot|cross|normalize|faceforward|reflect|refract|matrixCompMult|lessThan|lessThanEqual|greaterThan|greaterThanEqual|equal|notEqual|any|all|not|texture2D|texture2DProj|texture2DLod|texture2DProjLod|textureCube|textureCubeLod)\\b",
-      "name": "support.function.essl"
+      "name": "support.function.essl",
+      "match": "\\b(radians|degrees|sin|cos|tan|asin|acos|atan|atan|pow|exp|log|exp2|log2|sqrt|inversesqrt|abs|sign|floor|ceil|fract|mod|mod|min|max|clamp|mix|step|smoothstep|length|distance|dot|cross|normalize|faceforward|reflect|refract|matrixCompMult|lessThan|lessThanEqual|greaterThan|greaterThanEqual|equal|notEqual|any|all|not|texture2D|texture2DProj|texture2DLod|texture2DProjLod|textureCube|textureCubeLod)\\b"
     },
     {
-      "match": "\\b(asm|class|union|enum|typedef|template|this|packed|goto|switch|default|inline|noinline|volatile|public|static|extern|external|interface|flat|long|short|double|half|fixed|unsigned|superp|input|output|hvec2|hvec3|hvec4|dvec2|dvec3|dvec4|fvec2|fvec3|fvec4|sampler1D|sampler3D|sampler1DShadow|sampler2DShadow|sampler2DRect|sampler3DRect|sampler2DRectShadow|sizeof|cast|namespace|using)\\b",
-      "name": "invalid.illegal.essl"
+      "name": "invalid.illegal.essl",
+      "match": "\\b(asm|class|union|enum|typedef|template|this|packed|goto|switch|default|inline|noinline|volatile|public|static|extern|external|interface|flat|long|short|double|half|fixed|unsigned|superp|input|output|hvec2|hvec3|hvec4|dvec2|dvec3|dvec4|fvec2|fvec3|fvec4|sampler1D|sampler3D|sampler1DShadow|sampler2DShadow|sampler2DRect|sampler3DRect|sampler2DRectShadow|sizeof|cast|namespace|using)\\b"
     },
     {
       "include": "source.c"
     }
-  ],
-  "scopeName": "source.essl",
-  "uuid": "5370EFAA-07AA-4597-962E-D051A99C57A9"
-}
+  ]
+}

data/grammars/source.factor.json

@@ -1,13 +1,10 @@
 {
-  "fileTypes": [
-    "factor",
-    "facts"
-  ],
-  "foldingStartMarker": "^\\s*(M|C)?:|#(V|H|C)\\{",
-  "foldingStopMarker": "^\\s*$",
   "name": "Factor",
+  "scopeName": "source.factor",
   "patterns": [
     {
+      "name": "definition.word.factor",
+      "match": "(^|(?\u003c=\\s))(::?)\\s+([^\\s]+)\\s",
       "captures": {
         "2": {
           "name": "keyword.colon.factor"
@@ -18,11 +15,11 @@
         "4": {
           "name": "comment.stack-effect.factor"
         }
-      },
-      "match": "(^|(?<=\\s))(::?)\\s+([^\\s]+)\\s",
-      "name": "definition.word.factor"
+      }
     },
     {
+      "name": "definition.word.class.factor",
+      "match": "(^|(?\u003c=\\s))(C:)\\s+([^\\s]+)\\s",
       "captures": {
         "2": {
           "name": "keyword.colon.factor"
@@ -33,11 +30,11 @@
         "4": {
           "name": "comment.stack-effect.factor"
         }
-      },
-      "match": "(^|(?<=\\s))(C:)\\s+([^\\s]+)\\s",
-      "name": "definition.word.class.factor"
+      }
     },
     {
+      "name": "definition.word.method.factor",
+      "match": "(^|(?\u003c=\\s))(M:)\\s+([^\\s]+)\\s+([^\\s]+)\\s",
       "captures": {
         "2": {
           "name": "keyword.colon.factor"
@@ -51,11 +48,11 @@
         "5": {
           "name": "comment.stack-effect.factor"
         }
-      },
-      "match": "(^|(?<=\\s))(M:)\\s+([^\\s]+)\\s+([^\\s]+)\\s",
-      "name": "definition.word.method.factor"
+      }
     },
     {
+      "name": "definition.word.generic.factor",
+      "match": "(^|(?\u003c=\\s))(GENERIC:)\\s+([^\\s]+)\\s",
       "captures": {
         "2": {
           "name": "keyword.colon.factor"
@@ -66,11 +63,11 @@
         "5": {
           "name": "comment.stack-effect.factor"
         }
-      },
-      "match": "(^|(?<=\\s))(GENERIC:)\\s+([^\\s]+)\\s",
-      "name": "definition.word.generic.factor"
+      }
     },
     {
+      "name": "definition.word.generic.factor",
+      "match": "(^|(?\u003c=\\s))(GENERIC#)\\s+([^\\s]+)\\s(\\d+)\\s",
       "captures": {
         "2": {
           "name": "keyword.colon.factor"
@@ -81,11 +78,11 @@
         "5": {
           "name": "comment.stack-effect.factor"
         }
-      },
-      "match": "(^|(?<=\\s))(GENERIC#)\\s+([^\\s]+)\\s(\\d+)\\s",
-      "name": "definition.word.generic.factor"
+      }
     },
     {
+      "name": "meta.class.factor",
+      "match": "(^|(?\u003c=\\s))(TUPLE:|BUILTIN:)\\s+([^\\s]+)\\s+(([^\\s]+)+)",
       "captures": {
         "2": {
           "name": "storage.type.factor"
@@ -93,105 +90,103 @@
         "3": {
           "name": "entity.name.class.factor"
         }
-      },
-      "match": "(^|(?<=\\s))(TUPLE:|BUILTIN:)\\s+([^\\s]+)\\s+(([^\\s]+)+)",
-      "name": "meta.class.factor"
+      }
     },
     {
-      "match": "(^|(?<=\\s))(>boolean|<wrapper>|\\(clone\\)|-rot|2bi|2bi@|2bi\\*|2curry|2dip|2drop|2dup|2keep|2nip|2over|2tri|2tri@|2tri\\*|2with|3bi|3curry|3dip|3drop|3dup|3keep|3tri|4dip|4drop|4dup|4keep|=|\\?|\\?if|and|assert|assert=|assert\\?|bi|bi-curry|bi-curry@|bi-curry\\*|bi@|bi\\*|boa|boolean|boolean\\?|both\\?|build|call|callstack|callstack>array|callstack\\?|clear|clone|compose|compose\\?|curry|curry\\?|datastack|die|dip|do|drop|dup|dupd|either\\?|eq\\?|equal\\?|execute|hashcode|hashcode\\*|identity-hashcode|identity-tuple|identity-tuple\\?|if|if\\*|keep|loop|most|new|nip|not|null|object|or|over|pick|prepose|retainstack|rot|same\\?|swap|swapd|throw|tri|tri-curry|tri-curry@|tri-curry\\*|tri@|tri\\*|tuple|tuple\\?|unless|unless\\*|until|when|when\\*|while|with|wrapper|wrapper\\?|xor)(\\s|$)",
-      "name": "keyword.control.kernel.factor"
+      "name": "keyword.control.kernel.factor",
+      "match": "(^|(?\u003c=\\s))(\u003eboolean|\u003cwrapper\u003e|\\(clone\\)|-rot|2bi|2bi@|2bi\\*|2curry|2dip|2drop|2dup|2keep|2nip|2over|2tri|2tri@|2tri\\*|2with|3bi|3curry|3dip|3drop|3dup|3keep|3tri|4dip|4drop|4dup|4keep|=|\\?|\\?if|and|assert|assert=|assert\\?|bi|bi-curry|bi-curry@|bi-curry\\*|bi@|bi\\*|boa|boolean|boolean\\?|both\\?|build|call|callstack|callstack\u003earray|callstack\\?|clear|clone|compose|compose\\?|curry|curry\\?|datastack|die|dip|do|drop|dup|dupd|either\\?|eq\\?|equal\\?|execute|hashcode|hashcode\\*|identity-hashcode|identity-tuple|identity-tuple\\?|if|if\\*|keep|loop|most|new|nip|not|null|object|or|over|pick|prepose|retainstack|rot|same\\?|swap|swapd|throw|tri|tri-curry|tri-curry@|tri-curry\\*|tri@|tri\\*|tuple|tuple\\?|unless|unless\\*|until|when|when\\*|while|with|wrapper|wrapper\\?|xor)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(\\+@|change|change-global|counter|dec|get|get-global|global|inc|init-namespaces|initialize|is-global|namespace|namestack|off|on|set|set-global|set-namestack|toggle|with-global|with-scope|with-variable|with-variables)(\\s|$)",
-      "name": "keyword.control.namespaces.factor"
+      "name": "keyword.control.namespaces.factor",
+      "match": "(^|(?\u003c=\\s))(\\+@|change|change-global|counter|dec|get|get-global|global|inc|init-namespaces|initialize|is-global|namespace|namestack|off|on|set|set-global|set-namestack|toggle|with-global|with-scope|with-variable|with-variables)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(>alist|<enum>|2cache|\\?at|\\?of|assoc|assoc>map|assoc-all\\?|assoc-any\\?|assoc-clone-like|assoc-combine|assoc-diff|assoc-diff!|assoc-differ|assoc-each|assoc-empty\\?|assoc-filter|assoc-filter!|assoc-filter-as|assoc-find|assoc-hashcode|assoc-intersect|assoc-like|assoc-map|assoc-map-as|assoc-partition|assoc-refine|assoc-size|assoc-stack|assoc-subset\\?|assoc-union|assoc-union!|assoc=|assoc\\?|at|at\\*|at\\+|cache|change-at|clear-assoc|delete-at|delete-at\\*|enum|enum\\?|extract-keys|inc-at|key\\?|keys|map>assoc|maybe-set-at|new-assoc|of|push-at|rename-at|set-at|sift-keys|sift-values|substitute|unzip|value-at|value-at\\*|value\\?|values|zip|zip-as|zip-index|zip-index-as)(\\s|$)",
-      "name": "keyword.control.assocs.factor"
+      "name": "keyword.control.assocs.factor",
+      "match": "(^|(?\u003c=\\s))(\u003ealist|\u003cenum\u003e|2cache|\\?at|\\?of|assoc|assoc\u003emap|assoc-all\\?|assoc-any\\?|assoc-clone-like|assoc-combine|assoc-diff|assoc-diff!|assoc-differ|assoc-each|assoc-empty\\?|assoc-filter|assoc-filter!|assoc-filter-as|assoc-find|assoc-hashcode|assoc-intersect|assoc-like|assoc-map|assoc-map-as|assoc-partition|assoc-refine|assoc-size|assoc-stack|assoc-subset\\?|assoc-union|assoc-union!|assoc=|assoc\\?|at|at\\*|at\\+|cache|change-at|clear-assoc|delete-at|delete-at\\*|enum|enum\\?|extract-keys|inc-at|key\\?|keys|map\u003eassoc|maybe-set-at|new-assoc|of|push-at|rename-at|set-at|sift-keys|sift-values|substitute|unzip|value-at|value-at\\*|value\\?|values|zip|zip-as|zip-index|zip-index-as)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(2cleave|2cleave>quot|3cleave|3cleave>quot|4cleave|4cleave>quot|alist>quot|call-effect|case|case>quot|case-find|cleave|cleave>quot|cond|cond>quot|deep-spread>quot|execute-effect|linear-case-quot|no-case|no-case\\?|no-cond|no-cond\\?|recursive-hashcode|shallow-spread>quot|spread|to-fixed-point|wrong-values|wrong-values\\?)(\\s|$)",
-      "name": "keyword.control.combinators.factor"
+      "name": "keyword.control.combinators.factor",
+      "match": "(^|(?\u003c=\\s))(2cleave|2cleave\u003equot|3cleave|3cleave\u003equot|4cleave|4cleave\u003equot|alist\u003equot|call-effect|case|case\u003equot|case-find|cleave|cleave\u003equot|cond|cond\u003equot|deep-spread\u003equot|execute-effect|linear-case-quot|no-case|no-case\\?|no-cond|no-cond\\?|recursive-hashcode|shallow-spread\u003equot|spread|to-fixed-point|wrong-values|wrong-values\\?)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(>|>=|>bignum|>fixnum|>float|>integer|<|<=|<fp-nan>|\\(all-integers\\?\\)|\\(each-integer\\)|\\(find-integer\\)|-|/|/f|/i|/mod|2/|2^|\\*|\\+|\\?1\\+|abs|align|all-integers\\?|bignum|bignum\\?|bit\\?|bitand|bitnot|bitor|bits>double|bits>float|bitxor|complex|complex\\?|denominator|double>bits|each-integer|even\\?|find-integer|find-last-integer|fixnum|fixnum\\?|float|float>bits|float\\?|fp-bitwise=|fp-infinity\\?|fp-nan-payload|fp-nan\\?|fp-qnan\\?|fp-sign|fp-snan\\?|fp-special\\?|if-zero|imaginary-part|integer|integer>fixnum|integer>fixnum-strict|integer\\?|log2|log2-expects-positive|log2-expects-positive\\?|mod|neg|neg\\?|next-float|next-power-of-2|number|number=|number\\?|numerator|odd\\?|power-of-2\\?|prev-float|ratio|ratio\\?|rational|rational\\?|real|real-part|real\\?|recip|rem|sgn|shift|sq|times|u>|u>=|u<|u<=|unless-zero|unordered\\?|when-zero|zero\\?)(\\s|$)",
-      "name": "keyword.control.math.factor"
+      "name": "keyword.control.math.factor",
+      "match": "(^|(?\u003c=\\s))(\u003e|\u003e=|\u003ebignum|\u003efixnum|\u003efloat|\u003einteger|\u003c|\u003c=|\u003cfp-nan\u003e|\\(all-integers\\?\\)|\\(each-integer\\)|\\(find-integer\\)|-|/|/f|/i|/mod|2/|2^|\\*|\\+|\\?1\\+|abs|align|all-integers\\?|bignum|bignum\\?|bit\\?|bitand|bitnot|bitor|bits\u003edouble|bits\u003efloat|bitxor|complex|complex\\?|denominator|double\u003ebits|each-integer|even\\?|find-integer|find-last-integer|fixnum|fixnum\\?|float|float\u003ebits|float\\?|fp-bitwise=|fp-infinity\\?|fp-nan-payload|fp-nan\\?|fp-qnan\\?|fp-sign|fp-snan\\?|fp-special\\?|if-zero|imaginary-part|integer|integer\u003efixnum|integer\u003efixnum-strict|integer\\?|log2|log2-expects-positive|log2-expects-positive\\?|mod|neg|neg\\?|next-float|next-power-of-2|number|number=|number\\?|numerator|odd\\?|power-of-2\\?|prev-float|ratio|ratio\\?|rational|rational\\?|real|real-part|real\\?|recip|rem|sgn|shift|sq|times|u\u003e|u\u003e=|u\u003c|u\u003c=|unless-zero|unordered\\?|when-zero|zero\\?)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(<repetition>|<reversed>|<slice>|1sequence|2all\\?|2each|2map|2map-as|2map-reduce|2reduce|2selector|2sequence|3append|3append-as|3each|3map|3map-as|3sequence|4sequence|\\?first|\\?last|\\?nth|\\?second|\\?set-nth|accumulate|accumulate!|accumulate-as|all\\?|any\\?|append|append!|append-as|assert-sequence|assert-sequence=|assert-sequence\\?|binary-reduce|bounds-check|bounds-check\\?|bounds-error|bounds-error\\?|but-last|but-last-slice|cartesian-each|cartesian-map|cartesian-product|change-nth|check-slice|check-slice-error|clone-like|collapse-slice|collector|collector-for|concat|concat-as|copy|count|cut|cut-slice|cut\\*|delete-all|delete-slice|drop-prefix|each|each-from|each-index|empty\\?|exchange|filter|filter!|filter-as|find|find-from|find-index|find-index-from|find-last|find-last-from|first|first2|first3|first4|flip|follow|fourth|glue|halves|harvest|head|head-slice|head-slice\\*|head\\*|head\\?|if-empty|immutable|immutable-sequence|immutable-sequence\\?|immutable\\?|index|index-from|indices|infimum|infimum-by|insert-nth|interleave|iota|iota-tuple|iota-tuple\\?|join|join-as|last|last-index|last-index-from|length|lengthen|like|longer|longer\\?|longest|map|map!|map-as|map-find|map-find-last|map-index|map-index-as|map-integers|map-reduce|map-sum|max-length|member-eq\\?|member\\?|midpoint@|min-length|mismatch|move|new-like|new-resizable|new-sequence|non-negative-integer-expected|non-negative-integer-expected\\?|nth|nths|pad-head|pad-tail|padding|partition|pop|pop\\*|prefix|prepend|prepend-as|produce|produce-as|product|push|push-all|push-either|push-if|reduce|reduce-index|remove|remove!|remove-eq|remove-eq!|remove-nth|remove-nth!|repetition|repetition\\?|replace-slice|replicate|replicate-as|rest|rest-slice|reverse|reverse!|reversed|reversed\\?|second|selector|selector-for|sequence|sequence-hashcode|sequence=|sequence\\?|set-first|set-fourth|set-last|set-length|set-nth|set-second|set-third|short|shorten|shorter|shorter\\?|shortest|sift|slice|slice-error|slice-error\\?|slice\\?|snip|snip-slice|start|start\\*|subseq|subseq\\?|suffix|suffix!|sum|sum-lengths|supremum|supremum-by|surround|tail|tail-slice|tail-slice\\*|tail\\*|tail\\?|third|trim|trim-head|trim-head-slice|trim-slice|trim-tail|trim-tail-slice|unclip|unclip-last|unclip-last-slice|unclip-slice|unless-empty|virtual-exemplar|virtual-sequence|virtual-sequence\\?|virtual@|when-empty)(\\s|$)",
-      "name": "keyword.control.sequences.factor"
+      "name": "keyword.control.sequences.factor",
+      "match": "(^|(?\u003c=\\s))(\u003crepetition\u003e|\u003creversed\u003e|\u003cslice\u003e|1sequence|2all\\?|2each|2map|2map-as|2map-reduce|2reduce|2selector|2sequence|3append|3append-as|3each|3map|3map-as|3sequence|4sequence|\\?first|\\?last|\\?nth|\\?second|\\?set-nth|accumulate|accumulate!|accumulate-as|all\\?|any\\?|append|append!|append-as|assert-sequence|assert-sequence=|assert-sequence\\?|binary-reduce|bounds-check|bounds-check\\?|bounds-error|bounds-error\\?|but-last|but-last-slice|cartesian-each|cartesian-map|cartesian-product|change-nth|check-slice|check-slice-error|clone-like|collapse-slice|collector|collector-for|concat|concat-as|copy|count|cut|cut-slice|cut\\*|delete-all|delete-slice|drop-prefix|each|each-from|each-index|empty\\?|exchange|filter|filter!|filter-as|find|find-from|find-index|find-index-from|find-last|find-last-from|first|first2|first3|first4|flip|follow|fourth|glue|halves|harvest|head|head-slice|head-slice\\*|head\\*|head\\?|if-empty|immutable|immutable-sequence|immutable-sequence\\?|immutable\\?|index|index-from|indices|infimum|infimum-by|insert-nth|interleave|iota|iota-tuple|iota-tuple\\?|join|join-as|last|last-index|last-index-from|length|lengthen|like|longer|longer\\?|longest|map|map!|map-as|map-find|map-find-last|map-index|map-index-as|map-integers|map-reduce|map-sum|max-length|member-eq\\?|member\\?|midpoint@|min-length|mismatch|move|new-like|new-resizable|new-sequence|non-negative-integer-expected|non-negative-integer-expected\\?|nth|nths|pad-head|pad-tail|padding|partition|pop|pop\\*|prefix|prepend|prepend-as|produce|produce-as|product|push|push-all|push-either|push-if|reduce|reduce-index|remove|remove!|remove-eq|remove-eq!|remove-nth|remove-nth!|repetition|repetition\\?|replace-slice|replicate|replicate-as|rest|rest-slice|reverse|reverse!|reversed|reversed\\?|second|selector|selector-for|sequence|sequence-hashcode|sequence=|sequence\\?|set-first|set-fourth|set-last|set-length|set-nth|set-second|set-third|short|shorten|shorter|shorter\\?|shortest|sift|slice|slice-error|slice-error\\?|slice\\?|snip|snip-slice|start|start\\*|subseq|subseq\\?|suffix|suffix!|sum|sum-lengths|supremum|supremum-by|surround|tail|tail-slice|tail-slice\\*|tail\\*|tail\\?|third|trim|trim-head|trim-head-slice|trim-slice|trim-tail|trim-tail-slice|unclip|unclip-last|unclip-last-slice|unclip-slice|unless-empty|virtual-exemplar|virtual-sequence|virtual-sequence\\?|virtual@|when-empty)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(>array|<array>|1array|2array|3array|4array|array|array\\?|pair|pair\\?|resize-array)(\\s|$)",
-      "name": "keyword.control.arrays.factor"
+      "name": "keyword.control.arrays.factor",
+      "match": "(^|(?\u003c=\\s))(\u003earray|\u003carray\u003e|1array|2array|3array|4array|array|array\\?|pair|pair\\?|resize-array)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(\\(each-stream-block-slice\\)|\\(each-stream-block\\)|\\(stream-contents-by-block\\)|\\(stream-contents-by-element\\)|\\(stream-contents-by-length-or-block\\)|\\(stream-contents-by-length\\)|\\+byte\\+|\\+character\\+|bad-seek-type|bad-seek-type\\?|bl|contents|each-block|each-block-size|each-block-slice|each-line|each-morsel|each-stream-block|each-stream-block-slice|each-stream-line|error-stream|flush|input-stream|input-stream\\?|invalid-read-buffer|invalid-read-buffer\\?|lines|nl|output-stream|output-stream\\?|print|read|read-into|read-partial|read-partial-into|read-until|read1|readln|seek-absolute|seek-absolute\\?|seek-end|seek-end\\?|seek-input|seek-output|seek-relative|seek-relative\\?|stream-bl|stream-contents|stream-contents\\*|stream-copy|stream-copy\\*|stream-element-type|stream-flush|stream-length|stream-lines|stream-nl|stream-print|stream-read|stream-read-into|stream-read-partial|stream-read-partial-into|stream-read-partial-unsafe|stream-read-unsafe|stream-read-until|stream-read1|stream-readln|stream-seek|stream-seekable\\?|stream-tell|stream-write|stream-write1|tell-input|tell-output|with-error>output|with-error-stream|with-error-stream\\*|with-input-output\\+error-streams|with-input-output\\+error-streams\\*|with-input-stream|with-input-stream\\*|with-output>error|with-output-stream|with-output-stream\\*|with-output\\+error-stream|with-output\\+error-stream\\*|with-streams|with-streams\\*|write|write1)(\\s|$)",
-      "name": "keyword.control.io.factor"
+      "name": "keyword.control.io.factor",
+      "match": "(^|(?\u003c=\\s))(\\(each-stream-block-slice\\)|\\(each-stream-block\\)|\\(stream-contents-by-block\\)|\\(stream-contents-by-element\\)|\\(stream-contents-by-length-or-block\\)|\\(stream-contents-by-length\\)|\\+byte\\+|\\+character\\+|bad-seek-type|bad-seek-type\\?|bl|contents|each-block|each-block-size|each-block-slice|each-line|each-morsel|each-stream-block|each-stream-block-slice|each-stream-line|error-stream|flush|input-stream|input-stream\\?|invalid-read-buffer|invalid-read-buffer\\?|lines|nl|output-stream|output-stream\\?|print|read|read-into|read-partial|read-partial-into|read-until|read1|readln|seek-absolute|seek-absolute\\?|seek-end|seek-end\\?|seek-input|seek-output|seek-relative|seek-relative\\?|stream-bl|stream-contents|stream-contents\\*|stream-copy|stream-copy\\*|stream-element-type|stream-flush|stream-length|stream-lines|stream-nl|stream-print|stream-read|stream-read-into|stream-read-partial|stream-read-partial-into|stream-read-partial-unsafe|stream-read-unsafe|stream-read-until|stream-read1|stream-readln|stream-seek|stream-seekable\\?|stream-tell|stream-write|stream-write1|tell-input|tell-output|with-error\u003eoutput|with-error-stream|with-error-stream\\*|with-input-output\\+error-streams|with-input-output\\+error-streams\\*|with-input-stream|with-input-stream\\*|with-output\u003eerror|with-output-stream|with-output-stream\\*|with-output\\+error-stream|with-output\\+error-stream\\*|with-streams|with-streams\\*|write|write1)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(>string|<string>|1string|resize-string|string|string\\?)(\\s|$)",
-      "name": "keyword.control.strings.factor"
+      "name": "keyword.control.strings.factor",
+      "match": "(^|(?\u003c=\\s))(\u003estring|\u003cstring\u003e|1string|resize-string|string|string\\?)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(>vector|<vector>|1vector|\\?push|vector|vector\\?)(\\s|$)",
-      "name": "keyword.control.vectors.factor"
+      "name": "keyword.control.vectors.factor",
+      "match": "(^|(?\u003c=\\s))(\u003evector|\u003cvector\u003e|1vector|\\?push|vector|vector\\?)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(<condition>|<continuation>|<restart>|attempt-all|attempt-all-error|attempt-all-error\\?|callback-error-hook|callcc0|callcc1|cleanup|compute-restarts|condition|condition\\?|continuation|continuation\\?|continue|continue-restart|continue-with|current-continuation|error|error-continuation|error-in-thread|error-thread|ifcc|ignore-errors|in-callback\\?|original-error|recover|restart|restart\\?|restarts|rethrow|rethrow-restarts|return|return-continuation|thread-error-hook|throw-continue|throw-restarts|with-datastack|with-return)(\\s|$)",
-      "name": "keyword.control.continuations.factor"
+      "name": "keyword.control.continuations.factor",
+      "match": "(^|(?\u003c=\\s))(\u003ccondition\u003e|\u003ccontinuation\u003e|\u003crestart\u003e|attempt-all|attempt-all-error|attempt-all-error\\?|callback-error-hook|callcc0|callcc1|cleanup|compute-restarts|condition|condition\\?|continuation|continuation\\?|continue|continue-restart|continue-with|current-continuation|error|error-continuation|error-in-thread|error-thread|ifcc|ignore-errors|in-callback\\?|original-error|recover|restart|restart\\?|restarts|rethrow|rethrow-restarts|return|return-continuation|thread-error-hook|throw-continue|throw-restarts|with-datastack|with-return)(\\s|$)"
     },
     {
-      "begin": "(^|(?<=\\s))(USING:)",
-      "end": "(?<=\\s);(\\s|$)",
       "name": "keyword.control.using.factor",
+      "begin": "(^|(?\u003c=\\s))(USING:)",
+      "end": "(?\u003c=\\s);(\\s|$)",
       "patterns": [
         {
-          "match": "(^|(?<=\\s))[^\\s]+(\\s|$)",
-          "name": "constant.namespace.factor"
+          "name": "constant.namespace.factor",
+          "match": "(^|(?\u003c=\\s))[^\\s]+(\\s|$)"
         }
       ]
     },
     {
-      "match": "(^|(?<=\\s))(f|t)(\\s|$)",
-      "name": "constant.language.factor"
+      "name": "constant.language.factor",
+      "match": "(^|(?\u003c=\\s))(f|t)(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))CHAR:\\s+[^\\s]+(\\s|$)",
-      "name": "constant.character.factor"
+      "name": "constant.character.factor",
+      "match": "(^|(?\u003c=\\s))CHAR:\\s+[^\\s]+(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))[+-]?\\d([\\d,]*\\d)?(\\s|$)",
-      "name": "constant.numeric.integer.factor"
+      "name": "constant.numeric.integer.factor",
+      "match": "(^|(?\u003c=\\s))[+-]?\\d([\\d,]*\\d)?(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))[+-]?(\\d([\\d,]*\\d)?)?\\.\\d([\\d,]*\\d)?([Ee][+-]?\\d([\\d,]*\\d)?)?(\\s|$)",
-      "name": "constant.numeric.float.factor"
+      "name": "constant.numeric.float.factor",
+      "match": "(^|(?\u003c=\\s))[+-]?(\\d([\\d,]*\\d)?)?\\.\\d([\\d,]*\\d)?([Ee][+-]?\\d([\\d,]*\\d)?)?(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))(-\\d([\\d,]*\\d)?)?-?\\d([\\d,]*\\d)?/\\d([\\d,]*\\d)?(\\s|$)",
-      "name": "constant.numeric.neg-ratio.factor"
+      "name": "constant.numeric.neg-ratio.factor",
+      "match": "(^|(?\u003c=\\s))(-\\d([\\d,]*\\d)?)?-?\\d([\\d,]*\\d)?/\\d([\\d,]*\\d)?(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))\\+?(\\d([\\d,]*\\d)?\\+?)?\\d([\\d,]*\\d)?/\\d([\\d,]*\\d)?(\\s|$)",
-      "name": "constant.numeric.pos-ratio.factor"
+      "name": "constant.numeric.pos-ratio.factor",
+      "match": "(^|(?\u003c=\\s))\\+?(\\d([\\d,]*\\d)?\\+?)?\\d([\\d,]*\\d)?/\\d([\\d,]*\\d)?(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))[+-]?0b[01]([01,]*[01])?(\\s|$)",
-      "name": "constant.numeric.binary.factor"
+      "name": "constant.numeric.binary.factor",
+      "match": "(^|(?\u003c=\\s))[+-]?0b[01]([01,]*[01])?(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))[+-]?0o[0-7]([0-7,]*[0-7])?(\\s|$)",
-      "name": "constant.numeric.octal.factor"
+      "name": "constant.numeric.octal.factor",
+      "match": "(^|(?\u003c=\\s))[+-]?0o[0-7]([0-7,]*[0-7])?(\\s|$)"
     },
     {
-      "match": "(^|(?<=\\s))[+-]?0x[0-9a-fA-Fp]([0-9a-fA-F,]*[0-9a-fA-F])?(p[0-9a-fA-Fp]([0-9a-fA-F,]*[0-9a-fA-F])?)?(\\s|$)",
-      "name": "constant.numeric.hex.factor"
+      "name": "constant.numeric.hex.factor",
+      "match": "(^|(?\u003c=\\s))[+-]?0x[0-9a-fA-Fp]([0-9a-fA-F,]*[0-9a-fA-F])?(p[0-9a-fA-Fp]([0-9a-fA-F,]*[0-9a-fA-F])?)?(\\s|$)"
     },
     {
+      "name": "string.quoted.double.factor",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.factor",
       "patterns": [
         {
           "include": "#escaped_characters"
@@ -199,9 +194,9 @@
       ]
     },
     {
-      "begin": "<\"",
-      "end": "\">",
       "name": "string.quoted.double.multiline.factor",
+      "begin": "\u003c\"",
+      "end": "\"\u003e",
       "patterns": [
         {
           "include": "#escaped_characters"
@@ -209,7 +204,10 @@
       ]
     },
     {
-      "begin": "(^|(?<=\\s))(STRING:)\\s+(\\S+)",
+      "name": "definition.word.heredoc.factor",
+      "contentName": "string.unquoted.heredoc.factor",
+      "begin": "(^|(?\u003c=\\s))(STRING:)\\s+(\\S+)",
+      "end": "^;$",
       "captures": {
         "2": {
           "name": "keyword.colon.factor"
@@ -217,42 +215,38 @@
         "3": {
           "name": "entity.name.heredoc.factor"
         }
-      },
-      "contentName": "string.unquoted.heredoc.factor",
-      "end": "^;$",
-      "name": "definition.word.heredoc.factor"
+      }
     },
     {
-      "match": "inline|foldable",
-      "name": "storage.modifier.factor"
+      "name": "storage.modifier.factor",
+      "match": "inline|foldable"
     },
     {
-      "match": "(^|(?<=\\s))#?!(\\s.*)?$",
-      "name": "comment.line.factor"
+      "name": "comment.line.factor",
+      "match": "(^|(?\u003c=\\s))#?!(\\s.*)?$"
     },
     {
+      "name": "comment.parens.factor",
       "begin": "\\((?=\\s)",
-      "end": "(^|(?<=\\s))\\)",
-      "name": "comment.parens.factor"
+      "end": "(^|(?\u003c=\\s))\\)"
     },
     {
-      "match": "\\b[^\\s]+:\\s+[^\\s]+(\\s|$)",
-      "name": "keyword.control.postpone.factor"
+      "name": "keyword.control.postpone.factor",
+      "match": "\\b[^\\s]+:\\s+[^\\s]+(\\s|$)"
     }
   ],
   "repository": {
     "escaped_characters": {
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnrtsv0\"]|x[a-fA-F0-9]{2}|u[a-fA-F0-9]{6})",
-          "name": "constant.character.escape.factor"
+          "name": "constant.character.escape.factor",
+          "match": "\\\\(\\\\|[abefnrtsv0\"]|x[a-fA-F0-9]{2}|u[a-fA-F0-9]{6})"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unknown-escape.factor"
+          "name": "invalid.illegal.unknown-escape.factor",
+          "match": "\\\\."
         }
       ]
     }
-  },
-  "scopeName": "source.factor"
-}
+  }
+}

data/grammars/source.fan.json

@@ -1,8 +1,6 @@
 {
-  "fileTypes": [
-    "fan"
-  ],
   "name": "Fantom",
+  "scopeName": "source.fan",
   "patterns": [
     {
       "include": "#main"
@@ -25,9 +23,9 @@
     "double-quoted-string": {
       "patterns": [
         {
+          "name": "string.quoted.double.fan",
           "begin": "(\")",
           "end": "(\")",
-          "name": "string.quoted.double.fan",
           "patterns": [
             {
               "include": "#escaped-unicode"
@@ -45,100 +43,100 @@
     "escaped-char": {
       "patterns": [
         {
-          "match": "(\\\\[bfnrt\"'`$\\\\])",
-          "name": "constant.character.escape.char.fan"
+          "name": "constant.character.escape.char.fan",
+          "match": "(\\\\[bfnrt\"'`$\\\\])"
         },
         {
-          "match": "(\\\\.)",
-          "name": "invalid.illegal.escape.char.fan"
+          "name": "invalid.illegal.escape.char.fan",
+          "match": "(\\\\.)"
         }
       ]
     },
     "escaped-unicode": {
       "patterns": [
         {
-          "match": "(\\\\u[0-9A-Fa-f]{4})",
-          "name": "constant.character.escape.unicode.fan"
+          "name": "constant.character.escape.unicode.fan",
+          "match": "(\\\\u[0-9A-Fa-f]{4})"
         },
         {
-          "match": "(\\\\u[0-9A-Fa-f]{0,3})",
-          "name": "invalid.illegal.escape.unicode.fan"
+          "name": "invalid.illegal.escape.unicode.fan",
+          "match": "(\\\\u[0-9A-Fa-f]{0,3})"
         }
       ]
     },
     "fandoc-comment": {
       "patterns": [
         {
-          "match": "(^\\s*\\*\\*.*$)",
-          "name": "comment.line.fandoc.fan"
+          "name": "comment.line.fandoc.fan",
+          "match": "(^\\s*\\*\\*.*$)"
         }
       ]
     },
     "interpolation": {
       "patterns": [
         {
-          "match": "(\\$\\{.+?\\})",
-          "name": "variable.other.interpolated-expr.fan"
+          "name": "variable.other.interpolated-expr.fan",
+          "match": "(\\$\\{.+?\\})"
         },
         {
-          "match": "(\\$([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*))",
-          "name": "variable.other.interpolated-dotcall.fan"
+          "name": "variable.other.interpolated-dotcall.fan",
+          "match": "(\\$([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*))"
         },
         {
-          "match": "(\\$\\{\\w*)",
-          "name": "invalid.illegal.interpolation.fan"
+          "name": "invalid.illegal.interpolation.fan",
+          "match": "(\\$\\{\\w*)"
         }
       ]
     },
     "keywords": {
       "patterns": [
         {
-          "match": "(\\b(true|false|null)\\b)",
-          "name": "constant.language.fan"
+          "name": "constant.language.fan",
+          "match": "(\\b(true|false|null)\\b)"
         },
         {
-          "match": "(\\b(abstract|const|enum|facet|final|internal|native|once|override|private|protected|public|readonly|static|virtual|volatile)\\b)",
-          "name": "storage.modifier.fan"
+          "name": "storage.modifier.fan",
+          "match": "(\\b(abstract|const|enum|facet|final|internal|native|once|override|private|protected|public|readonly|static|virtual|volatile)\\b)"
         },
         {
-          "match": "(\\b(return|break|continue)\\b)",
-          "name": "keyword.control.block.fan"
+          "name": "keyword.control.block.fan",
+          "match": "(\\b(return|break|continue)\\b)"
         },
         {
-          "match": "(\\b(try|catch|finally|throw|assert)\\b)",
-          "name": "keyword.control.exceptions.fan"
+          "name": "keyword.control.exceptions.fan",
+          "match": "(\\b(try|catch|finally|throw|assert)\\b)"
         },
         {
-          "match": "(\\b(for|while|do|foreach)\\b)",
-          "name": "keyword.control.loop.fan"
+          "name": "keyword.control.loop.fan",
+          "match": "(\\b(for|while|do|foreach)\\b)"
         },
         {
-          "match": "(\\b(if|else|switch|case|default)\\b)",
-          "name": "keyword.control.flow.fan"
+          "name": "keyword.control.flow.fan",
+          "match": "(\\b(if|else|switch|case|default)\\b)"
         },
         {
-          "match": "(\\b(new|void)\\b)",
-          "name": "keyword.other.fan"
+          "name": "keyword.other.fan",
+          "match": "(\\b(new|void)\\b)"
         },
         {
-          "match": "(\\b(using)\\b)",
-          "name": "storage.modifier.global.fan"
+          "name": "storage.modifier.global.fan",
+          "match": "(\\b(using)\\b)"
         },
         {
-          "match": "(\\b(this|super|it)\\b)",
-          "name": "variable.language.self.fan"
+          "name": "variable.language.self.fan",
+          "match": "(\\b(this|super|it)\\b)"
         },
         {
-          "match": "(\\b(Void|Bool|Int|Float|Decimal|Duration|Str|Uri|Type|Slot|Range|List|Map|This)\\b)",
-          "name": "support.type.sys.fan"
+          "name": "support.type.sys.fan",
+          "match": "(\\b(Void|Bool|Int|Float|Decimal|Duration|Str|Uri|Type|Slot|Range|List|Map|This)\\b)"
         }
       ]
     },
     "line-comment": {
       "patterns": [
         {
-          "match": "((//).*$)",
-          "name": "comment.line.double-slash.fan"
+          "name": "comment.line.double-slash.fan",
+          "match": "((//).*$)"
         }
       ]
     },
@@ -170,107 +168,107 @@
     "multiline-comment": {
       "patterns": [
         {
+          "name": "comment.block",
           "begin": "(/\\*)",
-          "end": "(\\*/)",
-          "name": "comment.block"
+          "end": "(\\*/)"
         }
       ]
     },
     "numbers": {
       "patterns": [
         {
-          "match": "(\\b0x[0-9A-Fa-f][_0-9A-Fa-f]*)",
-          "name": "constant.numeric.hex.fan"
+          "name": "constant.numeric.hex.fan",
+          "match": "(\\b0x[0-9A-Fa-f][_0-9A-Fa-f]*)"
         },
         {
-          "match": "(0x)",
-          "name": "invalid.illegal.hex.fan"
+          "name": "invalid.illegal.hex.fan",
+          "match": "(0x)"
         },
         {
-          "match": "(\\\\u[0-9A-Fa-f]{4})",
-          "name": "constant.numeric.escape.unicode.fan"
+          "name": "constant.numeric.escape.unicode.fan",
+          "match": "(\\\\u[0-9A-Fa-f]{4})"
         },
         {
-          "match": "(\\\\(u[0-9A-Fa-f]{0,3})?)",
-          "name": "invalid.illegal.escape.unicode.fan"
+          "name": "invalid.illegal.escape.unicode.fan",
+          "match": "(\\\\(u[0-9A-Fa-f]{0,3})?)"
         },
         {
-          "match": "(\\'\\\\[bfnrt\"'$\\\\]\\')",
-          "name": "constant.numeric.escape.char.fan"
+          "name": "constant.numeric.escape.char.fan",
+          "match": "(\\'\\\\[bfnrt\"'$\\\\]\\')"
         },
         {
-          "match": "(\\'[^\\\\]\\')",
-          "name": "constant.numeric.char.fan"
+          "name": "constant.numeric.char.fan",
+          "match": "(\\'[^\\\\]\\')"
         },
         {
-          "match": "((\\B\\.[0-9][0-9_]*|\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE][-+]?[0-9][0-9_]*)?(ns|ms|sec|min|hr|day))",
-          "name": "constant.other.duration.fan"
+          "name": "constant.other.duration.fan",
+          "match": "((\\B\\.[0-9][0-9_]*|\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE][-+]?[0-9][0-9_]*)?(ns|ms|sec|min|hr|day))"
         },
         {
-          "match": "((\\B\\.[0-9][0-9_]*|\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE][-+]?[0-9][0-9_]*)?[fdFD]?)",
-          "name": "constant.numeric.number.fan"
+          "name": "constant.numeric.number.fan",
+          "match": "((\\B\\.[0-9][0-9_]*|\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE][-+]?[0-9][0-9_]*)?[fdFD]?)"
         }
       ]
     },
     "operators": {
       "patterns": [
         {
-          "match": "(===?|!==?)",
-          "name": "keyword.operator.equality.fan"
+          "name": "keyword.operator.equality.fan",
+          "match": "(===?|!==?)"
         },
         {
-          "match": "(<(=|=>)?|>=?)",
-          "name": "keyword.operator.relational.symbol.fan"
+          "name": "keyword.operator.relational.symbol.fan",
+          "match": "(\u003c(=|=\u003e)?|\u003e=?)"
         },
         {
-          "match": "(:?=)",
-          "name": "keyword.operator.assign.fan"
+          "name": "keyword.operator.assign.fan",
+          "match": "(:?=)"
         },
         {
-          "match": "([+*/%-]=?)",
-          "name": "keyword.operator.math.fan"
+          "name": "keyword.operator.math.fan",
+          "match": "([+*/%-]=?)"
         },
         {
-          "match": "(!|&&|(\\?\\:)|(\\|\\|))",
-          "name": "keyword.operator.logical.fan"
+          "name": "keyword.operator.logical.fan",
+          "match": "(!|\u0026\u0026|(\\?\\:)|(\\|\\|))"
         },
         {
-          "match": "(\\b(is|isnot|as)\\b)",
-          "name": "keyword.operator.relational.named.fan"
+          "name": "keyword.operator.relational.named.fan",
+          "match": "(\\b(is|isnot|as)\\b)"
         },
         {
-          "match": "(\\->|\\?\\->|\\?\\.)",
-          "name": "keyword.operator.call.fan"
+          "name": "keyword.operator.call.fan",
+          "match": "(\\-\u003e|\\?\\-\u003e|\\?\\.)"
         },
         {
-          "match": "(\\+\\+|\\-\\-)",
-          "name": "keyword.operator.inc-dec.fan"
+          "name": "keyword.operator.inc-dec.fan",
+          "match": "(\\+\\+|\\-\\-)"
         },
         {
-          "match": "(\\.\\.<?)",
-          "name": "keyword.operator.range.fan"
+          "name": "keyword.operator.range.fan",
+          "match": "(\\.\\.\u003c?)"
         },
         {
-          "match": "(\\?|:)",
-          "name": "keyword.operator.tertiary.fan"
+          "name": "keyword.operator.tertiary.fan",
+          "match": "(\\?|:)"
         },
         {
-          "match": "(;)",
-          "name": "punctuation.terminator.fan"
+          "name": "punctuation.terminator.fan",
+          "match": "(;)"
         }
       ]
     },
     "string-dsl": {
       "patterns": [
         {
-          "begin": "((Str)<\\|)",
+          "name": "string.quoted.other.fan",
+          "begin": "((Str)\u003c\\|)",
+          "end": "(\\|\u003e)",
           "captures": {
             "1": {
               "name": "support.type.sys.fan"
             }
-          },
-          "end": "(\\|>)",
-          "name": "string.quoted.other.fan"
+          }
         }
       ]
     },
@@ -290,13 +288,13 @@
     "triple-quoted-string": {
       "patterns": [
         {
+          "name": "string.quoted.triple.fan",
           "begin": "\"\"\"",
           "end": "\"\"\"",
-          "name": "string.quoted.triple.fan",
           "patterns": [
             {
-              "match": "\\\\\"",
-              "name": "invalid.illegal.escape.char.fan"
+              "name": "invalid.illegal.escape.char.fan",
+              "match": "\\\\\""
             },
             {
               "include": "#escaped-unicode"
@@ -314,17 +312,17 @@
     "typedef": {
       "patterns": [
         {
-          "match": "(class|mixin)(?=\\s+([A-Za-z_][A-Za-z0-9_]*))",
-          "name": "storage.modifier.fan"
+          "name": "storage.modifier.fan",
+          "match": "(class|mixin)(?=\\s+([A-Za-z_][A-Za-z0-9_]*))"
         }
       ]
     },
     "uris": {
       "patterns": [
         {
+          "name": "string.quoted.other.uri.fan",
           "begin": "(`)",
           "end": "(`)",
-          "name": "string.quoted.other.uri.fan",
           "patterns": [
             {
               "include": "#escaped-unicode"
@@ -339,7 +337,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.fan",
-  "uuid": "de0743d9-c48e-44a0-a28b-6003d88f09d0"
-}
+  }
+}