Skip to content

Add support for a table without an extra new line before it #885

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for a table without an extra new line before it #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/Markdig.Tests/TestPipeTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public sealed class TestPipeTable
[TestCase("| S | T |\r\n|---|---|\t\r\n| G | H |")]
[TestCase("| S | T |\r\n|---|---|\f\r\n| G | H |")]
[TestCase("| S | \r\n|---|\r\n| G |\r\n\r\n| D | D |\r\n| ---| ---| \r\n| V | V |", 2)]
[TestCase("a\r| S | T |\r|---|---|")]
[TestCase("a\n| S | T |\r|---|---|")]
public void TestTableBug(string markdown, int tableCount = 1)
{
MarkdownDocument document =
Expand Down
6 changes: 3 additions & 3 deletions src/Markdig/Extensions/Tables/PipeTableParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public override bool Match(InlineProcessor processor, ref StringSlice slice)
}

var c = slice.CurrentChar;
var isNewLineFollowedByPipe = (c == '\n' || c == '\r') && slice.PeekChar() == '|';

// If we have not a delimiter on the first line of a paragraph, don't bother to continue
// tracking other delimiters on following lines
Expand All @@ -60,18 +61,17 @@ public override bool Match(InlineProcessor processor, ref StringSlice slice)

if (tableState is null)
{

// A table could be preceded by an empty line or a line containing an inline
// that has not been added to the stack, so we consider this as a valid
// start for a table. Typically, with this, we can have an attributes {...}
// starting on the first line of a pipe table, even if the first line
// doesn't have a pipe
if (processor.Inline != null && (localLineIndex > 0 || c == '\n' || c == '\r'))
if (processor.Inline != null && (localLineIndex > 0 || c == '\n' || c == '\r') && !isNewLineFollowedByPipe)
{
return false;
}

if (processor.Inline is null)
if (processor.Inline is null || isNewLineFollowedByPipe)
{
isFirstLineEmpty = true;
}
Expand Down