Change code span attr to support multiple different tags on same line

Author: BenHall

lib/marked.js

@@ -458,7 +458,7 @@ var inline = {
   strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
   em: /^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
   code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
-  attr: /^({{)(.*)}}/,
+  attr: /^{{([^}]*)}}/,
   br: /^ {2,}\n(?!\s*$)/,
   del: noop,
   text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
@@ -666,9 +666,8 @@ InlineLexer.prototype.output = function(src) {
       var attr = undefined;
       if (attr_cap = this.rules.attr.exec(src)) {
         src = src.substring(attr_cap[0].length);
-        attr = attr_cap[2];
+        attr = attr_cap[1];
       }
-
       out += this.renderer.codespan(escape(cap[2], true), attr);
 
       continue;

test/tests/code_spans.html

@@ -2,7 +2,9 @@
 
 <p><code class="lang">code with an attribute</code></p>
 
-<p><code class="execute">code with an attribute</code> in the same line as another<code>code block</code></p>
+<p><code class="execute">code with an attribute</code> in the same line as another <code>code block</code> followed by <code class="ui test">UI</code> or <code class="copy">copy</code></p>
+
+<p><code class="execute EXTRA">code with an attribute with additional info</code></p>
 
 <p>Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span></p>
 

test/tests/code_spans.text

@@ -2,7 +2,9 @@
 
 `code with an attribute`{{lang}}
 
-`code with an attribute`{{execute}} in the same line as another `code block`
+`code with an attribute`{{execute}} in the same line as another `code block` followed by `UI`{{ui test}} or `copy`{{copy}}
+
+`code with an attribute with additional info`{{execute EXTRA}}
 
 Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>