Correctly handle multi-line fixes from cargo/clippy

3 files changed, 114 insertions, 2 deletions

diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap
index 95ca163dc..47801ae79 100644
--- a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap
@@ -63,7 +63,7 @@ MappedRustDiagnostic {
     },
     fixes: [
         CodeAction {
-            title: "consider passing by value instead: \'self\'",
+            title: "consider passing by value instead",
             kind: Some(
                 "quickfix",
             ),
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_multi_line_fix.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_multi_line_fix.snap
new file mode 100644
index 000000000..23c4f5a2c
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_multi_line_fix.snap
@@ -0,0 +1,112 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+    location: Location {
+        uri: "file:///test/src/main.rs",
+        range: Range {
+            start: Position {
+                line: 3,
+                character: 4,
+            },
+            end: Position {
+                line: 3,
+                character: 5,
+            },
+        },
+    },
+    diagnostic: Diagnostic {
+        range: Range {
+            start: Position {
+                line: 3,
+                character: 4,
+            },
+            end: Position {
+                line: 3,
+                character: 5,
+            },
+        },
+        severity: Some(
+            Warning,
+        ),
+        code: Some(
+            String(
+                "let_and_return",
+            ),
+        ),
+        source: Some(
+            "clippy",
+        ),
+        message: "returning the result of a let binding from a block\n`#[warn(clippy::let_and_return)]` on by default\nfor further information visit https://rust-lang.github.io/rust-clippy/master/index.html#let_and_return",
+        related_information: Some(
+            [
+                DiagnosticRelatedInformation {
+                    location: Location {
+                        uri: "file:///test/src/main.rs",
+                        range: Range {
+                            start: Position {
+                                line: 2,
+                                character: 4,
+                            },
+                            end: Position {
+                                line: 2,
+                                character: 30,
+                            },
+                        },
+                    },
+                    message: "unnecessary let binding",
+                },
+            ],
+        ),
+        tags: None,
+    },
+    fixes: [
+        CodeAction {
+            title: "return the expression directly",
+            kind: Some(
+                "quickfix",
+            ),
+            diagnostics: None,
+            edit: Some(
+                WorkspaceEdit {
+                    changes: Some(
+                        {
+                            "file:///test/src/main.rs": [
+                                TextEdit {
+                                    range: Range {
+                                        start: Position {
+                                            line: 2,
+                                            character: 4,
+                                        },
+                                        end: Position {
+                                            line: 2,
+                                            character: 30,
+                                        },
+                                    },
+                                    new_text: "",
+                                },
+                                TextEdit {
+                                    range: Range {
+                                        start: Position {
+                                            line: 3,
+                                            character: 4,
+                                        },
+                                        end: Position {
+                                            line: 3,
+                                            character: 5,
+                                        },
+                                    },
+                                    new_text: "(0..10).collect()",
+                                },
+                            ],
+                        },
+                    ),
+                    document_changes: None,
+                },
+            ),
+            command: None,
+            is_preferred: None,
+        },
+    ],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap
index 3e1fe736c..8bab09540 100644
--- a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap
@@ -48,7 +48,7 @@ MappedRustDiagnostic {
     },
     fixes: [
         CodeAction {
-            title: "consider prefixing with an underscore: \'_foo\'",
+            title: "consider prefixing with an underscore",
             kind: Some(
                 "quickfix",
             ),