Changes per reviewer comments

Author: davidBar-On

src/items.rs

@@ -113,13 +113,13 @@ impl Rewrite for ast::Local {
         result.push_str(&infix);
 
         if let Some((init, _els)) = self.kind.init_else_opt() {
-            let base_span = if let Some(ref ty) = self.ty {
-                mk_sp(ty.span.hi(), self.span.hi())
+            let lhs_to_expr_span = if let Some(ref ty) = self.ty {
+                ty.span.between(init.span)
             } else {
-                mk_sp(self.pat.span.hi(), self.span.hi())
+                self.pat.span.between(init.span)
             };
 
-            result = rewrite_initializer_expr(context, init, result, base_span, shape)?;
+            result = rewrite_initializer_expr(context, init, result, lhs_to_expr_span, shape)?;
         }
         // todo else of kind.init_else_opt
 
@@ -132,7 +132,7 @@ fn rewrite_initializer_expr(
     context: &RewriteContext<'_>,
     init: &ast::Expr,
     lhs: String,
-    base_span: Span,
+    lhs_to_rhs_span: Span,
     shape: Shape,
 ) -> Option<String> {
     if context.config.version() == Version::One {
@@ -148,7 +148,7 @@ fn rewrite_initializer_expr(
         )
     } else {
         // Version:Two+
-        let comment_lo = context.snippet_provider.span_after(base_span, "=");
+        let comment_lo = context.snippet_provider.span_after(lhs_to_rhs_span, "=");
         let comment_span = mk_sp(comment_lo, init.span.lo());
 
         // 1 = trailing semicolon;

tests/source/lhs-to-rhs-between-comments/assignment-multi-line-comments.rs

@@ -42,6 +42,32 @@ var = // Line comment
 * Block comment line 2 */ seventh;
 }
 
+// ": type =" Assignemnt - Multiline Line and Block comments
+fn main () {
+let var: int = /* Block comment line 1 
+* Block comment line 2
+* Block comment line 3 */ first;
+let var: u64 = /* Block comment line 1 
+* Block comment line 2
+* Block comment line 3 */ second;
+let var: f32 = // Line comment 1
+// Line comment 2
+// Line comment 3
+third;
+let var: bool = // Line comment 
+/* Block comment line 1
+* Block comment line 2 */ forth;
+let var: char = /* Block comment single line */ 
+// Line comment
+/* Block comment line 1
+* Block comment line 2 */ fifth;
+let var: str = /* Block comment single line 1 */ 
+/* Block comment single line 2*/ fsixth;
+let var: usize = /* Block comment single line 1 */ 
+/* Block comment single line 2*/
+seventh;
+}
+
 // BinOp Assignemnt - Multiline Block comments
 fn main () {
 let var = /* Block comment line 1 

tests/source/lhs-to-rhs-between-comments/assignment-single-line-comments.rs

@@ -25,6 +25,32 @@ let var = /* Block comment longggggggggggggggggggggggggggggggggggggggggggggggggg
 var = /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg */ second;
 }
 
+// ": type =" Assignemnt
+fn main () {
+let var: u8 = first;
+var = second;
+}
+fn main () {
+let var: int = /* Block comment */ first;
+let var: u32 = /* Block comment */ second;
+let var: f64 = /* Block comment */
+third;
+}
+fn main () {
+let var: bool = // Line comment
+first;
+let var: char = // Line comment
+second;
+}
+fn main () {
+let var: str = /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggg */ first;
+let var: usize = /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg */ second;
+}
+fn main () {
+let var: isize = /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg */ first;
+let var: u8 = /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg */ second;
+}
+    
 // BinOp Assigment
 fn main () {
 let var = first;

tests/target/lhs-to-rhs-between-comments/assignment-multi-line-comments.rs

@@ -55,6 +55,39 @@ fn main() {
         seventh;
 }
 
+// ": type =" Assignemnt - Multiline Line and Block comments
+fn main() {
+    let var: int =
+        /* Block comment line 1
+         * Block comment line 2
+         * Block comment line 3 */
+        first;
+    let var: u64 =
+        /* Block comment line 1
+         * Block comment line 2
+         * Block comment line 3 */
+        second;
+    let var: f32 = // Line comment 1
+        // Line comment 2
+        // Line comment 3
+        third;
+    let var: bool = // Line comment
+        /* Block comment line 1
+         * Block comment line 2 */
+        forth;
+    let var: char = /* Block comment single line */
+        // Line comment
+        /* Block comment line 1
+         * Block comment line 2 */
+        fifth;
+    let var: str = /* Block comment single line 1 */
+        /* Block comment single line 2*/
+        fsixth;
+    let var: usize = /* Block comment single line 1 */
+        /* Block comment single line 2*/
+        seventh;
+}
+
 // BinOp Assignemnt - Multiline Block comments
 fn main() {
     let var =

tests/target/lhs-to-rhs-between-comments/assignment-single-line-comments.rs

@@ -30,6 +30,39 @@ fn main() {
         second;
 }
 
+// ": type =" Assignemnt
+fn main() {
+    let var: u8 = first;
+    var = second;
+}
+fn main() {
+    let var: int = /* Block comment */ first;
+    let var: u32 = /* Block comment */ second;
+    let var: f64 = /* Block comment */ third;
+}
+fn main() {
+    let var: bool = // Line comment
+        first;
+    let var: char = // Line comment
+        second;
+}
+fn main() {
+    let var: str =
+        /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggg */
+        first;
+    let var: usize =
+        /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg */
+        second;
+}
+fn main() {
+    let var: isize =
+        /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg */
+        first;
+    let var: u8 =
+        /* Block comment longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg */
+        second;
+}
+
 // BinOp Assigment
 fn main() {
     let var = first;