github-linguist 7.6.1 → 7.9.0

data/grammars/source.abap.json

@@ -253,15 +253,15 @@
       ]
     },
     "arithmetic_operator": {
-      "name": "keyword.operator.arithmetic.abap",
-      "match": "(?\u003c=\\s)(\\+|\\-|\\*|\\*\\*|/|%)(?=\\s)"
+      "name": "keyword.operator.abap",
+      "match": "(?i)(?\u003c=\\s)(\\+|\\-|\\*|\\*\\*|/|%|DIV|MOD|BIT-AND|BIT-OR|BIT-XOR|BIT-NOT)(?=\\s)"
     },
     "builtin_functions": {
       "name": "entity.name.function.builtin.abap",
       "match": "(?ix)(?\u003c=\\s)(abs|sign|ceil|floor|trunc|frac|acos|asin|atan|cos|sin|tan|cosh|sinh|tanh|exp|log|log10|sqrt|strlen|xstrlen|charlen|lines|numofchar|dbmaxlen|round|rescale|nmax|nmin|cmax|cmin|boolc|boolx|xsdbool|contains|contains_any_of|contains_any_not_of|matches|line_exists|ipow|char_off|count|count_any_of|count_any_not_of|distance|condense|concat_lines_of|escape|find|find_end|find_any_of|find_any_not_of|insert|match|repeat|replace|reverse|segment|shift_left|shift_right|substring|substring_after|substring_from|substring_before|substring_to|to_upper|to_lower|to_mixed|from_mixed|translate|bit-set|line_index)(?=\\()"
     },
     "comparison_operator": {
-      "name": "keyword.operator.comparison.abap",
+      "name": "keyword.operator.abap",
       "match": "(?i)(?\u003c=\\s)(\u003c|\u003e|\u003c\\=|\u003e\\=|\\=|\u003c\u003e|eq|ne|lt|le|gt|ge|cs|cp)(?=\\s)"
     },
     "control_keywords": {
@@ -296,12 +296,12 @@
       }
     },
     "logical_operator": {
-      "name": "keyword.operator.arithmetic.abap",
+      "name": "keyword.operator.abap",
       "match": "(?i)(?\u003c=\\s)(not|or|and)(?=\\s)"
     },
     "main_keywords": {
       "name": "keyword.control.simple.abap",
-      "match": "(?ix)(?\u003c=^|\\s)(\n\t        abstract|add|add-corresponding|adjacent|alias|aliases|all|append|appending|ascending|as|assert|assign|assigned|assigning|association|authority-check|\n\t        back|begin|binary|block|bound|break-point|by|byte|\n\t        call|cast|changing|check|class-data|class-method|class-methods|clear|close|cnt|collect|commit|cond|character|\n\t        corresponding|communication|component|compute|concatenate|condense|constants|conv|count|\n\t        controls|convert|create|currency|\n\t        data|descending|default|define|deferred|delete|describe|detail|display|divide|divide-corresponding|display-mode|duplicates|\n\t        deleting|\n\t        editor-call|end|endexec|endfunction|ending|endmodule|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|exit-command|\n\t        endprovide|endselect|endtry|endwhile|enum|event|events|exec|exit|export|\n\t        exporting|extract|exception|exceptions|\n\t        field-symbols|field-groups|field|first|fetch|fields|format|frame|free|from|function|find|for|found|function-pool|\n\t        generate|get|\n\t        handle|hide|hashed|\n\t        include|import|importing|index|infotypes|initial|initialization|\n\t        id|is|in|interface|interfaces|input|insert|instance|into|\n\t\t\tkey|\n\t        left-justified|leave|like|line|line-count|line-size|load|local|log-point|length|left|leading|lower|\n\t        matchcode|method|mesh|message|message-id|methods|modify|module|move|move-corresponding|multiply|multiply-corresponding|match|\n\t\t\tnew|new-line|new-page|new-section|no|no-gap|no-gaps|no-sign|no-zero|non-unique|number|\n\t        occurrence|object|obligatory|of|output|overlay|optional|others|occurrences|occurs|offset|options|\n\t        pack|parameters|perform|places|position|print-control|private|program|protected|provide|public|put|\n\t        radiobutton|raising|ranges|receive|receiving|redefinition|reference|refresh|regex|reject|results|requested|\n\t        ref|replace|report|reserve|restore|result|return|returning|right-justified|rollback|read|read-only|rp-provide-from-last|run|\n\t        scan|screen|scroll|search|select|select-options|selection-screen|stamp|source|subkey|\n\t        separated|set|shift|single|skip|sort|sorted|split|standard|stamp|starting|start-of-selection|sum|subtract-corresponding|statics|step|stop|structure|submatches|submit|subtract|summary|supplied|suppress|section|syntax-check|syntax-trace|system-call|switch|\n\t        tables|table|task|testing|test-seam|test-injection|then|time|times|title|titlebar|to|top-of-page|trailing|transfer|transformation|translate|transporting|types|type|type-pool|type-pools|\n\t        unassign|unique|uline|unpack|update|upper|using|\n\t        value|\n\t        when|while|window|write|where|with|work|\n\t\txml)(?=\\s|\\.|:|,)"
+      "match": "(?ix)(?\u003c=^|\\s)(\n\t        abstract|add|add-corresponding|adjacent|alias|aliases|all|append|appending|ascending|as|assert|assign|assigned|assigning|association|authority-check|\n\t        back|begin|binary|block|bound|break-point|by|byte|\n\t        call|cast|changing|check|class-data|class-method|class-methods|class-pool|clear|close|cnt|collect|commit|comment|cond|character|\n\t        corresponding|communication|component|compute|concatenate|condense|constants|conv|count|\n\t        controls|convert|create|currency|\n\t        data|descending|default|define|deferred|delete|describe|destination|detail|display|divide|divide-corresponding|display-mode|duplicates|\n\t        deleting|\n\t        editor-call|empty|end|endexec|endfunction|ending|endmodule|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|exit-command|\n\t        endprovide|endselect|endtry|endwhile|enum|event|events|exec|exit|export|\n\t        exporting|extract|exception|exceptions|\n\t        field-symbols|field-groups|field|first|fetch|fields|format|frame|free|from|function|find|for|found|function-pool|\n\t        generate|get|\n\t        handle|hide|hashed|header|help-request|\n\t        include|import|importing|index|infotypes|initial|initialization|\n\t        id|implemented|is|in|interface|interfaces|interface-pool|intervals|init|input|insert|instance|into|\n\t\t\tkey|\n\t        left-justified|leave|like|line|lines|line-count|line-size|load|local|log-point|length|left|leading|lower|\n\t        matchcode|method|mesh|message|message-id|methods|modify|module|move|move-corresponding|multiply|multiply-corresponding|match|modif|\n\t\t\tnew|new-line|new-page|new-section|next|no|no-display|no-gap|no-gaps|no-sign|no-zero|non-unique|number|\n\t        occurrence|object|obligatory|of|output|overlay|optional|others|occurrences|occurs|offset|options|\n\t        pack|parameters|partially|perform|places|position|print-control|private|program|protected|provide|public|put|\n\t        radiobutton\\s+group|raising|range|ranges|receive|receiving|redefinition|reduce|reference|refresh|regex|reject|results|requested|\n\t        ref|replace|report|reserve|restore|result\\s+xml|return|returning|right-justified|rollback|read|read-only|rp-provide-from-last|run|\n\t        scan|screen|scroll|search|select|select-options|selection-screen|stamp|source|subkey|\n\t        separated|set|shift|single|skip|sort|sorted|split|standard|stamp|starting|start-of-selection|sum|subtract-corresponding|statics|step|stop|structure|submatches|submit|subtract|summary|supplied|suppress|section|syntax-check|syntax-trace|system-call|switch|\n\t        tables|table|task|testing|test-seam|test-injection|then|time|times|title|titlebar|to|top-of-page|trailing|transfer|transformation|translate|transporting|types|type|type-pool|type-pools|\n\t        unassign|unique|uline|unpack|update|upper|using|user-command|\n\t        value|value-request|\n\t        when|while|window|write|where|with|work|\n\t\txml)(?=\\s|\\.|:|,)"
     },
     "operators": {
       "patterns": [
@@ -320,8 +320,8 @@
       ]
     },
     "other_operator": {
-      "name": "keyword.operator.other.abap",
-      "match": "\\s(\u0026\u0026|\\?\\=)\\s"
+      "name": "keyword.operator.abap",
+      "match": "(?\u003c=\\s)(\u0026\u0026|\\?=|\\+=|-=|\\/=|\\*=|\u0026\u0026=)(?=\\s)"
     },
     "reserved_names": {
       "name": "constant.language.abap",

data/grammars/source.abnf.json

@@ -13,6 +13,10 @@
           "name": "keyword.operator.assignment.increment.abnf",
           "match": "=/"
         },
