Put entities to separate token

lib/rules_inline/entity.js

@@ -13,11 +13,12 @@ var NAMED_RE   = /^&([a-z][a-z0-9]{1,31});/i;
 
 
 module.exports = function entity(state, silent) {
-  var ch, code, match, pos = state.pos, max = state.posMax;
+  var ch, code, match, token, pos = state.pos, max = state.posMax;
 
-  if (state.src.charCodeAt(pos) !== 0x26/* & */) { return false; }
+  if (state.src.charCodeAt(pos) !== 0x26/* & */) return false;
+
+  if (pos + 1 >= max) return false;
 
-  if (pos + 1 < max) {
   ch = state.src.charCodeAt(pos + 1);
 
   if (ch === 0x23 /* # */) {
@@ -25,7 +26,11 @@ module.exports = function entity(state, silent) {
     if (match) {
       if (!silent) {
         code = match[1][0].toLowerCase() === 'x' ? parseInt(match[1].slice(1), 16) : parseInt(match[1], 10);
-          state.pending += isValidEntityCode(code) ? fromCodePoint(code) : fromCodePoint(0xFFFD);
+
+        token         = state.push('text_special', '', 0);
+        token.content = isValidEntityCode(code) ? fromCodePoint(code) : fromCodePoint(0xFFFD);
+        token.markup  = match[0];
+        token.info    = 'entity';
       }
       state.pos += match[0].length;
       return true;
@@ -34,15 +39,17 @@ module.exports = function entity(state, silent) {
     match = state.src.slice(pos).match(NAMED_RE);
     if (match) {
       if (has(entities, match[1])) {
-          if (!silent) { state.pending += entities[match[1]]; }
+        if (!silent) {
+          token         = state.push('text_special', '', 0);
+          token.content = entities[match[1]];
+          token.markup  = match[0];
+          token.info    = 'entity';
+        }
         state.pos += match[0].length;
         return true;
       }
     }
   }
-  }
 
-  if (!silent) { state.pending += '&'; }
+  return false;
-  state.pos++;
-  return true;
 };

test/fixtures/markdown-it/smartquotes.txt

@@ -177,3 +177,16 @@ Should be escapable:
 <p>&quot;foo&quot;</p>
 <p>&quot;foo&quot;</p>
 .
+
+Should not replace entities:
+.
+&quot;foo&quot;
+
+&quot;foo"
+
+"foo&quot;
+.
+<p>&quot;foo&quot;</p>
+<p>&quot;foo&quot;</p>
+<p>&quot;foo&quot;</p>
+.

test/fixtures/markdown-it/typographer.txt

@@ -67,6 +67,13 @@ copyright should be escapable
 <p>(c)</p>
 .
 
+shouldn't replace entities
+.
+&#40;c) (c&#41; (c)
+.
+<p>(c) (c) ©</p>
+.
+
 
 dashes
 .