Fix tests for new TextEdit calculation

Author: jrobsonchase

rls/src/actions/format.rs

@@ -224,13 +224,13 @@ mod tests {
             )
         }
         // Handle single-line text wrt. added/removed trailing newline
-        test_case("fn main() {} ", vec![(0, 0, 0, 13, "fn main() {}\n")]);
-        test_case("fn main() {} \n", vec![(0, 0, 0, 13, "fn main() {}")]);
-        test_case("\nfn main() {} \n", vec![(0, 0, 1, 13, "fn main() {}")]);
+        test_case("fn main() {} ", vec![(0, 0, 1, 0, "fn main() {}\n\n")]);
+        test_case("fn main() {} \n", vec![(0, 0, 1, 0, "fn main() {}\n")]);
+        test_case("\nfn main() {} \n", vec![(0, 0, 2, 0, "fn main() {}\n")]);
         // Check that we send two separate edits
         test_case(
             "  struct Upper ;\n\nstruct Lower ;",
-            vec![(0, 0, 0, 16, "struct Upper;"), (2, 0, 2, 14, "struct Lower;\n")],
+            vec![(0, 0, 1, 0, "struct Upper;\n"), (2, 0, 3, 0, "struct Lower;\n\n")],
         );
     }
 }

tests/client.rs

@@ -935,7 +935,7 @@ fn client_format_utf16_range() {
         result.unwrap().iter().map(|edit| edit.new_text.as_str().replace('\r', "")).collect();
     // Actual formatting isn't important - what is, is that the buffer isn't
     // malformed and code stays semantically equivalent.
-    assert_eq!(new_text, vec!["/* 😢😢😢😢😢😢😢 */\nfn main() {}\n"]);
+    assert_eq!(new_text, vec!["/* 😢😢😢😢😢😢😢 */\nfn main() {}\n\n"]);
 }
 
 #[test]
@@ -1765,9 +1765,9 @@ fn client_reformat() {
     assert_eq!(result.unwrap()[0], TextEdit {
         range: Range {
             start: Position { line: 0, character: 0 },
-            end: Position { line: 1, character: 69 },
+            end: Position { line: 2, character: 0 },
         },
-        new_text: "pub mod foo;\npub fn main() {\n    let world = \"world\";\n    println!(\"Hello, {}!\", world);\n}".to_string(),
+        new_text: "pub mod foo;\npub fn main() {\n    let world = \"world\";\n    println!(\"Hello, {}!\", world);\n}\n".to_string(),
     });
 }
 
@@ -1804,14 +1804,15 @@ fn client_reformat_with_range() {
     let newline = if cfg!(windows) { "\r\n" } else { "\n" };
     let formatted = r#"pub fn main() {
     let world1 = "world";
-    println!("Hello, {}!", world1);"#
-        .replace("\r", "")
-        .replace("\n", newline);
+    println!("Hello, {}!", world1);
+"#
+    .replace("\r", "")
+    .replace("\n", newline);
 
     let edits = result.unwrap();
     assert_eq!(edits.len(), 2);
     assert_eq!(edits[0].new_text, formatted);
-    assert_eq!(edits[1].new_text, "");
+    assert_eq!(edits[1].new_text, newline);
 }
 
 #[test]