github-linguist 5.3.3 → 6.0.0

data/grammars/source.modelica.json

@@ -1,87 +1,82 @@
 {
-  "fileTypes": [
-    "mo"
-  ],
   "name": "Modelica",
+  "scopeName": "source.modelica",
   "patterns": [
     {
+      "name": "comment.block",
       "begin": "/\\*",
-      "end": "\\*/",
-      "name": "comment.block"
+      "end": "\\*/"
     },
     {
-      "match": "(//).*$\\n?",
-      "name": "comment.line"
+      "name": "comment.line",
+      "match": "(//).*$\\n?"
     },
     {
-      "match": "\\b(true|false)\\b",
-      "name": "constant.language"
+      "name": "constant.language",
+      "match": "\\b(true|false)\\b"
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
-      "name": "constant.numeric"
+      "name": "constant.numeric",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b"
     },
     {
-      "match": "\\b(Real|Integer|Boolean|String)\\b",
-      "name": "storage.type"
+      "name": "storage.type",
+      "match": "\\b(Real|Integer|Boolean|String)\\b"
     },
     {
-      "match": "\\b(constant|final|parameter|expandable|replaceable|redeclare|constrainedby|import|flow|stream|input|output|discrete|connector)\\b",
-      "name": "storage.modifier"
+      "name": "storage.modifier",
+      "match": "\\b(constant|final|parameter|expandable|replaceable|redeclare|constrainedby|import|flow|stream|input|output|discrete|connector)\\b"
     },
     {
-      "match": "\\b\\s*([A-Z])(?:([^ ;$]+)(;)?)([.]([A-Z])(?:([^ ;$]+)(;)?)?)++\\b",
-      "name": "keyword"
+      "name": "keyword",
+      "match": "\\b\\s*([A-Z])(?:([^ ;$]+)(;)?)([.]([A-Z])(?:([^ ;$]+)(;)?)?)++\\b"
     },
     {
-      "match": "\\b(for|if|when|while|then|loop|end if|end when|end for|end while|else|elsewhen|and|break|each|elseif)\\b",
-      "name": "keyword.control"
+      "name": "keyword.control",
+      "match": "\\b(for|if|when|while|then|loop|end if|end when|end for|end while|else|elsewhen|and|break|each|elseif)\\b"
     },
     {
-      "match": "\\b(and|or|not)\\b",
-      "name": "keyword.operator.logical"
+      "name": "keyword.operator.logical",
+      "match": "\\b(and|or|not)\\b"
     },
     {
-      "match": "<|<\\=|>|>\\=|\\=\\=|<>",
-      "name": "keyword.operator.comparison"
+      "name": "keyword.operator.comparison",
+      "match": "\u003c|\u003c\\=|\u003e|\u003e\\=|\\=\\=|\u003c\u003e"
     },
     {
-      "match": "\\+|\\-|\\.\\+|\\.\\-|\\*|\\.\\*|/|\\./|\\^",
-      "name": "keyword.operator.arithmetic"
+      "name": "keyword.operator.arithmetic",
+      "match": "\\+|\\-|\\.\\+|\\.\\-|\\*|\\.\\*|/|\\./|\\^"
     },
     {
-      "match": "\\=|\\:\\=",
-      "name": "keyword.operator.assignment"
+      "name": "keyword.operator.assignment",
+      "match": "\\=|\\:\\="
     },
     {
-      "match": "\\b(algorithm|equation|initial equation|protected|public|register|end)\\b",
-      "name": "keyword"
+      "name": "keyword",
+      "match": "\\b(algorithm|equation|initial equation|protected|public|register|end)\\b"
     },
     {
-      "match": "\\b(inner|outer)\\b",
-      "name": "keyword.other"
+      "name": "support.function.mathematical",
+      "match": "\\b(acos|asin|atan|atan2|cos|cosh|exp|log|log10|sin|sinh|tan|tanh|abs|sign|sqrt|max|min|product|sum)\\b"
     },
     {
-      "match": "\\b(acos|asin|atan|atan2|cos|cosh|exp|log|log10|sin|sinh|tan|tanh|abs|sign|sqrt|max|min|product|sum)\\b",
-      "name": "support.function.mathematical"
+      "name": "support.function.array",
+      "match": "\\b(scalar|vector|matrix|identity|diagonal|zeros|ones|fill|linspace|transpose|outerProduct|symmetric|cross|skew)\\b"
     },
     {
-      "match": "\\b(scalar|vector|matrix|identity|diagonal|zeros|ones|fill|linspace|transpose|outerProduct|symmetric|cross|skew)\\b",
-      "name": "support.function.array"
+      "name": "support.function.event",
+      "match": "\\b(ceil|div|fill|floor|integer|max|min|mod|rem|pre|noEvent|change|edge|initial|terminal|reinit|sample|smooth|terminate)\\b"
     },
     {
-      "match": "\\b(ceil|div|fill|floor|integer|max|min|mod|rem|pre|noEvent|change|edge|initial|terminal|reinit|sample|smooth|terminate)\\b",
-      "name": "support.function.event"
+      "name": "support.function.special",
+      "match": "\\b(connect|der|inStream|actualStream|semiLinear|spatialDistribution|getInstanceName|homotopy|delay|assert|ndims|size|cardinality|isPresent)\\b"
     },
     {
-      "match": "\\b(connect|der|inStream|actualStream|semiLinear|spatialDistribution|getInstanceName|homotopy|delay|assert|ndims|size|cardinality|isPresent)\\b",
-      "name": "support.function.special"
-    },
-    {
-      "match": "\\b(extends|partial|within)\\b",
-      "name": "support.type"
+      "name": "support.type",
+      "match": "\\b(extends|partial|within)\\b"
     },
     {
+      "match": "\\b((model|class|record|block|package)\\s+\\w+\\s*(\".*\")*)",
       "captures": {
         "1": {
           "name": "entity.name.type"
@@ -92,10 +87,10 @@
         "3": {
           "name": "comment.line"
         }
-      },
-      "match": "\\b((model|class|record|block|package)\\s+\\w+\\s*(\".*\")*)"
+      }
     },
     {
+      "match": "((function)\\s+\\w+\\s*(\".*\")*)",
       "captures": {
         "1": {
           "name": "entity.name.function"
@@ -106,41 +101,38 @@
         "3": {
           "name": "comment.line"
         }
-      },
-      "match": "((function)\\s+\\w+\\s*(\".*\")*)"
+      }
     },
     {
+      "name": "comment.block",
       "begin": "annotation",
       "end": ";\\s*\\n",
-      "name": "comment.block",
       "patterns": [
         {
+          "name": "comment.block",
           "begin": "\"",
-          "end": "\"",
-          "name": "comment.block"
+          "end": "\""
         }
       ]
     },
     {
+      "match": "[\"\\w\\)](\\s+\".*\"\\s*);",
       "captures": {
         "1": {
           "name": "constant.string"
         }
-      },
-      "match": "[\"\\w\\)](\\s+\".*\"\\s*);"
+      }
     },
     {
+      "name": "constant.string",
       "begin": "\"",
       "end": "\"",
-      "name": "constant.string",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escaped"
+          "name": "constant.character.escaped",
+          "match": "\\\\."
         }
       ]
     }