+        {
+          "name": "keyword.operator.assignment.colon.non-standard.abnf",
+          "match": ":+="
+        },
         {
           "name": "keyword.operator.assignment.abnf",
           "match": "="
@@ -31,7 +35,7 @@
     },
     "core-rules": {
       "name": "support.constant.reference.core-rule.abnf",
-      "match": "(?x)\n\\b\n(ALPHA|BIT|CHAR|CRLF|CR|CTL|DIGIT|DQUOTE\n|HEXDIG|HTAB|LF|LWSP|OCTET|SP|VCHAR|WSP)\n\\b"
+      "match": "(?x)\n\\b (?\u003c!-)\n(ALPHA|BIT|CHAR|CRLF|CR|CTL|DIGIT|DQUOTE\n|HEXDIG|HTAB|LF|LWSP|OCTET|SP|VCHAR|WSP)\n\\b (?!-)"
     },
     "group": {
       "name": "meta.group.abnf",
@@ -83,6 +87,21 @@
         }
       }
     },
+    "prose": {
+      "name": "string.other.prose.abnf",
+      "begin": "\u003c",
+      "end": "\u003e",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.abnf"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.abnf"
+        }
+      }
+    },
     "quantifier": {
       "name": "meta.quantifier.abnf",
       "match": "([0-9]*)(\\*)",
@@ -128,6 +147,9 @@
         {
           "include": "#reference"
         },
+        {
+          "include": "#prose"
+        },
         {
           "name": "keyword.operator.logical.or.alternation.pipe.abnf",
           "match": "/"

data/grammars/source.agda.json

@@ -3,240 +3,70 @@
   "scopeName": "source.agda",
   "patterns": [
     {
-      "name": "meta.declaration.module.agda",
-      "begin": "\\b(module)\\s+([^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*)\\b",
-      "end": "(\\bwhere\\b|=)",
-      "patterns": [
-        {
-          "include": "#module_param"
-        },
-        {
-          "include": "#module_params"
-        },
-        {
-          "include": "#module_params_implicit"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.agda"
-        },
-        "2": {
-          "name": "storage.module.agda"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "keyword.other.agda"
-        }
-      }
-    },
-    {
-      "name": "meta.import.agda",
-      "begin": "^\\s*(import|open(\\s+import)?)\\b",
-      "end": "$",
-      "patterns": [
-        {
-          "name": "keyword.other.agda",
-          "match": "\\b(as|using|renaming|hiding|public)\\b"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.agda"
-        }
-      }
+      "name": "comment.line.double-dash.agda",
+      "begin": "--",
+      "end": "$"
     },
     {
-      "name": "meta.declaration.record.agda",
-      "begin": "^\\s*(record)\\s+([^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*)\\b",
-      "end": "\\b(where)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.agda"
-        },
-        "2": {
-          "name": "storage.record.agda"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "keyword.other.agda"
-        }
-      }
+      "name": "comment.block.agda",
+      "begin": "{-[^#]",
+      "end": "-}"
     },
     {
-      "name": "meta.declaration.record.agda",
-      "begin": "\\b(data)\\s+([^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*)\\b",
-      "end": "\\b(where)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.agda"
-        },
-        "2": {
-          "name": "storage.data.agda"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "keyword.other.agda"
-        }
-      }
+      "name": "support.other.agda",
+      "begin": "{-#",
+      "end": "#-}"
     },
     {
       "name": "string.quoted.double.agda",
       "begin": "\"",
-      "end": "\"",
-      "patterns": [
-        {
-          "name": "constant.character.escape.agda",
-          "match": "\\\\."
-        }
-      ]
+      "end": "\""
     },
     {
-      "name": "keyword.operator.agda",
-      "match": "\\binfix[lr]\\b"
+      "name": "constant.char.agda",
+      "match": "'([^\\\\']|\\\\['\\\\\"[:alnum:]]+)'"
     },
     {
-      "name": "keyword.other.agda",
-      "match": "\\b(where|as|case|field|constructor|record|private|public|abstract|mutual)\\b"
-    },
-    {
-      "name": "keyword.operator.agda",
-      "match": "(?\u003c=\\s)[=→λ∀?]"
+      "name": "constant.numeric.agda",
+      "match": "(?\u003c=^|[[:space:]\\(\\){}])(-?\\d+|0x[0-9A-F]+|-?\\d+\\.\\d+((e|E)(\\+|-)?\\d+)?|-?\\d+(e|E)(\\+|-)?\\d+)(?=[[:space:]\\(\\){}])"
     },
     {
-      "name": "meta.function.type-declaration.agda",
-      "match": "^\\s*([^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*)\\s*(:)(?=\\s|$)",
+      "match": "\\b(data|record|module|constructor|open *import|open|import)[[:space:]]+([^;\\(\\){}@\"[:space:]]+)",
       "captures": {
         "1": {
-          "name": "entity.name.function.agda"
+          "name": "keyword.other.agda"
         },
         "2": {
-          "name": "keyword.other.colon.agda"
+          "name": "entity.name.type.agda"
         }
       }
     },
     {
-      "name": "string.quoted.double.agda",
-      "begin": "\"",
-      "end": "\"",
-      "patterns": [
-        {
-          "name": "constant.character.escape.agda",
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\\u0026])"
-        },
-        {
-          "name": "constant.character.escape.octal.agda",
-          "match": "\\\\o[0-7]+|\\\\x[0-9A-Fa-f]+|\\\\[0-9]+"
-        },
-        {
-          "name": "constant.character.escape.control.agda",
-          "match": "\\^[A-Z@\\[\\]\\\\\\^_]"
-        }
-      ],
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.agda"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.agda"
-        }
-      }
+      "name": "entity.name.tag.agda",
+      "match": "((?\u003c=^|[.;\\(\\){}@\"[:space:]])\\?(?=[.;\\(\\){}@\"[:space:]])|{!.*!})"
     },
     {
-      "name": "constant.numeric.agda",
-      "match": "\\b([0-9]+|0([xX][0-9a-fA-F]+))\\b"
+      "name": "keyword.other.agda",
+      "match": "\\b(abstract|constructor|data|do|eta-equality|field|forall|hiding|import|in|inductive|infix|infixl|infixr|instance|let|macro|module|mutual|no-eta-equality|open|overlap|pattern|postulate|primitive|private|public|quote|quoteContext|quoteGoal|quoteTerm|record|renaming|rewrite|syntax|tactic|unquote|unquoteDecl|unquoteDef|using|variable|where|with)\\b"
     },
     {
-      "include": "#dashComment"
+      "name": "constant.language.agda",
+      "match": "\\b(Set|Prop)[0123456789₀₁₂₃₄₅₆₇₈₉]*(?=[[:space:]\\(\\)\\{\\}])"
     },
     {
-      "include": "#pragma"
+      "name": "keyword.other.agda",
+      "match": "(?\u003c=^|[[:space:]\\(\\)\\{\\}])(λ|→|-\u003e|∀|=|←|:)(?=[[:space:]\\(\\)\\{\\}])"
     },
     {
-      "include": "#blockComment"
-    }
-  ],
-  "repository": {
-    "blockComment": {
-      "name": "comment.block.agda",
-      "begin": "{-",
-      "end": "-}",
+      "match": "^(([[:space:]]+|abstract|instance|macro|pattern|postulate|primitive|private|syntax|variable|where|let)*)([^;\\(\\){}@\"[:space:]]+)[[:space:]]+(?=:)",
       "captures": {
-        "0": {
-          "name": "punctuation.definition.comment.agda"
-        }
-      }
-    },
-    "dashComment": {
-      "name": "comment.line.double-dash.agda",
-      "begin": "(--) ",
-      "end": "$",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.comment.agda"
-        }
-      }
-    },
-    "identifier": {
-      "name": "entity.name.function.agda",
-      "match": "\\b[^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*"
-    },
-    "module_param": {
-      "name": "entity.name.parameter.agda",
-      "match": "\\b[^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*"
-    },
-    "module_params": {
-      "name": "meta.declaration.module.params.agda",
-      "begin": "\\(",
-      "end": "\\)",
-      "patterns": [
-        {
-          "include": "#module_param"
-        },
-        {
-          "include": "#type_sig_rhs"
-        }
-      ]
-    },
-    "module_params_implicit": {
-      "name": "meta.declaration.module.params.agda",
-      "begin": "\\{",
-      "end": "\\}",
-      "patterns": [
-        {
-          "include": "#module_param"
+        "1": {
+          "name": "keyword.other.agda"
         },
-        {
-          "include": "#type_sig_rhs"
+        "3": {
+          "name": "entity.name.agda"
         }
-      ]
-    },
-    "pragma": {
-      "name": "support.pragma.block.agda",
-      "begin": "\\{-#",
-      "end": "#-\\}",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.pragma.agda"
-        }
-      },
-      "applyEndPatternLast": true
-    },
-    "type_sig_rhs": {
-      "name": "meta.declaration.module.params.typesig.agda",
-      "begin": ":",
-      "end": "(?=[\\)\\}])",
-      "patterns": [
-        {
-          "name": "storage.type.agda",
-          "match": "\\b[^\\(\\)\\{\\}[:space:]=→λ∀?][^\\(\\)\\{\\}[:space:]]*"
-        }
-      ]
+      }
     }
