Skip to content

Handle nested style tags #568

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
Blacksmoke16 merged 2 commits into from
Aug 4, 2025
Merged

Handle nested style tags #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a1f443
Handle nested style tags
Blacksmoke16 Aug 3, 2025
2895b86
Merge branch 'master' into handle-nested-style-tags
Blacksmoke16 Aug 4, 2025
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
8 changes: 4 additions & 4 deletions ...e/spec/fixtures/helper/table/default_cells_with_rowspan_and_colspan_and_custom_format.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+----------------+---------------+---------------------+
| ISBN | Title | Author |
| ISBN | Title | Author |
+----------------+---------------+---------------------+
| 978-0521567817 | De Monarchia | Dante Alighieri |
| 978-0804169127 | Divine Comedy | spans multiple rows |
| test | tttt |
| 978-0521567817 | De Monarchia | Dante Alighieri |
| 978-0804169127 | Divine Comedy | spans multiple rows |
| test | tttt |
+----------------+---------------+---------------------+
8 changes: 4 additions & 4 deletions ...ts/console/spec/fixtures/helper/table/default_cells_with_rowspan_and_colspan_and_fgbg.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+---------------+---------------+-------------------------------------------+
| 978 | De Monarchia | Dante Alighieri |
| 99921-58-10-7 | Divine Comedy | spans multiple rows rows Dante Alighieri |
| | | spans multiple rows rows |
| 978 | De Monarchia | Dante Alighieri |
| 99921-58-10-7 | Divine Comedy | spans multiple rows rows Dante Alighieri |
| | | spans multiple rows rows |
+---------------+---------------+-------------------------------------------+
| test | tttt |
| test | tttt |
+---------------+---------------+-------------------------------------------+
2 changes: 1 addition & 1 deletion .../console/spec/fixtures/helper/table/default_colspan_and_table_cell_with_comment_style.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
+-----------------+------------------+---------+
| Long Title |
| Long Title |
+-----------------+------------------+---------+
| 9971-5-0210-0 |
+-----------------+------------------+---------+
Expand Down
8 changes: 4 additions & 4 deletions src/components/console/spec/fixtures/helper/table/default_formatted_row_with_line_breaks.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+-------+------------+
| Dont break |
| here |
| Dont break |
| here |
+-------+------------+
| foo | Dont break |
| bar | here |
| foo | Dont break |
| bar | here |
+-------+------------+
12 changes: 6 additions & 6 deletions src/components/console/spec/fixtures/style/block_padding.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

