github-linguist 7.7.0 → 7.9.0

data/grammars/source.mcfunction-snapshot.json

@@ -8913,7 +8913,7 @@
       }
     },
     "generated.command.effect.clear": {
-      "begin": "(clear) (?=\\S)",
+      "begin": "(clear)( |(?=\\n))",
       "end": "(?=\\n)",
       "patterns": [
         {

data/grammars/source.meson.json

@@ -59,7 +59,7 @@
     },
     {
       "name": "support.function.builtin.meson",
-      "match": "(?x)\\b(add_global_arguments|add_project_arguments|add_global_link_arguments|add_project_link_arguments|add_test_setup|add_languages|alias_target|assert|benchmark|both_libraries|build_target|configuration_data|configure_file|custom_target|declare_dependency|dependency|disabler|environment|error|executable|generator|gettext|get_option|get_variable|files|find_library|find_program|include_directories|import|install_data|install_headers|install_man|install_subdir|is_disabler|is_variable|jar|join_paths|library|message|option|project|run_target|run_command|set_variable|subdir|subdir_done|subproject|shared_library|shared_module|static_library|test|vcs_tag|warning\n)\\b\\s*(?=\\()"
+      "match": "(?x)\\b(add_global_arguments|add_project_arguments|add_global_link_arguments|add_project_link_arguments|add_test_setup|add_languages|alias_target|assert|benchmark|both_libraries|build_target|configuration_data|configure_file|custom_target|declare_dependency|dependency|disabler|environment|error|executable|generator|gettext|get_option|get_variable|files|find_library|find_program|include_directories|import|install_data|install_headers|install_man|install_subdir|is_disabler|is_variable|jar|join_paths|library|message|option|project|run_target|run_command|set_variable|subdir|subdir_done|subproject|summary|shared_library|shared_module|static_library|test|vcs_tag|warning\n)\\b\\s*(?=\\()"
     }
   ],
   "repository": {

data/grammars/source.mrc.json

@@ -1,213 +1,261 @@
 {
-  "name": "mIRC",
   "scopeName": "source.mrc",
   "patterns": [
     {
       "include": "#comments"
     },
     {
-      "include": "#function-definitions"
+      "include": "#group"
     },
     {
-      "include": "#variable-assignments"
+      "include": "#alias"
     },
     {
-      "include": "#statements"
+      "include": "#menu"
     },
     {
-      "include": "#labels"
+      "include": "#events"
     },
     {
-      "include": "#keywords"
-    },
-    {
-      "include": "#commands"
-    },
-    {
-      "include": "#identifiers"
-    },
-    {
-      "include": "#variables"
-    },
-    {
-      "include": "#constants"
-    },
-    {
-      "include": "#punctuation"
+      "include": "#dialog"
     }
   ],
   "repository": {
-    "arithmetic-operators": {
-      "patterns": [
-        {
-          "name": "keyword.operator.arithmetic.mrc",
-          "match": "[+\\-/*^%]"
-        }
-      ]
-    },
-    "commands": {
+    "alias": {
       "patterns": [
         {
-          "match": "(?:^|(?\u003c=[|{)]|else)\\s)\\s*((/*)(?:(!)(\\.)?|(\\.)(!)?)?!?(?i:abook|ajinvite|alias|aline|ame|amsg|anick|aop|auser|autojoin|away|avoice|background|ban|bcopy|beep|bindip|bread|breplace|bset|btrunc|bunset|bwrite|channel|clear(?:all)?|cline|clipboard|close|cnick|color|com(?:close|list|open|reg)|copy|creq|ctcreply|ctcps|dcc|ddcserver|dde|ddeserver|debug|dec|describe|dialog|did|didtok|disable|disconnect|dlevel|dline|dll|dns|dqwindow|draw(?:copy|dot|fill|line|pic|rect|replace|rot|save|size|scroll|text)|ebeeps|echo|editbox|emailaddr|enable|events|exit|fclose|filter|findtext|firewall|flash|flist|flood|flush|flushini|font|fopen|fseek|fsend|fserve|fullname|fwrite|ghide|gload|gmove|gopts|gplay|gpoint|gqreq|groups|gshow|gsize|gstop|gtalk|gunload|guser|hadd|hdec|hdel|help|hfree|hinc|hload|hmake|hop|hsave|ial(?:clear|mark)?|identd|ignore|iline|inc|invite|iuser|join|kick|linesep|links|list|load(?:buf)?|localinfo|log|logview|mdi|me|menubar|mkdir|mnick|mode|msg|nick|noop|notice|notify|omsg|onotice|part|partall|pdcc|perform|play|playctrl|pop|protect|proxy|pvoice|qme|qmsg|query|queryrn|quit|raw|reload|remini|remote|remove|rename|renwin|reseterror|resetidle|rlevel|rline|rmdir|run|ruser|save(?:buf|ini)?|say|scid|scon|server|showmirc|signal|sline|sock(?:accept|close|list|listen|mark|open|pause|read|rename|udp|write)|sound|speak|splay|sreq|strip|switchbar|timestamp|tip|tips|titlebar|tnick|tokenize|toolbar|topic|tray|treebar|ulist|unload|unset|unsetall|updatenl|url|uwho|vc(?:add|md|rem)|whois|window|winhelp|vol|write|writeini))(?=\\s)",
-          "captures": {
+          "name": "meta.alias.code.mrc",
+          "begin": "(?i)^(alias)\\x20+(?:(-l)\\x20+)?(?!-l)([^\\s]+)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "support.function.command.default.mrc"
+              "name": "storage.type.alias.mrc"
             },
             "2": {
-              "name": "punctuation.definition.command.mrc"
+              "name": "storage.modifier.alias.mrc"
             },
             "3": {
-              "name": "meta.keyword.operator.command.default.mrc"
-            },
-            "4": {
-              "name": "meta.keyword.operator.command.silent.mrc"
-            },
-            "5": {
-              "name": "meta.keyword.operator.command.silent.mrc"
-            },
-            "6": {
-              "name": "meta.keyword.operator.command.default.mrc"
+              "name": "entity.name.function.mrc"
             }
           }
+        }
+      ]
+    },
+    "calc_content": {
+      "patterns": [
+        {
+          "name": "keyword.operator.arithmetic.mrc",
+          "match": "[+\\-*/%^]"
         },
         {
-          "match": "(?:^|(?\u003c=[|{)]|else)\\s)\\s*((/*)(?:(!)(\\.)?|(\\.)(!)?)?(?i:timer))(\\w+)?(?=\\s)",
-          "captures": {
+          "name": "meta.arithmetic.mrc",
+          "begin": "(\u003c=\\()",
+          "end": "(?\u003c=\\))",
+          "patterns": [
+            {
+              "include": "#calc_content"
+            }
+          ]
+        }
+      ]
+    },
+    "code_block": {
+      "patterns": [
+        {
+          "name": "meta.code.block.mrc",
+          "begin": "{",
+          "end": "}",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ]
+        }
+      ]
+    },
+    "code_content": {
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#variables"
+        },
+        {
+          "include": "#identifiers"
+        },
+        {
+          "include": "#conditionals"
+        },
+        {
+          "include": "#commands"
+        },
+        {
+          "include": "#code_block"
+        }
+      ]
+    },
+    "commands": {
+      "patterns": [
+        {
+          "begin": "(?i)(?:\\x20+\\|\\x20+|(?\u003c=else\\x20)|^\\x20*|\\)|\\G)\\x20*(\\/+)?([!|.]{1,2})?((?:win)?help|server|disconnect|join|hop|part|part(?:all)?|quit|list|links|quote|raw|(?:a|q)?me|(?:a|q|o|v|priv)?msg|action|(?:o|v)?notice|describe|query|sound|ctcp|dcc|wall(?:chops|voices)|uwho|sock(?:accept|close|list|listen|mark|open|pause|read|rename|udp|write)|b(?:read|replace|copy|set|trunc|unset|write)|com(?:close|list|open|reg)|dialog|did(?:tok)?|draw(?:copy|dot|fill|line|pic|rect|replace|rot|save|scroll|size|text)|f(?:open|list|seek|write|close)|(?:a|c|d|i|r|s)line|clear(?:all|ial)?|window|g(?:hide|(?:un)?load|move|opts|play|point|qreq|show|size|stop|talk)|h(?:add|dec|del|free|inc|load|make|save)|break|continue|goto|halt(?:def)?|return(?:ex)?|dec|inc|set|var|unset(?:all)|dec|inc|set|var|unset(?:all)?|(?:a|g|i|r)user|(?:d|r)level|ulist|flush|ial(?:clear|mark|fill)?|copy|flushini|(?:mk|rm)dir|rem(?:ini|ove)|rename|write(?:ini)?|aop|avoice|ban|channel|ignore|leave|mode|parseline|pop|protect|pvoice|say|updatenl|abook|ajinvite|alias|(?:a|c|m|t)nick|auto(?:join)?|background|beep|bindip|clipboard|colou?r|creq|ctcp(?:reply|s)|dccserver|dde(?:server)?|debug|disable|dll|dns|dqwindow|ebeeps|exit|echo|editbox|emailaddr|enable|events|filter|findtext|finger|firewall|flash|flood|fnord|font|fsend|fserve|fullname|fupdate|groups|hotlink|identd|linesep|load(?:buf)?|localinfo|log(?:view)?|mdi|menubar|noop|notify|pdcc|perform|play(?:ctrl)?|proxy|queryrn|registration|reload|remote|renwin|reset(?:error|idle)|run|save(?:buf|ini)?|scid|scon|setlayer|showmirc|signal|speak|splay|sreq|strip|switchbar|time(?:stamp|rs|r([^\\s]+)?)|tips?|titlebar|tokenize|toolbar|tray|treebar|unload|url|vc(?:add|md|rem)|vol|xyzzy|away|close(?:msg)?|username|aclear|advertise|allnick|autoconnect|aquit|back|banlist|betaup|bin2txt|bw|channels|charset|config|cycleall|de(?:halfop|s?op|voice)|dock(?:panels)?|download|echo(?:monitor|x)|edit|encoding|fakeraw|fget|fullscreen|gcmem|globalkeys|p?google|halfop|highlight|icon|inick|inlineimage|kblayout|lag|linemarker|lock|logs|msgbox|mute|nextunread|nick(?:column|list)|nmsg|np|oline|options|paths|pause|plugins|priv|quick(?:connect|save)|raw(?:log|x)|re(?:alname|connect|freshsong|join|solve|start)|scripts|scrolltext|search|sendkeys|serverlist|set(?:config|option)|show(?:adiirc|menu)|slap|sleep|sop|statusbar|tab|themes|topicbox|usernick|txt2bin|un(?:ban|ignore|notify)|update|vars|viewlog|voice|w(?:down|jump|next|pause|play))(?=\\b)",
+          "end": "(?=\\z|\\x20+\\|\\x20+[^\\x20]|\\x20}|$)",
+          "patterns": [
+            {
+              "include": "#switches"
+            },
+            {
+              "include": "#parameters"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "support.function.command.default.mrc"
+              "name": "keyword.other.command.symbol.mrc"
             },
             "2": {
-              "name": "punctuation.definition.command.mrc"
+              "name": "keyword.other.command.symbol.mrc"
             },
             "3": {
-              "name": "meta.keyword.operator.command.default.mrc"
+              "name": "keyword.control.command.mrc"
             },
             "4": {
-              "name": "meta.keyword.operator.command.silent.mrc"
-            },
-            "5": {
-              "name": "meta.keyword.operator.command.silent.mrc"
-            },
-            "6": {
-              "name": "meta.keyword.operator.command.default.mrc"
+              "name": "support.variable.name.mrc"
             }
           }
         },
         {
-          "match": "(?:^|(?\u003c=[|{)]|else)\\s)\\s*((/+)(\\.)?\\w+)(?=\\s)",
-          "captures": {
+          "name": "meta.cmd.mrc",
+          "begin": "(?i)(?:\\x20+\\|\\x20+|(?\u003c=else\\x20)|^\\x20*|\\)|\\G)\\x20*(?!\\|\\|\\x20)(\\/+)?([!|.]{1,2})?(?:(?![{};%\u0026$]|if|else(?:if)?|while)([^\\s]+))",
+          "end": "(?=\\z|\\x20\\|\\x20[^\\x20]|\\x20}|$)",
+          "patterns": [
+            {
+              "include": "#switches"
+            },
+            {
+              "include": "#parameters"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "entity.name.function.command.custom.mrc"
+              "name": "keyword.other.command.symbol.mrc"
             },
             "2": {
-              "name": "punctuation.definition.command.mrc"
+              "name": "keyword.other.command.symbol.mrc"
             },
             "3": {
-              "name": "meta.keyword.operator.command.silent.mrc"
+              "name": "support.function.name.mrc"
             }
           }
         }
       ]
     },
-    "comments": {
+    "comment_block": {
       "patterns": [
         {
           "name": "comment.block.mrc",
-          "begin": "(?:^|(?\u003c=\\s))(/\\*)",
-          "end": "(\\*/)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.comment.slash-star.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.comment.star-slash.mrc"
-            }
-          }
-        },
+          "begin": "^(?:\\x20*)\\/\\*",
+          "end": "^(?:\\x20*)\\*\\/$"
+        }
+      ]
+    },
+    "comment_documentation": {
+      "patterns": [
         {
-          "name": "comment.line.mrc",
-          "match": "(?:^|(?\u003c=\\s));.*",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.comment.semicolon.mrc"
+          "name": "comment.block.documentation.mrc",
+          "begin": "^(?:\\x20*)(\\/\\*\\*)$",
+          "end": "^(?:\\x20*)\\*\\/$",
+          "patterns": [
+            {
+              "include": "#documentation_block"
             }
-          }
+          ]
         }
       ]
     },
