Commit Graph

982 Commits

Author SHA1 Message Date
Seiichi Uchida 2d0487164f Add a test for #3137 2018-10-26 16:36:01 +09:00
Nick Cameron 825207dd2e Merge pull request #3126 from topecongiro/issue-3117
Use correct width when formatting type on local statement
2018-10-23 10:35:32 +13:00
Seiichi Uchida cf44c079c1 Add a test for #3117 2018-10-22 22:20:48 +09:00
Matthias Krüger b25f974c0d fix a few typos found via codespell. 2018-10-19 12:28:00 +02:00
Nick Cameron e633f2b3f5 Merge pull request #3109 from scampi/issue-3038
force a newline after the `if` condition if there is a different indentation level
2018-10-18 19:56:17 +13:00
Seiichi Uchida 8c4e92a14e Catch parser panic in format_snippet (#3103) 2018-10-17 14:21:04 +09:00
Stéphane Campinas 30c06da781 force a newline after the if condition if there is a different
indentation level
2018-10-15 23:24:35 +02:00
Nick Cameron 5f02be6294 Merge pull request #3102 from nrc/arm-guard-newline
Only put `{` on a newline in a match arm where necessary
2018-10-16 09:06:15 +13:00
Nick Cameron bc4414e53c Merge pull request #3101 from nrc/pair-newline
Simplify multi-lining binop exprs
2018-10-16 09:01:40 +13:00
Daniele D'Orazio 075aa909cd try to fix comment bad wrapping (#3099) 2018-10-15 11:18:37 +09:00
Nick Cameron e2be62c7a5 Add test (issue 3005) 2018-10-15 14:09:31 +13:00
Nick Cameron 7be173eb8c add test 2018-10-15 12:09:53 +13:00
Nick Cameron a6ef302236 Merge pull request #3100 from topecongiro/issue-3092
Fix poor formatting of empty trait with generic bounds
2018-10-15 08:07:59 +12:00
Nick Cameron 2f8c1fea72 Merge pull request #3093 from scampi/issue2633
do not vertically align list items in case the tactic is Horizontal
2018-10-15 07:57:39 +12:00
Nick Cameron 945fb504b1 Merge pull request #3091 from topecongiro/issue-3060
Do not add parens around lifetimes
2018-10-15 07:40:34 +12:00
Seiichi Uchida 476992a15d Add a test for #3092 2018-10-14 21:47:50 +09:00
Otavio Salvador ef59b34cd7 Avoid control flow expressions conditions to go multi line
Extends the multi line condition to over other control flow
expressions, it now covers: `if`, `if let`, `for`, `loop`, `while`,
`while let` and `match`.

Refs: #3029

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-13 14:12:43 -03:00
Stéphane Campinas 8f7a0470b0 handle lines prefixed with a # inside code blocks 2018-10-13 09:57:43 +02:00
Otavio Salvador 8feeddf1f8 Only combine match if its condition expression fits in a single line
This improves the formatting and reading of code avoiding the
condition expression to be rewrite, if it goes multi line.

Fixes: #3029.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-12 20:12:45 -03:00
Seiichi Uchida 6b33043e06 Add a test for #3060 2018-10-13 00:42:22 +09:00
Nick Cameron 8b709c0019 Add attr_fn_like_width to the width heuristics
It is a bit larger than than `fn_call_width` which we used previously, so fewer attributes get reformatted.

Closes #2929
2018-10-12 15:20:42 +13:00
Seiichi Uchida b2de574848 Add format_doc_comments 2018-10-11 23:34:36 +09:00
Nick Cameron 4895699e88 Merge pull request #3083 from scampi/itemized_blocks
Handle itemized blocks in comments
2018-10-10 10:38:54 +12:00
Stéphane Campinas 375c87820f rewrite_string: detect when a url is being split and place the new line
after it
2018-10-09 21:47:32 +02:00
Stéphane Campinas c0b7222e2d handle itemized items inside comments 2018-10-09 00:44:59 +02:00
Seiichi Uchida a925bdf092 Add a test for #3031 and update test
No combining for an item-like macro argument.
2018-10-08 13:50:00 +09:00
Nick Cameron 1b2e72726f Merge pull request #3078 from YaLTeR/fix-closure-indentation
Fix inconsistent overflow behavior in Visual style
2018-10-08 14:38:49 +13:00
Nick Cameron 832a912f79 Merge pull request #3077 from YaLTeR/fix-extra-commas
Get rid of extra commas in Visual struct literal formatting
2018-10-08 14:37:48 +13:00
Nick Cameron 4dc5557625 Merge pull request #3070 from topecongiro/issue-3030
Format a paren expr with double slash comment
2018-10-08 13:05:36 +13:00
Ivan Molodetskikh 6dc9b96651 Add a test for #3049 2018-10-06 16:32:27 +03:00
Ivan Molodetskikh cfe20fe585 Add a test for #3066 2018-10-06 10:59:47 +03:00
Seiichi Uchida efe24bd7e7 Add a test for #3030 2018-10-01 00:06:37 +09:00
Seiichi Uchida 4a15875f07 Add a test for #3003
and run cargo fmt.
2018-09-30 23:28:03 +09:00
Nick Cameron 3dc6eed601 Merge pull request #2816 from moxian/enum-discrim
Add option to vertically align enum discriminants.
2018-09-28 21:48:57 +12:00
Stéphane Campinas 2bcc3a9302 do not format a code block in documentation if it is annotated with ignore or text (#3058) 2018-09-28 11:06:29 +09:00
moxian 65ae0b9a09 Change enum align semantics to care about absolute length, rather than difference.
If we're only aligning enum discriminants that are "not too far apart
(length-wise)", then this works really well for enums with
consistently-long or consistently-short idents, but not for the mixed
ones.
However, consistently-long idents is somewhate of an uncommon case and
overlong idents may be allowed to be formatted suboptimally if that
makes mixed-length idents work better (and it does in this case).
2018-09-26 18:47:17 +00:00
moxian cc22869fb4 Add option to vertically align enum discriminants. 2018-09-26 14:35:38 +00:00
Nick Cameron ac6871f376 Merge pull request #3048 from emilio/merged-comments
lists: Detect block comment by starting from the end.
2018-09-24 14:22:01 +12:00
Emilio Cobos Álvarez 66c15e46ba lists: Detect block comment by starting from the end.
The issue with the current code is that comments are collapsed, so comments like
the one from the test end up in a string like:

```
"// this is a single line comment\n/* block = */"
```

I chose to fix it by detecting whether we're in a block comment starting from
the end instead, and tested a single-line comment ended in `*/` just for sanity,
ensuring line breaks are not removed in that case, which would break the
formatting.

The right fix eventually is probably to lex the comments properly, but this does
the work for now, I guess :)

Fixes #3025
2018-09-22 12:16:38 +02:00
Stéphane Campinas 5fdb6db136 Prevent right-shifting of block comments with bare lines.
Lines that didn't start with a comment sigil were returned unchanged in
comment::rewrite_comment. Then these unchanged lines were indented in
MacroBranch::rewrite.
2018-09-22 00:09:11 +02:00
Seiichi Uchida ec32c961d3 Add a test for #3040 2018-09-21 00:57:46 +09:00
Seiichi Uchida 8021b29405 Add a test for #3006 2018-09-19 22:33:25 +09:00
Nick Cameron 829dbfabe9 Merge pull request #3028 from scampi/issue2973
Fix indent computation of a macro with braces.
2018-09-19 11:31:28 +12:00
Nick Cameron 1739041f03 Merge pull request #3002 from lqd/normalize-doc-attributes
normalize_doc_attributes option: convert doc attributes to comments
2018-09-19 11:05:27 +12:00
Nick Cameron 2267c2cddc Merge pull request #3001 from scampi/issue2977
propagate errors about failing to rewrite a macro
2018-09-19 10:43:21 +12:00
Seiichi Uchida 661bea71c1 Merge pull request #3013 from YaLTeR/fix-issue-2985
Fix wrong shape for last chain items for indent_style = "Visual"
2018-09-18 20:21:21 +09:00
Nick Cameron 01c14a2058 Merge pull request #3012 from YaLTeR/fix-issue-2496
Fix match arm block flattening
2018-09-18 21:12:12 +12:00
Stéphane Campinas c3edf6d3a1 Fix indent computation of a macro with braces.
The leading whitespace of a multine string was taken into account when
computing the `min_prefix_space_width`, even if that line couldn't be
trimmed. The consequence is it was always shifting the macro's content
to the right.
2018-09-18 00:01:51 +02:00
Rémy Rakic 0c73b9414b add test ensuring only doc = "" attributes are normalized to comments
The other shapes of doc attributes shouldn't be normalized or modified.
2018-09-13 02:40:24 +02:00
Rémy Rakic cbc58410d9 add tests interleaving doc attrib comments and regular comments 2018-09-13 02:27:09 +02:00