Skip to content

Commit dba08bf

Browse files
committed
Indent uncontinued chains to block level
1 parent 1acce55 commit dba08bf

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

src/chains.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ pub fn rewrite_chain(mut expr: &ast::Expr,
4545
let parent_rewrite = try_opt!(expr.rewrite(context, width, offset));
4646
let (extra_indent, extend) = if !parent_rewrite.contains('\n') && is_continuable(parent) ||
4747
parent_rewrite.len() <= context.config.tab_spaces {
48-
(parent_rewrite.len(), true)
48+
(Indent::new(0, parent_rewrite.len()), true)
4949
} else {
50-
(context.config.tab_spaces, false)
50+
(Indent::new(context.config.tab_spaces, 0), false)
5151
};
5252
let indent = offset + extra_indent;
5353

54-
let max_width = try_opt!(width.checked_sub(extra_indent));
54+
let max_width = try_opt!(width.checked_sub(extra_indent.width()));
5555
let mut rewrites = try_opt!(subexpr_list.iter()
5656
.rev()
5757
.map(|e| {

tests/source/hard-tabs.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ unsafe // So this is a very long comment.
3131
{
3232
}
3333

34+
let chain = funktion_kall().go_to_next_line_with_tab().go_to_next_line_with_tab().go_to_next_line_with_tab();
35+
3436
let z = [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzz, q];
3537

3638
fn generic<T>(arg: T) -> &SomeType

tests/target/hard-tabs.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ fn main() {
5050
* Will it still format correctly? */ {
5151
}
5252

53+
let chain = funktion_kall()
54+
.go_to_next_line_with_tab()
55+
.go_to_next_line_with_tab()
56+
.go_to_next_line_with_tab();
57+
5358
let z = [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
5459
yyyyyyyyyyyyyyyyyyyyyyyyyyy,
5560
zzzzzzzzzzzzzzzzzz,

0 commit comments

Comments
 (0)