github-linguist 5.3.3 → 6.0.0

data/grammars/source.js.regexp.json

@@ -9,43 +9,50 @@
     "regex-character-class": {
       "patterns": [
         {
-          "match": "\\\\[wWsSdDtrnvf]|\\.",
-          "name": "constant.character.character-class.regexp"
+          "name": "constant.character.character-class.regexp",
+          "match": "\\\\[wWsSdDtrnvf]|\\."
         },
         {
-          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})",
-          "name": "constant.character.numeric.regexp"
+          "name": "constant.character.numeric.regexp",
+          "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})"
         },
         {
-          "match": "\\\\c[A-Z]",
-          "name": "constant.character.control.regexp"
+          "name": "constant.character.control.regexp",
+          "match": "\\\\c[A-Z]"
         },
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.backslash.regexp"
+          "name": "constant.character.escape.backslash.regexp",
+          "match": "\\\\."
         }
       ]
     },
     "regexp": {
       "patterns": [
         {
-          "match": "\\\\[bB]|\\^|\\$",
-          "name": "keyword.control.anchor.regexp"
+          "name": "keyword.control.anchor.regexp",
+          "match": "\\\\[bB]|\\^|\\$"
         },
         {
-          "match": "\\\\[1-9]\\d*",
-          "name": "keyword.other.back-reference.regexp"
+          "name": "keyword.other.back-reference.regexp",
+          "match": "\\\\[1-9]\\d*"
         },
         {
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??",
-          "name": "keyword.operator.quantifier.regexp"
+          "name": "keyword.operator.quantifier.regexp",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??"
         },
         {
-          "match": "\\|",
-          "name": "keyword.operator.or.regexp"
+          "name": "keyword.operator.or.regexp",
+          "match": "\\|"
         },
         {
+          "name": "meta.group.assertion.regexp",
           "begin": "(\\()((\\?=)|(\\?!))",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.group.regexp"
@@ -57,58 +64,40 @@
               "name": "meta.assertion.negative-look-ahead.regexp"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.group.regexp"
             }
-          },
-          "name": "meta.group.assertion.regexp",
+          }
+        },
+        {
+          "name": "meta.group.regexp",
+          "begin": "\\((\\?:)?",
+          "end": "\\)",
           "patterns": [
             {
               "include": "#regexp"
             }
-          ]
-        },
-        {
-          "begin": "\\((\\?:)?",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.group.regexp"
             }
-          },
-          "name": "meta.group.regexp",
-          "patterns": [
-            {
-              "include": "#regexp"
-            }
-          ]
+          }
         },
         {
+          "name": "constant.other.character-class.set.regexp",
           "begin": "(\\[)(\\^)?",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.character-class.regexp"
-            },
-            "2": {
-              "name": "keyword.operator.negation.regexp"
-            }
-          },
           "end": "(\\])",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.character-class.regexp"
-            }
-          },
-          "name": "constant.other.character-class.set.regexp",
           "patterns": [
             {
+              "name": "constant.other.character-class.range.regexp",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
               "captures": {
                 "1": {
                   "name": "constant.character.numeric.regexp"
@@ -128,14 +117,25 @@
                 "6": {
                   "name": "constant.character.escape.backslash.regexp"
                 }
-              },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\c[A-Z])|(\\\\.))",
-              "name": "constant.other.character-class.range.regexp"
+              }
             },
             {
               "include": "#regex-character-class"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.regexp"
+            },
+            "2": {
+              "name": "keyword.operator.negation.regexp"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.regexp"
+            }
+          }
         },
         {
           "include": "#regex-character-class"
@@ -143,4 +143,4 @@
       ]
     }
   }
-}
+}

data/grammars/source.js.regexp.replacement.json

@@ -9,18 +9,18 @@
     "regexp-replacement": {
       "patterns": [
         {
-          "match": "\\$([1-9][0-9]|[1-9]|0[1-9]|[&`'])",
-          "name": "variable.regexp.replacement"
+          "name": "variable.regexp.replacement",
+          "match": "\\$([1-9][0-9]|[1-9]|0[1-9]|[\u0026`'])"
         },
         {
-          "match": "\\$\\$",
-          "name": "constant.character.escape.dollar.regexp.replacement"
+          "name": "constant.character.escape.dollar.regexp.replacement",
+          "match": "\\$\\$"
         },
         {
-          "match": "\\\\[^$]",
-          "name": "constant.character.escape.backslash.regexp.replacement"
+          "name": "constant.character.escape.backslash.regexp.replacement",
+          "match": "\\\\[^$]"
         }
       ]
     }
   }
