mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Indent uncontinued chains to block level

Browse Source
This commit is contained in:
Marcus Klaas 2015-10-14 19:41:29 +02:00
parent 1acce558be
commit dba08bf898
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chains.rs
View File

@ -45,13 +45,13 @@ pub fn rewrite_chain(mut expr: &ast::Expr,
let parent_rewrite = try_opt!(expr.rewrite(context, width, offset));
let (extra_indent, extend) = if !parent_rewrite.contains('\n') && is_continuable(parent) ||
parent_rewrite.len() <= context.config.tab_spaces {
(parent_rewrite.len(), true)
(Indent::new(0, parent_rewrite.len()), true)
} else {
(context.config.tab_spaces, false)
(Indent::new(context.config.tab_spaces, 0), false)
};
let indent = offset + extra_indent;
let max_width = try_opt!(width.checked_sub(extra_indent));
let max_width = try_opt!(width.checked_sub(extra_indent.width()));
let mut rewrites = try_opt!(subexpr_list.iter()
.rev()
.map(|e| {

2
tests/source/hard-tabs.rs
View File

@ -31,6 +31,8 @@ unsafe // So this is a very long comment.
{
}
let chain = funktion_kall().go_to_next_line_with_tab().go_to_next_line_with_tab().go_to_next_line_with_tab();
let z = [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzz, q];
fn generic<T>(arg: T) -> &SomeType

5
tests/target/hard-tabs.rs
View File

@ -50,6 +50,11 @@ fn main() {
* Will it still format correctly? */ {
}
let chain = funktion_kall()
.go_to_next_line_with_tab()
.go_to_next_line_with_tab()
.go_to_next_line_with_tab();
let z = [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
yyyyyyyyyyyyyyyyyyyyyyyyyyy,
zzzzzzzzzzzzzzzzzz,