Merge pull request #895 from abu-co/master

Add syntax highlighting for JSDoc "template" tags with constraints.

Author: Orta Therox

TypeScript.YAML-tmLanguage

@@ -3028,6 +3028,17 @@ repository:
           # patterns:
           # - name: punctuation.delimiter.object.comma.jsdoc
           #   match: ','
+    # @template {Constraint} Foo
+    - begin: (?x)((@)template)\s+(?={)
+      beginCaptures:
+        '1': { name: storage.type.class.jsdoc }
+        '2': { name: punctuation.definition.block.tag.jsdoc }
+      end: (?=\s|\*/|[^{}\[\]A-Za-z_$])
+      patterns:
+      - include: '#jsdoctype'
+      - name: variable.other.jsdoc
+        # One valid identifier
+        match: ([A-Za-z_$][\w$.\[\]]*)
     # Tags followed by an identifier token
     # -  @<tag> identifier
     - match: |-

TypeScript.tmLanguage

@@ -9096,6 +9096,38 @@
               </dict>
             </dict>
           </dict>
+          <dict>
+            <key>begin</key>
+            <string>(?x)((@)template)\s+(?={)</string>
+            <key>beginCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>storage.type.class.jsdoc</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.definition.block.tag.jsdoc</string>
+              </dict>
+            </dict>
+            <key>end</key>
+            <string>(?=\s|\*/|[^{}\[\]A-Za-z_$])</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#jsdoctype</string>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>variable.other.jsdoc</string>
+                <key>match</key>
+                <string>([A-Za-z_$][\w$.\[\]]*)</string>
+              </dict>
+            </array>
+          </dict>
           <dict>
             <key>match</key>
             <string>(?x)

TypeScriptReact.tmLanguage

@@ -9044,6 +9044,38 @@
               </dict>
             </dict>
           </dict>
+          <dict>
+            <key>begin</key>
+            <string>(?x)((@)template)\s+(?={)</string>
+            <key>beginCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>storage.type.class.jsdoc</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.definition.block.tag.jsdoc</string>
+              </dict>
+            </dict>
+            <key>end</key>
+            <string>(?=\s|\*/|[^{}\[\]A-Za-z_$])</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#jsdoctype</string>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>variable.other.jsdoc</string>
+                <key>match</key>
+                <string>([A-Za-z_$][\w$.\[\]]*)</string>
+              </dict>
+            </array>
+          </dict>
           <dict>
             <key>match</key>
             <string>(?x)