-  ],
-  "scopeName": "source.modelica",
-  "uuid": "43df6fac-7928-42e2-9890-f5073aaddb14"
-}
+  ]
+}

data/grammars/source.modula2.json

@@ -1,11 +1,9 @@
 {
-  "fileTypes": [
-    "mod",
-    "def"
-  ],
   "name": "Modula-2",
+  "scopeName": "source.modula2",
   "patterns": [
     {
+      "match": "\\b(PROCEDURE|DEFINITION MODULE|IMPLEMENTATION MODULE|MODULE)\\b\\s+(\\w+(\\.\\w+)?)",
       "captures": {
         "1": {
           "name": "storage.type.function.modula2"
@@ -13,11 +11,10 @@
         "2": {
           "name": "entity.name.function.modula2"
         }
-      },
-      "comment": "Reconocimiento de las palabras de inicio.",
-      "match": "\\b(PROCEDURE|DEFINITION MODULE|IMPLEMENTATION MODULE|MODULE)\\b\\s+(\\w+(\\.\\w+)?)"
+      }
     },
     {
+      "match": "\\b(END)\\b\\s+(\\w+(\\.\\w+)?)",
       "captures": {
         "1": {
           "name": "keyword.control.modula2"
@@ -25,11 +22,11 @@
         "2": {
           "name": "entity.name.function.end.modula2"
         }
-      },
-      "comment": "Reconocimiento de las palabras de fin.",
-      "match": "\\b(END)\\b\\s+(\\w+(\\.\\w+)?)"
+      }
     },
     {
+      "name": "meta.function.modula2",
+      "match": "\\b(ABS|ADDRES|ADR|BITSET|BOOLEAN|BYTE|CAP|CARDINAL|CHAR|CHR|DEC|DISPOSE|EXCL|FALSE|FLOAT|HALT|HIGH|INC|INCL|INTEGER|LONGCARD|LONGINT|LONGREAL|LONGWORD|NEW|NULLPROC|ODD|ORD|PROC|REAL|SHORTADDR|SHORTCARD|SHORTINT|SIZE|TRUE|TRUNC|VAL|VSIZE|WORD)\\b",
       "captures": {
         "1": {
           "name": "storage.type.function.modula2"
@@ -37,67 +34,61 @@
         "2": {
           "name": "entity.name.function.modula2"
         }
-      },
-      "comment": "Definicion de identificadores predefinidos.",
-      "match": "\\b(ABS|ADDRES|ADR|BITSET|BOOLEAN|BYTE|CAP|CARDINAL|CHAR|CHR|DEC|DISPOSE|EXCL|FALSE|FLOAT|HALT|HIGH|INC|INCL|INTEGER|LONGCARD|LONGINT|LONGREAL|LONGWORD|NEW|NULLPROC|ODD|ORD|PROC|REAL|SHORTADDR|SHORTCARD|SHORTINT|SIZE|TRUE|TRUNC|VAL|VSIZE|WORD)\\b",
-      "name": "meta.function.modula2"
+      }
     },
     {
-      "comment": "Definicion de palabras reservadas.",
-      "match": "\\b(AND|ARRAY|BEGIN|BY|CASE|CONST|DIV|DO|ELSE|ELSIF|END|EXIT|EXPORT|FOR|FORWARD|FROM|GOTO|IF|IMPORT|IN|LABEL|LOOP|MOD|NOT|OF|OR|POINTER|QUALIFIED|RECORD|REPEAT|RETURN|SET|THEN|TO|DOWNTO|TYPE|UNTIL|VAR|WHILE|WITH|NIL)\\b",
-      "name": "keyword.control.modula2"
+      "name": "keyword.control.modula2",
+      "match": "\\b(AND|ARRAY|BEGIN|BY|CASE|CONST|DIV|DO|ELSE|ELSIF|END|EXIT|EXPORT|FOR|FORWARD|FROM|GOTO|IF|IMPORT|IN|LABEL|LOOP|MOD|NOT|OF|OR|POINTER|QUALIFIED|RECORD|REPEAT|RETURN|SET|THEN|TO|DOWNTO|TYPE|UNTIL|VAR|WHILE|WITH|NIL)\\b"
     },
     {
       "include": "#block_comment"
     },
     {
+      "name": "string.quoted.double.modula2",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.modula2",
+          "match": "\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.modula2"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.modula2"
         }
-      },
-      "name": "string.quoted.double.modula2",
-      "patterns": [
-        {
-          "match": "\\.",
-          "name": "constant.character.escape.modula2"
-        }
-      ]
+      }
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
-      "name": "constant.numeric.modula2"
+      "name": "constant.numeric.modula2",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
     },
     {
-      "match": "(\\(|\\)|\\+|-|\\*|/|:|;|\\.|\\^|=|:=|<|>|#)",
-      "name": "variable.parameter.function.modula2"
+      "name": "variable.parameter.function.modula2",
+      "match": "(\\(|\\)|\\+|-|\\*|/|:|;|\\.|\\^|=|:=|\u003c|\u003e|#)"
     }
   ],
   "repository": {
     "block_comment": {
-      "applyEndPatternLast": 1,
+      "name": "comment.block.modula2.one",
       "begin": "\\(\\*",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.comment.modula2"
-        }
-      },
+      "end": "\\*\\)",
       "patterns": [
         {
           "include": "#block_comment"
         }
       ],
