codewalker/marked
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge pull request #1262 from UziTech/table-cells

Browse Source 
Fix table cells
This commit is contained in:
Steven 2018-06-12 11:49:29 -04:00 committed by GitHub
commit 05e322c69b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 82 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/marked.js
View File

@ -1340,7 +1340,22 @@ function merge(obj) {
}
function splitCells(tableRow, count) {
var cells = tableRow.replace(/([^\\])\|/g, '$1 |').split(/ +\| */),
// ensure that every cell-delimiting pipe has a space
// before it to distinguish it from an escaped pipe
var row = tableRow.replace(/\|/g, function (match, offset, str) {
var escaped = false,
curr = offset;
while (--curr >= 0 && str[curr] === '\\') escaped = !escaped;
if (escaped) {
// odd number of slashes means | is escaped
// so we leave it alone
return '|';
} else {
// add space before unescaped |
return ' |';
}
}),
cells = row.split(/ \|/),
i = 0;
if (cells.length > count) {
@ -1350,7 +1365,8 @@ function splitCells(tableRow, count) {
}
for (; i < cells.length; i++) {
cells[i] = cells[i].replace(/\\\|/g, '|');
// leading or trailing whitespace is ignored per the gfm spec
cells[i] = cells[i].trim().replace(/\\\|/g, '|');
}
return cells;
}

15
test/specs/marked/marked-spec.js
View File

@ -46,3 +46,18 @@ describe('Marked Code spans', function() {
messenger.test(spec, section, ignore);
});
});
describe('Marked Table cells', function() {
var section = 'Table cells';
// var shouldPassButFails = [];
var shouldPassButFails = [];
var willNotBeAttemptedByCoreTeam = [];
var ignore = shouldPassButFails.concat(willNotBeAttemptedByCoreTeam);
markedSpec.forEach(function(spec) {
messenger.test(spec, section, ignore);
});
});

50
test/specs/marked/marked.json
View File

@ -2,7 +2,55 @@
{
"section": "Code spans",
"markdown": "`someone@example.com`",
"html": "<p><code>someone@exmaple.com</code></p>\n",
"html": "<p><code>someone@example.com</code></p>",
"example": 1
},
{
"section": "Table cells",
"markdown": "|1|\n|-|\n|1|",
"html": "<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>",
"example": 2
},
{
"section": "Table cells",
"markdown": "|1|\n|-|\n|\\||",
"html": "<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>|</td></tr></tbody></table>",
"example": 3
},
{
"section": "Table cells",
"markdown": "|1|\n|-|\n|1\\\\1|",
"html": "<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>1\\1</td></tr></tbody></table>",
"example": 4
},
{
"section": "Table cells",
"markdown": "|1|\n|-|\n|\\\\\\\\||",
"html": "<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>\\\\</td></tr></tbody></table>",
"example": 5
},
{
"section": "Table cells",
"markdown": "|1|\n|-|\n|\\\\\\\\\\||",
"html": "<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>\\\\|</td></tr></tbody></table>",
"example": 6
},
{
"section": "Table cells",
"markdown": "|1|2|\n|-|-|\n||2|",
"html": "<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td></td><td>2</td></tr></tbody></table>",
"example": 7
},
{
"section": "Table cells",
"markdown": "|1|2|\n|-|-|\n|1\\|\\\\|2\\|\\\\|",
"html": "<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td>1|\\</td><td>2|\\</td></tr></tbody></table>",
"example": 8
},
{
"section": "Table cells",
"markdown": "|1|2|\n|-|-|\n| |2|",
"html": "<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td></td><td>2</td></tr></tbody></table>",
"example": 9
}
]