diff options
author | Igor Aleksanov <[email protected]> | 2020-08-07 12:25:55 +0100 |
---|---|---|
committer | Igor Aleksanov <[email protected]> | 2020-08-07 12:25:55 +0100 |
commit | 90857ff8b08d73945598bac12a841559e86402b1 (patch) | |
tree | 8e98c8d7a1b50d55dbbbf788cda94b11eb3e3395 /crates/ra_ide/src/diagnostics.rs | |
parent | c463d217a1e001abe6a812f309d93527e28a70c6 (diff) |
Add an AnalysisConfig structure and use it to configure diagnostics run
Diffstat (limited to 'crates/ra_ide/src/diagnostics.rs')
-rw-r--r-- | crates/ra_ide/src/diagnostics.rs | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs index 73c0b8275..33e4f1743 100644 --- a/crates/ra_ide/src/diagnostics.rs +++ b/crates/ra_ide/src/diagnostics.rs | |||
@@ -21,7 +21,7 @@ use ra_syntax::{ | |||
21 | }; | 21 | }; |
22 | use ra_text_edit::{TextEdit, TextEditBuilder}; | 22 | use ra_text_edit::{TextEdit, TextEditBuilder}; |
23 | 23 | ||
24 | use crate::{Diagnostic, FileId, FileSystemEdit, Fix, SourceFileEdit}; | 24 | use crate::{AnalysisConfig, Diagnostic, FileId, FileSystemEdit, Fix, SourceFileEdit}; |
25 | 25 | ||
26 | #[derive(Debug, Copy, Clone)] | 26 | #[derive(Debug, Copy, Clone)] |
27 | pub enum Severity { | 27 | pub enum Severity { |
@@ -33,6 +33,7 @@ pub(crate) fn diagnostics( | |||
33 | db: &RootDatabase, | 33 | db: &RootDatabase, |
34 | file_id: FileId, | 34 | file_id: FileId, |
35 | enable_experimental: bool, | 35 | enable_experimental: bool, |
36 | analysis_config: &AnalysisConfig, | ||
36 | ) -> Vec<Diagnostic> { | 37 | ) -> Vec<Diagnostic> { |
37 | let _p = profile("diagnostics"); | 38 | let _p = profile("diagnostics"); |
38 | let sema = Semantics::new(db); | 39 | let sema = Semantics::new(db); |
@@ -41,6 +42,7 @@ pub(crate) fn diagnostics( | |||
41 | 42 | ||
42 | // [#34344] Only take first 128 errors to prevent slowing down editor/ide, the number 128 is chosen arbitrarily. | 43 | // [#34344] Only take first 128 errors to prevent slowing down editor/ide, the number 128 is chosen arbitrarily. |
43 | res.extend(parse.errors().iter().take(128).map(|err| Diagnostic { | 44 | res.extend(parse.errors().iter().take(128).map(|err| Diagnostic { |
45 | name: None, | ||
44 | range: err.range(), | 46 | range: err.range(), |
45 | message: format!("Syntax Error: {}", err), | 47 | message: format!("Syntax Error: {}", err), |
46 | severity: Severity::Error, | 48 | severity: Severity::Error, |
@@ -52,7 +54,7 @@ pub(crate) fn diagnostics( | |||
52 | check_struct_shorthand_initialization(&mut res, file_id, &node); | 54 | check_struct_shorthand_initialization(&mut res, file_id, &node); |
53 | } | 55 | } |
54 | let res = RefCell::new(res); | 56 | let res = RefCell::new(res); |
55 | let mut sink = DiagnosticSinkBuilder::new() | 57 | let mut sink_builder = DiagnosticSinkBuilder::new() |
56 | .on::<hir::diagnostics::UnresolvedModule, _>(|d| { | 58 | .on::<hir::diagnostics::UnresolvedModule, _>(|d| { |
57 | let original_file = d.source().file_id.original_file(db); | 59 | let original_file = d.source().file_id.original_file(db); |
58 | let fix = Fix::new( | 60 | let fix = Fix::new( |
@@ -61,6 +63,7 @@ pub(crate) fn diagnostics( | |||
61 | .into(), | 63 | .into(), |
62 | ); | 64 | ); |
63 | res.borrow_mut().push(Diagnostic { | 65 | res.borrow_mut().push(Diagnostic { |
66 | name: Some(d.name()), | ||
64 | range: sema.diagnostics_range(d).range, | 67 | range: sema.diagnostics_range(d).range, |
65 | message: d.message(), | 68 | message: d.message(), |
66 | severity: Severity::Error, | 69 | severity: Severity::Error, |
@@ -95,6 +98,7 @@ pub(crate) fn diagnostics( | |||
95 | }; | 98 | }; |
96 | 99 | ||
97 | res.borrow_mut().push(Diagnostic { | 100 | res.borrow_mut().push(Diagnostic { |
101 | name: Some(d.name()), | ||
98 | range: sema.diagnostics_range(d).range, | 102 | range: sema.diagnostics_range(d).range, |
99 | message: d.message(), | 103 | message: d.message(), |
100 | severity: Severity::Error, | 104 | severity: Severity::Error, |
@@ -108,6 +112,7 @@ pub(crate) fn diagnostics( | |||
108 | let source_change = SourceFileEdit { file_id, edit }.into(); | 112 | let source_change = SourceFileEdit { file_id, edit }.into(); |
109 | let fix = Fix::new("Wrap with ok", source_change); | 113 | let fix = Fix::new("Wrap with ok", source_change); |
110 | res.borrow_mut().push(Diagnostic { | 114 | res.borrow_mut().push(Diagnostic { |
115 | name: Some(d.name()), | ||
111 | range: sema.diagnostics_range(d).range, | 116 | range: sema.diagnostics_range(d).range, |
112 | message: d.message(), | 117 | message: d.message(), |
113 | severity: Severity::Error, | 118 | severity: Severity::Error, |
@@ -116,6 +121,7 @@ pub(crate) fn diagnostics( | |||
116 | }) | 121 | }) |
117 | .on::<hir::diagnostics::NoSuchField, _>(|d| { | 122 | .on::<hir::diagnostics::NoSuchField, _>(|d| { |
118 | res.borrow_mut().push(Diagnostic { | 123 | res.borrow_mut().push(Diagnostic { |
124 | name: Some(d.name()), | ||
119 | range: sema.diagnostics_range(d).range, | 125 | range: sema.diagnostics_range(d).range, |
120 | message: d.message(), | 126 | message: d.message(), |
121 | severity: Severity::Error, | 127 | severity: Severity::Error, |
@@ -123,10 +129,20 @@ pub(crate) fn diagnostics( | |||
123 | }) | 129 | }) |
124 | }) | 130 | }) |
125 | // Only collect experimental diagnostics when they're enabled. | 131 | // Only collect experimental diagnostics when they're enabled. |
126 | .filter(|diag| !diag.is_experimental() || enable_experimental) | 132 | .filter(|diag| !diag.is_experimental() || enable_experimental); |
133 | |||
134 | if !analysis_config.disabled_diagnostics.is_empty() { | ||
135 | // Do not collect disabled diagnostics. | ||
136 | sink_builder = sink_builder | ||
137 | .filter(|diag| !analysis_config.disabled_diagnostics.contains(&diag.name())); | ||
138 | } | ||
139 | |||
140 | // Finalize the `DiagnosticSink` building process. | ||
141 | let mut sink = sink_builder | ||
127 | // Diagnostics not handled above get no fix and default treatment. | 142 | // Diagnostics not handled above get no fix and default treatment. |
128 | .build(|d| { | 143 | .build(|d| { |
129 | res.borrow_mut().push(Diagnostic { | 144 | res.borrow_mut().push(Diagnostic { |
145 | name: Some(d.name()), | ||
130 | message: d.message(), | 146 | message: d.message(), |
131 | range: sema.diagnostics_range(d).range, | 147 | range: sema.diagnostics_range(d).range, |
132 | severity: Severity::Error, | 148 | severity: Severity::Error, |
@@ -234,6 +250,7 @@ fn check_unnecessary_braces_in_use_statement( | |||
234 | }); | 250 | }); |
235 | 251 | ||
236 | acc.push(Diagnostic { | 252 | acc.push(Diagnostic { |
253 | name: None, | ||
237 | range, | 254 | range, |
238 | message: "Unnecessary braces in use statement".to_string(), | 255 | message: "Unnecessary braces in use statement".to_string(), |
239 | severity: Severity::WeakWarning, | 256 | severity: Severity::WeakWarning, |
@@ -279,6 +296,7 @@ fn check_struct_shorthand_initialization( | |||
279 | let edit = edit_builder.finish(); | 296 | let edit = edit_builder.finish(); |
280 | 297 | ||
281 | acc.push(Diagnostic { | 298 | acc.push(Diagnostic { |
299 | name: None, | ||
282 | range: record_field.syntax().text_range(), | 300 | range: record_field.syntax().text_range(), |
283 | message: "Shorthand struct initialization".to_string(), | 301 | message: "Shorthand struct initialization".to_string(), |
284 | severity: Severity::WeakWarning, | 302 | severity: Severity::WeakWarning, |