-}
+}

data/grammars/source.jsdoc.json

@@ -1,8 +1,9 @@
 {
-  "scopeName": "source.jsdoc",
   "name": "JSDoc",
+  "scopeName": "source.jsdoc",
   "patterns": [
     {
+      "match": "(?x)\n((@)(?:access|api))\n\\s+\n(private|protected|public)\n\\b",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -13,11 +14,10 @@
         "3": {
           "name": "constant.language.access-type.jsdoc"
         }
-      },
-      "match": "(?x)\n((@)(?:access|api))\n\\s+\n(private|protected|public)\n\\b"
+      }
     },
     {
-      "match": "(?x)\n((@)author)\n\\s+\n(\n  [^@\\s<>*/]\n  (?:[^@<>*/]|\\*[^/])*\n)\n(?:\n  \\s*\n  (<)\n  ([^>\\s]+)\n  (>)\n)?",
+      "match": "(?x)\n((@)author)\n\\s+\n(\n  [^@\\s\u003c\u003e*/]\n  (?:[^@\u003c\u003e*/]|\\*[^/])*\n)\n(?:\n  \\s*\n  (\u003c)\n  ([^\u003e\\s]+)\n  (\u003e)\n)?",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -40,7 +40,7 @@
       }
     },
     {
-      "match": "(?x)\n((@)borrows) \\s+\n((?:[^@\\s*/]|\\*[^/])+)    # <that namepath>\n\\s+ (as) \\s+              # as\n((?:[^@\\s*/]|\\*[^/])+)    # <this namepath>",
+      "match": "(?x)\n((@)borrows) \\s+\n((?:[^@\\s*/]|\\*[^/])+)    # \u003cthat namepath\u003e\n\\s+ (as) \\s+              # as\n((?:[^@\\s*/]|\\*[^/])+)    # \u003cthis namepath\u003e",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -63,20 +63,14 @@
       "name": "meta.example.jsdoc",
       "begin": "((@)example)\\s+",
       "end": "(?=@|\\*/)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.class.jsdoc"
-        },
-        "2": {
-          "name": "punctuation.definition.block.tag.jsdoc"
-        }
-      },
       "patterns": [
         {
           "match": "^\\s\\*\\s+"
         },
         {
-          "begin": "\\G(<)caption(>)",
+          "contentName": "constant.other.description.jsdoc",
+          "begin": "\\G(\u003c)caption(\u003e)",
+          "end": "(\u003c/)caption(\u003e)|(?=\\*/)",
           "beginCaptures": {
             "0": {
               "name": "entity.name.tag.inline.jsdoc"
@@ -88,8 +82,6 @@
               "name": "punctuation.definition.bracket.angle.end.jsdoc"
             }
           },
-          "contentName": "constant.other.description.jsdoc",
-          "end": "(</)caption(>)|(?=\\*/)",
           "endCaptures": {
             "0": {
               "name": "entity.name.tag.inline.jsdoc"
@@ -115,9 +107,18 @@
             }
           }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.class.jsdoc"
+        },
+        "2": {
+          "name": "punctuation.definition.block.tag.jsdoc"
+        }
+      }
     },
     {
+      "match": "(?x)\n((@)kind)\n\\s+\n(class|constant|event|external|file|function|member|mixin|module|namespace|typedef)\n\\b",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -128,10 +129,10 @@
         "3": {
           "name": "constant.language.symbol-type.jsdoc"
         }
-      },
-      "match": "(?x)\n((@)kind)\n\\s+\n(class|constant|event|external|file|function|member|mixin|module|namespace|typedef)\n\\b"
+      }
     },
     {
+      "match": "(?x)\n((@)see)\n\\s+\n(?:\n  # URL\n  (\n    (?=https?://)\n    (?:[^\\s*]|\\*[^/])+\n  )\n  |\n  # JSDoc namepath\n  (\n    (?!\n      # Avoid matching bare URIs (also acceptable as links)\n      https?://\n      |\n      # Avoid matching {@inline tags}; we match those below\n      (?:\\[[^\\[\\]]*\\])? # Possible description [preceding]{@tag}\n      {@(?:link|linkcode|linkplain|tutorial)\\b\n    )\n    # Matched namepath\n    (?:[^@\\s*/]|\\*[^/])+\n  )\n)",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -145,10 +146,10 @@
         "4": {
           "name": "entity.name.type.instance.jsdoc"
         }
-      },
-      "match": "(?x)\n((@)see)\n\\s+\n(?:\n  # URL\n  (\n    (?=https?://)\n    (?:[^\\s*]|\\*[^/])+\n  )\n  |\n  # JSDoc namepath\n  (\n    (?!\n      # Avoid matching bare URIs (also acceptable as links)\n      https?://\n      |\n      # Avoid matching {@inline tags}; we match those below\n      (?:\\[[^\\[\\]]*\\])? # Possible description [preceding]{@tag}\n      {@(?:link|linkcode|linkplain|tutorial)\\b\n    )\n    # Matched namepath\n    (?:[^@\\s*/]|\\*[^/])+\n  )\n)"
+      }
     },
     {
+      "match": "(?x)\n((@)template)\n\\s+\n# One or more valid identifiers\n(\n  [A-Za-z_$]        # First character: non-numeric word character\n  [\\w$.\\[\\]]*    # Rest of identifier\n  (?:               # Possible list of additional identifiers\n    \\s* , \\s*\n    [A-Za-z_$]\n    [\\w$.\\[\\]]*\n  )*\n)",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -160,15 +161,15 @@
           "name": "variable.other.jsdoc",
           "patterns": [
             {
-              "match": ",",
-              "name": "punctuation.delimiter.object.comma.jsdoc"
+              "name": "punctuation.delimiter.object.comma.jsdoc",
+              "match": ","
             }
           ]
         }
