Commit 1d8c41f

authored

Merge pull request #266 from Muscraft/suggestion-window

fix: Continue suggestion window if there are more elements

2 parents 65b4022 + f4c3a2c commit 1d8c41fCopy full SHA for 1d8c41f

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,8 @@ impl Renderer {`
`367`	`367`	`primary_path.or(og_primary_path),`
`368`	`368`	`matches_previous_suggestion,`
`369`	`369`	`is_first,`
	`370`	`+ //matches!(peek, Some(Element::Message(_) \| Element::Padding(_))),`
	`371`	`+ peek.is_some(),`
`370`	`372`	`);`
`371`	`373`
`372`	`374`	`if matches!(peek, Some(Element::Suggestion(_))) {`
`@@ -1619,6 +1621,7 @@ impl Renderer {`
`1619`	`1621`	`primary_path: Option<&Cow<'_, str>>,`
`1620`	`1622`	`matches_previous_suggestion: bool,`
`1621`	`1623`	`is_first: bool,`
	`1624`	`+ is_cont: bool,`
`1622`	`1625`	`) {`
`1623`	`1626`	`let suggestions = sm.splice_lines(suggestion.markers.clone());`
`1624`	`1627`
`@@ -2010,7 +2013,11 @@ impl Renderer {`
`2010`	`2013`	`\| DisplaySuggestion::Underline => row_num - 1,`
`2011`	`2014`	`DisplaySuggestion::None => row_num,`
`2012`	`2015`	`};`
`2013`		`- self.draw_col_separator_end(buffer, row, max_line_num_len + 1);`
	`2016`	`+ if is_cont {`
	`2017`	`+ self.draw_col_separator_no_space(buffer, row, max_line_num_len + 1);`
	`2018`	`+ } else {`
	`2019`	`+ self.draw_col_separator_end(buffer, row, max_line_num_len + 1);`
	`2020`	`+ }`
`2014`	`2021`	`row_num = row + 1;`
`2015`	`2022`	`}`
`2016`	`2023`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4071,7 +4071,7 @@ LL + use std::collections::binary_heap::IntoIter;`
`4071`	`4071`	`LL + use std::collections::btree_map::IntoIter;`
`4072`	`4072`	`├╴`
`4073`	`4073`	`LL + use std::collections::btree_set::IntoIter;`
`4074`		`- ╰╴`
	`4074`	`+ │`
`4075`	`4075`	`╰ and 9 other candidates`
`4076`	`4076`	`"#]];`
`4077`	`4077`	`let renderer = renderer.theme(OutputTheme::Unicode);`
`@@ -4392,7 +4392,7 @@ LL - wtf: None,`
`4392`	`4392`	`LL - x: (),`
`4393`	`4393`	`LL - })),`
`4394`	`4394`	`LL + wtf: Some(Box::new_in(_, _)),`
`4395`		`- ╰╴`
	`4395`	`+ │`
`4396`	`4396`	`╰ and 12 other candidates`
`4397`	`4397`	help: consider using the `Default` trait
`4398`	`4398`	`╭╴`
`@@ -4528,7 +4528,7 @@ LL │ t.a1.bar();`
`4528`	`4528`	`LL │ t.a2.bar();`
`4529`	`4529`	`├╴ +++`
`4530`	`4530`	`LL │ t.a3.bar();`
`4531`		`- ╰╴ +++`
	`4531`	`+ │ +++`
`4532`	`4532`	`╰ and 6 other candidates`
`4533`	`4533`	`"#]];`
`4534`	`4534`	`let renderer = renderer.theme(OutputTheme::Unicode);`

Comments

(0)