Commit e14a69d

authored

Merge pull request #214 from Muscraft/match-group-trailing-line

fix: Match rustc's first group trailing line

2 parents a65bbc2 + 14fb674 commit e14a69dCopy full SHA for e14a69d

File tree

3 files changed

+27

-16

lines changed

examples
- highlight_source.svg
src/renderer
- mod.rs
tests
- formatter.rs

3 files changed

+27

-16

lines changed

`‎examples/highlight_source.svg`

Lines changed: 5 additions & 3 deletions

Loading[フレーム]

`‎src/renderer/mod.rs`

Lines changed: 15 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -351,23 +351,25 @@ impl Renderer {`
`351`	`351`	`peek.is_some() \|\| (g == 0 && group_len > 1),`
`352`	`352`	`);`
`353`	`353`
`354`		`- if g == 0 && group_len > 1{`
	`354`	`+ if g == 0 {`
`355`	`355`	`let current_line = buffer.num_lines();`
`356`		`- if matches!(peek, Some(Element::Title(level)) if level.level.name != Some(None))`
`357`		`- {`
`358`		`- self.draw_col_separator_no_space(`
`359`		`- &mut buffer,`
`360`		`- current_line,`
`361`		`- max_line_num_len + 1,`
`362`		`- );`
`363`		`- // We want to draw the separator when it is`
`364`		`- // requested, or when it is the last element`
`365`		`- } else if peek.is_none() {`
`366`		`- self.draw_col_separator_end(`
	`356`	`+ match peek {`
	`357`	`+ Some(Element::Title(level))`
	`358`	`+ if level.level.name != Some(None) =>`
	`359`	`+ {`
	`360`	`+ self.draw_col_separator_no_space(`
	`361`	`+ &mut buffer,`
	`362`	`+ current_line,`
	`363`	`+ max_line_num_len + 1,`
	`364`	`+ );`
	`365`	`+ }`
	`366`	`+`
	`367`	`+ None if group_len > 1 => self.draw_col_separator_end(`
`367`	`368`	`&mut buffer,`
`368`	`369`	`current_line,`
`369`	`370`	`max_line_num_len + 1,`
`370`		`- );`
	`371`	`+ ),`
	`372`	`+ _ => {}`
`371`	`373`	`}`
`372`	`374`	`}`
`373`	`375`	`}`

`‎tests/formatter.rs`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2021,6 +2021,7 @@ LL │ ┃ Ok("")`
`2021`	`2021`	`LL │ ┃ ))))))))))))))))))))))))))))))`
`2022`	`2022`	`LL │ ┃ ))))))))))))))))))))))))))))));`
`2023`	`2023`	│ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ expected `Atype<Btype<Ctype<..., i32>, i32>, i32>`, found `Result<Result<Result<..., _>, _>, _>`
	`2024`	`+ │`
`2024`	`2025`	├ note: expected struct `Atype<Btype<..., i32>, i32>`
`2025`	`2026`	│ found enum `Result<Result<..., _>, _>`
`2026`	`2027`	`├ note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'`
@@ -2180,6 +2181,7 @@ error: expected item, found `?`
`2180`	`2181`	`\|`
`2181`	`2182`	`1 \| ... 的。这是宽的。这是宽的。这是宽的。这是宽的。这是宽的。*/?`
`2182`	`2183`	`\| ^ expected item`
	`2184`	`+ \|`
`2183`	`2185`	`= note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>`
`2184`	`2186`	`"#]];`
`2185`	`2187`
@@ -2191,6 +2193,7 @@ error: expected item, found `?`
`2191`	`2193`	`│`
`2192`	`2194`	`1 │ ... 宽的。这是宽的。这是宽的。这是宽的。这是宽的。这是宽的。*/?`
`2193`	`2195`	`│ ━ expected item`
	`2196`	`+ │`
`2194`	`2197`	`╰ note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>`
`2195`	`2198`	`"#]];`
`2196`	`2199`	`let renderer_unicode = renderer_ascii.theme(OutputTheme::Unicode);`
@@ -2217,6 +2220,7 @@ error: expected item, found `?`
`2217`	`2220`	`\|`
`2218`	`2221`	`1 \| ... 。这是宽的。这是宽的。这是宽的...`
`2219`	`2222`	`\| ^^ expected item`
	`2223`	`+ \|`
`2220`	`2224`	`= note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>`
`2221`	`2225`	`"#]];`
`2222`	`2226`
@@ -2228,6 +2232,7 @@ error: expected item, found `?`
`2228`	`2232`	`│`
`2229`	`2233`	`1 │ ... 的。这是宽的。这是宽的。这是宽的。...`
`2230`	`2234`	`│ ━━ expected item`
	`2235`	`+ │`
`2231`	`2236`	`╰ note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>`
`2232`	`2237`	`"#]];`
`2233`	`2238`	`let renderer_unicode = renderer_ascii.theme(OutputTheme::Unicode);`
@@ -2254,6 +2259,7 @@ error: expected item, found `?`
`2254`	`2259`	`\|`
`2255`	`2260`	`1 \| ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa*/?`
`2256`	`2261`	`\| ^ expected item`
	`2262`	`+ \|`
`2257`	`2263`	`= note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>`
`2258`	`2264`	`"#]];`
`2259`	`2265`
@@ -2265,6 +2271,7 @@ error: expected item, found `?`
`2265`	`2271`	`│`
`2266`	`2272`	`1 │ ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa*/?`
`2267`	`2273`	`│ ━ expected item`
	`2274`	`+ │`
`2268`	`2275`	`╰ note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>`
`2269`	`2276`	`"#]];`
`2270`	`2277`	`let renderer_unicode = renderer_ascii.theme(OutputTheme::Unicode);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e14a69d

File tree

3 files changed

3 files changed

`‎examples/highlight_source.svg`

`‎src/renderer/mod.rs`

`‎tests/formatter.rs`

0 commit comments