-      },
-      "match": "(?x)\n((@)template)\n\\s+\n# One or more valid identifiers\n(\n  [A-Za-z_$]        # First character: non-numeric word character\n  [\\w$.\\[\\]]*    # Rest of identifier\n  (?:               # Possible list of additional identifiers\n    \\s* , \\s*\n    [A-Za-z_$]\n    [\\w$.\\[\\]]*\n  )*\n)"
+      }
     },
     {
+      "match": "(?x)\n(\n  (@)\n  (?:arg|argument|const|constant|member|namespace|param|var)\n)\n\\s+\n(\n  [A-Za-z_$]\n  [\\w$.\\[\\]]*\n)",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -179,19 +180,10 @@
         "3": {
           "name": "variable.other.jsdoc"
         }
-      },
-      "match": "(?x)\n(\n  (@)\n  (?:arg|argument|const|constant|member|namespace|param|var)\n)\n\\s+\n(\n  [A-Za-z_$]\n  [\\w$.\\[\\]]*\n)"
+      }
     },
     {
       "begin": "((@)typedef)\\s+(?={)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.class.jsdoc"
-        },
-        "2": {
-          "name": "punctuation.definition.block.tag.jsdoc"
-        }
-      },
       "end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
       "patterns": [
         {
@@ -201,10 +193,7 @@
           "name": "entity.name.type.instance.jsdoc",
           "match": "(?:[^@\\s*/]|\\*[^/])+"
         }
-      ]
-    },
-    {
-      "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -212,19 +201,22 @@
         "2": {
           "name": "punctuation.definition.block.tag.jsdoc"
         }
-      },
+      }
+    },
+    {
+      "begin": "((@)(?:arg|argument|const|constant|member|namespace|param|prop|property|var))\\s+(?={)",
       "end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
       "patterns": [
         {
           "include": "#type"
         },
         {
-          "match": "([A-Za-z_$][\\w$.\\[\\]]*)",
-          "name": "variable.other.jsdoc"
+          "name": "variable.other.jsdoc",
+          "match": "([A-Za-z_$][\\w$.\\[\\]]*)"
         },
         {
           "name": "variable.other.jsdoc",
-          "match": "(?x)\n(\\[)\\s*\n[\\w$]+\n(?:\n  (?:\\[\\])?                                        # Foo[].bar properties within an array\n  \\.                                                # Foo.Bar namespaced parameter\n  [\\w$]+\n)*\n(?:\n  \\s*\n  (=)                                                # [foo=bar] Default parameter value\n  \\s*\n  (\n    # The inner regexes are to stop the match early at */ and to not stop at escaped quotes\n    (?>\n      \"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\" |  # [foo=\"bar\"] Double-quoted\n      '(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?' |  # [foo='bar'] Single-quoted\n      \\[ (?:(?:\\*(?!/))|[^*])*? \\] |              # [foo=[1,2]] Array literal\n      (?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])* # Everything else (sorry)\n    )*\n  )\n)?\n\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
+          "match": "(?x)\n(\\[)\\s*\n[\\w$]+\n(?:\n  (?:\\[\\])?                                        # Foo[].bar properties within an array\n  \\.                                                # Foo.Bar namespaced parameter\n  [\\w$]+\n)*\n(?:\n  \\s*\n  (=)                                                # [foo=bar] Default parameter value\n  \\s*\n  (\n    # The inner regexes are to stop the match early at */ and to not stop at escaped quotes\n    (?\u003e\n      \"(?:(?:\\*(?!/))|(?:\\\\(?!\"))|[^*\\\\])*?\" |  # [foo=\"bar\"] Double-quoted\n      '(?:(?:\\*(?!/))|(?:\\\\(?!'))|[^*\\\\])*?' |  # [foo='bar'] Single-quoted\n      \\[ (?:(?:\\*(?!/))|[^*])*? \\] |              # [foo=[1,2]] Array literal\n      (?:(?:\\*(?!/))|\\s(?!\\s*\\])|\\[.*?(?:\\]|(?=\\*/))|[^*\\s\\[\\]])* # Everything else (sorry)\n    )*\n  )\n)?\n\\s*(?:(\\])((?:[^*\\s]|\\*[^\\s/])+)?|(?=\\*/))",
           "captures": {
             "1": {
               "name": "punctuation.definition.optional-value.begin.bracket.square.jsdoc"
@@ -251,10 +243,7 @@
             }
           }
         }
-      ]
-    },
-    {
-      "begin": "(?x)\n(\n  (@)\n  (?:define|enum|exception|export|extends|lends|implements|modifies\n  |namespace|private|protected|returns?|suppress|this|throws|type\n  |yields?)\n)\n\\s+(?={)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -262,15 +251,27 @@
         "2": {
           "name": "punctuation.definition.block.tag.jsdoc"
         }
-      },
+      }
+    },
+    {
+      "begin": "(?x)\n(\n  (@)\n  (?:define|enum|exception|export|extends|lends|implements|modifies\n  |namespace|private|protected|returns?|suppress|this|throws|type\n  |yields?)\n)\n\\s+(?={)",
       "end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
       "patterns": [
         {
           "include": "#type"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.class.jsdoc"
+        },
+        "2": {
+          "name": "punctuation.definition.block.tag.jsdoc"
+        }
+      }
     },
     {
+      "match": "(?x)\n(\n  (@)\n  (?:alias|augments|callback|constructs|emits|event|fires|exports?\n  |extends|external|function|func|host|lends|listens|interface|memberof!?\n  |method|module|mixes|mixin|name|requires|see|this|typedef|uses)\n)\n\\s+\n(\n  (?:\n    [^{}@\\s*] | \\*[^/]\n  )+\n)",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -281,11 +282,12 @@
         "3": {
           "name": "entity.name.type.instance.jsdoc"
         }
-      },
-      "match": "(?x)\n(\n  (@)\n  (?:alias|augments|callback|constructs|emits|event|fires|exports?\n  |extends|external|function|func|host|lends|listens|interface|memberof!?\n  |method|module|mixes|mixin|name|requires|see|this|typedef|uses)\n)\n\\s+\n(\n  (?:\n    [^{}@\\s*] | \\*[^/]\n  )+\n)"
+      }
     },
     {
+      "contentName": "variable.other.jsdoc",
       "begin": "((@)(?:default(?:value)?|license|version))\\s+((['\"]))",
+      "end": "(\\3)|(?=$|\\*/)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -300,8 +302,6 @@
           "name": "punctuation.definition.string.begin.jsdoc"
         }
       },