-      "end": "\\*\\)",
-      "name": "comment.block.modula2.one"
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.modula2"
+        }
+      },
+      "applyEndPatternLast": true
     }
-  },
-  "scopeName": "source.modula2",
-  "uuid": "c01a654e-2960-44f2-aeae-5909f5043d35"
-}
+  }
+}

data/grammars/source.monkey.json

@@ -1,15 +1,10 @@
 {
-  "fileTypes": [
-    "monkey"
-  ],
-  "foldingStartMarker": "(?xi)\n\t^\\s*(\n\t\t(?<!end|end\\s)(function|class|method|select|while) |\n\t\t\\#rem | for | repeat | '\\#region\n\t)\\b",
-  "foldingStopMarker": "(?xi)\n\t^\\s*(\n\t# end <keyword>\n\t\tend\\s?(function|class|method|select|while) |\n\t\t\\#end | '\\#end\\s?region\n\t)\\b",
-  "keyEquivalent": "^~M",
   "name": "Monkey",
+  "scopeName": "source.monkey",
   "patterns": [
     {
-      "match": ";",
-      "name": "punctuation.terminator.line.monkey"
+      "name": "punctuation.terminator.line.monkey",
+      "match": ";"
     },
     {
       "include": "#mnky_comment_quote"
@@ -39,6 +34,8 @@
       "include": "#mnky_method"
     },
     {
+      "name": "import.module.monkey",
+      "match": "(?i)\\b(import)\\s+((?:[a-zA-Z_]\\w*\\.?)+)",
       "captures": {
         "1": {
           "name": "keyword.other.import.monkey"
@@ -46,12 +43,18 @@
         "2": {
           "name": "string.unquoted.module.monkey"
         }
-      },
-      "match": "(?i)\\b(import)\\s+((?:[a-zA-Z_]\\w*\\.?)+)",
-      "name": "import.module.monkey"
+      }
     },
     {
+      "name": "import.file.monkey",
+      "contentName": "string.quoted.double.monkey",
       "begin": "(?i)\\b(import)\\s+((\"))",
+      "end": "(\")",
+      "patterns": [
+        {
+          "include": "#mnky_string_content"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.import.monkey"
@@ -63,8 +66,6 @@
           "name": "string.quoted.double.monkey"
         }
       },
-      "contentName": "string.quoted.double.monkey",
-      "end": "(\")",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.monkey"
@@ -72,40 +73,12 @@
         "1": {
           "name": "string.quoted.double.monkey"
         }
-      },
-      "name": "import.file.monkey",
-      "patterns": [
-        {
-          "include": "#mnky_string_content"
-        }
-      ]
+      }
     },
     {
+      "name": "type.monkey",
       "begin": "(?i)\\b(class)\\s+([a-zA-Z_]\\w*)(?:\\s+(extends)\\s+([a-zA-Z_]\\w*))?(?:\\s+(final|abstract))?",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.class.monkey"
-        },
-        "2": {
-          "name": "entity.name.type.monkey"
-        },
-        "3": {
-          "name": "storage.modifier.extends.monkey"
-        },
-        "4": {
-          "name": "entity.other.inherited-class.monkey"
-        },
-        "5": {
-          "name": "storage.modifier.class.monkey"
-        }
-      },
       "end": "(?i)\\b(end(\\s?class)?)\\b",
