diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-12 14:46:42 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-12 14:46:42 +0000 |
| commit | 7bbdca6182ca6ab562fe7644015b30b171c5748e (patch) | |
| tree | 07104eb5418d633e4ec14251596dbeb9b0a15b91 /crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap | |
| parent | afd64ef4f75844ff61bc5967406f40ec90047348 (diff) | |
| parent | 98e8ad5e608b739d1d28a43c8c69358e77c1c1f0 (diff) | |
Merge #3564
3564: Better handling of a few kinds of cargo/clippy diagnostics r=matklad a=kiljacken
This was initially supposed to just be a fix for #3433, but I caught a few things that ended up being useful as well.
This PR primarily makes us handle multi-edit fix suggestions properly. Instead of just applying the first fix we apply all the parts of the fix in a single action.
Second up, this PR handles diagnostics with multiple primary spans, f.x. the unused import diagnostic from rustc:
The LSP doesn't handle this too well, as it only support a single complete range for each diagnostic, so we get duplicate messages in the problem panel of VSCode:
However, I feel like the improved visual aspect in-editor outweighs the duplication in the problem panel. I'm open to not including the second commit if anybody really doesn't like the idea of duplicate diagnostics in the problem pane.
Fixes #3433
Fixes #3257
Co-authored-by: Emil Lauridsen <[email protected]>
Diffstat (limited to 'crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap')
| -rw-r--r-- | crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap | 148 |
1 files changed, 75 insertions, 73 deletions
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..5989ed202 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 | |||
| @@ -2,83 +2,85 @@ | |||
| 2 | source: crates/ra_cargo_watch/src/conv/test.rs | 2 | source: crates/ra_cargo_watch/src/conv/test.rs |
| 3 | expression: diag | 3 | expression: diag |
| 4 | --- | 4 | --- |
| 5 | MappedRustDiagnostic { | 5 | [ |
| 6 | location: Location { | 6 | MappedRustDiagnostic { |
| 7 | uri: "file:///test/driver/subcommand/repl.rs", | 7 | location: Location { |
| 8 | range: Range { | 8 | uri: "file:///test/driver/subcommand/repl.rs", |
| 9 | start: Position { | 9 | range: Range { |
| 10 | line: 290, | 10 | start: Position { |
| 11 | character: 8, | 11 | line: 290, |
| 12 | }, | 12 | character: 8, |
| 13 | end: Position { | 13 | }, |
| 14 | line: 290, | 14 | end: Position { |
| 15 | character: 11, | 15 | line: 290, |
| 16 | character: 11, | ||
| 17 | }, | ||
| 16 | }, | 18 | }, |
| 17 | }, | 19 | }, |
| 18 | }, | 20 | diagnostic: Diagnostic { |
| 19 | diagnostic: Diagnostic { | 21 | range: Range { |
| 20 | range: Range { | 22 | start: Position { |
| 21 | start: Position { | 23 | line: 290, |
| 22 | line: 290, | 24 | character: 8, |
| 23 | character: 8, | 25 | }, |
| 24 | }, | 26 | end: Position { |
| 25 | end: Position { | 27 | line: 290, |
| 26 | line: 290, | 28 | character: 11, |
| 27 | character: 11, | 29 | }, |
| 28 | }, | 30 | }, |
| 29 | }, | 31 | severity: Some( |
| 30 | severity: Some( | 32 | Warning, |
| 31 | Warning, | ||
| 32 | ), | ||
| 33 | code: Some( | ||
| 34 | String( | ||
| 35 | "unused_variables", | ||
| 36 | ), | 33 | ), |
| 37 | ), | 34 | code: Some( |
| 38 | source: Some( | 35 | String( |
| 39 | "rustc", | 36 | "unused_variables", |
| 40 | ), | 37 | ), |
| 41 | message: "unused variable: `foo`\n#[warn(unused_variables)] on by default", | ||
| 42 | related_information: None, | ||
| 43 | tags: Some( | ||
| 44 | [ | ||
| 45 | Unnecessary, | ||
| 46 | ], | ||
| 47 | ), | ||
| 48 | }, | ||
| 49 | fixes: [ | ||
| 50 | CodeAction { | ||
| 51 | title: "consider prefixing with an underscore: \'_foo\'", | ||
| 52 | kind: Some( | ||
| 53 | "quickfix", | ||
| 54 | ), | 38 | ), |
| 55 | diagnostics: None, | 39 | source: Some( |
| 56 | edit: Some( | 40 | "rustc", |
| 57 | WorkspaceEdit { | 41 | ), |
| 58 | changes: Some( | 42 | message: "unused variable: `foo`\n#[warn(unused_variables)] on by default", |
| 59 | { | 43 | related_information: None, |
| 60 | "file:///test/driver/subcommand/repl.rs": [ | 44 | tags: Some( |
| 61 | TextEdit { | 45 | [ |
| 62 | range: Range { | 46 | Unnecessary, |
| 63 | start: Position { | 47 | ], |
| 64 | line: 290, | ||
| 65 | character: 8, | ||
| 66 | }, | ||
| 67 | end: Position { | ||
| 68 | line: 290, | ||
| 69 | character: 11, | ||
| 70 | }, | ||
| 71 | }, | ||
| 72 | new_text: "_foo", | ||
| 73 | }, | ||
| 74 | ], | ||
| 75 | }, | ||
| 76 | ), | ||
| 77 | document_changes: None, | ||
| 78 | }, | ||
| 79 | ), | 48 | ), |
| 80 | command: None, | ||
| 81 | is_preferred: None, | ||
| 82 | }, | 49 | }, |
| 83 | ], | 50 | fixes: [ |
| 84 | } | 51 | CodeAction { |
| 52 | title: "consider prefixing with an underscore", | ||
| 53 | kind: Some( | ||
| 54 | "quickfix", | ||
| 55 | ), | ||
| 56 | diagnostics: None, | ||
| 57 | edit: Some( | ||
| 58 | WorkspaceEdit { | ||
| 59 | changes: Some( | ||
| 60 | { | ||
| 61 | "file:///test/driver/subcommand/repl.rs": [ | ||
| 62 | TextEdit { | ||
| 63 | range: Range { | ||
| 64 | start: Position { | ||
| 65 | line: 290, | ||
| 66 | character: 8, | ||
| 67 | }, | ||
| 68 | end: Position { | ||
| 69 | line: 290, | ||
| 70 | character: 11, | ||
| 71 | }, | ||
| 72 | }, | ||
| 73 | new_text: "_foo", | ||
| 74 | }, | ||
| 75 | ], | ||
| 76 | }, | ||
| 77 | ), | ||
| 78 | document_changes: None, | ||
| 79 | }, | ||
| 80 | ), | ||
| 81 | command: None, | ||
| 82 | is_preferred: None, | ||
| 83 | }, | ||
| 84 | ], | ||
| 85 | }, | ||
| 86 | ] | ||