Skip to content

Fixed table rendering for lines begining with | for GFM #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marekdedic wants to merge 7 commits into from
Closed

Fixed table rendering for lines begining with | for GFM #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
760cf66
Removed table end condition: no |
marekdedic Mar 12, 2018
844cf08
Ending table on 4 spaces
marekdedic Mar 12, 2018
102b5e9
Regression fix
marekdedic Mar 12, 2018
948553a
Tables: Ignoring whitespace in the front
marekdedic Mar 12, 2018
c64396a
Deleted accidental swp file
marekdedic Mar 12, 2018
bc4509e
Fixed typo - missing |
marekdedic Mar 12, 2018
08ce423
Altered test, also in the way GFM is rendered
marekdedic Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions block/TableTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ protected function consumeTable($lines, $current)
'cols' => [],
'rows' => [],
];
$beginsWithPipe = $lines[$current][0] === '|';
for ($i = $current, $count = count($lines); $i < $count; $i++) {
$line = rtrim($lines[$i]);
$line = trim($lines[$i]);

// extract alignment from second line
if ($i == $current+1) {
Expand All @@ -65,7 +64,7 @@ protected function consumeTable($lines, $current)

continue;
}
if ($line === '' || $beginsWithPipe && $line[0] !== '|') {
if ($line === '' || substr($lines[$i], 0, 4) === ' ') {
break;
}
if ($line[0] === '|') {
Expand Down
2 changes: 1 addition & 1 deletion tests/extra-data/tables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ <h2>Tables</h2>
</thead>
<tbody>
<tr><td align="left">3 </td><td>4</td></tr>
<tr><td align="left">3 </td><td>4</td></tr>
</tbody>
</table>
<p>3 | 4</p>
2 changes: 1 addition & 1 deletion tests/github-data/tables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ <h2>Tables</h2>
</thead>
<tbody>
<tr><td align="left">3 </td><td>4</td></tr>
<tr><td align="left">3 </td><td>4</td></tr>
</tbody>
</table>
<p>3 | 4</p>
<table>
<thead>
<tr><th>Table </th><th>With </th><th>Empty </th><th>Cells</th></tr>
Expand Down