-      "endCaptures": {
-        "1": {
-          "name": "storage.type.class.monkey"
-        }
-      },
-      "name": "type.monkey",
       "patterns": [
         {
           "include": "#mnky_comment_quote"
@@ -152,200 +125,222 @@
         {
           "include": "#mnky_constructor"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.class.monkey"
+        },
+        "2": {
+          "name": "entity.name.type.monkey"
+        },
+        "3": {
+          "name": "storage.modifier.extends.monkey"
+        },
+        "4": {
+          "name": "entity.other.inherited-class.monkey"
+        },
+        "5": {
+          "name": "storage.modifier.class.monkey"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "storage.type.class.monkey"
+        }
+      }
     },
     {
-      "match": "\\s*\\b(c(ase|ontinue)|do|e(lse(\\s?if)?|nd(class|for(each)?|function|if|method|select|while)|xit)|for(\\s?each)?|if|return|select|then|wend|while)\\b",
-      "name": "control.keywords.monkey"
+      "name": "control.keywords.monkey",
+      "match": "\\s*\\b(c(ase|ontinue)|do|e(lse(\\s?if)?|nd(class|for(each)?|function|if|method|select|while)|xit)|for(\\s?each)?|if|return|select|then|wend|while)\\b"
     },
     {
       "include": "#mnky_control_keywords"
     },
     {
+      "name": "control.while.monkey",
       "begin": "(?i)\\b(while)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.while.monkey"
-        }
-      },
       "end": "(?i)\\b(end(\\s?while)?|wend)\\b",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.control.while.end.monkey"
-        }
-      },
-      "name": "control.while.monkey",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "(?i)\\b(if|then|else|else(\\s?if)?)\\b",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.if.monkey"
+          "name": "keyword.control.while.monkey"
         }
       },
-      "end": "(?i)\\b(end(\\s?if)?)\\b",
       "endCaptures": {
         "1": {
-          "name": "keyword.control.if.end.monkey"
+          "name": "keyword.control.while.end.monkey"
         }
-      },
+      }
+    },
+    {
       "name": "control.if.monkey",
+      "begin": "(?i)\\b(if|then|else|else(\\s?if)?)\\b",
+      "end": "(?i)\\b(end(\\s?if)?)\\b",
       "patterns": [
         {
-          "match": "(?i)\\b(then)\\b",
-          "name": "keyword.control.then.monkey"
+          "name": "keyword.control.then.monkey",
+          "match": "(?i)\\b(then)\\b"
         },
         {
-          "match": "(?i)\\b(else(\\s?if)?)\\b",
-          "name": "keyword.control.else-if.monkey"
+          "name": "keyword.control.else-if.monkey",
+          "match": "(?i)\\b(else(\\s?if)?)\\b"
         },
         {
-          "match": "(?i)\\b(else)\\b",
-          "name": "keyword.control.else.monkey"
+          "name": "keyword.control.else.monkey",
+          "match": "(?i)\\b(else)\\b"
         },
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "(?i)\\b(if)\\b",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.if.monkey"
         }
       },
-      "end": "$",
       "endCaptures": {
         "1": {
           "name": "keyword.control.if.end.monkey"
         }
-      },
+      }
+    },
+    {
       "name": "control.if-then.monkey",
+      "begin": "(?i)\\b(if)\\b",
+      "end": "$",
       "patterns": [
         {
-          "match": "(?i)\\b(then)\\b",
-          "name": "keyword.control.then.monkey"
+          "name": "keyword.control.then.monkey",
+          "match": "(?i)\\b(then)\\b"
         },
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "(?i)\\b(for)\\b",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.for.monkey"
+          "name": "keyword.control.if.monkey"
         }
       },
-      "end": "(?i)\\b(next)\\b",
       "endCaptures": {
         "1": {
-          "name": "keyword.control.for.end.monkey"
+          "name": "keyword.control.if.end.monkey"
         }
-      },
+      }
+    },
+    {
       "name": "control.for.monkey",
+      "begin": "(?i)\\b(for)\\b",
+      "end": "(?i)\\b(next)\\b",
       "patterns": [
         {
-          "match": "(?i)\\beachin\\b",
-          "name": "keyword.control.for.eachin.monkey"
+          "name": "keyword.control.for.eachin.monkey",
+          "match": "(?i)\\beachin\\b"
         },
         {
-          "match": "(?i)\\bto\\b",
-          "name": "keyword.control.for.to.monkey"
+          "name": "keyword.control.for.to.monkey",
+          "match": "(?i)\\bto\\b"
         },
         {
-          "match": "(?i)\\buntil\\b",
-          "name": "keyword.control.for.until.monkey"
+          "name": "keyword.control.for.until.monkey",
+          "match": "(?i)\\buntil\\b"
         },
         {
-          "match": "(?i)\\bstep\\b",
-          "name": "keyword.control.for.step.monkey"
+          "name": "keyword.control.for.step.monkey",
+          "match": "(?i)\\bstep\\b"
         },
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "(?i)\\b(repeat)\\b",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.repeat.monkey"
+          "name": "keyword.control.for.monkey"
         }
       },
