Skip to content

[BUGFIX] Prevent fatal error caused by variables in tables #560

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

Merged
merged 3 commits into from
Sep 1, 2023
Merged

[BUGFIX] Prevent fatal error caused by variables in tables #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e29d65f
[BUGFIX] Prevent fatal error caused by variables in tables
linawolf Aug 26, 2023
0979091
Merge branch 'main' into bugfix/table
linawolf Aug 27, 2023
f7ac69d
Merge branch 'main' into bugfix/table
linawolf Aug 27, 2023
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
6 changes: 5 additions & 1 deletion packages/guides/src/Nodes/Inline/VariableInlineNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class VariableInlineNode extends InlineNode
{
final public const TYPE = 'variable';

private Node $child;
private Node|null $child = null;

public function __construct(string $value)
{
Expand All @@ -19,6 +19,10 @@ public function __construct(string $value)

public function getChild(): Node
{
if ($this->child === null) {
return new PlainTextInlineNode('|' . $this->value . '|');
}

return $this->child;
}

Expand Down
30 changes: 30 additions & 0 deletions tests/Integration/tests/simple-table-with-variable/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Some table with long lines</title>

</head>
<body>
<div class="section" id="some-table-with-long-lines">
<h1>Some table with long lines</h1>

<table>
<thead>
<tr>
<th>Project</th>
<th>Links</th>
</tr>
</thead>

<tbody>
<tr>
<td>TSconfig Reference (full)</td>
<td>|unkown| and another reStructuredText variable</td>
</tr>
</tbody>
</table>

</div>

</body>
</html>
10 changes: 10 additions & 0 deletions tests/Integration/tests/simple-table-with-variable/input/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Some table with long lines
==========================

========================= ==================================================
Project Links
========================= ==================================================
TSconfig Reference (full) |unkown| and another |known| variable
========================= ==================================================

.. |known| replace:: reStructuredText
1 change: 1 addition & 0 deletions tests/Integration/tests/simple-table-with-variable/input/skip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Variables in simple tables do not get replaced