github-linguist 4.8.3 → 4.8.4

data/grammars/source.js.jsx.json

@@ -41,9 +41,6 @@
         {
           "include": "#literal-labels"
         },
-        {
-          "include": "#literal-keywords"
-        },
         {
           "include": "#literal-for"
         },
@@ -53,6 +50,9 @@
         {
           "include": "#expression"
         },
+        {
+          "include": "#literal-keywords"
+        },
         {
           "include": "#literal-punctuation"
         }
@@ -107,6 +107,9 @@
         {
           "include": "#literal-language-variable"
         },
+        {
+          "include": "#literal-object"
+        },
         {
           "include": "#literal-module"
         },
@@ -155,7 +158,7 @@
         {
           "comment": "e.g. play: function(arg1, arg2) { }",
           "name": "meta.function.json.js",
-          "begin": "\\s*+([_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(?:(async)\\s+)?\\s*+(\\bfunction\\b)\\s*+(?:(\\*)\\s*)?\\s*(?=\\(|<)",
+          "begin": "\\s*+([_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(?:(\\*)\\s*)?\\s*(?=\\(|<)",
           "end": "(?=\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -184,7 +187,7 @@
         {
           "comment": "e.g. 'play': function(arg1, arg2) { }",
           "name": "meta.function.json.js",
-          "begin": "\\s*+(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\s*+(:)\\s*+(async)?\\s*+(\\bfunction\\b)\\s*(\\*\\s*)?\\s*(?=\\(|<)",
+          "begin": "\\s*+(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\s*+(:)\\s*+(async)?\\s*+((?<!\\.)\\bfunction\\b)\\s*(\\*\\s*)?\\s*(?=\\(|<)",
           "end": "(?=\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -435,7 +438,7 @@
         },
         {
           "name": "keyword.control.flow.js",
-          "match": "\\s*+(?<!\\.)\\b(yield)\\b(?:\\s*+(\\*))?",
+          "match": "\\s*+(?<!\\.)\\b(yield|type|declare)\\b(?:\\s*+(\\*))?",
           "captures": {
             "1": {
               "name": "keyword.control.flow.js"
@@ -578,7 +581,6 @@
       "patterns": [
         {
           "comment": "try to avoid ternary operators which have a '? some chars :'",
-          "name": "meta.group.braces.round",
           "begin": "(^|:|;|=|(?<=:|;|=))\\s*+(\\((?=((\"|').*?(?<=[^\\\\])\\k<-1>|[^?:])*(:|\\?\\s*+:)))",
           "end": "\\s*\\)",
           "beginCaptures": {
@@ -601,7 +603,6 @@
           ]
         },
         {
-          "name": "meta.group.braces.round",
           "begin": "\\s*+\\(",
           "end": "\\s*\\)",
           "endCaptures": {
@@ -625,7 +626,6 @@
     "square-brackets": {
       "patterns": [
         {
-          "name": "meta.group.braces.square",
           "begin": "\\s*+\\[",
           "end": "\\s*\\]",
           "endCaptures": {
@@ -649,7 +649,6 @@
     "curly-brackets": {
       "patterns": [
         {
-          "name": "meta.group.braces.curly",
           "begin": "\\s*+\\{",
           "end": "\\s*\\}",
           "endCaptures": {
@@ -827,16 +826,16 @@
     "literal-keyword-storage": {
       "patterns": [
         {
-          "comment": "these statements must end in a ;",
+          "comment": "flowtype vars with a : to indicate type",
           "begin": "\\s*+(?<!\\.)\\b(const|let|var)\\b\\s+(?=[$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-]*+\\s*+:))",
-          "end": "\\s*\\;",
+          "end": "\\s*((\\;)|(?=\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|label|yield|type|declare)\\b|^\\s*$|}))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.js"
             }
           },
           "endCaptures": {
-            "0": {
+            "2": {
               "name": "punctuation.terminator.statement.js"
             }
           },
@@ -847,16 +846,16 @@
           ]
         },
         {
-          "comment": "these statements must end in a ;",
+          "comment": "flowtype objects {a,b,{z}} with a : to indicate type",
           "begin": "\\s*+(?<!\\.)\\b(const|let|var)\\b\\s+(?=(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})\\s*+:)",
-          "end": "\\s*\\;",
+          "end": "\\s*((\\;)|(?=\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|label|yield|type|declare)\\b|^\\s*$|}))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.js"
             }
           },
           "endCaptures": {
-            "0": {
+            "2": {
               "name": "punctuation.terminator.statement.js"
             }
           },
@@ -867,16 +866,16 @@
           ]
         },
         {
-          "comment": "these statements must end in a ;",
+          "comment": "flowtype arrays [a,[b,c]] with a : to indicate type",
           "begin": "\\s*+(?<!\\.)\\b(const|let|var)\\b\\s+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+:)",
-          "end": "\\s*\\;",
+          "end": "\\s*((\\;)|(?=\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|label|yield|type|declare)\\b|^\\s*$|}))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.js"
             }
           },
           "endCaptures": {
-            "0": {
+            "2": {
               "name": "punctuation.terminator.statement.js"
             }
           },
@@ -898,7 +897,7 @@
         {
           "comment": "e.g. function play<T>(arg1, arg2) { }",
           "name": "meta.function.js",
-          "begin": "\\s*+(?:\\b(async)\\b\\s+)?\\s*+(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
+          "begin": "\\s*+(?:\\b(async)\\b\\s+)?\\s*+(?:(?<=\\.\\.\\.)|(?<!\\.))(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
           "end": "(?=\\s*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -924,7 +923,7 @@
         {
           "comment": "e.g. play = function(arg1, arg2) { }",
           "name": "meta.function.js",
-          "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
+          "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
           "end": "(?=\\s*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -956,7 +955,7 @@
         {
           "comment": "e.g. Sound.prototype.play = function(arg1, arg2) { }",
           "name": "meta.prototype.function.js",
-          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
+          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
           "end": "(?=\\s*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1000,7 +999,7 @@
         {
           "comment": "e.g. Sound.play = function(arg1, arg2) { }",
           "name": "meta.function.static.js",
-          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
+          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
           "end": "(?=\\s*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1040,20 +1039,28 @@
     "literal-quasi": {
       "patterns": [
         {
+          "comment": "Use two forms of scopes! fixes some themes",
           "name": "string.quasi.js",
-          "begin": "\\s*+([a-zA-Z$_][\\w$_]*)?(`)",
-          "end": "\\s*(?<!\\\\)`",
+          "contentName": "string.quoted.template.js",
+          "begin": "\\s*+([a-zA-Z$_][\\w$_]*)?((`))",
+          "end": "\\s*(?<!\\\\)((`))",
           "beginCaptures": {
             "1": {
               "name": "entity.quasi.tag.name.js"
             },
             "2": {
               "name": "punctuation.definition.quasi.begin.js"
+            },
+            "3": {
+              "name": "string.quoted.template.js"
             }
           },
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "punctuation.definition.quasi.end.js"
+            },
+            "2": {
+              "name": "string.quoted.template.js"
             }
           },
           "patterns": [
@@ -1084,6 +1091,66 @@
         }
       ]
     },
+    "literal-object": {
+      "patterns": [
+        {
+          "comment": "obj lteral ({ or ,{ or [{ or ={ or return { or default {",
+          "begin": "(?:(?<=\\(|\\[|:)|(?:\\s*(?:(=)|\\b(default)\\b|\\b(return)\\b|(,))))\\s*({)",
+          "end": "\\s*+(})",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.assignment.js"
+            },
+            "2": {
+              "name": "keyword.control.module.js"
+            },
+            "3": {
+              "name": "keyword.control.flow.js"
+            },
+            "4": {
+              "name": "meta.delimiter.comma.js"
+            },
+            "5": {
+              "name": "meta.brace.curly.js"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "meta.brace.curly.js"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#literal-object"
+            },
+            {
+              "include": "#literal-keywords"
+            },
+            {
+              "include": "#literal-function-labels"
+            },
+            {
+              "include": "#literal-arrow-function-labels"
+            },
+            {
+              "include": "#literal-arrow-function"
+            },
+            {
+              "include": "#literal-method"
+            },
+            {
+              "include": "#literal-labels"
+            },
+            {
+              "include": "#expression"
+            },
+            {
+              "include": "#literal-punctuation"
+            }
+          ]
+        }
+      ]
+    },
     "literal-operators": {
       "patterns": [
         {
@@ -1151,12 +1218,18 @@
     "literal-function-call": {
       "comment": "maybe in array form e.g. foo[bar]()",
       "patterns": [
+        {
+          "include": "#literal-keywords"
+        },
         {
           "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?=\\(\\s*+\\))",
+          "begin": "\\s*+((\\bnew\\b)*)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?=\\(\\s*+\\))",
           "end": "\\s*(?<=\\))",
           "beginCaptures": {
-            "1": {
+            "2": {
+              "name": "keyword.operator.js"
+            },
+            "3": {
               "name": "entity.name.function.js"
             }
           },
@@ -1168,9 +1241,14 @@
         },
         {
           "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+\\(\\s*+\\))",
+          "begin": "\\s*+((\\bnew\\b)*)\\s*+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+\\(\\s*+\\))",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.operator.js"
+            }
+          },
           "patterns": [
             {
               "include": "#flowtype-parse-array"
@@ -1182,11 +1260,14 @@
         },
         {
           "name": "meta.function-call.with-arguments.js",
-          "begin": "\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
+          "begin": "\\s*+((\\bnew\\b)*)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
-            "1": {
+            "2": {
+              "name": "keyword.operator.js"
+            },
+            "3": {
               "name": "entity.name.function.js"
             }
           },
@@ -1198,9 +1279,14 @@
         },
         {
           "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+\\()",
+          "begin": "\\s*+((\\bnew\\b)*)\\s*+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+\\()",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.operator.js"
+            }
+          },
           "patterns": [
             {
               "include": "#flowtype-parse-array"
@@ -1839,7 +1925,7 @@
         {
           "comment": "e.g. play<T,T>(arg1, arg2): Type<T> { }",
           "name": "meta.function.method.js",
-          "begin": "\\s*++(\\bstatic\\b)?\\s*++(\\basync\\b)?\\s*++(\\*?)\\s*++(?<!\\.)([_$a-zA-Z][$\\w]*)\\s*++(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\())",
+          "begin": "\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?<!\\.)([_$a-zA-Z][$\\w]*)\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\())",
           "end": "\\s*(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1865,7 +1951,7 @@
         {
           "comment": "e.g. [var]<T,T>(arg1, arg2): Type<T> { } or 'var'<T,T>(arg1, arg2)",
           "name": "meta.function.method.js",
-          "begin": "\\s*++(\\bstatic\\b)?\\s*++(\\basync\\b)?\\s*++(\\*?)\\s*++(?=((\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\"))))\\s*+(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\())",
+          "begin": "\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?=((\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\"))))\\s*+(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\())",
           "end": "\\s*(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -2442,7 +2528,7 @@
     "flowtype-variable": {
       "patterns": [
         {
-          "comment": "name of variable spread var with flowtype :",
+          "comment": "name of variable spread var with optional ? and optional flowtype :",
           "match": "\\s*+((?<!\\.)\\.\\.\\.)?([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*+(\\??)\\s*+(?=:|=>)",
           "captures": {
             "1": {
@@ -2537,7 +2623,7 @@
         {
           "comment": "flowtype optional arg/parameter e.g. protocol? : string",
           "name": "punctuation.type.flowtype",
-          "match": "\\?(?=\\s*+:)"
+          "match": "\\s*+\\?"
         },
         {
           "comment": "typed entity :",
@@ -2555,6 +2641,9 @@
             }
           ]
         },
+        {
+          "include": "#literal-object"
+        },
         {
           "include": "#literal-comma"
         },
@@ -2599,16 +2688,22 @@
             }
           ]
         },
+        {
+          "include": "#literal-object"
+        },
         {
           "comment": "some form of default assignment for func args",
           "begin": "\\s*+=(?!>|=|==)",
-          "end": "\\s*(?=,|;|\\))",
+          "end": "\\s*(?=,|;|\\)|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|label|yield|type|declare)\\b)",
           "beginCaptures": {
             "0": {
               "name": "keyword.operator.assignment.js"
             }
           },
           "patterns": [
+            {
+              "include": "#literal-labels"
+            },
             {
               "include": "#expression"
             }
@@ -2629,7 +2724,7 @@
         },
         {
           "comment": "primitive flowtypes",
-          "match": "\\s*+\\b((?>any|boolean|mixed|number|string|void))\\b",
+          "match": "(?!^)\\s*+\\b((?>any|boolean|mixed|number|string|void))\\b",
           "captures": {
             "1": {
               "name": "support.type.builtin.primitive.flowtype"
@@ -2638,7 +2733,7 @@
         },
         {
           "comment": "Built-in Class Types",
-          "match": "\\s*+\\b((?>ArrayBuffer|ArrayBufferView|Boolean|Date|DataView|Error|EvalError|Float32Array|Float64Array|Function|Int8Array|Int16Array|Int32Array|JSON|Math|Number|Object|RangeError|ReferenceError|RegExp|String|Symbol|TypeError|Uint8Array|Uint16Array|Uint32Array|Uint8ClampedArray))\\b",
+          "match": "(?!^)\\s*+\\b((?>ArrayBuffer|ArrayBufferView|Boolean|Date|DataView|Error|EvalError|Float32Array|Float64Array|Function|Int8Array|Int16Array|Int32Array|JSON|Math|Number|Object|RangeError|ReferenceError|RegExp|String|Symbol|TypeError|Uint8Array|Uint16Array|Uint32Array|Uint8ClampedArray))\\b",
           "captures": {
             "1": {
               "name": "support.type.builtin.class.flowtype"
@@ -2650,7 +2745,7 @@
         },
         {
           "comment": "custom Class Types e.g. Abc avoid Abc(",
-          "match": "\\s*+([$_[\\p{Lu}\\p{Lt}\\p{Lm}\\p{Lo}]][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*+\\()",
+          "match": "(?!^)\\s*+([$_[\\p{Lu}\\p{Lt}\\p{Lm}\\p{Lo}]][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*+\\()",
           "captures": {
             "1": {
               "name": "support.type.class.flowtype"
@@ -2659,9 +2754,9 @@
         },
         {
           "comment": "custom primitive/var Types e.g. abc avoid abc(",
-          "match": "\\s*+([$_\\p{L}][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*+\\()",
+          "match": "(?!^)\\s*+(?!\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|label|yield|type|declare)\\b)([$_\\p{L}][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*+\\()",
           "captures": {
-            "1": {
+            "2": {
               "name": "support.type.primitive.flowtype"
             }
           }
@@ -2869,7 +2964,7 @@
         {
           "comment": "type aliases for export but avoid type instaceof or type in operators",
           "begin": "\\s*+\\b(type)\\b\\s+(?!(instanceof|in)\\b)(?=[$_\\p{L}])",
-          "end": "\\s*;|\\n",
+          "end": "\\s*(\\;|\\n|\\b(?=if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|label|yield|type|declare)\\b)",
           "beginCaptures": {
             "1": {
               "name": "support.type.type.flowtype"