-    "comparison-operators": {
+    "comment_line": {
       "patterns": [
         {
-          "name": "keyword.operator.comparison.mrc",
-          "match": "===?|[!\u003c\u003e]=|\u003c|\u003e|//|\\\\|is(?:in(?:cs)?|wm(?:cs)?|num|letter|alnum|alpha|lower|upper|on|op|hop|voice|reg|chan|ban|invite|except|aop|avoice|ignore|protect|notify)"
-        },
-        {
-          "name": "keyword.operator.logical.mrc",
-          "match": "!|\u0026\u0026?|\\|\\|"
+          "name": "comment.line.semicolon.mrc",
+          "begin": "(?\u003c=\\G|\\x20\\|\\x20|^)(?:\\x20*);",
+          "end": "(?=\\z|\\x20+\\|\\x20+[^\\s]|\\x20}|$)"
         }
       ]
     },
-    "constants": {
+    "comments": {
       "patterns": [
         {
-          "name": "constant.numeric.mrc",
-          "match": "(?:^|(?\u003c=\\W))(?:-)?\\d+(?:\\.\\d+)?\\b"
+          "include": "#comment_documentation"
         },
         {
-          "name": "meta.constant.other.channel.mrc",
-          "match": "(?\u003c=[\\s\\[(,:=])#\\w*"
+          "include": "#comment_block"
         },
         {
-          "name": "meta.constant.other.window.mrc",
-          "match": "(?\u003c=[\\s\\[(,:=])@\\w+"
+          "include": "#comment_line"
         }
       ]
     },
-    "function-definitions": {
+    "conditionals": {
       "patterns": [
         {
-          "match": "^(?i)^(alias)\\s+(?:-l\\s+)?(\\w+)\\s+(?={)",
-          "captures": {
+          "name": "meta.conditional.mrc",
+          "begin": "(?i)(?:(?\u003c=\\x20\\|\\x20|^|\\G)\\x20*(if|elseif|while)|(?:(?\u003c=\\))\\x20+(\u0026\u0026|\\|\\|)))\\x20+(?=\\()",
+          "end": "(?=\\)(?:\\x20|$))",
+          "patterns": [
+            {
+              "include": "#conditionals_content"
+            },
+            {
+              "include": "#parameters"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "storage.type.alias.mrc"
+              "name": "keyword.control.conditional.mrc"
             },
             "2": {
-              "name": "entity.name.function.mrc"
+              "name": "keyword.control.conditional.mrc"
             }
           }
         },
         {
-          "begin": "(?i)^(dialog)\\s+(?:-l\\s+)?(\\w+)\\s+({)",
-          "end": "(})",
+          "name": "keyword.control.conditional.mrc",
+          "match": "(?i)(?\u003c=\\x20\\|\\x20|^)\\x20*(else)\\b"
+        }
+      ]
+    },
+    "conditionals_content": {
+      "patterns": [
+        {
+          "name": "keyword.operator.mrc",
+          "match": "(?i)((?\u003c=\\x20)!?(?:==?=?|(?:\u003c|\u003e)=?|\\/\\/|\\\\|\u0026|is(?:in(?:cs)?|wm(?:cs)?|(?:al)?num|letter|alpha|(?:low|upp)er|on|(?:a|h)?op|a?voice|reg|chan|ban|quiet|ignore|protected|notify|admin|owner|quiet|url))(?=\\x20|\\))|(?\u003c=\\()!(?=\\$|%|\u0026))"
+        },
+        {
+          "include": "#constants"
+        }
+      ]
+    },
+    "constants": {
+      "patterns": [
+        {
+          "name": "constant.numeric.mrc",
+          "match": "(?\u003c=\\x20|^|\\(|,)-?\\d+(\\.\\d+)?(?=\\x20|$|\\)|,)"
+        }
+      ]
+    },
+    "dialog": {
+      "patterns": [
+        {
+          "name": "meta.dialog.code.mrc",
+          "begin": "(?i)^(dialog)\\x20+(?:(-l)\\x20+)?(?!-l)([^\\s]+)\\s*(?={)",
+          "end": "(?\u003c=}$)",
           "patterns": [
             {
-              "include": "#comments"
-            },
-            {
-              "match": "(?i)^\\s*(title|icon|size|option|text|edit|button|check|radio|box|scroll|list|combo|link|tab|menu|item)\\s+",
-              "captures": {
-                "1": {
-                  "name": "entity.name.tag.mrc"
-                }
-              }
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#identifiers"
-            },
-            {
-              "include": "#variables"
-            },
-            {
-              "include": "#constants"
-            },
-            {
-              "name": "punctuation.separator.delimiter.mrc",
-              "match": ","
+              "include": "#dialog_content"
             }
           ],
           "beginCaptures": {
@@ -215,620 +263,464 @@
               "name": "storage.type.dialog.mrc"
             },
             "2": {
-              "name": "entity.name.section.dialog.mrc"
+              "name": "storage.modifier.dialog.mrc"
             },
             "3": {
-              "name": "punctuation.bracket.curly.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.curly.end.mrc"
+              "name": "entity.name.section.mrc"
             }
           }
+        }
+      ]
+    },
+    "dialog_content": {
+      "patterns": [
+        {
+          "include": "#comments"
         },
         {
-          "match": "(?i)^(menu)\\s+(channel|menubar|nicklist|query|status|@\\w+)(,(channel|menubar|nicklist|query|status|@\\w+))*\\s+(?={)",
-          "captures": {
+          "contentName": "string.quoted.double.control.mrc",
+          "begin": "(?i)^\\x20*(title|icon|size|option|text|edit|button|check|radio|box|scroll|list|combo|icon|link|tab|menu|item)\\x20+",
+          "end": "(?\u003c=$)",
+          "patterns": [
+            {
+              "include": "#parameters"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "storage.type.menu.mrc"
+              "name": "keyword.control.dialog.control.mrc"
             }
           }
-        },
-        {
-          "name": "entity.name.class.mrc",
-          "match": "(?i)^(raw)\\s+.+:.+:"
-        },
-        {
-          "name": "entity.name.class.mrc",
-          "match": "(?i)^(on)\\s+.+:(ACTION|ACTIVE|AGENT|APPACTIVE|BAN|CHAT|CLOSE|CONNECT(?:FAIL)?|CTCPREPLY|DCCSERVER|DE(HELP|OP|VOICE)|DIALOG|DISCONNECT|DNS|ERROR|EXIT|FILERCVD|FILESENT|GETFAIL|HELP|HOTLINK|INPUT|INVITE|JOIN|KEY(DOWN|UP)|KICK|LOAD|LOGON|MIDIEND|MODE|MP3END|NICK|NOSOUND|NOTICE|NOTIFY|OP|OPEN|PARSELINE|PART|PING|PLAYEND|PONG|QUIT|RAWMODE|SENDFAIL|SERV(?:ERMODE|EROP)?|SIGNAL|SNOTICE|SOCK(CLOSE|LISTEN|OPEN|READ|WRITE)|START|TABCOMP|TEXT|TOPIC|UDPREAD|UN(BAN|LOAD|NOTIFY)|USERMODE|WALLOPS|WAVEEND|VCMD|VOICE):(.+:)*"
         }
       ]
     },
-    "identifiers": {
+    "documentation_block": {
       "patterns": [
         {
-          "name": "constant.language.mrc",
-          "match": "(\\$~?)(!)?(?i:true|false|null|pi|crlf|cr|lf)\\b",
+          "match": "(?i)\\x20*\\*\\x20+(@(?:author|command|const(?:ant)?|copyright|deprecated|event|example|experimental|global|identifier|ignore|license|nobadges|param(?:eter)?|arg(?:ument)?|prop|returns?|see|switch|todo|version))\\b",
           "captures": {
             "1": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "2": {
-              "name": "meta.keyword.operator.identifier.default.mrc"
+              "name": "storage.type.class.mrc"
             }
           }
-        },
+        }
+      ]
+    },
+    "events": {
+      "patterns": [
         {
-          "name": "keyword.operator.input-prompt.mrc",
-          "match": "(\\$)(\\$)?~?\\?(?:[*!]?(?==))?",
-          "captures": {
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:action|notice|(?:client)?text):[^:]+:[^:]+:)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "2": {
-              "name": "meta.punctuation.definition.identifier.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "name": "support.type.parameter.mrc",
-          "match": "(\\$)(\\$)?~?(?:\\d+(?:-\\d+|-)?|\\?\\d+)(?!\\w)",
-          "captures": {
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:active|input|tabcomp|mscroll):(?:\\*|#[^:]*|\\?|=|!|@[^:]*):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "2": {
-              "name": "meta.punctuation.definition.identifier.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "name": "support.type.prev-result.mrc",
-          "match": "(\\$~?)(?:!|!?(?i:ifmatch|v[12]))\\b",
-          "captures": {
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:agent|appactive|connect(?:fail)?|disconnect|dns|exit|(?:un)?load|(?:midi|mp3|play|song|wave)end|nick|nosound|u?notify|ping|pong|quit|start|usermode|options|resume|song|suspend):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.punctuation.definition.identifier.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "begin": "((\\$~?)\\+?)(\\()",
-          "end": "(\\))",
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:(?:un)?ban|(?:de)?help|(?:de|server)?op|(?:de)?owner|(?:de)?voice|invite|join|kick|(?:server|raw)?mode|part|topic|(?:de)?admin):(?:\\*|#[^:]*):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
             {
-              "include": "#identifiers-content"
-            },
-            {
-              "include": "#identifiers-recurse"
+              "include": "#code_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "support.function.identifier.default.mrc"
-            },
-            "2": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "3": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.round.end.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "name": "keyword.operator.string.mrc",
-          "match": "(\\$~?)[\u0026+]\\B",
-          "captures": {
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:chat|ctcpreply|error|file(?:rcvd|sent)|(?:get|send)fail|logon|serv|signal|snotice|sock(?:close|listen|open|read|write)|udp(?:read|write)|vcmd|wallops|download|(?:un)?zip):[^:]+:)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.punctuation.definition.identifier.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "begin": "((\\$~?)(!)?iif)(\\()",
-          "end": "(\\))((\\.)\\w+)?",
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:(?:close|open):(?:\\*|\\?|=|!|@[^:]*):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
             {
-              "include": "#identifiers-iif-content"
-            },
-            {
-              "include": "#identifiers-iif-recurse"
+              "include": "#code_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "support.function.identifier.default.mrc"
-            },
-            "2": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "3": {
-              "name": "meta.keyword.operator.identifier.default.mrc"
-            },
-            "4": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.round.end.mrc"
-            },
-            "2": {
-              "name": "support.function.identifier.default.property.mrc"
-            },
-            "3": {
-              "name": "meta.punctuation.definition.identifier.property.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "begin": "((\\$~?)(!)?calc)(\\()",
-          "end": "(\\))((\\.)\\w+)?",
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:dccserver:(?:chat|send|fserve):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
             {
-              "include": "#identifiers-calc-content"
-            },
-            {
-              "include": "#identifiers-calc-recurse"
+              "include": "#code_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "support.function.identifier.default.mrc"
-            },
-            "2": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "3": {
-              "name": "meta.keyword.operator.identifier.default.mrc"
-            },
-            "4": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.round.end.mrc"
-            },
-            "2": {
-              "name": "support.function.identifier.default.property.mrc"
-            },
-            "3": {
-              "name": "meta.punctuation.definition.identifier.property.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "begin": "((\\$~?)(!)?(?i:abook|abs|acos|address|addtok|agent|alias|and|ansi2mirc|aop|asc|asctime|asin|atan2?|avoice|base|bfind|bindip|bitoff|biton|bvar|bytes|cb|ceil|chan|chat|chr|click|cnick|color|com(?:call|chan|val)?|compress|cosh?|count|countcs|crc|ctime|dccignore|dde|decode|decompress|deltok|dialog|did(?:reg|tok|wm)?|disk|dll|dllcall|dns|duration|editbox|encode|eval|exists|fgetc|file|find(?:dir|file|tok)|fline|floor|fopen|fread|fserve|get(?:dot|tok)?|group|hash|height|hfind|hget|highlight|hypot|ial|ialchan|ibl|iel|ignore|iil|inellipse|ini|inpoly|input|inrect|inroundrect|instok|int|intersect|iptype|isalias|isbit|isdde|isdir|isfile|islower|istok|istokcs|isupper|left|len|level|line|lines|link|lock|log|log10|longfn|longip|lower|mask|matchtok|matchtokcs|md5|mid|mk(?:fn|logfn|nickfn)|mode|msfile|nick|nofile|nopath|noqt|not|notags|notify|numtok|onpoly|or|ord|pic|play|portfree|pos|poscs|protect|puttok|qt|query|rand|read|readini|reg(?:ex|ml|mlex|sub|subex)|remove|removecs|remtok|remtokcs|replacex?|replacex?cs|reptok|reptokcs|rgb|right|round|scid|scon|script|sdir|send|server|sfile|sha1|shortfn|sin|sline|snick|sock|sorttok|sorttokcs|sound|speak|sqrt|str|strip|style|submenu|tanh?|timer|tip|toolbar|trust|ulist|upper|uptime|var|vcmd|width|wildtok|wildtokcs|window|vol|wrap|xor))(\\()",
-          "end": "(\\))((\\.)\\w+)?",
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:dialog:[^:]+:(?:init|close|edit|sclick|dclick|menu|scroll|mouse|rclick|drop|\\*):[\\d\\-,\\*]+:)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
             {
-              "include": "#identifiers-content"
-            },
-            {
-              "include": "#identifiers-recurse"
+              "include": "#code_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "support.function.identifier.default.mrc"
-            },
-            "2": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "3": {
-              "name": "meta.keyword.operator.identifier.default.mrc"
-            },
-            "4": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.round.end.mrc"
-            },
-            "2": {
-              "name": "support.function.identifier.default.property.mrc"
-            },
-            "3": {
-              "name": "meta.punctuation.definition.identifier.property.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "name": "support.type.identifier.default.noargs.mrc",
-          "match": "(\\$~?)(!)?(?i:active(?:cid|wid)?|address|agent(?:name|stat|ver)|anick|aop|appactive|appstate|away(?:msg|time)?|avoice|banmask|bnick|cb|cd|chan(?:modes|types)?|cid|clevel|cmdbox|cmdline|comerr|compact|creq|ctimer?|ctrlenter|date|day|daylight|dbuh|dbuw|dccignore|dccport|ddename|debug|devent|dlevel|dname|ebeeps|emailaddr|error|event|feof|ferr|filename|filtered|find(?:dirn|filen)|full(?:address|date|name|screen)|getdir|gmt|halted|highlight|hnick|host|hotline|hotlinepos|ial|idle|ignore|inmidi|inpaste|insong|inwave|ip|isid|key(?:char|rpt|val)|knick|lactive(?:cid|wid)?|leftwin(?:cid|wid)?|locked|log(?:dir|stamp|stampfmt)?|ltimer|maddress|matchkey|me|menu(?:bar|context|type)?|mididir|mirc(?:dir|exe|ini)|mnick|mode(?:first|last|spl)|mouse|network|newnick|nick|numeric|online|opnick|os|passivedcc|pi|pnick|port|portable|prefix|prop|protect|rawbytes|rawmsg|readn|remote|result|script(?:dir|line)?|server(?:ip|target)?|show|signal|site|snicks|snotify|sock(?:br|err|name)|sreq|ssl(?:dll|libdll|ready|version)?|status|stripped|switchbar|target|ticks|time|timestamp|timestampfmt|timezone|tips|titlebar|toolbar|treebar|ulevel|url|usermode|vcmd(?:stat|ver)|version|wid|wildsite|window|vnick)\\b",
-          "captures": {
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:hotlink:[^:]+:(?:\\*|#[^:]*|\\?|=|!|@[^:]*):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "2": {
-              "name": "meta.keyword.operator.identifier.default.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "begin": "((\\$)(!)?\\w+)(\\()",
-          "end": "(\\))((\\.)\\w+)?",
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:key(?:down|up):(?:\\*|@[^:]*):(?:\\*|\\d+(?:,\\d+)*):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
             {
-              "include": "#identifiers-content"
-            },
-            {
-              "include": "#identifiers-recurse"
+              "include": "#code_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.function.identifier.custom.mrc"
-            },
-            "2": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "3": {
-              "name": "meta.keyword.operator.identifier.default.mrc"
-            },
-            "4": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.round.end.mrc"
-            },
-            "2": {
-              "name": "entity.name.function.identifier.custom.property.mrc"
-            },
-            "3": {
-              "name": "meta.punctuation.definition.identifier.property.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         },
         {
-          "name": "entity.name.function.identifier.custom.noargs.mrc",
-          "match": "(\\$)(!)?\\w+",
-          "captures": {
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(on\\x20+(?:me:)?[^:\\s]+:parseline:(?:\\*|in|out):[^:]+:)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.punctuation.definition.identifier.mrc"
-            },
-            "2": {
-              "name": "meta.keyword.operator.identifier.default.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
-        }
-      ]
-    },
-    "identifiers-calc-content": {
-      "patterns": [
-        {
-          "include": "#identifiers-content"
-        },
-        {
-          "include": "#arithmetic-operators"
         },
         {
-          "include": "#identifiers-calc-recurse"
-        }
-      ]
-    },
-    "identifiers-calc-recurse": {
-      "patterns": [
-        {
-          "begin": "(\\()",
-          "end": "(\\))",
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(raw\\x20+[^:\\s]+:[^:]+:)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
           "patterns": [
             {
-              "include": "#identifiers-calc-content"
-            },
-            {
-              "include": "#identifiers-calc-recurse"
+              "include": "#code_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.bracket.round.begin.mrc"
+              "name": "entity.name.type.event.mrc"
             }
-          },
-          "endCaptures": {
+          }
+        },
+        {
+          "name": "meta.event.code.mrc",
+          "begin": "^(?i)(ctcp\\x20+[^:\\s]+:[^:]+:(?:\\*|#.*|\\?):)\\s*",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|(?\u003c=}$)",
+          "patterns": [
+            {
+              "include": "#code_content"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "punctuation.bracket.round.end.mrc"
+              "name": "entity.name.type.event.mrc"
             }
           }
         }
       ]
     },
-    "identifiers-content": {
+    "group": {
       "patterns": [
         {
-          "include": "#identifiers"
-        },
-        {
-          "include": "#variables"
-        },
+          "name": "keyword.other.groupname.mrc",
+          "match": "(?i)^#[^\\s]+ (on|off|end)(?:\\b)"
+        }
+      ]
+    },
+    "identifiers": {
+      "patterns": [
         {
-          "include": "#constants"
+          "include": "#identifiers_params"
         },
         {
-          "name": "punctuation.separator.delimiter.mrc",
-          "match": ","
+          "include": "#identifiers_no_params"
         }
       ]
     },
-    "identifiers-iif-content": {
+    "identifiers_no_params": {
       "patterns": [
         {
-          "include": "#comparison-operators"
+          "name": "keyword.other.identifier.mrc",
+          "match": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)\\$\\$?~?(0|\\!|\u0026(?=$)|\\*|\\+\\+?|[1-9]+(-?([0-9]+)|[^\\s|\\)|,]+)?|active((c|w)id)?|a?date|adiirc(dir([^\\s,)]+)?|exe|ini)|address|admnick|agent(name|stat|ver)|album|anick|aop|app(active|bits|state)|artist|asctime|audio|auto|avoice|away(msg|time)?|banmask|batteryp?|beta|bit(rate|s)|bname|bnick|boldify|builddate|bw(downb?|name|recb?|sentb?|speed|upb?)|cal(ias|ler)|cancel|cb|cd|chan(modes|types)?|cid|clevel|cmd(box|line)|com(char|err|ment|pact)|cpu(cache|count|ident|load|mhz|name|vendor)|cr(eq|lf)?|ctimer?|ctrlenter|day(light)?|dbu(h|w)|dccignore|dccport|ddename|debug|devent|did|disk(free|total)|dlevel|dname|dock(panels)?|dotnet|download(err)?|dqwindow|ebeeps|email(addr)?|error|event(id|parms)?|exiting|false|fe(of|rr)|filename|filtered|find(dirn|filen)|flinen|frequency|fromeditbox|full(address|date|name|screen|title)|genre|getdir|gfx(ram)?|globalidle|gmt|halted|highlight|hnick|host|hotline(pos)?|ia(ddress|l)|ident|idle|ifmatch2?|ignore|in(midi(.(pos|length|fname|pause))?|mode|mp3|paste|song(.(pos|length|fname|pause))?|wave(.(pos|length|fname|pause))?|who)|ip|is(admin|id|wine)|kblayout|key(char|rpt|val)|knick|lactive(cid|wid)?|lag|layer|leftwin(cid|wid)?|length|lf|locked|log(dir|stamp(fmt)?)|lquitmsg|ltimer|maddress|matchkey|max(lenl|lenm|lens)|me|mem(freep?|total)|menu(bar|context|type)?|mididir|mircdir([^\\s,)]+)?|mircexe|mircini|mnick|modefirst|modelast|modespl|motherboard|mouse(.(x|y||mx|my|dx|dy|cx|cy|win|lb|key))?|mp3dir|msg(stamp|tags|x)|muted|mversion|naddress|nick(column|mode)?|network|newnick|no(tify)?|null|numeric|ok|online(server|total)?|op?nick|os(bits|build|edition|idle|installdate|major|minor|name|servicepack|version)?|parms|parse(line|type|utf)|passivedcc|pcre|percent(l|p)|pi|play(count|er(handle)?)|pnick|port(able)?|position|prefix(ctcp|emote|sys|user)?|progress|prop|protect|quickconnect|quitmessage|raddress|randomcolors|rating|raw(bytes|msgx?)|readn|realname|regerrstr|remote|result|screen(b|hz?|w)?|script(dir([^\\s,)]+)?|line|s)?|server(ip|target)?|sfstate|show|signal|site|size|snicks|snotify|sock(err|br|name)|song(path)?|sreq|ssl(cert((remote)?sha(1|256)|valid)|(lib)?dll|ready|version)?|starting|status(bar)?|stripped|switchbar|target|tempfn|ticks|time(out|stamp(fmt)?|zone)|tips|title(bar)?|toolbar|topic|totaltracks|track|treebar|true|ulevel|up(days|dating|hours|mins)|url|user(mode|name)|v1|v2|vcmd(stat|ver)|version|volume(b|p)?|vnick|wavedir|wid|wildsite|window|year|yes|ziperr)(?=\\s|\\)|,)"
+        },
+        {
+          "match": "(?\u003c=\\s|\\(|\\,|\\.|^)(\\$\\$?~?(?:\\?(?:[^\\s=]+)?|s?dir|hfile))(?:(=)(\"(?:[^\"])*\"))?(?=\\s|\\)|,)",
+          "captures": {
+            "1": {
+              "name": "keyword.other.identifier.mrc"
+            },
+            "2": {
+              "name": "keyword.operator.mrc"
+            },
+            "3": {
+              "name": "string.quoted.double.mrc"
+            }
+          }
         },
         {
-          "include": "#identifiers-content"
+          "name": "keyword.other.identifier.mrc",
+          "match": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\=\\$\\$?~?nick)(?=\\b)"
         },
         {
-          "include": "#identifiers-iif-recurse"
+          "name": "support.function.name.mrc",
+          "match": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?[^\\s(),]+)(?=\\b)"
         }
       ]
     },
-    "identifiers-iif-recurse": {
+    "identifiers_params": {
       "patterns": [
         {
-          "begin": "(\\()",
-          "end": "(\\))",
+          "begin": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?(\\+|abook|a?cos|abs|date|add(ress|tok(cs)?)|adilang|admnick|agent|alias|and|ansi2mirc|aop|asc(time)?|a?sin|a?tan|avoice|banlist|base|bfind|bindip|bit(off|on)|boldify|bvar|bytes|calias|cb|ceil|chan(nel)?|chat|chr|click|cnick|colou?r|com(call|chan|press|val)?|cosh?|count(cs)?|cpuload|crc|ctime|date|dccignore|dde|decode|decompress|decrypt|deltok|dialog|did(reg|tok|wm)?|disk(menu)?|dll(call)?|dns|dockpanels|download|duration|editbox(history)?|emoticons|encode|encodingmenu|encrypt|envvar|eval(next)?|eventtarget|exec|exists|fgetc|file|find(dir|file|tok(cs)?)|fline|floor|font|fopen|fread|fserve?|get(dir|dot|tok)?|gfx(ram)?|gmt|group|hash|height|hexcolor|hfind|hget|highlight|hmac|hmatch|hnick|hotlink|hotp|hregex|hypot|ial(chan)?|ibl|iel|ignore|iil|inellipse|ini(ck|topic)?|inpoly|input|in(round)?rect|insert|instok|int(ersect)?|invitemenu|iptype|iql|ircv3caps|is(alias|bit|dde|dir|file|lower|tok(cs)?|upper|utf)|keylocked|left|len|level|line(height|s)?|link|lock|lo(f|g(10)?)|long(fn|ip)|loop|lower|maddress|mask|matchtok(cs)?|md5|menuicon|mid|mk(log|nick)?fn|mode|mp3|msfile|msgtags|nadmnick|(nh)?nick|no(file|p?nick|t(ags|ify)?|path|qt)?|numtok|nvnick|ocolor|onpoly|op?nick|ord?|pic|play|plugins|portfree|pos(cs)?|powmod|prefix(emote|user)|puttok|qt|query|r(ands?|ead(ini)?|eg(ex|ml(ex)?|sub(ex)?)|em(ove(cs)?|tok(cs)?)|eplace(cs|x(cs)?)?|eptok(cs)?|gb|ight|ound|nick)?|samepath|scid|scon|screen(b|hz?|shot|w)?|script|sdir|send|server(vars)?|sfile|sha(1|2|256|384|512)|shortfn|sinh|slapsmenu|sline|snick|sock|sorttok(cs)?|sound|speak|spellcheck|sqrt|statusbar|str(ip)?|style|submenu|sysdir|tanh|timer|tip|token|toolbar|topicbox|totp|trust|ulist|unsafe|upper|uptime|url(get)?|utf(de|en)code|var|vc(md)?|vol|width|wildtok(cs)?|window|wmiquery|wrap|xor|zip))\\(",
+          "end": "(?i)\\)(?:\\.([^\\s|\\)|,]+))?",
           "patterns": [
             {
-              "include": "#identifiers-iif-content"
-            },
-            {
-              "include": "#identifiers-iif-recurse"
+              "include": "#parameters"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.bracket.round.begin.mrc"
+              "name": "keyword.other.identifier.mrc"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "punctuation.bracket.round.end.mrc"
+              "name": "keyword.other.identifier.property.mrc"
             }
           }
-        }
-      ]
-    },
-    "identifiers-recurse": {
-      "patterns": [
+        },
         {
-          "begin": "(\\()",
-          "end": "(\\))",
+          "begin": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?calc)\\(",
+          "end": "(?i)\\)(?:\\.([^\\s|\\)|,]+))?",
           "patterns": [
             {
-              "include": "#identifiers-content"
+              "include": "#parameters"
             },
             {
-              "include": "#identifiers-recurse"
+              "include": "#calc_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.bracket.round.begin.mrc"
+              "name": "keyword.other.identifier.mrc"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "punctuation.bracket.round.end.mrc"
+              "name": "keyword.other.identifier.property.mrc"
             }
           }
-        }
-      ]
-    },
-    "keywords": {
-      "patterns": [
+        },
         {
-          "match": "(?:^|(?\u003c=[|{)]|else)\\s)\\s*(/*!?(?i:break|continue|goto|halt(?:def)?|return))\\b",
-          "captures": {
+          "begin": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?iif)\\(",
+          "end": "(?i)\\)(?:\\.([^\\s|\\)|,]+))?",
+          "patterns": [
+            {
+              "include": "#conditionals_content"
+            },
+            {
+              "include": "#parameters"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "keyword.control.flow.mrc"
+              "name": "keyword.other.identifier.mrc"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.other.identifier.property.mrc"
             }
           }
-        }
-      ]
-    },
-    "labels": {
-      "patterns": [
-        {
-          "name": "entity.name.section.label.mrc",
-          "match": "(?:^|(?\u003c=[|{)]|else)\\s)\\s*:\\w+"
-        }
-      ]
-    },
-    "punctuation": {
-      "patterns": [
-        {
-          "name": "punctuation.separator.command.mrc",
-          "match": "(?\u003c=\\s)\\|(?=\\s)"
         },
         {
-          "name": "punctuation.bracket.square.begin.mrc",
-          "match": "(?:^|(?\u003c=\\s))\\[(?=\\s)"
-        },
-        {
-          "name": "punctuation.bracket.square.end.mrc",
-          "match": "(?\u003c=\\s)\\](?:(?=\\s)|$)"
-        },
-        {
-          "name": "meta.block.mrc",
-          "begin": "(?\u003c=\\s)({)(?:(?=\\s)|$)",
-          "end": "(?:^|(?\u003c=\\s))(})(?:(?=\\s)|$)",
+          "begin": "(?\u003c=\\s|\\(!|\\(|\\,|\\.|^)(\\$\\$?~?[^\\s(),]+)\\(",
+          "end": "(?i)\\)(?:\\.([^\\s|\\)|,]+))?",
           "patterns": [
             {
-              "include": "$self"
+              "include": "#parameters"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.bracket.curly.begin.mrc"
+              "name": "support.function.name.mrc"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "punctuation.bracket.curly.end.mrc"
+              "name": "keyword.other.identifier.property.mrc"
             }
           }
         }
       ]
     },
-    "statements": {
+    "menu": {
       "patterns": [
         {
-          "name": "meta.conditional.statement.mrc",
-          "begin": "(?ix:(?:^|(?\u003c=[{}]\\s))\\s*(if|while)\\s+(\\() | (?:^|(?\u003c=}\\s))\\s*(elseif)\\s+(\\())",
-          "end": "(\\))",
+          "name": "meta.menu.code.mrc",
+          "begin": "(?i)^(menu)\\x20+((?:status|channel|query|nicklist|menubar|(?:channel)?link|@[^\\x20,]+|\\*)(?:,(?:status|channel|query|nicklist|menubar|(?:channel)?link|@[^\\x20,]+))*|\\*)\\x20+{",
+          "end": "(?i)(?=\\z|(?:^(?:on|raw|ctcp|dialog|\\#[^\\s]+|alias|menu)\\b))|}$",
           "patterns": [
             {
-              "include": "#statements-content"
-            },
-            {
-              "include": "#statements-recurse"
+              "include": "#menu_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.conditional.mrc"
+              "name": "storage.type.menu.mrc"
             },
             "2": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            },
-            "3": {
-              "name": "keyword.control.conditional.mrc"
-            },
-            "4": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.round.end.mrc"
-            }
-          }
-        },
-        {
-          "match": "(?i)(?:^|(?\u003c=}\\s))\\s*(else)(?=\\s)",
-          "captures": {
-            "1": {
-              "name": "keyword.control.conditional.mrc"
+              "name": "storage.modifier.function.mrc"
             }
           }
         }
       ]
     },
-    "statements-content": {
+    "menu_content": {
       "patterns": [
         {
           "include": "#comments"
         },
         {
-          "include": "#identifiers"
-        },
-        {
-          "include": "#variables"
+          "include": "#parameters"
         },
         {
-          "include": "#constants"
-        },
-        {
-          "include": "#comparison-operators"
-        }
-      ]
-    },
-    "statements-recurse": {
-      "patterns": [
-        {
-          "begin": "(\\()",
-          "end": "(\\))",
+          "begin": "(?:^\\x20*|\\G)\\x20*(?:\\.+)?((?:mouse|(?:s|d(?:r|m)?|u|r|lb|m)click)|leave|drop)(?:\\x20*:\\x20*)?",
+          "end": "(?=\\z|\\x20}|$)",
           "patterns": [
             {
-              "include": "#statements-content"
-            },
-            {
-              "include": "#statements-recurse"
+              "include": "#code_content"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.bracket.round.begin.mrc"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.bracket.round.end.mrc"
+              "name": "keyword.other.menu.item.mrc"
             }
           }
-        }
-      ]
-    },
-    "strings": {
-      "patterns": [
+        },
         {
-          "name": "string.quoted.double.mrc",
-          "match": "(\").*?(\")",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.string.begin.mrc"
+          "begin": "^\\x20*",
+          "end": "(?=\\z|\\x20}|$)",
+          "patterns": [
+            {
+              "include": "#parameters"
             },
-            "2": {
-              "name": "punctuation.definition.string.end.mrc"
+            {
+              "begin": "(?\u003c=:|{)",
+              "end": "(?=\\z|\\x20}|$)",
+              "patterns": [
+                {
+                  "include": "#code_content"
+                }
+              ]
             }
-          }
+          ]
         }
       ]
     },
-    "variable-assignments": {
+    "parameters": {
       "patterns": [
         {
-          "match": "(?i)(?:(?:^|(?\u003c=[|{)]|else)\\s)\\s*((/*)!?var(\\s-g)?)?|(,)\\s+)\\s*((%)\\w+)(?:\\s+(=)\\s+)?",
-          "captures": {
-            "1": {
-              "name": "storage.type.mrc"
-            },
-            "2": {
-              "name": "punctuation.definition.command.mrc"
-            },
-            "3": {
-              "name": "punctuation.separator.delimiter.mrc"
-            },
-            "4": {
-              "name": "variable.other.normal.mrc"
-            },
-            "5": {
-              "name": "variable.global.set.mrc"
-            },
-            "6": {
-              "name": "meta.punctuation.definition.variable.other.normal.mrc"
-            },
-            "7": {
-              "name": "keyword.operator.assignment.mrc"
-            }
-          }
+          "include": "#variables"
         },
         {
-          "match": "(?i)(?:^|(?\u003c=[|{)]|else)\\s)\\s*((/*)set)(?:\\s+\\-[a-z]+)?\\s+((%)\\w+)\\s",
-          "captures": {
-            "1": {
-              "name": "storage.type.mrc"
-            },
-            "2": {
-              "name": "punctuation.definition.command.mrc"
-            },
-            "3": {
-              "name": "variable.other.normal.mrc"
-            },
-            "4": {
-              "name": "meta.punctuation.definition.variable.other.normal.mrc"
-            }
-          }
+          "include": "#identifiers"
+        },
+        {
+          "include": "#constants"
+        }
+      ]
+    },
+    "switches": {
+      "patterns": [
+        {
+          "name": "keyword.other.switch.mrc",
+          "match": "(?\u003c=\\x20)[-+][[:alnum:]]+(?=\\s)"
         }
       ]
     },
@@ -836,21 +728,11 @@
       "patterns": [
         {
           "name": "variable.other.normal.mrc",
-          "match": "(%)\\w+",
-          "captures": {
-            "1": {
-              "name": "meta.punctuation.definition.variable.other.normal.mrc"
-            }
-          }
+          "match": "(?\u003c![^(,\\x20!])(%)[^\\x20),]+"
         },
         {
           "name": "variable.other.binary.mrc",
-          "match": "(\u0026)\\w+",
-          "captures": {
-            "1": {
-              "name": "meta.punctuation.definition.variable.other.binary.mrc"
-            }
-          }
+          "match": "(?\u003c![^(,\\x20!])(\u0026)[^\\x20),]+"
         }
       ]
     }