\e\[30;42m \e\[0m
\e\[30;42m \[OK\] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore \e\[0m
\e\[30;42m magna aliqua\. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo \e\[0m
\e\[30;42m consequat\. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur\. \e\[0m
\e\[30;42m Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum \e\[0m
\e\[30;42m \e\[0m
\e\[30;42m \e\[39;49m
\e\[30;42m \[OK\] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore \e\[39;49m
\e\[30;42m magna aliqua\. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo \e\[39;49m
\e\[30;42m consequat\. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur\. \e\[39;49m
\e\[30;42m Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum \e\[39;49m
\e\[30;42m \e\[39;49m

2 changes: 1 addition & 1 deletion src/components/console/spec/fixtures/style/closing_tag.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
\e\[30;46mdo you want \e\[0m\e\[33msomething\e\[0m\e\[30;46m\?\e\[0m
\e\[30;46mdo you want \e\[39;49m\e\[33msomething\e\[39m\e\[30;46m\?\e\[39;49m
8 changes: 4 additions & 4 deletions src/components/console/spec/fixtures/style/long_line_comment_decorated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

\/\/ Árvíztűrőtükörfúrógép 🎼 Lorem ipsum dolor sit \e\[33m💕 amet, consectetur adipisicing elit, sed do eiusmod tempor incididu \e\[0m
\/\/ \e\[33mlabore et dolore magna aliqua\. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex\e\[0m
\/\/ \e\[33mea commodo consequat\. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla \e\[0m
\/\/ \e\[33mpariatur\.\e\[0m Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
\/\/ Árvíztűrőtükörfúrógép 🎼 Lorem ipsum dolor sit \e\[33m💕 amet, consectetur adipisicing elit, sed do eiusmod tempor incididu \e\[39m
\/\/ \e\[33mlabore et dolore magna aliqua\. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex\e\[39m
\/\/ \e\[33mea commodo consequat\. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla \e\[39m
\/\/ \e\[33mpariatur\.\e\[39m Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
\/\/ laborum

8 changes: 4 additions & 4 deletions src/components/console/spec/fixtures/style/nested_tag_prefix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

║ \[★\] Árvíztűrőtükörfúrógép Lorem ipsum dolor sit \e\[33mamet, consectetur adipisicing elit, sed do eiusmod tempor incididunt \e\[0m
║ \e\[33m ut labore et dolore magna aliqua\. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut \e\[0m
║ \e\[33m aliquip ex ea commodo consequat\. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu \e\[0m
║ \e\[33m fugiat nulla pariatur\.\e\[0m Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
║ \[★\] Árvíztűrőtükörfúrógép Lorem ipsum dolor sit \e\[33mamet, consectetur adipisicing elit, sed do eiusmod tempor incididunt \e\[39m
║ \e\[33m ut labore et dolore magna aliqua\. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut \e\[39m
║ \e\[33m aliquip ex ea commodo consequat\. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu \e\[39m
║ \e\[33m fugiat nulla pariatur\.\e\[39m Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
║ anim id est laborum

2 changes: 1 addition & 1 deletion src/components/console/spec/fixtures/style/table.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
----- -------
\e\[32m Foo \e\[0m \e\[32m Bar \e\[0m
\e\[32m Foo \e\[39m \e\[32m Bar \e\[39m
----- -------
Biz Baz
12 false
Expand Down
4 changes: 2 additions & 2 deletions src/components/console/spec/fixtures/style/table_horizontal.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
----- ----- -------
\e\[32m Foo \e\[0m Biz 12
\e\[32m Bar \e\[0m Baz false
\e\[32m Foo \e\[39m Biz 12
\e\[32m Bar \e\[39m Baz false
----- ----- -------

8 changes: 4 additions & 4 deletions src/components/console/spec/fixtures/style/table_vertical.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
------------
\[33mFoo\[0m: Biz
\[33mBar\[0m: Baz
\[33mFoo\[39m: Biz
\[33mBar\[39m: Baz
------------
\[33mFoo\[0m: 12
\[33mBar\[0m: false
\[33mFoo\[39m: 12
\[33mBar\[39m: false
------------

26 changes: 13 additions & 13 deletions src/components/console/spec/fixtures/text/application_renderexception3_decorated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

\e\[33mIn foo3\.cr line \d+:\e\[0m
\e\[97;41m \e\[0m
\e\[97;41m Third exception <fg=blue;bg=red>comment</> \e\[0m
\e\[97;41m \e\[0m
\e\[33mIn foo3\.cr line \d+:\e\[39m
\e\[97;41m \e\[39;49m
\e\[97;41m Third exception <fg=blue;bg=red>comment</> \e\[39;49m
\e\[97;41m \e\[39;49m

\e\[33mIn foo3\.cr line \d+:\e\[0m
\e\[97;41m \e\[0m
\e\[97;41m Second exception <comment>comment</comment> \e\[0m
\e\[97;41m \e\[0m
\e\[33mIn foo3\.cr line \d+:\e\[39m
\e\[97;41m \e\[39;49m
\e\[97;41m Second exception <comment>comment</comment> \e\[39;49m
\e\[97;41m \e\[39;49m

\e\[33mIn foo3\.cr line \d+:\e\[0m
\e\[97;41m \e\[0m
\e\[97;41m First exception <p>this is html</p> \e\[0m
\e\[97;41m \e\[0m
\e\[33mIn foo3\.cr line \d+:\e\[39m
\e\[97;41m \e\[39;49m
\e\[97;41m First exception <p>this is html</p> \e\[39;49m
\e\[97;41m \e\[39;49m

\e\[32mfoo3:bar\e\[0m
\e\[32mfoo3:bar\e\[39m

Loading
Loading