github-linguist 6.0.1 → 6.1.0

data/grammars/source.hxml.json

@@ -2,16 +2,48 @@
   "name": "Hxml",
   "scopeName": "source.hxml",
   "patterns": [
-    {
-      "name": "keyword.other.hxml",
-      "match": "(-cpp?|-js|-as3|-swf-(header|version|lib)|-swf9?|-neko|-python|-php|-cs|-java|-xml|-x|-main|-lib|-D|-resource|-exclude|-v|-debug|-prompt|-cmd|-dce|--flash-strict|--no-traces|--flash-use-stage|--neko-source|--gen-hx-classes|-java-lib|-net-lib|--each|--next|--display|--no-output|--times|--no-inline|--no-opt|--php-front|--php-lib|--php-prefix|--remap|-help|--help|-java|-cs|--dead-code-elimination|--js-modern|--interp|--macro|--dce|--wait|--connect|--cwd|--help-defines|--run)"
-    },
     {
       "name": "comment.line.number-sign.hxml",
       "match": "(#).*$\\n?",
       "captures": {
         "1": {
-          "name": "punctuation.definition.comment.actionscript"
+          "name": "punctuation.definition.comment.hxml"
+        }
+      }
+    },
+    {
+      "match": "^\\s*(-cppia|-cpp?|-js|-as3|-swf-(header|version|lib(-extern)?)|-swf9?|-neko|-python|-php|-cs|-java-lib|-java|-xml|-lua|-hl|-x|-lib|-D|-resource|-exclude|-version|-v|-debug|-prompt|-cmd|-dce\\s+(std|full|no)?|--flash-strict|--no-traces|--flash-use-stage|--neko-source|--gen-hx-classes|-net-lib|-net-std|-c-arg|--each|--next|--display|--no-output|--times|--no-inline|--no-opt|--php-front|--php-lib|--php-prefix|--remap|--help-defines|--help-metas|-help|--help|-java|-cs|--dead-code-elimination|--js-modern|--interp|--eval|--dce|--wait|--connect|--cwd|--run).*$",
+      "captures": {
+        "1": {
+          "name": "keyword.other.hxml"
+        }
+      }
+    },
+    {
+      "begin": "(?:^|[^a-zA-Z])(--macro)\\b",
+      "end": "\\n",
+      "patterns": [
+        {
+          "include": "source.hx"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.hxml"
+        }
+      }
+    },
+    {
+      "match": "(?:^|[^a-zA-Z])(-main)\\b\\s*\\b(?:(([a-z][a-zA-Z0-9]*\\.)*)(_*[A-Z]\\w*))?\\b",
+      "captures": {
+        "1": {
+          "name": "keyword.other.hxml"
+        },
+        "2": {
+          "name": "support.package.hx"
+        },
+        "4": {
+          "name": "entity.name.type.hx"
         }
       }
     }

data/grammars/source.isabelle.theory.json

@@ -34,19 +34,19 @@
     },
     {
       "name": "markup.heading",
-      "match": "\\b(header|chapter|section|subsection|subsubsection|sect|subsect|subsubsect)\\b"
+      "match": "\\b(header|chapter|section|subsection|subsubsection|sect|subsect|subsubsect|paragraph|subparagraph)\\b"
     },
     {
       "name": "keyword.other.minor",
-      "match": "\\b(and|assumes|attach|avoids|binder|checking|class_instance|class_relation|code_module|congs|constant|constrains|datatypes|defines|file|fixes|for|functions|hints|identifier|if|imports|in|includes|infix|infixl|infixr|is|keywords|lazy|module_name|monos|morphisms|no_discs_sels|notes|obtains|open|output|overloaded|parametric|permissive|pervasive|rep_compat|shows|structure|type_class|type_constructor|unchecked|unsafe|where|begin|end)\\b"
+      "match": "\\b(abbrevs|and|assumes|attach|avoids|binder|checking|class_instance|class_relation|code_module|congs|constant|constrains|datatypes|defines|file|fixes|for|functions|hints|identifier|if|imports|in|includes|infix|infixl|infixr|is|keywords|lazy|module_name|monos|morphisms|no_discs_sels|notes|obtains|open|output|overloaded|parametric|permissive|pervasive|private|qualified|rep_compat|rewrites|shows|structure|type_class|type_constructor|unchecked|unsafe|when|where|begin|end)\\b"
     },
     {
       "name": "keyword.other.diagnostic",
-      "match": "\\b(ML_command|ML_val|class_deps|code_deps|code_thms|display_drafts|find_consts|find_theorems|find_unused_assms|full_prf|help|locale_deps|nitpick|pr|prf|print_abbrevs|print_antiquotations|print_attributes|print_binds|print_bnfs|print_bundles|print_case_translations|print_cases|print_claset|print_classes|print_codeproc|print_codesetup|print_coercions|print_commands|print_context|print_defn_rules|print_dependencies|print_facts|print_induct_rules|print_inductives|print_interps|print_locale|print_locales|print_methods|print_options|print_orders|print_quot_maps|print_quotconsts|print_quotients|print_quotientsQ3|print_quotmapsQ3|print_rules|print_simpset|print_state|print_statement|print_syntax|print_theorems|print_theory|print_trans_rules|prop|pwd|quickcheck|refute|sledgehammer|smt_status|solve_direct|spark_status|term|thm|thm_deps|thy_deps|try|try0|typ|unused_thms|value|values|welcome|print_ML_antiquotations|print_term_bindings|values_prolog)\\b"
+      "match": "\\b(ML_command|ML_val|class_deps|code_deps|code_thms|display_drafts|find_consts|find_theorems|find_unused_assms|full_prf|help|locale_deps|nitpick|pr|prf|print_abbrevs|print_antiquotations|print_attributes|print_binds|print_bnfs|print_bundles|print_case_translations|print_cases|print_claset|print_classes|print_codeproc|print_codesetup|print_coercions|print_commands|print_context|print_definitions|print_defn_rules|print_dependencies|print_facts|print_induct_rules|print_inductives|print_interps|print_locale|print_locales|print_methods|print_options|print_orders|print_quot_maps|print_quotconsts|print_quotients|print_quotientsQ3|print_quotmapsQ3|print_rules|print_simpset|print_state|print_statement|print_syntax|print_theorems|print_theory|print_trans_rules|prop|pwd|quickcheck|refute|sledgehammer|smt_status|solve_direct|spark_status|term|thm|thm_deps|thy_deps|try|try0|typ|unused_thms|value|values|welcome|print_ML_antiquotations|print_term_bindings|print_record|values_prolog|nunchaku\n        )\\b"
     },
     {
       "name": "keyword.other.declaration",
-      "match": "\\b(ML|ML_file|abbreviation|adhoc_overloading|arities|atom_decl|attribute_setup|axiomatization|bundle|case_of_simps|class|classes|classrel|codatatype|code_abort|code_class|code_const|code_datatype|code_identifier|code_include|code_instance|code_modulename|code_monad|code_printing|code_reflect|code_reserved|code_type|coinductive|coinductive_set|consts|context|datatype|datatype_new|datatype_new_compat|declaration|declare|default_sort|defer_recdef|definition|defs|domain|domain_isomorphism|domaindef|equivariance|export_code|extract|extract_type|fixrec|fun|fun_cases|hide_class|hide_const|hide_fact|hide_type|import_const_map|import_file|import_tptp|import_type_map|inductive|inductive_set|instantiation|judgment|lifting_forget|lifting_update|local_setup|locale|method_setup|nitpick_params|no_adhoc_overloading|no_notation|no_syntax|no_translations|no_type_notation|nominal_datatype|nonterminal|notation|notepad|oracle|overloading|parse_ast_translation|parse_translation|partial_function|primcorec|primrec|primrec_new|print_ast_translation|print_translation|quickcheck_generator|quickcheck_params|realizability|realizers|recdef|record|refute_params|setup|setup_lifting|simproc_setup|simps_of_case|sledgehammer_params|spark_end|spark_open|spark_open_siv|spark_open_vcg|spark_proof_functions|spark_types|statespace|syntax|syntax_declaration|text|text_raw|txt|txt_raw|theorems|translations|type_notation|type_synonym|typed_print_translation|typedecl|hoarestate|install_C_file|install_C_types|wpc_setup|c_defs|c_types|memsafe|SML_export|SML_file|SML_import|approximate|bnf_axiomatization|cartouche|datatype_compat|free_constructors|functor|nominal_function|nominal_termination|permanent_interpretation|binds|defining|smt2_status|term_cartouche|boogie_file|text_cartouche|autocorres|sep_instance)\\b"
+      "match": "\\b(ML|ML_file|ML_file_debug|ML_file_no_debug|abbreviation|alias|adhoc_overloading|arities|atom_decl|attribute_setup|axiomatization|bundle|unbundle|case_of_simps|class|classes|classrel|codatatype|code_abort|code_class|code_const|code_datatype|code_identifier|code_include|code_instance|code_modulename|code_monad|code_printing|code_reflect|code_reserved|code_type|coinductive|coinductive_set|consts|context|datatype|datatype_new|datatype_new_compat|declaration|declare|default_sort|defer_recdef|definition|defs|domain|domain_isomorphism|domaindef|equivariance|experiment|export_code|extract|extract_type|fixrec|fun|fun_cases|hide_class|hide_const|hide_fact|hide_type|import_const_map|import_file|import_tptp|import_type_map|inductive|inductive_set|instantiation|judgment|lifting_forget|lifting_update|local_setup|locale|method_setup|nitpick_params|nunchaku_params|no_adhoc_overloading|no_notation|no_syntax|no_translations|no_type_notation|nominal_datatype|nonterminal|notation|notepad|oracle|overloading|parse_ast_translation|parse_translation|partial_function|primcorec|primrec|primrec_new|print_ast_translation|print_translation|quickcheck_generator|quickcheck_params|realizability|realizers|recdef|record|refute_params|setup|setup_lifting|simproc_setup|simps_of_case|sledgehammer_params|spark_end|spark_open|spark_open_siv|spark_open_vcg|spark_proof_functions|spark_types|statespace|syntax|syntax_declaration|text|text_raw|txt|txt_raw|theorems|translations|type_alias|type_notation|type_synonym|typed_print_translation|typedecl|hoarestate|install_C_file|install_C_types|wpc_setup|c_defs|c_types|memsafe|SML_export|SML_file|SML_file_debug|SML_file_no_debug|SML_import|approximate|bnf_axiomatization|cartouche|datatype_compat|free_constructors|functor|nominal_function|nominal_termination|permanent_interpretation|binds|defining|smt2_status|term_cartouche|boogie_file|text_cartouche|autocorres|sep_instance)\\b"
     },
     {
       "name": "keyword.other.script",
@@ -54,15 +54,15 @@
     },
     {
       "name": "keyword.other.goal",
-      "match": "\\b(ax_specification|bnf|code_pred|corollary|cpodef|crunch_ignore|enriched_type|function|instance|interpretation|lift_definition|nominal_inductive|nominal_inductive2|nominal_primrec|pcpodef|primcorecursive|quotient_definition|quotient_type|recdef_tc|rep_datatype|spark_vc|specification|subclass|sublocale|termination|theorem|typedef|wrap_free_constructors)\\b"
+      "match": "\\b(ax_specification|bnf|copy_bnf|lift_bnf|code_pred|corollary|cpodef|crunch_ignore|enriched_type|function|instance|interpretation|global_interpretation|lift_definition|nominal_inductive|nominal_inductive2|nominal_primrec|pcpodef|primcorecursive|quotient_definition|quotient_type|recdef_tc|rep_datatype|old_rep_datatype|spark_vc|specification|subclass|sublocale|termination|theorem|typedef|wrap_free_constructors)\\b"
     },
     {
       "name": "keyword.control.proof",
-      "match": "\\b(have|hence|interpret|next|proof|finally|from|then|ultimately|with|ML_prf|also|include|including|let|moreover|note|unfolding|using|write|ML_prf|also|include|including|let|moreover|note|txt|txt_raw|unfolding|using|write|assume|case|def|fix|presume|guess|obtain|show|thus|apply|apply_end|apply_trace|back|defer|prefer|and|by|done|qed)\\b"
+      "match": "\\b(have|hence|interpret|next|proof|finally|from|then|ultimately|with|ML_prf|also|include|including|let|moreover|note|unfolding|using|write|also|include|including|let|moreover|note|txt|txt_raw|unfolding|using|supply|write|assume|case|def|fix|presume|consider|guess|obtain|show|subgoal|thus|apply|apply_end|apply_trace|back|defer|prefer|and|by|done|qed)\\b"
     },
     {
       "name": "support.constant",
-      "match": "\\b(lemma|schematic_lemma|theorem|schematic_theorem|corollary|schematic_corollary|lemmas)\\b"
+      "match": "\\b(lemma|schematic_lemma|theorem|schematic_theorem|corollary|schematic_corollary|lemmas|schematic_goal|proposition|named_theorems|method)\\b"
     },
     {
       "name": "invalid.illegal.abandon-proof",

data/grammars/source.js.json

@@ -135,56 +135,6 @@
         {
           "include": "#numbers"
         },
-        {
-          "begin": "{(?=.*\\bfrom\\b)",
-          "end": "}",
-          "patterns": [
-            {
-              "match": "(?x)\n(?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)\n\\s*\n(\\b as \\b)\n\\s*\n(?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)",
-              "captures": {
-                "1": {
-                  "name": "variable.language.default.js"
-                },
-                "2": {
-                  "name": "variable.other.module.js"
-                },
-                "3": {
-                  "name": "keyword.control.js"
-                },
-                "4": {
-                  "name": "variable.language.default.js"
-                },
-                "5": {
-                  "name": "invalid.illegal.js"
-                },
-                "6": {
-                  "name": "variable.other.module-alias.js"
-                }
-              }
-            },
-            {
-              "name": "meta.delimiter.object.comma.js",
-              "match": ","
-            },
-            {
-              "include": "#comments"
-            },
-            {
-              "name": "variable.other.module.js",
-              "match": "\\b([a-zA-Z_$][\\w$]*)\\b"
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.modules.begin.js"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.modules.end.js"
-            }
-          }
-        },
         {
           "begin": "(?![a-zA-Z_$0-9]){",
           "end": "}",
@@ -193,7 +143,7 @@
               "match": "(?x)\n(?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)\n\\s*\n(\\b as \\b)\n\\s*\n(?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)",
               "captures": {
                 "1": {
-                  "name": "invalid.illegal.js"
+                  "name": "variable.language.default.js"
                 },
                 "2": {
                   "name": "variable.other.module.js"
@@ -772,6 +722,38 @@
         }
       }
     },
+    {
+      "begin": "(?\u003c![\\w$])Promise(?![\\w$]|\\s*:)",
+      "end": "(?x)\n(?\u003c=\\)) | (?=\n  (?! (\\s*//)|(\\s*/\\*)|(\\s*\\.\\s*(all|race|reject|resolve)\\s*\\() )\\s*\\S\n)",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "name": "meta.method-call.js",
+          "begin": "\\s*(\\.)\\s*(\\w+)\\s*(?=\\()",
+          "end": "(?\u003c=\\))",
+          "patterns": [
+            {
+              "include": "#arguments"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "meta.delimiter.method.period.js"
+            },
+            "2": {
+              "name": "support.function.promise.js"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "support.class.promise.js"
+        }
+      }
+    },
     {
       "include": "#strings"
     },
@@ -911,7 +893,7 @@
     },
     {
       "name": "support.class.js",
-      "match": "(?x) (?\u003c!\\$) \\b\n(Array|ArrayBuffer|Atomics|Boolean|DataView|Date|Error|EvalError|Float32Array|Float64Array|Function|Generator\n|GeneratorFunction|Int16Array|Int32Array|Int8Array|InternalError|Intl|JSON|Map|Number|Object|Promise|Proxy\n|RangeError|ReferenceError|Reflect|RegExp|Set|SharedArrayBuffer|SIMD|String|Symbol|SyntaxError|TypeError\n|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|URIError|WeakMap|WeakSet)\n\\b"
+      "match": "(?x) (?\u003c!\\$) \\b\n(Array|ArrayBuffer|Atomics|Boolean|DataView|Date|Error|EvalError|Float32Array|Float64Array|Function|Generator\n|GeneratorFunction|Int16Array|Int32Array|Int8Array|InternalError|Intl|JSON|Map|Number|Object|Proxy\n|RangeError|ReferenceError|Reflect|RegExp|Set|SharedArrayBuffer|SIMD|String|Symbol|SyntaxError|TypeError\n|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|URIError|WeakMap|WeakSet)\n\\b"
     },
     {
       "match": "(?x) (\\.) \\s* (?:\n  (constructor|length|prototype) |\n  (EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\n)\\b",
@@ -963,7 +945,7 @@
     {
       "name": "string.regexp.js",
       "begin": "(?\u003c=[\\[=(?:+,!]|^|return|=\u003e|\u0026\u0026|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)",
-      "end": "(/)[gimuy]*",
+      "end": "(/)([gimsuy]*)",
       "patterns": [
         {
           "include": "source.js.regexp"
@@ -977,6 +959,9 @@
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.js"
+        },
+        "2": {
+          "name": "meta.flag.regexp"
         }
       }
     },
@@ -1400,7 +1385,7 @@
                 },
                 {
                   "name": "support.function.js",
-                  "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|stringify|\nprint|prompt|preference|enableExternalCapture|exec|execScript|valueOf|UTC|find|file|\nfileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|\nforward|fromCharCode|watch|link|load|lastIndexOf|anchor|attachEvent|atob|apply|alert|\nabort|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|\nreleaseCapture|releaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b"
+                  "match": "(?x)\n\\b(catch|finally|then|shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|stringify|\nprint|prompt|preference|enableExternalCapture|exec|execScript|valueOf|UTC|find|file|\nfileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|\nforward|fromCharCode|watch|link|load|lastIndexOf|anchor|attachEvent|atob|apply|alert|\nabort|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|\nreleaseCapture|releaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b"
                 },
                 {
                   "name": "support.function.dom.js",

data/grammars/source.js.regexp.json

@@ -34,7 +34,7 @@
         },
         {
           "name": "keyword.other.back-reference.regexp",
-          "match": "\\\\[1-9]\\d*"
+          "match": "\\\\[1-9]\\d*|\\\\k\u003c[a-zA-Z_$][\\w$]*\u003e"
         },
         {
           "name": "keyword.operator.quantifier.regexp",
@@ -46,7 +46,7 @@
         },
         {
           "name": "meta.group.assertion.regexp",
-          "begin": "(\\()((\\?=)|(\\?!))",
+          "begin": "(\\()(?:(\\?=)|(\\?!)|(\\?\u003c=)|(\\?\u003c!))",
           "end": "(\\))",
           "patterns": [
             {
@@ -57,11 +57,17 @@
             "1": {
               "name": "punctuation.definition.group.regexp"
             },
-            "3": {
+            "2": {
               "name": "meta.assertion.look-ahead.regexp"
             },
-            "4": {
+            "3": {
               "name": "meta.assertion.negative-look-ahead.regexp"
+            },
+            "4": {
+              "name": "meta.assertion.look-behind.regexp"
+            },
+            "5": {
+              "name": "meta.assertion.negative-look-behind.regexp"
             }
           },
           "endCaptures": {
@@ -72,7 +78,7 @@
         },
         {
           "name": "meta.group.regexp",
-          "begin": "\\((\\?:)?",
+          "begin": "\\(((\\?:)|(\\?\u003c[a-zA-Z_$][\\w$]*\u003e))?",
           "end": "\\)",
           "patterns": [
             {

data/grammars/source.julia.json

@@ -42,7 +42,7 @@
         {
           "name": "meta.array.julia",
           "begin": "\\[",
-          "end": "\\]((\\.)?'*)",
+          "end": "(?:\\])(?:(\\.)?'*)",
           "patterns": [
             {
               "name": "constant.numeric.julia",
@@ -56,7 +56,15 @@
               "include": "$self"
             }
           ],
+          "beginCaptures": {
+            "0": {
+              "name": "meta.bracket.julia"
+            }
+          },
           "endCaptures": {
+            "0": {
+              "name": "meta.bracket.julia"
+            },
             "1": {
               "name": "keyword.operator.transpose.julia"
             }
@@ -104,7 +112,7 @@
     "function_call": {
       "patterns": [
         {
-          "begin": "([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\.?\\(",
+          "begin": "([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\.?(?=\\()",
           "end": "\\)(('|(\\.'))*\\.?')?",
           "patterns": [
             {
@@ -124,6 +132,9 @@
             }
           },
           "endCaptures": {
+            "0": {
+              "name": "meta.bracket.julia"
+            },
             "1": {
               "name": "keyword.operator.transposed-func.julia"
             }
@@ -134,7 +145,7 @@
     "function_decl": {
       "patterns": [
         {
-          "match": "([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?\\((?=.*\\)(::[^\\s]+)?(\\s*\\bwhere\\b\\s*[^\\s]+)?\\s*?=(?![=\u003e]))",
+          "match": "([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?(?=\\(.*\\)(::[^\\s]+)?(\\s*\\bwhere\\b\\s*[^\\s]+)?\\s*?=(?![=\u003e]))",
           "captures": {
             "1": {
               "name": "entity.name.function.julia"
@@ -145,7 +156,7 @@
           }
         },
         {
-          "match": "\\b(function|macro)(?:\\s+(?:[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*(\\.))?([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?|\\s*)\\(",
+          "match": "\\b(function|macro)(?:\\s+(?:[[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*(\\.))?([[:alpha:]_∇][[:word:]⁺-ₜ!′∇]*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?|\\s*)(?=\\()",
           "captures": {
             "1": {
               "name": "keyword.other.julia"
@@ -167,7 +178,7 @@
       "patterns": [
         {
           "name": "keyword.other.julia",
-          "match": "\\b(?\u003c![:_])(?:function|@generated|type|immutable|mutable|struct|macro|quote|abstract|bitstype|typealias|module|baremodule|new|where)\\b"
+          "match": "\\b(?\u003c![:_\\.])(?:function|@generated|type|immutable|mutable|struct|macro|quote|abstract|bitstype|typealias|module|baremodule|new|where)\\b"
         },
         {
           "begin": "\\b(for)\\b",

data/grammars/{source.Kotlin.json → source.kotlin.json}

@@ -1,6 +1,6 @@
 {
   "name": "Kotlin",
-  "scopeName": "source.Kotlin",
+  "scopeName": "source.kotlin",
   "patterns": [
     {
       "include": "#comments"
@@ -24,17 +24,65 @@
     }
   ],
   "repository": {
+    "annotations": {
+      "patterns": [
+        {
+          "name": "meta.declaration.annotation.kotlin",
+          "begin": "(@[^ (]+)(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "match": "(\\w*)\\s*(=)",
+              "captures": {
+                "1": {
+                  "name": "constant.other.key.kotlin"
+                },
+                "2": {
+                  "name": "keyword.operator.assignment.kotlin"
+                }
+              }
+            },
+            {
+              "include": "#statements"
+            },
+            {
+              "name": "punctuation.seperator.property.kotlin",
+              "match": ","
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.annotation.kotlin"
+            },
+            "2": {
+              "name": "punctuation.definition.annotation-arguments.begin.kotlin"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.annotation-arguments.end.kotlin"
+            }
+          }
+        },
+        {
+          "name": "storage.type.annotation.kotlin",
+          "match": "@\\w*"
+        }
+      ]
+    },
     "classes": {
-      "begin": "(?=\\s*(?:companion|class|object|interface))",
-      "end": "}|(?=$)",
+      "begin": "(?\u003c!::)(?=\\b(?:companion|class|object|interface)\\b)",
+      "end": "(?=$|\\})",
       "patterns": [
+        {
+          "include": "#comments"
+        },
         {
           "begin": "\\b(companion\\s*)?(class|object|interface)\\b",
-          "end": "(?=\u003c|{|\\(|:)",
+          "end": "(?=\u003c|\\{|\\(|:|$)",
           "patterns": [
             {
-              "name": "keyword.other.kotlin",
-              "match": "\\b(object)\\b"
+              "include": "#comments"
             },
             {
               "name": "entity.name.type.class.kotlin",
@@ -43,7 +91,10 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.kotlin"
+              "name": "storage.modifier.kotlin"
+            },
+            "2": {
+              "name": "storage.modifier.kotlin"
             }
           }
         },
@@ -101,6 +152,25 @@
       ]
     },
     "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.empty.kotlin",
+          "match": "/\\*\\*/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.kotlin"
+            }
+          }
+        },
+        {
+          "include": "text.html.javadoc"
+        },
+        {
+          "include": "#comments-inline"
+        }
+      ]
+    },
+    "comments-inline": {
       "patterns": [
         {
           "name": "comment.block.kotlin",
@@ -170,8 +240,8 @@
       ]
     },
     "functions": {
-      "begin": "(?=\\s*(?:fun))",
-      "end": "}|(?=$)",
+      "begin": "(?=\\s*\\b(?:fun)\\b)",
+      "end": "(?=$|\\})",
       "patterns": [
         {
           "begin": "\\b(fun)\\b",
@@ -358,12 +428,12 @@
     "imports": {
       "patterns": [
         {
-          "match": "^\\s*(import)\\s+[^ $]+\\s+(as)?",
+          "match": "^\\s*(import)\\s+[^ $.]+(\\.([`][^$`]+[`]|[^` $.]+))+\\s+(as)?",
           "captures": {
             "1": {
               "name": "keyword.other.kotlin"
             },
-            "2": {
+            "4": {
               "name": "keyword.other.kotlin"
             }
           }
@@ -374,7 +444,7 @@
       "patterns": [
         {
           "name": "storage.modifier.kotlin",
-          "match": "\\b(var|val|public|private|protected|abstract|final|enum|open|attribute|annotation|override|inline|var|val|vararg|lazy|in|out|internal|data|tailrec|operator|infix|const|yield|typealias|typeof)\\b"
+          "match": "\\b(var|val|external|public|private|protected|abstract|final|sealed|enum|open|attribute|annotation|override|inline|vararg|in|out|internal|data|tailrec|operator|infix|const|yield|typealias|typeof|expect|actual|reified|suspend)\\b"
         },
         {
           "name": "keyword.control.catch-exception.kotlin",
@@ -396,6 +466,10 @@
           "name": "keyword.operator.assignment.kotlin",
           "match": "(=)"
         },
+        {
+          "name": "keyword.operator.reference.kotlin",
+          "match": "(::)"
+        },
         {
           "name": "keyword.operator.declaration.kotlin",
           "match": "(:)"
@@ -404,6 +478,14 @@
           "name": "keyword.operator.dot.kotlin",
           "match": "(\\.)"
         },
+        {
+          "name": "keyword.operator.dot.kotlin",
+          "match": "(\\?\\.)"
+        },
+        {
+          "name": "keyword.operator.elvis.kotlin",
+          "match": "(\\?:)"
+        },
         {
           "name": "keyword.operator.increment-decrement.kotlin",
           "match": "(\\-\\-|\\+\\+)"
@@ -491,6 +573,9 @@
         {
           "include": "#namespaces"
         },
+        {
+          "include": "#annotations"
+        },
         {
           "include": "#typedefs"
         },
@@ -626,11 +711,11 @@
     "types": {
       "patterns": [
         {
-          "name": "storage.type.buildin.kotlin",
-          "match": "\\b(Any|Unit|String|Int|Boolean|Char|Long|Double|Float|Short|Byte|dynamic)\\b"
+          "name": "storage.type.builtin.kotlin",
+          "match": "\\b(Nothing|Any|Unit|String|CharSequence|Int|Boolean|Char|Long|Double|Float|Short|Byte|dynamic)\\b"
         },
         {
-          "name": "storage.type.buildin.array.kotlin",
+          "name": "storage.type.builtin.array.kotlin",
           "match": "\\b(IntArray|BooleanArray|CharArray|LongArray|DoubleArray|FloatArray|ShortArray|ByteArray)\\b"
         },
         {
@@ -646,7 +731,7 @@
           ],
           "beginCaptures": {
             "1": {
-              "name": "storage.type.buildin.collection.kotlin"
+              "name": "storage.type.builtin.collection.kotlin"
             }
           }
         },
@@ -662,20 +747,6 @@
             }
           ]
         },
-        {
-          "begin": "(#)\\(",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#expressions"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.tuple.kotlin"
-            }
-          }
-        },
         {
           "begin": "\\{",
           "end": "\\}",
@@ -701,12 +772,12 @@
       ]
     },
     "variables": {
-      "begin": "(?=\\s*(?:var|val))",
-      "end": "(?=:|=|$)",
+      "begin": "(?=\\s*\\b(?:var|val)\\b)",
+      "end": "(?=:|=|(\\b(by)\\b)|$)",
       "patterns": [
         {
           "begin": "\\b(var|val)\\b",
-          "end": "(?=:|=|$)",
+          "end": "(?=:|=|(\\b(by)\\b)|$)",
           "patterns": [
             {
               "begin": "\u003c",
@@ -749,6 +820,20 @@
             }
           }
         },
+        {
+          "begin": "\\b(by)\\b",
+          "end": "(?=$)",
+          "patterns": [
+            {
+              "include": "#expressions"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.kotlin"
+            }
+          }
+        },
         {
           "begin": "(=)",
           "end": "(?=$)",