-  }
+  ]
 }

data/grammars/source.ahk.json

@@ -16,8 +16,8 @@
     },
     {
       "name": "comment.block.ahk",
-      "begin": "^/\\*",
-      "end": "^\\*/"
+      "begin": "^\\s*/\\*",
+      "end": "^\\s*\\*/"
     },
     {
       "name": "functionline.ahk",
@@ -60,7 +60,7 @@
     },
     {
       "name": "hotkeyline.ahk",
-      "match": "^\\s*(.+)(::)",
+      "match": "^\\s*(\\S+(?:\\s+\u0026\\s+\\S+)*)(::)",
       "captures": {
         "1": {
           "name": "entity.name.function.label.ahk"
@@ -106,9 +106,13 @@
         }
       }
     },
+    {
+      "name": "invalid.deprecated.ahk",
+      "match": "\\b(?i:IfEqual|IfNotEqual|IfLess|IfLessOrEqual|IfGreater|IfGreaterOrEqual|IfExist|IfNotExist|IfInString|IfNotInString|IfWinActive|IfWinNotActive|IfWinExist|IfWinNotExist|OnExit|SetEnv|EnvDiv|EnvMult|SetFormat|StringGetPos|StringLeft|StringRight|StringLen|StringGetPos|StringMid|StringReplace|StringSplit|StringTrimLeft|StringTrimRight)\\b"
+    },
     {
       "name": "support.function.ahk",
-      "match": "\\b(?i:autotrim|blockinput|click|clipwait|controlclick|controlfocus|controlget|controlgetfocus|controlgetpos|controlgettext|controlmove|controlsend|controlsendraw|controlsettext|control|coordmode|detecthiddentext|detecthiddenwindows|driveget|drivespacefree|drive|edit|envadd|envdiv|envget|envmult|envset|envsub|envupdate|fileappend|filecopydir|filecopy|filecreatedir|filecreateshortcut|filedelete|fileencoding|filegetattrib|filegetshortcut|filegetsize|filegettime|filegetversion|fileinstall|filemovedir|filemove|filereadline|fileread|filerecycleempty|filerecycle|fileremovedir|fileselectfile|fileselectfolder|filesetattrib|filesettime|formattime|getkeystate|groupactivate|groupadd|groupclose|groupdeactivate|guicontrol|guicontrolget|gui|hotkey|ifequal|ifexist|ifgreater|ifgreaterorequal|ifinstring|ifless|iflessorequal|ifmsgbox|ifnotequal|ifnotexist|ifnotinstring|ifwinactive|ifwinexist|ifwinnotactive|ifwinnotexist|imagesearch|inidelete|iniread|iniwrite|inputbox|input|keyhistory|keywait|listhotkeys|listlines|listvars|menu|mouseclickdrag|mouseclick|mousegetpos|mousemove|msgbox|onexit|outputdebug|pause|pixelgetcolor|pixelsearch|postmessage|process|progress|random|regdelete|regread|regwrite|reload|run|runas|runwait|sendevent|sendinput|sendlevel|sendmessage|sendmode|sendplay|sendraw|send|setbatchlines|setcapslockstate|setcontroldelay|setdefaultmousespeed|setenv|setformat|setkeydelay|setmousedelay|setnumlockstate|setscrolllockstate|setstorecapslockmode|setregview|settimer|settitlematchmode|setwindelay|setworkingdir|shutdown|sleep|sort|soundbeep|soundgetwavevolume|soundget|soundplay|soundsetwavevolume|soundset|splashimage|splashtextoff|splashtexton|splitpath|statusbargettext|statusbarwait|stringcasesense|stringgetpos|stringleft|stringlen|stringlower|stringmid|stringreplace|stringright|stringsplit|stringtrimleft|stringtrimright|stringupper|suspend|sysget|thread|tooltip|transform|traytip|urldownloadtofile|winactivatebottom|winactivate|winclose|wingetactivestats|wingetactivetitle|wingetclass|wingetpos|wingettext|wingettitle|winget|winhide|winkill|winmaximize|winmenuselectitem|winminimizeallundo|winminimizeall|winminimize|winmove|winrestore|winsettitle|winset|winshow|winwaitactive|winwaitclose|winwaitnotactive|winwait)\\b"
+      "match": "\\b(?i:autotrim|blockinput|click|clipwait|controlclick|controlfocus|controlget|controlgetfocus|controlgetpos|controlgettext|controlmove|controlsend|controlsendraw|controlsettext|control|coordmode|detecthiddentext|detecthiddenwindows|driveget|drivespacefree|drive|edit|envadd|envget|envset|envsub|envupdate|fileappend|filecopydir|filecopy|filecreatedir|filecreateshortcut|filedelete|fileencoding|filegetattrib|filegetshortcut|filegetsize|filegettime|filegetversion|fileinstall|filemovedir|filemove|filereadline|fileread|filerecycleempty|filerecycle|fileremovedir|fileselectfile|fileselectfolder|filesetattrib|filesettime|formattime|getkeystate|groupactivate|groupadd|groupclose|groupdeactivate|guicontrol|guicontrolget|gui|hotkey|ifmsgbox|imagesearch|inidelete|iniread|iniwrite|inputbox|input|keyhistory|keywait|listhotkeys|listlines|listvars|menu|mouseclickdrag|mouseclick|mousegetpos|mousemove|msgbox|outputdebug|pause|pixelgetcolor|pixelsearch|postmessage|process|progress|random|regdelete|regread|regwrite|reload|run|runas|runwait|sendevent|sendinput|sendlevel|sendmessage|sendmode|sendplay|sendraw|send|setbatchlines|setcapslockstate|setcontroldelay|setdefaultmousespeed|setkeydelay|setmousedelay|setnumlockstate|setscrolllockstate|setstorecapslockmode|setregview|settimer|settitlematchmode|setwindelay|setworkingdir|shutdown|sleep|sort|soundbeep|soundgetwavevolume|soundget|soundplay|soundsetwavevolume|soundset|splashimage|splashtextoff|splashtexton|splitpath|statusbargettext|statusbarwait|stringcasesense|stringlen|stringlower|stringmid|stringreplace|stringsplit|stringupper|suspend|sysget|thread|tooltip|transform|traytip|urldownloadtofile|winactivatebottom|winactivate|winclose|wingetactivestats|wingetactivetitle|wingetclass|wingetpos|wingettext|wingettitle|winget|winhide|winkill|winmaximize|winmenuselectitem|winminimizeallundo|winminimizeall|winminimize|winmove|winrestore|winsettitle|winset|winshow|winwaitactive|winwaitclose|winwaitnotactive|winwait)\\b"
     },
     {
       "name": "support.function.ahk",
@@ -136,7 +140,7 @@
     },
     {
       "name": "keyword.control.ahk",
-      "match": "\\b(?\u003c!\\.)(?i:if|else|return|loop|break|for|while|class|extends|catch|finally|throw|try|until|continue|critical|exit|exitapp|gosub|goto||not|or|and|is|in)\\b"
+      "match": "\\b(?\u003c!\\.)(?i:if|else|return|loop|break|for|while|class|extends|catch|finally|throw|try|until|continue|critical|exit|exitapp|gosub|goto||not|or|and|is|in|switch|case)\\b"
     },
     {
       "name": "constant.numeric.ahk",

data/grammars/source.angelscript.json

@@ -100,7 +100,7 @@
     },
     {
       "name": "storage.modifier.angelscript",
-      "match": "\\b(get|in|inout|out|override|explicit|set|private|public|protected|const|default|final|shared|external|mixin|abstract)\\b"
+      "match": "\\b(get|in|inout|out|override|explicit|set|private|public|protected|const|default|final|shared|external|mixin|abstract|property)\\b"
     },
     {
       "name": "storage.type.angelscript",

data/grammars/source.ballerina.json

@@ -207,6 +207,9 @@
         {
           "include": "#comment"
         },
+        {
+          "include": "#annotationAttachment"
+        },
         {
           "match": "(?:'?(?:(?:[^ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s\\\\])|\\\\(?:[ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s])|\\\\)+)"
         },
@@ -384,7 +387,7 @@
       "patterns": [
         {
           "begin": "\\bfunction\\b",
-          "end": "\\}|(?=;)",
+          "end": "\\}|(?=;|=)",
           "patterns": [
             {
               "include": "#functionParameters"
@@ -473,7 +476,7 @@
       "patterns": [
         {
           "begin": "\\breturns\\b",
-          "end": "(?=\\{|;|,)",
+          "end": "(?=\\{|;|,|=)",
           "patterns": [
             {
               "include": "#record"
@@ -481,6 +484,9 @@
             {
               "include": "#objectDec"
             },
+            {
+              "include": "#tupleType"
+            },
             {
               "name": "storage.type.ballerina",
               "match": "(?:'?(?:(?:[^ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s\\\\])|\\\\(?:[ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s])|\\\\)+)"
@@ -581,10 +587,10 @@
       "patterns": [
         {
           "begin": "\\breturns\\b",
-          "end": "(?=\\,)",
+          "end": "(?=\\,)|(?:\\|)|(?=\\])|(?=\\))",
           "patterns": [
             {
-              "include": "#parameter"
+              "include": "#functionTypeReturnsParameter"
             },
             {
               "include": "#comment"
@@ -598,11 +604,51 @@
         }
       ]
     },
+    "functionTypeReturnsParameter": {
+      "patterns": [
+        {
+          "begin": "((?=record|object|function)|(?:(?:'?(?:(?:[^ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s\\\\])|\\\\(?:[ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s])|\\\\)+)))",
+          "end": "(?=\\,)|(?:\\|)|(?:\\:)|(?==\u003e)|(?=\\))|(?=\\])",
+          "patterns": [
+            {
+              "include": "#record"
+            },
+            {
+              "include": "#objectDec"
+            },
+            {
+              "include": "#functionType"
+            },
+            {
+              "include": "#constrainType"
+            },
+            {
+              "include": "#defaultValue"
+            },
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#parameterTuple"
+            },
+            {
+              "name": "variable.parameter.ballerina",
+              "match": "(?:'?(?:(?:[^ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s\\\\])|\\\\(?:[ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s])|\\\\)+)"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "storage.type.ballerina"
+            }
+          }
+        }
+      ]
+    },
     "functionTypeType": {
       "patterns": [
         {
           "begin": "(?:'?(?:(?:[^ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s\\\\])|\\\\(?:[ (){}\\[\\]\\-?*=\u003e\u003c?;\"',.\\s])|\\\\)+)",
-          "end": "(?:\\,)|(?:\\|)|(?=\\])|(?=\\))",
+          "end": "(?=\\,)|(?:\\|)|(?=\\])|(?=\\))",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
@@ -619,7 +665,7 @@
         },
         {
           "name": "keyword.other.ballerina",
-          "match": "\\b(import|version|public|private|attach|as|native|handle|documentation|lock|new|record|limit|ascending|descending|check|checkpanic|panic|trap|start|done|untainted|tainted|onretry|oncommit|onabort|scope|compensate|compensation|primarykey|channel|abstract|extern|final|listener|remote|client|is|__init)\\b"
+          "match": "\\b(import|version|public|private|attach|as|native|handle|documentation|lock|new|record|limit|ascending|descending|check|checkpanic|panic|trap|start|flush|done|untainted|tainted|onretry|committed|aborted|scope|compensate|compensation|primarykey|channel|abstract|extern|final|listener|remote|client|is|__init)\\b"
         },
         {
           "name": "keyword.other.siddhi.ballerina",
@@ -635,7 +681,7 @@
         },
         {
           "name": "keyword.operator.ballerina",
-          "match": "(!|%|\\+|\\-|~=|==|=|!=|\u003c|\u003e|\u0026\u0026|\\|\\||\\?:|\\.\\.\\.)"
+          "match": "(!|%|\\+|\\-|~=|==|=|!=|\u003c|\u003e|\u0026|\\||\\?:|\\.\\.\\.)"
         },
         {
           "include": "#types"
@@ -667,17 +713,7 @@
             {
               "include": "#code"
             }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.ballerina"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.ballerina"
-            }
-          }
+          ]
         }
       ]
     },