Fix previous snippets from breaking LL2

Author: jvsqzj

src/lint/rules/tests/indentation/continuation_line.rs

@@ -15,8 +15,8 @@ fn continuation_line_correct() {
 
 static CONTINUATION_LINE_RETURN_CORRECT: &str = "
 method calculate_sum(uint64 a, uint64 b) -> (uint64) {
-    return (a + b) * (a - b) +
-        (a * b);
+    return (a + b) * (a - b)
+        + (a * b);
 }
 ";
 #[test]
@@ -29,8 +29,8 @@ static CONTINUATION_LINE_LOCAL_DECLA_CORRECT: &str = "
 bank regs {
     register example_register size 4 @ 0x00 {
         method read() -> (uint64) {
-            local uint64 value = (this.val + 10) *
-                (this.val - 5);
+            local uint64 value = (this.val + 10)
+                * (this.val - 5);
             return value;
         }
     }
@@ -87,8 +87,8 @@ fn continuation_line_incorrect() {
 pub static CONTINUATION_LINE_BITWISE_INCORRECT: &str = "
 method write(uint64 value) {
     local uint64 a = value;
-    local uint64 result = a <<
-                               2;
+    local uint64 result = a
+                               << 2;
     log info: 'Writing to register, result after left shift = %x', result;
 }
 ";
@@ -97,7 +97,7 @@ fn continuation_line_bitwise_incorrect() {
     let rules = set_up();
     let expected_errors = define_expected_errors!(
         RuleType::IN6,
-        (4, 4, 31, 32),
+        (4, 4, 31, 33),
     );
     assert_snippet(CONTINUATION_LINE_BITWISE_INCORRECT, expected_errors, &rules);
 }
@@ -106,8 +106,8 @@ pub static CONTINUATION_LINE_PARAM_INCORRECT: &str = "
 bank regs {
     register control size 4 @ 0x00 {
         field status @ [31:3] {
-            param init_val = 1 << 2 |
-                                            1 << 1;
+            param init_val = 1 << 2
+                                            | 1 << 1;
         }
     }
 }

src/lint/rules/tests/indentation/paren_expr.rs

@@ -130,8 +130,8 @@ fn funcall_nested_paren_incorrect() {
 
 static IF_PAREN_CORRECT: &str = "
 method callback() {
-    if (conditionX &&
-        conditionY) {
+    if (conditionX
+        && conditionY) {
         return;
     }
 }
@@ -144,8 +144,8 @@ fn if_paren_correct() {
 
 static IF_PAREN_INCORRECT: &str = "
 method callback() {
-    if (conditionX &&
-          conditionY) {
+    if (conditionX
+          && conditionY) {
         return;
     }
 }
@@ -155,7 +155,7 @@ fn if_paren_incorrect() {
     let rules = set_up();
     let expected_errors = define_expected_errors!(
         RuleType::IN5,
-        (3, 3, 10, 20),
+        (3, 3, 10, 12),
     );
     assert_snippet(IF_PAREN_INCORRECT, expected_errors, &rules);
 }
@@ -348,10 +348,8 @@ fn switch_paren_incorrect() {
 static NESTED_PAREN_EXPR_CORRECT: &str = "
 param result = ((reg0.val
                  * reg1.enable.val)
-                &
-                mask_reg
-                +
-                1);
+                & mask_reg
+                + 1);
 ";
 
 #[test]
@@ -363,18 +361,16 @@ fn nested_paren_expr_correct(){
 static NESTED_PAREN_EXPR_INCORRECT: &str = "
 param result = ((reg0.val
      * reg1.enable.val)
-                &
-                 mask_reg
-                +
-                1);
+                 & mask_reg
+                + 1);
 ";
 #[test]
 fn nested_paren_expr_incorrect(){
     let rules = set_up();
     let expected_errors = define_expected_errors!(
         RuleType::IN5,
         (2, 2, 5, 6),
-        (4, 4, 17, 25),
+        (3, 3, 17, 18),
     );
     assert_snippet(NESTED_PAREN_EXPR_INCORRECT, expected_errors, &rules);
 }

src/lint/rules/tests/line_length_breaking/func_call_break_open_paren.rs

@@ -59,10 +59,8 @@ static PAREN_NESTED_CORRECT: &str = "
 param result = (
     (reg0.val
      * reg1.enable.val)
-    &
-    mask_reg
-    +
-    1);
+    & mask_reg
+    + 1);
 ";
 
 #[test]
@@ -75,10 +73,8 @@ static PAREN_NESTED_INCORRECT: &str = "
 param result = (
     (reg0.val
      * reg1.enable.val)
-                &
-    mask_reg
-                +
-                1);
+                & mask_reg
+                + 1);
 ";
 
 #[test]
@@ -87,8 +83,7 @@ fn paren_nested_incorrect(){
     let expected_errors = define_expected_errors!(
         RuleType::LL6,
         (4, 4, 16, 17),
-        (6, 6, 16, 17),
-        (7, 7, 16, 17),
+        (5, 5, 16, 17),
     );
     assert_snippet(PAREN_NESTED_INCORRECT, expected_errors, &rules);
 }