Revert adding named tag handles, since they are captured by the local tag handles

Author: pplantinga

src/languages/yaml.js

@@ -10,9 +10,12 @@ Category: common, config
 export default function(hljs) {
   var LITERALS = 'true false yes no null';
 
-  // YAML spec allows most URI characters as a part of tags.
-  // see https://yaml.org/spec/1.2/spec.html#id2764295
-  var YAML_TAG_RE = '[\\w#;/?:@&=+$,.~*\\\'()[\\]]+'
+  // YAML spec allows non-reserved characters in tags, since they are intended
+  // to be used sometimes as URIs. In order to differentiate between "local"
+  // tags, prefixed with `!` and global tags, prefixed with `!!`, don't allow
+  // the prefix char `!` in the first char of the expression.
+  var NON_EXCLAMATION_CHARS = '\\w#;/?:@&=+$,.~*\\\'()[\\]'
+  var YAML_TAG_RE = '[' + NON_EXCLAMATION_CHARS + '][' + NON_EXCLAMATION_CHARS + '!]*'
 
   // Define keys as starting with a word character
   // ...containing word chars, spaces, colons, forward-slashes, hyphens and periods
@@ -74,18 +77,14 @@ export default function(hljs) {
         excludeEnd: true,
         relevance: 0
       },
-      { // "named" tags
+      { // local tags
         className: 'type',
-        begin: '!\w+!' + YAML_TAG_RE,
+        begin: '!' + YAML_TAG_RE,
       },
-      { // "global" tags (data types)
+      { // data type
         className: 'type',
         begin: '!!' + YAML_TAG_RE,
       },
-      { // local tags
-        className: 'type',
-        begin: '!' + YAML_TAG_RE,
-      },
       { // fragment id &ref
         className: 'meta',
         begin: '&' + hljs.UNDERSCORE_IDENT_RE + '$',

test/markup/yaml/tag.expect.txt

@@ -6,4 +6,3 @@
 <span class="hljs-attr">key:</span> <span class="hljs-type">!!python/name:module.name</span> <span class="hljs-string">test</span>
 <span class="hljs-attr">key:</span> <span class="hljs-type">!foo2.bar</span> <span class="hljs-string">test</span>
 <span class="hljs-attr">key:</span> <span class="hljs-type">!(foo.bar?):tag</span> <span class="hljs-string">test</span>
-<span class="hljs-attr">key:</span> <span class="hljs-type">!foo!bar</span> <span class="hljs-string">test</span>

test/markup/yaml/tag.txt

@@ -6,4 +6,3 @@ key: !!python/dict test
 key: !!python/name:module.name test
 key: !foo2.bar test
 key: !(foo.bar?):tag test
-key: !foo!bar test