troldspejlet/forgejo-cli
troldspejlet/forgejo-cli
1
0
Fork 0
mirror of https://codeberg.org/Cyborus/forgejo-cli.git synced 2024-09-20 08:05:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix trailing paragraph newlines in markdown rendering' (#79) from trailing-newline-fix into main

Browse source 
Reviewed-on: https://codeberg.org/Cyborus/forgejo-cli/pulls/79
This commit is contained in:
Cyborus 2024-06-18 03:56:34 +00:00
commit a0bab975d4
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.rs
View file

@ -357,14 +357,17 @@ fn markdown(text: &str) -> String {
ansi_printer.pause_style(); ansi_printer.pause_style();
ansi_printer.prefix(); ansi_printer.prefix();
ansi_printer.resume_style(); ansi_printer.resume_style();
for (item, side) in render_queue { let mut iter = render_queue.into_iter().peekable();
while let Some((item, side)) = iter.next() {
use comrak::nodes::NodeValue; use comrak::nodes::NodeValue;
use Side::*; use Side::*;
match (&item.data.borrow().value, side) { match (&item.data.borrow().value, side) {
(NodeValue::Paragraph, Start) => (), (NodeValue::Paragraph, Start) => (),
(NodeValue::Paragraph, End) => { (NodeValue::Paragraph, End) => {
ansi_printer.newline(); if iter.peek().is_some_and(|(_, side)| *side == Start) {
ansi_printer.newline(); ansi_printer.newline();
ansi_printer.newline();
}
} }
(NodeValue::Text(s), Start) => ansi_printer.text(s), (NodeValue::Text(s), Start) => ansi_printer.text(s),
(NodeValue::Link(_), Start) => { (NodeValue::Link(_), Start) => {
@ -439,6 +442,7 @@ fn markdown(text: &str) -> String {
(NodeValue::Heading(_), End) => { (NodeValue::Heading(_), End) => {
ansi_printer.reset(); ansi_printer.reset();
ansi_printer.newline(); ansi_printer.newline();
ansi_printer.newline();
} }
(NodeValue::List(list), Start) => { (NodeValue::List(list), Start) => {
@ -450,6 +454,7 @@ fn markdown(text: &str) -> String {
if list.list_type == comrak::nodes::ListType::Ordered { if list.list_type == comrak::nodes::ListType::Ordered {
list_numbers.pop(); list_numbers.pop();
} }
ansi_printer.newline();
} }
(NodeValue::Item(list), Start) => { (NodeValue::Item(list), Start) => {
if list.list_type == comrak::nodes::ListType::Ordered { if list.list_type == comrak::nodes::ListType::Ordered {
@ -467,6 +472,9 @@ fn markdown(text: &str) -> String {
ansi_printer.cur_line_len += 2; ansi_printer.cur_line_len += 2;
} }
} }
(NodeValue::Item(_), End) => {
ansi_printer.newline();
}
(NodeValue::LineBreak, Start) => ansi_printer.newline(), (NodeValue::LineBreak, Start) => ansi_printer.newline(),
(NodeValue::SoftBreak, Start) => ansi_printer.newline(), (NodeValue::SoftBreak, Start) => ansi_printer.newline(),