-      "end": "(?i)\\b(until|forever)\\b",
       "endCaptures": {
         "1": {
-          "name": "keyword.control.repeat.end.monkey"
+          "name": "keyword.control.for.end.monkey"
         }
-      },
+      }
+    },
+    {
       "name": "control.repeat.monkey",
+      "begin": "(?i)\\b(repeat)\\b",
+      "end": "(?i)\\b(until|forever)\\b",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "(?i)\\b(select)\\b",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.select.monkey"
+          "name": "keyword.control.repeat.monkey"
         }
       },
-      "end": "(?i)\\b(end(\\s?select)?)\\b",
       "endCaptures": {
         "1": {
-          "name": "keyword.control.select.end.monkey"
+          "name": "keyword.control.repeat.end.monkey"
         }
-      },
+      }
+    },
+    {
       "name": "control.select.monkey",
+      "begin": "(?i)\\b(select)\\b",
+      "end": "(?i)\\b(end(\\s?select)?)\\b",
       "patterns": [
         {
+          "name": "control.select.case.monkey",
+          "match": "(?i)\\b(case)\\b",
           "captures": {
             "1": {
               "name": "keyword.control.select.case.monkey"
             }
-          },
-          "match": "(?i)\\b(case)\\b",
-          "name": "control.select.case.monkey"
+          }
         },
         {
+          "name": "control.select.default.monkey",
+          "match": "(?i)\\b(default)\\b",
           "captures": {
             "1": {
               "name": "keyword.control.select.default.monkey"
             }
-          },
-          "match": "(?i)\\b(default)\\b",
-          "name": "control.select.default.monkey"
+          }
         },
         {
           "include": "$self"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.select.monkey"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "keyword.control.select.end.monkey"
+        }
+      }
     },
     {
-      "match": "(?i)\\b(mod|shl|shr|and|or|not)\\b",
-      "name": "keyword.operator.monkey"
+      "name": "keyword.operator.monkey",
+      "match": "(?i)\\b(mod|shl|shr|and|or|not)\\b"
     },
     {
-      "match": ":?[\\^+\\-&~|=><]",
-      "name": "keyword.operator.monkey"
+      "name": "keyword.operator.monkey",
+      "match": ":?[\\^+\\-\u0026~|=\u003e\u003c]"
     },
     {
-      "match": "(?i)\\b(private|public)\\b",
-      "name": "keyword.other.scope.monkey"
+      "name": "keyword.other.scope.monkey",
+      "match": "(?i)\\b(private|public)\\b"
     },
     {
-      "match": "(?i)\\b(strict)\\b",
-      "name": "keyword.other.strictness.monkey"
+      "name": "keyword.other.strictness.monkey",
+      "match": "(?i)\\b(strict)\\b"
     },
     {
       "include": "#mnky_null"
@@ -360,12 +355,12 @@
       "include": "#mnky_string_quoted"
     },
     {
-      "match": "(?i)\\b(self)\\b",
-      "name": "variable.language.self.monkey"
+      "name": "variable.language.self.monkey",
+      "match": "(?i)\\b(self)\\b"
     },
     {
-      "match": "(?i)\\b(super)\\b",
-      "name": "variable.language.super.monkey"
+      "name": "variable.language.super.monkey",
+      "match": "(?i)\\b(super)\\b"
     },
     {
       "include": "#mnky_constructor"
@@ -379,49 +374,34 @@
   ],
   "repository": {
     "mnky_array": {
+      "name": "array.monkey",
       "begin": "(\\[)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.operator.array.monkey"
-        }
-      },
       "end": "(\\])",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.operator.array.monkey"
-        }
-      },
-      "name": "array.monkey",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    "mnky_attributes": {
-      "begin": "(\\{)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.attributes.braces.monkey"
+          "name": "keyword.operator.array.monkey"
         }
       },