-      "contentName": "variable.other.jsdoc",
-      "end": "(\\3)|(?=$|\\*/)",
       "endCaptures": {
         "0": {
           "name": "variable.other.jsdoc"
@@ -312,6 +312,7 @@
       }
     },
     {
+      "match": "((@)(?:default(?:value)?|license|tutorial|variation|version))\\s+([^\\s*]+)",
       "captures": {
         "1": {
           "name": "storage.type.class.jsdoc"
@@ -322,17 +323,16 @@
         "3": {
           "name": "variable.other.jsdoc"
         }
-      },
-      "match": "((@)(?:default(?:value)?|license|tutorial|variation|version))\\s+([^\\s*]+)"
+      }
     },
     {
+      "name": "storage.type.class.jsdoc",
+      "match": "(?x) (@)\n(?:abstract|access|alias|api|arg|argument|async|attribute|augments|author|beta|borrows|bubbles\n|callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright\n|default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exception\n|exports?|extends|extension(?:_?for)?|external|externs|file|fileoverview|final|fires|for|func\n|function|generator|global|hideconstructor|host|ignore|implements|implicitCast|inherit[Dd]oc\n|inner|instance|interface|internal|kind|lends|license|listens|main|member|memberof!?|method\n|mixes|mixins?|modifies|module|name|namespace|noalias|nocollapse|nocompile|nosideeffects\n|override|overview|package|param|polymer(?:Behavior)?|preserve|private|prop|property|protected\n|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary\n|suppress|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation\n|version|virtual|writeOnce|yields?)\n\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.block.tag.jsdoc"
         }
