Browse Source

Parser: Set ordered list_item_open token info to input marker.

For instance, in a list

    1. Item 1
    20. Item 2

the first list_item_open token will have token.info === '1', and the
second will have token.info === '20'.

This is useful for later rendering plugins that might want to
use the actual markers.
pull/817/head
Eddie Kohler 4 years ago
committed by Vitaly Puzrin
parent
commit
8bcc82aa74
  1. 6
      lib/rules_block/list.js
  2. 1
      lib/token.js
  3. 35
      test/misc.js

6
lib/rules_block/list.js

@ -161,7 +161,7 @@ module.exports = function list(state, startLine, endLine, silent) {
if ((posAfterMarker = skipOrderedListMarker(state, startLine)) >= 0) { if ((posAfterMarker = skipOrderedListMarker(state, startLine)) >= 0) {
isOrdered = true; isOrdered = true;
start = state.bMarks[startLine] + state.tShift[startLine]; start = state.bMarks[startLine] + state.tShift[startLine];
markerValue = Number(state.src.substr(start, posAfterMarker - start - 1)); markerValue = Number(state.src.slice(start, posAfterMarker - 1));
// If we're starting a new ordered list right after // If we're starting a new ordered list right after
// a paragraph, it should start with 1. // a paragraph, it should start with 1.
@ -254,6 +254,9 @@ module.exports = function list(state, startLine, endLine, silent) {
token = state.push('list_item_open', 'li', 1); token = state.push('list_item_open', 'li', 1);
token.markup = String.fromCharCode(markerCharCode); token.markup = String.fromCharCode(markerCharCode);
token.map = itemLines = [ startLine, 0 ]; token.map = itemLines = [ startLine, 0 ];
if (isOrdered) {
token.info = state.src.slice(start, posAfterMarker - 1);
}
// change current state, then restore it after parser subcall // change current state, then restore it after parser subcall
oldTight = state.tight; oldTight = state.tight;
@ -330,6 +333,7 @@ module.exports = function list(state, startLine, endLine, silent) {
if (isOrdered) { if (isOrdered) {
posAfterMarker = skipOrderedListMarker(state, nextLine); posAfterMarker = skipOrderedListMarker(state, nextLine);
if (posAfterMarker < 0) { break; } if (posAfterMarker < 0) { break; }
start = state.bMarks[nextLine] + state.tShift[nextLine];
} else { } else {
posAfterMarker = skipBulletListMarker(state, nextLine); posAfterMarker = skipBulletListMarker(state, nextLine);
if (posAfterMarker < 0) { break; } if (posAfterMarker < 0) { break; }

1
lib/token.js

@ -88,6 +88,7 @@ function Token(type, tag, nesting) {
* *
* - Info string for "fence" tokens * - Info string for "fence" tokens
* - The value "auto" for autolink "link_open" and "link_close" tokens * - The value "auto" for autolink "link_open" and "link_close" tokens
* - The string value of the item marker for ordered-list "list_item_open" tokens
**/ **/
this.info = ''; this.info = '';

35
test/misc.js

@ -362,6 +362,41 @@ describe('smartquotes', function () {
}); });
describe('Ordered list info', function () {
var md = markdownit();
function type_filter(tokens, type) {
return tokens.filter(function (t) { return t.type === type; });
}
it('Should mark ordered list item tokens with info', function () {
var tokens = md.parse('1. Foo\n2. Bar\n20. Fuzz');
assert.strictEqual(type_filter(tokens, 'ordered_list_open').length, 1);
tokens = type_filter(tokens, 'list_item_open');
assert.strictEqual(tokens.length, 3);
assert.strictEqual(tokens[0].info, '1');
assert.strictEqual(tokens[0].markup, '.');
assert.strictEqual(tokens[1].info, '2');
assert.strictEqual(tokens[1].markup, '.');
assert.strictEqual(tokens[2].info, '20');
assert.strictEqual(tokens[2].markup, '.');
tokens = md.parse(' 1. Foo\n2. Bar\n 20. Fuzz\n 199. Flp');
assert.strictEqual(type_filter(tokens, 'ordered_list_open').length, 1);
tokens = type_filter(tokens, 'list_item_open');
assert.strictEqual(tokens.length, 4);
assert.strictEqual(tokens[0].info, '1');
assert.strictEqual(tokens[0].markup, '.');
assert.strictEqual(tokens[1].info, '2');
assert.strictEqual(tokens[1].markup, '.');
assert.strictEqual(tokens[2].info, '20');
assert.strictEqual(tokens[2].markup, '.');
assert.strictEqual(tokens[3].info, '199');
assert.strictEqual(tokens[3].markup, '.');
});
});
describe('Token attributes', function () { describe('Token attributes', function () {
it('.attrJoin', function () { it('.attrJoin', function () {
var md = markdownit(); var md = markdownit();

Loading…
Cancel
Save