-      "end": "(\\})",
       "endCaptures": {
         "1": {
-          "name": "storage.modifier.attributes.braces.monkey"
+          "name": "keyword.operator.array.monkey"
         }
-      },
+      }
+    },
+    "mnky_attributes": {
       "name": "attributes.monkey",
+      "begin": "(\\{)",
+      "end": "(\\})",
       "patterns": [
         {
+          "name": "attribute.monkey",
           "begin": "\\b([a-zA-Z_]\\w*)\\s*(=)\\s*",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.other.attribute-name.monkey"
-            }
-          },
           "end": "(?=\\s|\\}|[a-zA-Z_])",
-          "name": "attribute.monkey",
           "patterns": [
             {
               "include": "#mnky_string_quoted"
@@ -429,35 +409,50 @@
             {
               "include": "#mnky_numbers"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.other.attribute-name.monkey"
+            }
+          }
         },
         {
+          "name": "attribute.monkey",
+          "match": "\\b([a-zA-Z_]\\w*)(?:\\s*((?!=)|(?=\\})))",
           "captures": {
             "1": {
               "name": "entity.other.attribute-name.monkey"
             }
-          },
-          "match": "\\b([a-zA-Z_]\\w*)(?:\\s*((?!=)|(?=\\})))",
-          "name": "attribute.monkey"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.attributes.braces.monkey"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "storage.modifier.attributes.braces.monkey"
+        }
+      }
     },
     "mnky_boolean": {
-      "match": "(?i)\\b(true|false)\\b",
-      "name": "constant.language.boolean.monkey"
+      "name": "constant.language.boolean.monkey",
+      "match": "(?i)\\b(true|false)\\b"
     },
     "mnky_char": {
-      "match": "\\b(CHAR_(TAB|BACKSPACE|ENTER|ESCAPE|PAGE(UP|DOWN)|END|HOME|LEFT|UP|RIGHT|DOWN|INSERT|DELETE))\\b",
-      "name": "constant.language.char.monkey"
+      "name": "constant.language.char.monkey",
+      "match": "\\b(CHAR_(TAB|BACKSPACE|ENTER|ESCAPE|PAGE(UP|DOWN)|END|HOME|LEFT|UP|RIGHT|DOWN|INSERT|DELETE))\\b"
     },
     "mnky_commands": {
-      "match": "(?i)\\b(A(bstract|Cos|Sin|Tan|Tan2|bs|ccel(X|Y|Z)|dd(First|Last)|pp|rray)|B(ackwards|ool)|C(ase|eil|hannelState|l(amp|s)|o(mpare|nst|nt(ains|inue)|py|s|unt)|lear)|D(e(faultFlags|vice(Height|Width))|iscard|raw(Circle|Ellipse|Image|ImageRect|Line|Oval|Point|Poly|Rect|Text))|E(achin|xt(ends|ern)|nd|ndsWith|rror|xit)|F(alse|i(eld|nd|ndLast|rst)|loat(Map|Set)|loor|or(ever)|rames|romChar)|G(et|et(Alpha|Blend|Char|Color|Font|Matrix|Scissor)|lobal|rabImage)|H(andle(X|Y)|eight)|I(m(age|p(lements|ort))|n(clude|line|t(erface|Map|Set))|sEmpty)|Jo(in|y(Down|Hit|X|Y|Z))|Key|Key(Down|Hit|s)|L(ast|ength|ist|o(g|ad(Image|Sound|State|String)|cal))|M(ap|ax|ethod|i(llisecs|n)|o(d(ule)|use(Down|Hit|X|Y))|in)|N(ative|e(w|xt)|o(de)|ull)|O(bject(Enumerator)|n(Create|Loading|Render|Resume|Suspend|Update))|P(laySound|o(pMatrix|w)|r(i(nt|vate)|operty)|u(blic|shMatrix))|R(e(move|move(Each|First|Last)|p(eat|lace)|turn)|nd|otate)|S(aveState|cale|e(ed|lect|lf|t(Alpha|Blend|Channel(Pan|Rate|Volume)|Color|Font|Handle|Image|List|Matrix|Scissor|UpdateRate))|gn|h(l|r)|in|ound|plit|qrt|t(artsWith|ep|opChannel|ri(ct|ng(Map|Set)))|uper)|T(an|hen|o(Lower|Upper|uch(Down|Hit|X|Y))|r(ans(form|late)|im|ue))|Until|V(alue|alue(ForKey|s)|oid)|Width)\\b",
-      "name": "keyword.other.commands.monkey"
+      "name": "keyword.other.commands.monkey",
+      "match": "(?i)\\b(A(bstract|Cos|Sin|Tan|Tan2|bs|ccel(X|Y|Z)|dd(First|Last)|pp|rray)|B(ackwards|ool)|C(ase|eil|hannelState|l(amp|s)|o(mpare|nst|nt(ains|inue)|py|s|unt)|lear)|D(e(faultFlags|vice(Height|Width))|iscard|raw(Circle|Ellipse|Image|ImageRect|Line|Oval|Point|Poly|Rect|Text))|E(achin|xt(ends|ern)|nd|ndsWith|rror|xit)|F(alse|i(eld|nd|ndLast|rst)|loat(Map|Set)|loor|or(ever)|rames|romChar)|G(et|et(Alpha|Blend|Char|Color|Font|Matrix|Scissor)|lobal|rabImage)|H(andle(X|Y)|eight)|I(m(age|p(lements|ort))|n(clude|line|t(erface|Map|Set))|sEmpty)|Jo(in|y(Down|Hit|X|Y|Z))|Key|Key(Down|Hit|s)|L(ast|ength|ist|o(g|ad(Image|Sound|State|String)|cal))|M(ap|ax|ethod|i(llisecs|n)|o(d(ule)|use(Down|Hit|X|Y))|in)|N(ative|e(w|xt)|o(de)|ull)|O(bject(Enumerator)|n(Create|Loading|Render|Resume|Suspend|Update))|P(laySound|o(pMatrix|w)|r(i(nt|vate)|operty)|u(blic|shMatrix))|R(e(move|move(Each|First|Last)|p(eat|lace)|turn)|nd|otate)|S(aveState|cale|e(ed|lect|lf|t(Alpha|Blend|Channel(Pan|Rate|Volume)|Color|Font|Handle|Image|List|Matrix|Scissor|UpdateRate))|gn|h(l|r)|in|ound|plit|qrt|t(artsWith|ep|opChannel|ri(ct|ng(Map|Set)))|uper)|T(an|hen|o(Lower|Upper|uch(Down|Hit|X|Y))|r(ans(form|late)|im|ue))|Until|V(alue|alue(ForKey|s)|oid)|Width)\\b"
     },
     "mnky_comment_block": {
-      "begin": "(?i)(?<=\\s|^|;)\\#rem\\b",
-      "end": "(?i)(?<=\\s|^|;)\\#end\\b",
       "name": "comment.block.rem.monkey",
+      "begin": "(?i)(?\u003c=\\s|^|;)\\#rem\\b",
+      "end": "(?i)(?\u003c=\\s|^|;)\\#end\\b",
       "patterns": [
         {
           "include": "#mnky_url_content"
@@ -465,9 +460,9 @@
       ]
     },
     "mnky_comment_quote": {
+      "name": "comment.line.apostrophe.monkey",
       "begin": "'",
       "end": "$",
-      "name": "comment.line.apostrophe.monkey",
       "patterns": [
         {
           "include": "#mnky_url_content"
@@ -475,6 +470,8 @@
       ]
     },
     "mnky_constant": {
+      "name": "constant.monkey",
+      "match": "(?i)\\b(const)\\s+([a-zA-Z_]\\w*)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.new.monkey"
@@ -482,9 +479,7 @@
         "2": {
           "name": "constant.monkey"
         }
-      },
-      "match": "(?i)\\b(const)\\s+([a-zA-Z_]\\w*)\\b",
-      "name": "constant.monkey"
+      }
     },
     "mnky_constants": {
       "name": "constants.monkey",
@@ -516,6 +511,8 @@
       ]
     },
     "mnky_constructor": {
+      "name": "call.constructor.monkey",
+      "match": "(?i)\\b(new)\\s+([a-zA-Z_]\\w*)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.new.monkey"
@@ -523,29 +520,34 @@
         "2": {
           "name": "storage.type.class.monkey"
         }
-      },
-      "match": "(?i)\\b(new)\\s+([a-zA-Z_]\\w*)\\b",
-      "name": "call.constructor.monkey"
+      }
     },
     "mnky_control_keywords": {
-      "match": "(?i)\\b(throw|return|exit|continue)\\b",
-      "name": "keyword.control.monkey"
+      "name": "keyword.control.monkey",
+      "match": "(?i)\\b(throw|return|exit|continue)\\b"
     },
     "mnky_env": {
-      "match": "\\b(TARGET|LANG)\\b",
-      "name": "constant.language.env.monkey"
+      "name": "constant.language.env.monkey",
+      "match": "\\b(TARGET|LANG)\\b"
     },
     "mnky_field": {
+      "name": "variable.field.monkey",
+      "match": "(?i)\\b(field)\\s+([a-zA-Z_]\\w*)+\\b",
       "captures": {
         "1": {
           "name": "keyword.other.variable.field.monkey"
         }
-      },
-      "match": "(?i)\\b(field)\\s+([a-zA-Z_]\\w*)+\\b",
-      "name": "variable.field.monkey"
+      }
     },
     "mnky_function": {
+      "name": "function.monkey",
       "begin": "(?i)\\b(function)\\s+([a-zA-Z_]\\w*)\\b",
+      "end": "(?i)\\b(end(\\s?function)?)\\b",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.monkey"
@@ -554,47 +556,47 @@
           "name": "entity.name.function.monkey"
         }
       },
