Don't wrap comments that are part of a table #5475
Conversation
src/comment.rs
Outdated
| @@ -939,6 +940,18 @@ fn has_url(s: &str) -> bool { | |||
| || REFERENCE_LINK_URL.is_match(s) | |||
| } | |||
|
|
|||
| /// Returns true if the given string may be part of a Markdown talble. | |||
There was a problem hiding this comment.
typo
| /// Returns true if the given string may be part of a Markdown talble. | |
| /// Returns true if the given string may be part of a Markdown table. |
tests/target/issue-4210.rs
Outdated
| // rustfmt-wrap_comments: true | ||
|
|
||
| /// Table that is > 80 symbols: | ||
| /// | ||
| /// | table | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | | ||
| /// |-------|-----------------------------------------------------------------------------| | ||
| /// | val | x | | ||
| pub struct Item; | ||
|
|
||
| /// Table that is > 80 symbols: | ||
| /// | ||
| /// | table | xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||
| /// |-------|----------------------------------------------------------------------------- | ||
| /// | val | x | ||
| pub struct Item; |
There was a problem hiding this comment.
I think these are good tests ported over from the backport, however I'd like to build on these before merging.
I'd like to see a test case for wrap_comments=false (just for completeness). Additionally, I'd like to add some text before the table that gets wrapped when wrap_comments=true to further emphasize that the table isn't being wrapped even when the text is wrapped.
I also think we should add a row to the table (besides the header) that contains a long line to show that it also isn't wrapped.
|
Any chance of merging this one? |
|
@l4l we plan to merge this and all other PRs labeled as |
calebcartwright
added
release-notes
Closes #4210
This is a trivial cherry-pick of #4214 onto the new
masterbranch.