Document which comments are excluded from wrapping (#5637)

* Document which comments are excluded from wrapping

Cf: https://github.com/rust-lang/rustfmt/issues/5634

* Add examples in wrap_commments doc

* fix failling tests
This commit is contained in:
Arthur Carcano 2023-01-28 22:16:46 +01:00 committed by GitHub
parent 1d8491b120
commit 567bd97723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions

View File

@ -2997,6 +2997,10 @@ See also [`brace_style`](#brace_style), [`control_brace_style`](#control_brace_s
Break comments to fit on the line Break comments to fit on the line
Note that no wrapping will happen if:
1. The comment is the start of a markdown header doc comment
2. An URL was found in the comment
- **Default value**: `false` - **Default value**: `false`
- **Possible values**: `true`, `false` - **Possible values**: `true`, `false`
- **Stable**: No (tracking issue: [#3347](https://github.com/rust-lang/rustfmt/issues/3347)) - **Stable**: No (tracking issue: [#3347](https://github.com/rust-lang/rustfmt/issues/3347))
@ -3011,6 +3015,11 @@ Break comments to fit on the line
// commodo consequat. // commodo consequat.
// Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. // Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
// Information on the lorem ipsum can be found at the following url: https://en.wikipedia.org/wiki/Lorem_ipsum. Its text is: lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
/// # This doc comment is a very long header (it starts with a '#'). Had it not been a header it would have been wrapped. But because it is a header, it will not be. That is because wrapping a markdown header breaks it.
struct Foo {}
``` ```
#### `true`: #### `true`:
@ -3021,6 +3030,17 @@ Break comments to fit on the line
// magna aliqua. Ut enim ad minim veniam, quis nostrud // magna aliqua. Ut enim ad minim veniam, quis nostrud
// exercitation ullamco laboris nisi ut aliquip ex ea // exercitation ullamco laboris nisi ut aliquip ex ea
// commodo consequat. // commodo consequat.
// Lorem ipsum dolor sit amet, consectetur adipiscing elit,
// sed do eiusmod tempor incididunt ut labore et dolore
// magna aliqua. Ut enim ad minim veniam, quis nostrud
// exercitation ullamco laboris nisi ut aliquip ex ea
// commodo consequat.
// Information on the lorem ipsum can be found at the following url: https://en.wikipedia.org/wiki/Lorem_ipsum. Its text is: lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
/// # This doc comment is a very long header (it starts with a '#'). Had it not been a header it would have been wrapped. But because it is a header, it will not be. That is because wrapping a markdown header breaks it.
struct Foo {}
``` ```
# Internal Options # Internal Options

View File

@ -801,6 +801,8 @@ fn handle_line(
// 2) The comment is not the start of a markdown header doc comment // 2) The comment is not the start of a markdown header doc comment
// 3) The comment width exceeds the shape's width // 3) The comment width exceeds the shape's width
// 4) No URLS were found in the comment // 4) No URLS were found in the comment
// If this changes, the documentation in ../Configurations.md#wrap_comments
// should be changed accordingly.
let should_wrap_comment = self.fmt.config.wrap_comments() let should_wrap_comment = self.fmt.config.wrap_comments()
&& !is_markdown_header_doc_comment && !is_markdown_header_doc_comment
&& unicode_str_width(line) > self.fmt.shape.width && unicode_str_width(line) > self.fmt.shape.width