-      "end": "(?i)\\b(end(\\s?function)?)\\b",
       "endCaptures": {
         "1": {
           "name": "storage.type.function.monkey"
         }
-      },
-      "name": "function.monkey",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     "mnky_global_variable": {
+      "name": "variable.monkey",
+      "match": "(?i)\\b(global)\\s+([a-zA-Z_]\\w*)\\b",
       "captures": {
         "1": {
           "name": "storage.modifier.global.monkey"
         }
-      },
-      "match": "(?i)\\b(global)\\s+([a-zA-Z_]\\w*)\\b",
-      "name": "variable.monkey"
+      }
     },
     "mnky_joy": {
-      "match": "\\bJOY_(A|B|X|Y|LB|RB|BACK|START|LEFT|UP|RIGHT|DOWN)\\b",
-      "name": "constant.language.joy.monkey"
+      "name": "constant.language.joy.monkey",
+      "match": "\\bJOY_(A|B|X|Y|LB|RB|BACK|START|LEFT|UP|RIGHT|DOWN)\\b"
     },
     "mnky_key": {
-      "match": "\\bKEY_(BACKSPACE|TAB|ENTER|ESCAPE|SPACE|SHIFT|CONTROL|PAGEUP|PAGEDOWN|END|HOME|LEFT|UP|RIGHT|DOWN|INSERT|DELETE|F([0-9]|1[0-2])|[0-9]|[A-Z]|TILDE|MINUS|EQUALS|OPENBRACKET|CLOSEBRACKET|BACKSLASH|SEMICOLON|QUOTES|COMMA|PERIOD|SLASH|(L|R|M)MB)|TOUCH([0-9]|[1-2][0-9]|3[0-2])\\b",
-      "name": "constant.language.key.monkey"
+      "name": "constant.language.key.monkey",
+      "match": "\\bKEY_(BACKSPACE|TAB|ENTER|ESCAPE|SPACE|SHIFT|CONTROL|PAGEUP|PAGEDOWN|END|HOME|LEFT|UP|RIGHT|DOWN|INSERT|DELETE|F([0-9]|1[0-2])|[0-9]|[A-Z]|TILDE|MINUS|EQUALS|OPENBRACKET|CLOSEBRACKET|BACKSLASH|SEMICOLON|QUOTES|COMMA|PERIOD|SLASH|(L|R|M)MB)|TOUCH([0-9]|[1-2][0-9]|3[0-2])\\b"
     },
     "mnky_local_variable": {
+      "name": "variable.monkey",
+      "match": "(?i)\\b(local)\\s+([a-zA-Z_]\\w*)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.variable.local.monkey"
         }
