From 8e0144116362b3c11a6b26d44e073063ca231277 Mon Sep 17 00:00:00 2001 From: John Chen Date: Sun, 1 Sep 2024 06:05:08 -0400 Subject: [PATCH] Update file names --- src/expr.rs | 36 ++++++------------- .../style-team#189.rs} | 0 .../style-team#189.rs} | 0 3 files changed, 11 insertions(+), 25 deletions(-) rename tests/source/{issue-189.rs => rust-lang/style-team#189.rs} (100%) rename tests/target/{issue-189.rs => rust-lang/style-team#189.rs} (100%) diff --git a/src/expr.rs b/src/expr.rs index 00aa1ab51fb..82ac962a7ad 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -2060,38 +2060,24 @@ fn rewrite_assignment( let lhs_shape = shape.sub_width(operator_str.len() + 1)?; let lhs_str = format!("{} {}", lhs.rewrite(context, lhs_shape)?, operator_str); - let lhs_lines: Vec<&str> = lhs_str.split("\n").collect(); - - let mut rhs_shape = shape.clone(); - - for line in lhs_lines.into_iter().rev() { - let mut indent_width = 0; - let mut first_char = ' '; - for char in line.chars() { - if char != ' ' { - first_char = char; - break; - } else { - indent_width += 1; - } - } - - if first_char != '/' { - let indent = Indent::from_width(&context.config, indent_width); - rhs_shape = Shape::indented(indent, &context.config); - break; - } - } + let last_line = lhs_str.rsplit_once("\n"); + let my_shape = match last_line { + Some(line) => { + println!("line={line:?}"); + println!("{:?}", shape.to_string_with_newline(&context.config)); + shape + } + _ => shape, + }; - println!("config={:?}", context.config.max_width()); println!("old shape={shape:?}"); - println!("new shape={rhs_shape:?}"); + println!("new shape={my_shape:?}"); rewrite_assign_rhs( context, lhs_str, rhs, &RhsAssignKind::Expr(&rhs.kind, rhs.span), - rhs_shape, + shape, ) } diff --git a/tests/source/issue-189.rs b/tests/source/rust-lang/style-team#189.rs similarity index 100% rename from tests/source/issue-189.rs rename to tests/source/rust-lang/style-team#189.rs diff --git a/tests/target/issue-189.rs b/tests/target/rust-lang/style-team#189.rs similarity index 100% rename from tests/target/issue-189.rs rename to tests/target/rust-lang/style-team#189.rs