@@ -135,6 +135,7 @@ impl Markdown {
135135 "markup.heading.5",
136136 "markup.heading.6",
137137 ];
138+ const INDENT: &'static str = " ";
138139
139140 pub fn new(contents: String, config_loader: Arc<syntax::Loader>) -> Self {
140141 Self {
@@ -144,8 +145,12 @@ impl Markdown {
144145 }
145146
146147 fn parse(&self, theme: Option<&Theme>) -> tui::text::Text<'_> {
147− // // also 2021-03-04T16:33:58.553 helix_lsp::transport [INFO] <- {"contents":{"kind":"markdown","value":"\n```rust\ncore::num\n```\n\n```rust\npub const fn saturating_sub(self, rhs:Self) ->Self\n```\n\n---\n\n```rust\n```"},"range":{"end":{"character":61,"line":101},"start":{"character":47,"line":101}}}
148− // let text = "\n```rust\ncore::iter::traits::iterator::Iterator\n```\n\n```rust\nfn collect<B: FromIterator<Self::Item>>(self) -> B\nwhere\n Self: Sized,\n```\n\n---\n\nTransforms an iterator into a collection.\n\n`collect()` can take anything iterable, and turn it into a relevant\ncollection. This is one of the more powerful methods in the standard\nlibrary, used in a variety of contexts.\n\nThe most basic pattern in which `collect()` is used is to turn one\ncollection into another. You take a collection, call [`iter`](https://doc.rust-lang.org/nightly/core/iter/traits/iterator/trait.Iterator.html) on it,\ndo a bunch of transformations, and then `collect()` at the end.\n\n`collect()` can also create instances of types that are not typical\ncollections. For example, a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html) can be built from [`char`](type@char)s,\nand an iterator of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result<Collection<T>, E>`. See the examples below for more.\n\nBecause `collect()` is so general, it can cause problems with type\ninference. As such, `collect()` is one of the few times you'll see\nthe syntax affectionately known as the 'turbofish': `::<>`. This\nhelps the inference algorithm understand specifically which collection\nyou're trying to collect into.\n\n# Examples\n\nBasic usage:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled: Vec<i32> = a.iter()\n .map(|&x| x * 2)\n .collect();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nNote that we needed the `: Vec<i32>` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque<T>`](https://doc.rust-lang.org/nightly/core/iter/std/collections/struct.VecDeque.html) instead:\n\n```rust\nuse std::collections::VecDeque;\n\nlet a = [1, 2, 3];\n\nlet doubled: VecDeque<i32> = a.iter().map(|&x| x * 2).collect();\n\nassert_eq!(2, doubled[0]);\nassert_eq!(4, doubled[1]);\nassert_eq!(6, doubled[2]);\n```\n\nUsing the 'turbofish' instead of annotating `doubled`:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<i32>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nBecause `collect()` only cares about what you're collecting into, you can\nstill use a partial type hint, `_`, with the turbofish:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<_>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nUsing `collect()` to make a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html):\n\n```rust\nlet chars = ['g', 'd', 'k', 'k', 'n'];\n\nlet hello: String = chars.iter()\n .map(|&x| x as u8)\n .map(|x| (x + 1) as char)\n .collect();\n\nassert_eq!(\"hello\", hello);\n```\n\nIf you have a list of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html)s, you can use `collect()` to\nsee if any of them failed:\n\n```rust\nlet results = [Ok(1), Err(\"nope\"), Ok(3), Err(\"bad\")];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the first error\nassert_eq!(Err(\"nope\"), result);\n\nlet results = [Ok(1), Ok(3)];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the list of answers\nassert_eq!(Ok(vec![1, 3]), result);\n```";
148+ fn push_line<'a>(spans: &mut Vec<Span<'a>>, lines: &mut Vec<Spans<'a>>) {
149+ let spans = std::mem::take(spans);
150+ if !spans.is_empty() {
151+ lines.push(Spans::from(spans));
152+ }
153+ }
149154
150155 let mut options = Options::empty();
151156 options.insert(Options::ENABLE_STRIKETHROUGH);
@@ -155,6 +160,15 @@ impl Markdown {
155160 let mut tags = Vec::new();
156161 let mut spans = Vec::new();
157162 let mut lines = Vec::new();
163+ let mut list_stack = Vec::new();
164+
165+ let get_indent = |level: usize| {
166+ if level < 1 {
167+ String::new()
168+ } else {
169+ Self::INDENT.repeat(level - 1)
170+ }
171+ };
158172
159173 let get_theme = |key: &str| -> Style { theme.map(|t| t.get(key)).unwrap_or_default() };
160174 let text_style = get_theme(Self::TEXT_STYLE);
@@ -164,22 +178,53 @@ impl Markdown {
164178 .map(|key| get_theme(key))
165179 .collect();
166180
167− let mut list_stack = Vec::new();
168−
169181 for event in parser {
170182 match event {
171− Event::Start(Tag::List(list)) => list_stack.push(list),
183+ Event::Start(Tag::List(list)) => {
184+ // if the list stack is not empty this is a sub list, in that
185+ // case we need to push the current line before proceeding
186+ if !list_stack.is_empty() {
187+ push_line(&mut spans, &mut lines);
188+ }
189+
190+ list_stack.push(list);
191+ }
172192 Event::End(Tag::List(_)) => {
173193 list_stack.pop();
174− // whenever list closes, new line
175− lines.push(Spans::default());
194+
195+ // whenever top-level list closes, empty line
196+ if list_stack.is_empty() {
197+ lines.push(Spans::default());
198+ }
176199 }
177200 Event::Start(Tag::Item) => {
201+ if list_stack.is_empty() {
202+ log::warn!("markdown parsing error, list item without list");
203+ }
204+
178205 tags.push(Tag::Item);
179− spans.push(Span::from("- "));
206+
207+ // get the approriate bullet for the current list
208+ let bullet = list_stack
209+ .last()
210+ .unwrap_or(&None) // use the '- ' bullet in case the list stack would be empty
211+ .map_or(String::from("- "), |number| format!("{}. ", number));
212+
213+ // increment the current list number if there is one
214+ if let Some(v) = list_stack.last_mut().unwrap_or(&mut None).as_mut() {
215+ *v += 1;
216+ }
217+
218+ let prefix = get_indent(list_stack.len()) + bullet.as_str();
219+ spans.push(Span::from(prefix));
180220 }
181221 Event::Start(tag) => {
182222 tags.push(tag);
223+ if spans.is_empty() && !list_stack.is_empty() {
224+ // TODO: could push indent + 2 or 3 spaces to align with
225+ // the rest of the list.
226+ spans.push(Span::from(get_indent(list_stack.len())));
227+ }
183228 }
184229 Event::End(tag) => {
185230 tags.pop();
@@ -188,15 +233,12 @@ impl Markdown {
188233 | Tag::Paragraph
189234 | Tag::CodeBlock(CodeBlockKind::Fenced(_))
190235 | Tag::Item => {
191− let spans = std::mem::take(&mut spans);
192− if !spans.is_empty() {
193− lines.push(Spans::from(spans));
194− }
236+ push_line(&mut spans, &mut lines);
195237 }
196238 _ => (),
197239 }
198240
199− // whenever heading, code block or paragraph closes, new line
241+ // whenever heading, code block or paragraph closes, empty line
200242 match tag {
201243 Tag::Heading(_, _, _)
202244 | Tag::Paragraph
@@ -237,9 +279,12 @@ impl Markdown {
237279 spans.push(Span::styled(text, code_style));
238280 }
239281 Event::SoftBreak | Event::HardBreak => {
240− // let spans = std::mem::replace(&mut spans, Vec::new());
241− // lines.push(Spans::from(spans));
242− spans.push(Span::raw(" "));
282+ push_line(&mut spans, &mut lines);
283+ if !list_stack.is_empty() {
284+ // TODO: could push indent + 2 or 3 spaces to align with
285+ // the rest of the list.
286+ spans.push(Span::from(get_indent(list_stack.len())));
287+ }
243288 }
244289 Event::Rule => {
245290 lines.push(Spans::from(Span::styled("---", code_style)));