-      },
-      "match": "(?x) (@)\n(?:abstract|access|alias|api|arg|argument|async|attribute|augments|author|beta|borrows|bubbles\n|callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright\n|default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exception\n|exports?|extends|extension(?:_?for)?|external|externs|file|fileoverview|final|fires|for|func\n|function|generator|global|hideconstructor|host|ignore|implements|implicitCast|inherit[Dd]oc\n|inner|instance|interface|internal|kind|lends|license|listens|main|member|memberof!?|method\n|mixes|mixins?|modifies|module|name|namespace|noalias|nocollapse|nocompile|nosideeffects\n|override|overview|package|param|polymer(?:Behavior)?|preserve|private|prop|property|protected\n|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary\n|suppress|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation\n|version|virtual|writeOnce|yields?)\n\\b",
-      "name": "storage.type.class.jsdoc"
+      }
     },
     {
       "include": "#inline-tags"
@@ -364,6 +364,8 @@
     "inline-tags": {
       "patterns": [
         {
+          "name": "constant.other.description.jsdoc",
+          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
           "captures": {
             "1": {
               "name": "punctuation.definition.bracket.square.begin.jsdoc"
@@ -371,32 +373,15 @@
             "2": {
               "name": "punctuation.definition.bracket.square.end.jsdoc"
             }
-          },
-          "match": "(\\[)[^\\]]+(\\])(?={@(?:link|linkcode|linkplain|tutorial))",
-          "name": "constant.other.description.jsdoc"
+          }
         },
         {
+          "name": "entity.name.type.instance.jsdoc",
           "begin": "({)((@)(?:link(?:code|plain)?|tutorial))\\s*",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.bracket.curly.begin.jsdoc"
-            },
-            "2": {
-              "name": "storage.type.class.jsdoc"
-            },
-            "3": {
-              "name": "punctuation.definition.inline.tag.jsdoc"
-            }
-          },
           "end": "}|(?=\\*/)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.bracket.curly.end.jsdoc"
-            }
-          },
-          "name": "entity.name.type.instance.jsdoc",
           "patterns": [
             {
+              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?",
               "captures": {
                 "1": {
                   "name": "variable.other.link.underline.jsdoc"
@@ -404,10 +389,10 @@
                 "2": {
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
-              },
-              "match": "\\G((?=https?://)(?:[^|}\\s*]|\\*[/])+)(\\|)?"
+              }
             },
             {
+              "match": "\\G((?:[^{}@\\s|*]|\\*[^/])+)(\\|)?",
               "captures": {
                 "1": {
                   "name": "variable.other.description.jsdoc"
@@ -415,21 +400,43 @@
                 "2": {
                   "name": "punctuation.separator.pipe.jsdoc"
                 }
-              },
-              "match": "\\G((?:[^{}@\\s|*]|\\*[^/])+)(\\|)?"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.bracket.curly.begin.jsdoc"
+            },
+            "2": {
+              "name": "storage.type.class.jsdoc"
+            },
+            "3": {
+              "name": "punctuation.definition.inline.tag.jsdoc"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.curly.end.jsdoc"
+            }
+          }
         }
       ]
     },
     "type": {
       "patterns": [
         {
-          "match": "\\G{(?:[^}*]|\\*[^/}])+$",
-          "name": "invalid.illegal.type.jsdoc"
+          "name": "invalid.illegal.type.jsdoc",
+          "match": "\\G{(?:[^}*]|\\*[^/}])+$"
         },
         {
+          "contentName": "entity.name.type.instance.jsdoc",
           "begin": "\\G({)",
+          "end": "((}))\\s*|(?=\\*/)",
+          "patterns": [
+            {
+              "include": "#brackets"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "entity.name.type.instance.jsdoc"
@@ -438,8 +445,6 @@
               "name": "punctuation.definition.bracket.curly.begin.jsdoc"
             }
           },
-          "contentName": "entity.name.type.instance.jsdoc",
-          "end": "((}))\\s*|(?=\\*/)",
           "endCaptures": {
             "1": {
               "name": "entity.name.type.instance.jsdoc"
@@ -447,14 +452,9 @@
             "2": {
               "name": "punctuation.definition.bracket.curly.end.jsdoc"
             }
-          },
-          "patterns": [
-            {
-              "include": "#brackets"
-            }
-          ]
+          }
         }
       ]
     }
   }
-}
+}