-      },
-      "match": "(?i)\\b(local)\\s+([a-zA-Z_]\\w*)\\b",
-      "name": "variable.monkey"
+      }
     },
     "mnky_method": {
+      "name": "method.monkey",
       "begin": "(?i)\\b(method)\\s+([a-zA-Z_]\\w*)\\b",
+      "end": "(?i)\\b(end(\\s?method)?)\\b",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.method.monkey"
@@ -603,52 +605,45 @@
           "name": "entity.name.method.monkey"
         }
       },
-      "end": "(?i)\\b(end(\\s?method)?)\\b",
       "endCaptures": {
         "1": {
           "name": "storage.type.method.monkey"
         }
-      },
-      "name": "method.monkey",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     "mnky_mouse": {
-      "match": "\\bMOUSE_(LEFT|RIGHT|MIDDLE)\\b",
-      "name": "constant.language.mouse.monkey"
+      "name": "constant.language.mouse.monkey",
+      "match": "\\bMOUSE_(LEFT|RIGHT|MIDDLE)\\b"
     },
     "mnky_null": {
-      "match": "(?i)\\bnull\\b",
-      "name": "constant.language.null.monkey"
+      "name": "constant.language.null.monkey",
+      "match": "(?i)\\bnull\\b"
     },
     "mnky_numbers": {
       "patterns": [
         {
-          "match": "(\\$[0-9a-fA-F]{1,16})",
-          "name": "constant.numeric.integer.hexadecimal.monkey"
+          "name": "constant.numeric.integer.hexadecimal.monkey",
+          "match": "(\\$[0-9a-fA-F]{1,16})"
         },
         {
-          "match": "(?x) (?<! \\$ ) (\n\t\t\t\t\t\t\t\\b ([0-9]+ \\. [0-9]+) |\n\t\t\t\t\t\t\t(\\. [0-9]+)\n\t\t\t\t\t\t)",
-          "name": "constant.numeric.float.monkey"
+          "name": "constant.numeric.float.monkey",
+          "match": "(?x) (?\u003c! \\$ ) (\n\t\t\t\t\t\t\t\\b ([0-9]+ \\. [0-9]+) |\n\t\t\t\t\t\t\t(\\. [0-9]+)\n\t\t\t\t\t\t)"
         },
         {
-          "match": "(?x)\\b(([0-9]+))",
-          "name": "constant.numeric.integer.monkey"
+          "name": "constant.numeric.integer.monkey",
+          "match": "(?x)\\b(([0-9]+))"
         }
       ]
     },
     "mnky_pi": {
-      "match": "\\b(HALF|TWO)?PI\\b",
-      "name": "constant.language.monkey"
+      "name": "constant.language.monkey",
+      "match": "\\b(HALF|TWO)?PI\\b"
     },
     "mnky_string_content": {
       "patterns": [
         {
-          "match": "\\~[^\"]",
-          "name": "constant.character.escape.monkey"
+          "name": "constant.character.escape.monkey",
+          "match": "\\~[^\"]"
         },
         {
           "include": "#mnky_url_content"
@@ -656,26 +651,28 @@
       ]
     },
     "mnky_string_quoted": {
+      "name": "string.quoted.double.monkey",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#mnky_string_content"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.monkey"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.monkey"
         }
-      },
-      "name": "string.quoted.double.monkey",
-      "patterns": [
-        {
-          "include": "#mnky_string_content"
-        }
-      ]
+      }
     },
     "mnky_typename": {
+      "name": "typename.monkey",
+      "match": "(?xi)(?: \\: \\s* ([a-zA-Z_]\\w*) | ([!#%]|@{1,2}|\\$[zw]?) )",
       "captures": {
         "1": {
           "name": "storage.type.monkey"
@@ -683,19 +680,15 @@
         "2": {
           "name": "storage.type.monkey"
         }
-      },
-      "match": "(?xi)(?: \\: \\s* ([a-zA-Z_]\\w*) | ([!#%]|@{1,2}|\\$[zw]?) )",
-      "name": "typename.monkey"
+      }
     },
     "mnky_types": {
-      "match": "(?i)\\b(array|bool|int|float|string)\\b",
-      "name": "storage.type.monkey"
+      "name": "storage.type.monkey",
+      "match": "(?i)\\b(array|bool|int|float|string)\\b"
     },
     "mnky_url_content": {
-      "match": "[a-zA-Z_]\\w*://[^ \"'()\\[\\]]*(?=$|\\b)",
-      "name": "url.monkey"
+      "name": "url.monkey",
+      "match": "[a-zA-Z_]\\w*://[^ \"'()\\[\\]]*(?=$|\\b)"
     }
-  },
-  "scopeName": "source.monkey",
-  "uuid": "622229C4-3E96-47AE-9C2C-235DB5BC068C"
-}
+  }
+}