e053277 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Do not add extra line breaks in markdown lists (#2689)

e053277Frojdholm4 years ago

helix-term/src/ui/markdown.rs+11−1

compare with master

unifiedsplit

@@ -171,6 +171,8 @@ impl Markdown {

171 Event::Start(Tag::List(list)) => list_stack.push(list),

172 Event::End(Tag::List(_)) => {

173 list_stack.pop();

174+ // whenever list closes, new line

175+ lines.push(Spans::default());

174 }

176 }

175 Event::Start(Tag::Item) => {

177 Event::Start(Tag::Item) => {

176 tags.push(Tag::Item);

178 tags.push(Tag::Item);

@@ -186,11 +188,19 @@ impl Markdown {

186 | Tag::Paragraph

188 | Tag::Paragraph

187 | Tag::CodeBlock(CodeBlockKind::Fenced(_))

189 | Tag::CodeBlock(CodeBlockKind::Fenced(_))

188 | Tag::Item => {

190 | Tag::Item => {

189− // whenever code block or paragraph closes, new line

190 let spans = std::mem::take(&mut spans);

191 let spans = std::mem::take(&mut spans);

191 if !spans.is_empty() {

192 if !spans.is_empty() {

192 lines.push(Spans::from(spans));

193 lines.push(Spans::from(spans));

193 }

194 }

195+ }

196+ _ => (),

197+ }

198+

199+ // whenever heading, code block or paragraph closes, new line

200+ match tag {

201+ Tag::Heading(_, _, _)

202+ | Tag::Paragraph

203+ | Tag::CodeBlock(CodeBlockKind::Fenced(_)) => {

194 lines.push(Spans::default());

204 lines.push(Spans::default());

195 }

205 }

196 _ => (),

206 _ => (),