diff options
Diffstat (limited to 'crates/ide/src')
23 files changed, 3 insertions, 4601 deletions
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs deleted file mode 100644 index 815a633e5..000000000 --- a/crates/ide/src/diagnostics.rs +++ /dev/null | |||
@@ -1,498 +0,0 @@ | |||
1 | //! Collects diagnostics & fixits for a single file. | ||
2 | //! | ||
3 | //! The tricky bit here is that diagnostics are produced by hir in terms of | ||
4 | //! macro-expanded files, but we need to present them to the users in terms of | ||
5 | //! original files. So we need to map the ranges. | ||
6 | |||
7 | mod break_outside_of_loop; | ||
8 | mod inactive_code; | ||
9 | mod incorrect_case; | ||
10 | mod macro_error; | ||
11 | mod mismatched_arg_count; | ||
12 | mod missing_fields; | ||
13 | mod missing_match_arms; | ||
14 | mod missing_ok_or_some_in_tail_expr; | ||
15 | mod missing_unsafe; | ||
16 | mod no_such_field; | ||
17 | mod remove_this_semicolon; | ||
18 | mod replace_filter_map_next_with_find_map; | ||
19 | mod unimplemented_builtin_macro; | ||
20 | mod unlinked_file; | ||
21 | mod unresolved_extern_crate; | ||
22 | mod unresolved_import; | ||
23 | mod unresolved_macro_call; | ||
24 | mod unresolved_module; | ||
25 | mod unresolved_proc_macro; | ||
26 | |||
27 | mod field_shorthand; | ||
28 | |||
29 | use hir::{diagnostics::AnyDiagnostic, Semantics}; | ||
30 | use ide_assists::AssistResolveStrategy; | ||
31 | use ide_db::{base_db::SourceDatabase, RootDatabase}; | ||
32 | use itertools::Itertools; | ||
33 | use rustc_hash::FxHashSet; | ||
34 | use syntax::{ | ||
35 | ast::{self, AstNode}, | ||
36 | SyntaxNode, TextRange, | ||
37 | }; | ||
38 | use text_edit::TextEdit; | ||
39 | use unlinked_file::UnlinkedFile; | ||
40 | |||
41 | use crate::{Assist, AssistId, AssistKind, FileId, Label, SourceChange}; | ||
42 | |||
43 | #[derive(Copy, Clone, Debug, PartialEq)] | ||
44 | pub struct DiagnosticCode(pub &'static str); | ||
45 | |||
46 | impl DiagnosticCode { | ||
47 | pub fn as_str(&self) -> &str { | ||
48 | self.0 | ||
49 | } | ||
50 | } | ||
51 | |||
52 | #[derive(Debug)] | ||
53 | pub struct Diagnostic { | ||
54 | pub code: DiagnosticCode, | ||
55 | pub message: String, | ||
56 | pub range: TextRange, | ||
57 | pub severity: Severity, | ||
58 | pub unused: bool, | ||
59 | pub experimental: bool, | ||
60 | pub fixes: Option<Vec<Assist>>, | ||
61 | } | ||
62 | |||
63 | impl Diagnostic { | ||
64 | fn new(code: &'static str, message: impl Into<String>, range: TextRange) -> Diagnostic { | ||
65 | let message = message.into(); | ||
66 | Diagnostic { | ||
67 | code: DiagnosticCode(code), | ||
68 | message, | ||
69 | range, | ||
70 | severity: Severity::Error, | ||
71 | unused: false, | ||
72 | experimental: false, | ||
73 | fixes: None, | ||
74 | } | ||
75 | } | ||
76 | |||
77 | fn experimental(mut self) -> Diagnostic { | ||
78 | self.experimental = true; | ||
79 | self | ||
80 | } | ||
81 | |||
82 | fn severity(mut self, severity: Severity) -> Diagnostic { | ||
83 | self.severity = severity; | ||
84 | self | ||
85 | } | ||
86 | |||
87 | fn with_fixes(mut self, fixes: Option<Vec<Assist>>) -> Diagnostic { | ||
88 | self.fixes = fixes; | ||
89 | self | ||
90 | } | ||
91 | |||
92 | fn with_unused(mut self, unused: bool) -> Diagnostic { | ||
93 | self.unused = unused; | ||
94 | self | ||
95 | } | ||
96 | } | ||
97 | |||
98 | #[derive(Debug, Copy, Clone)] | ||
99 | pub enum Severity { | ||
100 | Error, | ||
101 | WeakWarning, | ||
102 | } | ||
103 | |||
104 | #[derive(Default, Debug, Clone)] | ||
105 | pub struct DiagnosticsConfig { | ||
106 | pub disable_experimental: bool, | ||
107 | pub disabled: FxHashSet<String>, | ||
108 | } | ||
109 | |||
110 | struct DiagnosticsContext<'a> { | ||
111 | config: &'a DiagnosticsConfig, | ||
112 | sema: Semantics<'a, RootDatabase>, | ||
113 | resolve: &'a AssistResolveStrategy, | ||
114 | } | ||
115 | |||
116 | pub(crate) fn diagnostics( | ||
117 | db: &RootDatabase, | ||
118 | config: &DiagnosticsConfig, | ||
119 | resolve: &AssistResolveStrategy, | ||
120 | file_id: FileId, | ||
121 | ) -> Vec<Diagnostic> { | ||
122 | let _p = profile::span("diagnostics"); | ||
123 | let sema = Semantics::new(db); | ||
124 | let parse = db.parse(file_id); | ||
125 | let mut res = Vec::new(); | ||
126 | |||
127 | // [#34344] Only take first 128 errors to prevent slowing down editor/ide, the number 128 is chosen arbitrarily. | ||
128 | res.extend( | ||
129 | parse.errors().iter().take(128).map(|err| { | ||
130 | Diagnostic::new("syntax-error", format!("Syntax Error: {}", err), err.range()) | ||
131 | }), | ||
132 | ); | ||
133 | |||
134 | for node in parse.tree().syntax().descendants() { | ||
135 | check_unnecessary_braces_in_use_statement(&mut res, file_id, &node); | ||
136 | field_shorthand::check(&mut res, file_id, &node); | ||
137 | } | ||
138 | |||
139 | let mut diags = Vec::new(); | ||
140 | let module = sema.to_module_def(file_id); | ||
141 | if let Some(m) = module { | ||
142 | m.diagnostics(db, &mut diags) | ||
143 | } | ||
144 | |||
145 | let ctx = DiagnosticsContext { config, sema, resolve }; | ||
146 | if module.is_none() { | ||
147 | let d = UnlinkedFile { file: file_id }; | ||
148 | let d = unlinked_file::unlinked_file(&ctx, &d); | ||
149 | res.push(d) | ||
150 | } | ||
151 | |||
152 | for diag in diags { | ||
153 | #[rustfmt::skip] | ||
154 | let d = match diag { | ||
155 | AnyDiagnostic::BreakOutsideOfLoop(d) => break_outside_of_loop::break_outside_of_loop(&ctx, &d), | ||
156 | AnyDiagnostic::IncorrectCase(d) => incorrect_case::incorrect_case(&ctx, &d), | ||
157 | AnyDiagnostic::MacroError(d) => macro_error::macro_error(&ctx, &d), | ||
158 | AnyDiagnostic::MismatchedArgCount(d) => mismatched_arg_count::mismatched_arg_count(&ctx, &d), | ||
159 | AnyDiagnostic::MissingFields(d) => missing_fields::missing_fields(&ctx, &d), | ||
160 | AnyDiagnostic::MissingMatchArms(d) => missing_match_arms::missing_match_arms(&ctx, &d), | ||
161 | AnyDiagnostic::MissingOkOrSomeInTailExpr(d) => missing_ok_or_some_in_tail_expr::missing_ok_or_some_in_tail_expr(&ctx, &d), | ||
162 | AnyDiagnostic::MissingUnsafe(d) => missing_unsafe::missing_unsafe(&ctx, &d), | ||
163 | AnyDiagnostic::NoSuchField(d) => no_such_field::no_such_field(&ctx, &d), | ||
164 | AnyDiagnostic::RemoveThisSemicolon(d) => remove_this_semicolon::remove_this_semicolon(&ctx, &d), | ||
165 | AnyDiagnostic::ReplaceFilterMapNextWithFindMap(d) => replace_filter_map_next_with_find_map::replace_filter_map_next_with_find_map(&ctx, &d), | ||
166 | AnyDiagnostic::UnimplementedBuiltinMacro(d) => unimplemented_builtin_macro::unimplemented_builtin_macro(&ctx, &d), | ||
167 | AnyDiagnostic::UnresolvedExternCrate(d) => unresolved_extern_crate::unresolved_extern_crate(&ctx, &d), | ||
168 | AnyDiagnostic::UnresolvedImport(d) => unresolved_import::unresolved_import(&ctx, &d), | ||
169 | AnyDiagnostic::UnresolvedMacroCall(d) => unresolved_macro_call::unresolved_macro_call(&ctx, &d), | ||
170 | AnyDiagnostic::UnresolvedModule(d) => unresolved_module::unresolved_module(&ctx, &d), | ||
171 | AnyDiagnostic::UnresolvedProcMacro(d) => unresolved_proc_macro::unresolved_proc_macro(&ctx, &d), | ||
172 | |||
173 | AnyDiagnostic::InactiveCode(d) => match inactive_code::inactive_code(&ctx, &d) { | ||
174 | Some(it) => it, | ||
175 | None => continue, | ||
176 | } | ||
177 | }; | ||
178 | res.push(d) | ||
179 | } | ||
180 | |||
181 | res.retain(|d| { | ||
182 | !ctx.config.disabled.contains(d.code.as_str()) | ||
183 | && !(ctx.config.disable_experimental && d.experimental) | ||
184 | }); | ||
185 | |||
186 | res | ||
187 | } | ||
188 | |||
189 | fn check_unnecessary_braces_in_use_statement( | ||
190 | acc: &mut Vec<Diagnostic>, | ||
191 | file_id: FileId, | ||
192 | node: &SyntaxNode, | ||
193 | ) -> Option<()> { | ||
194 | let use_tree_list = ast::UseTreeList::cast(node.clone())?; | ||
195 | if let Some((single_use_tree,)) = use_tree_list.use_trees().collect_tuple() { | ||
196 | // If there is a comment inside the bracketed `use`, | ||
197 | // assume it is a commented out module path and don't show diagnostic. | ||
198 | if use_tree_list.has_inner_comment() { | ||
199 | return Some(()); | ||
200 | } | ||
201 | |||
202 | let use_range = use_tree_list.syntax().text_range(); | ||
203 | let edit = | ||
204 | text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(&single_use_tree) | ||
205 | .unwrap_or_else(|| { | ||
206 | let to_replace = single_use_tree.syntax().text().to_string(); | ||
207 | let mut edit_builder = TextEdit::builder(); | ||
208 | edit_builder.delete(use_range); | ||
209 | edit_builder.insert(use_range.start(), to_replace); | ||
210 | edit_builder.finish() | ||
211 | }); | ||
212 | |||
213 | acc.push( | ||
214 | Diagnostic::new( | ||
215 | "unnecessary-braces", | ||
216 | "Unnecessary braces in use statement".to_string(), | ||
217 | use_range, | ||
218 | ) | ||
219 | .severity(Severity::WeakWarning) | ||
220 | .with_fixes(Some(vec![fix( | ||
221 | "remove_braces", | ||
222 | "Remove unnecessary braces", | ||
223 | SourceChange::from_text_edit(file_id, edit), | ||
224 | use_range, | ||
225 | )])), | ||
226 | ); | ||
227 | } | ||
228 | |||
229 | Some(()) | ||
230 | } | ||
231 | |||
232 | fn text_edit_for_remove_unnecessary_braces_with_self_in_use_statement( | ||
233 | single_use_tree: &ast::UseTree, | ||
234 | ) -> Option<TextEdit> { | ||
235 | let use_tree_list_node = single_use_tree.syntax().parent()?; | ||
236 | if single_use_tree.path()?.segment()?.self_token().is_some() { | ||
237 | let start = use_tree_list_node.prev_sibling_or_token()?.text_range().start(); | ||
238 | let end = use_tree_list_node.text_range().end(); | ||
239 | return Some(TextEdit::delete(TextRange::new(start, end))); | ||
240 | } | ||
241 | None | ||
242 | } | ||
243 | |||
244 | fn fix(id: &'static str, label: &str, source_change: SourceChange, target: TextRange) -> Assist { | ||
245 | let mut res = unresolved_fix(id, label, target); | ||
246 | res.source_change = Some(source_change); | ||
247 | res | ||
248 | } | ||
249 | |||
250 | fn unresolved_fix(id: &'static str, label: &str, target: TextRange) -> Assist { | ||
251 | assert!(!id.contains(' ')); | ||
252 | Assist { | ||
253 | id: AssistId(id, AssistKind::QuickFix), | ||
254 | label: Label::new(label), | ||
255 | group: None, | ||
256 | target, | ||
257 | source_change: None, | ||
258 | } | ||
259 | } | ||
260 | |||
261 | #[cfg(test)] | ||
262 | mod tests { | ||
263 | use expect_test::Expect; | ||
264 | use ide_assists::AssistResolveStrategy; | ||
265 | use stdx::trim_indent; | ||
266 | use test_utils::{assert_eq_text, extract_annotations}; | ||
267 | |||
268 | use crate::{fixture, DiagnosticsConfig}; | ||
269 | |||
270 | /// Takes a multi-file input fixture with annotated cursor positions, | ||
271 | /// and checks that: | ||
272 | /// * a diagnostic is produced | ||
273 | /// * the first diagnostic fix trigger range touches the input cursor position | ||
274 | /// * that the contents of the file containing the cursor match `after` after the diagnostic fix is applied | ||
275 | #[track_caller] | ||
276 | pub(crate) fn check_fix(ra_fixture_before: &str, ra_fixture_after: &str) { | ||
277 | check_nth_fix(0, ra_fixture_before, ra_fixture_after); | ||
278 | } | ||
279 | /// Takes a multi-file input fixture with annotated cursor positions, | ||
280 | /// and checks that: | ||
281 | /// * a diagnostic is produced | ||
282 | /// * every diagnostic fixes trigger range touches the input cursor position | ||
283 | /// * that the contents of the file containing the cursor match `after` after each diagnostic fix is applied | ||
284 | pub(crate) fn check_fixes(ra_fixture_before: &str, ra_fixtures_after: Vec<&str>) { | ||
285 | for (i, ra_fixture_after) in ra_fixtures_after.iter().enumerate() { | ||
286 | check_nth_fix(i, ra_fixture_before, ra_fixture_after) | ||
287 | } | ||
288 | } | ||
289 | |||
290 | #[track_caller] | ||
291 | fn check_nth_fix(nth: usize, ra_fixture_before: &str, ra_fixture_after: &str) { | ||
292 | let after = trim_indent(ra_fixture_after); | ||
293 | |||
294 | let (analysis, file_position) = fixture::position(ra_fixture_before); | ||
295 | let diagnostic = analysis | ||
296 | .diagnostics( | ||
297 | &DiagnosticsConfig::default(), | ||
298 | AssistResolveStrategy::All, | ||
299 | file_position.file_id, | ||
300 | ) | ||
301 | .unwrap() | ||
302 | .pop() | ||
303 | .expect("no diagnostics"); | ||
304 | let fix = &diagnostic.fixes.expect("diagnostic misses fixes")[nth]; | ||
305 | let actual = { | ||
306 | let source_change = fix.source_change.as_ref().unwrap(); | ||
307 | let file_id = *source_change.source_file_edits.keys().next().unwrap(); | ||
308 | let mut actual = analysis.file_text(file_id).unwrap().to_string(); | ||
309 | |||
310 | for edit in source_change.source_file_edits.values() { | ||
311 | edit.apply(&mut actual); | ||
312 | } | ||
313 | actual | ||
314 | }; | ||
315 | |||
316 | assert_eq_text!(&after, &actual); | ||
317 | assert!( | ||
318 | fix.target.contains_inclusive(file_position.offset), | ||
319 | "diagnostic fix range {:?} does not touch cursor position {:?}", | ||
320 | fix.target, | ||
321 | file_position.offset | ||
322 | ); | ||
323 | } | ||
324 | |||
325 | /// Checks that there's a diagnostic *without* fix at `$0`. | ||
326 | pub(crate) fn check_no_fix(ra_fixture: &str) { | ||
327 | let (analysis, file_position) = fixture::position(ra_fixture); | ||
328 | let diagnostic = analysis | ||
329 | .diagnostics( | ||
330 | &DiagnosticsConfig::default(), | ||
331 | AssistResolveStrategy::All, | ||
332 | file_position.file_id, | ||
333 | ) | ||
334 | .unwrap() | ||
335 | .pop() | ||
336 | .unwrap(); | ||
337 | assert!(diagnostic.fixes.is_none(), "got a fix when none was expected: {:?}", diagnostic); | ||
338 | } | ||
339 | |||
340 | pub(crate) fn check_expect(ra_fixture: &str, expect: Expect) { | ||
341 | let (analysis, file_id) = fixture::file(ra_fixture); | ||
342 | let diagnostics = analysis | ||
343 | .diagnostics(&DiagnosticsConfig::default(), AssistResolveStrategy::All, file_id) | ||
344 | .unwrap(); | ||
345 | expect.assert_debug_eq(&diagnostics) | ||
346 | } | ||
347 | |||
348 | #[track_caller] | ||
349 | pub(crate) fn check_diagnostics(ra_fixture: &str) { | ||
350 | let mut config = DiagnosticsConfig::default(); | ||
351 | config.disabled.insert("inactive-code".to_string()); | ||
352 | check_diagnostics_with_config(config, ra_fixture) | ||
353 | } | ||
354 | |||
355 | #[track_caller] | ||
356 | pub(crate) fn check_diagnostics_with_config(config: DiagnosticsConfig, ra_fixture: &str) { | ||
357 | let (analysis, files) = fixture::files(ra_fixture); | ||
358 | for file_id in files { | ||
359 | let diagnostics = | ||
360 | analysis.diagnostics(&config, AssistResolveStrategy::All, file_id).unwrap(); | ||
361 | |||
362 | let expected = extract_annotations(&*analysis.file_text(file_id).unwrap()); | ||
363 | let mut actual = | ||
364 | diagnostics.into_iter().map(|d| (d.range, d.message)).collect::<Vec<_>>(); | ||
365 | actual.sort_by_key(|(range, _)| range.start()); | ||
366 | assert_eq!(expected, actual); | ||
367 | } | ||
368 | } | ||
369 | |||
370 | #[test] | ||
371 | fn test_check_unnecessary_braces_in_use_statement() { | ||
372 | check_diagnostics( | ||
373 | r#" | ||
374 | use a; | ||
375 | use a::{c, d::e}; | ||
376 | |||
377 | mod a { | ||
378 | mod c {} | ||
379 | mod d { | ||
380 | mod e {} | ||
381 | } | ||
382 | } | ||
383 | "#, | ||
384 | ); | ||
385 | check_diagnostics( | ||
386 | r#" | ||
387 | use a; | ||
388 | use a::{ | ||
389 | c, | ||
390 | // d::e | ||
391 | }; | ||
392 | |||
393 | mod a { | ||
394 | mod c {} | ||
395 | mod d { | ||
396 | mod e {} | ||
397 | } | ||
398 | } | ||
399 | "#, | ||
400 | ); | ||
401 | check_fix( | ||
402 | r" | ||
403 | mod b {} | ||
404 | use {$0b}; | ||
405 | ", | ||
406 | r" | ||
407 | mod b {} | ||
408 | use b; | ||
409 | ", | ||
410 | ); | ||
411 | check_fix( | ||
412 | r" | ||
413 | mod b {} | ||
414 | use {b$0}; | ||
415 | ", | ||
416 | r" | ||
417 | mod b {} | ||
418 | use b; | ||
419 | ", | ||
420 | ); | ||
421 | check_fix( | ||
422 | r" | ||
423 | mod a { mod c {} } | ||
424 | use a::{c$0}; | ||
425 | ", | ||
426 | r" | ||
427 | mod a { mod c {} } | ||
428 | use a::c; | ||
429 | ", | ||
430 | ); | ||
431 | check_fix( | ||
432 | r" | ||
433 | mod a {} | ||
434 | use a::{self$0}; | ||
435 | ", | ||
436 | r" | ||
437 | mod a {} | ||
438 | use a; | ||
439 | ", | ||
440 | ); | ||
441 | check_fix( | ||
442 | r" | ||
443 | mod a { mod c {} mod d { mod e {} } } | ||
444 | use a::{c, d::{e$0}}; | ||
445 | ", | ||
446 | r" | ||
447 | mod a { mod c {} mod d { mod e {} } } | ||
448 | use a::{c, d::e}; | ||
449 | ", | ||
450 | ); | ||
451 | } | ||
452 | |||
453 | #[test] | ||
454 | fn test_disabled_diagnostics() { | ||
455 | let mut config = DiagnosticsConfig::default(); | ||
456 | config.disabled.insert("unresolved-module".into()); | ||
457 | |||
458 | let (analysis, file_id) = fixture::file(r#"mod foo;"#); | ||
459 | |||
460 | let diagnostics = | ||
461 | analysis.diagnostics(&config, AssistResolveStrategy::All, file_id).unwrap(); | ||
462 | assert!(diagnostics.is_empty()); | ||
463 | |||
464 | let diagnostics = analysis | ||
465 | .diagnostics(&DiagnosticsConfig::default(), AssistResolveStrategy::All, file_id) | ||
466 | .unwrap(); | ||
467 | assert!(!diagnostics.is_empty()); | ||
468 | } | ||
469 | |||
470 | #[test] | ||
471 | fn import_extern_crate_clash_with_inner_item() { | ||
472 | // This is more of a resolver test, but doesn't really work with the hir_def testsuite. | ||
473 | |||
474 | check_diagnostics( | ||
475 | r#" | ||
476 | //- /lib.rs crate:lib deps:jwt | ||
477 | mod permissions; | ||
478 | |||
479 | use permissions::jwt; | ||
480 | |||
481 | fn f() { | ||
482 | fn inner() {} | ||
483 | jwt::Claims {}; // should resolve to the local one with 0 fields, and not get a diagnostic | ||
484 | } | ||
485 | |||
486 | //- /permissions.rs | ||
487 | pub mod jwt { | ||
488 | pub struct Claims {} | ||
489 | } | ||
490 | |||
491 | //- /jwt/lib.rs crate:jwt | ||
492 | pub struct Claims { | ||
493 | field: u8, | ||
494 | } | ||
495 | "#, | ||
496 | ); | ||
497 | } | ||
498 | } | ||
diff --git a/crates/ide/src/diagnostics/break_outside_of_loop.rs b/crates/ide/src/diagnostics/break_outside_of_loop.rs deleted file mode 100644 index 80e68f3cc..000000000 --- a/crates/ide/src/diagnostics/break_outside_of_loop.rs +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
2 | |||
3 | // Diagnostic: break-outside-of-loop | ||
4 | // | ||
5 | // This diagnostic is triggered if the `break` keyword is used outside of a loop. | ||
6 | pub(super) fn break_outside_of_loop( | ||
7 | ctx: &DiagnosticsContext<'_>, | ||
8 | d: &hir::BreakOutsideOfLoop, | ||
9 | ) -> Diagnostic { | ||
10 | Diagnostic::new( | ||
11 | "break-outside-of-loop", | ||
12 | "break outside of loop", | ||
13 | ctx.sema.diagnostics_display_range(d.expr.clone().map(|it| it.into())).range, | ||
14 | ) | ||
15 | } | ||
16 | |||
17 | #[cfg(test)] | ||
18 | mod tests { | ||
19 | use crate::diagnostics::tests::check_diagnostics; | ||
20 | |||
21 | #[test] | ||
22 | fn break_outside_of_loop() { | ||
23 | check_diagnostics( | ||
24 | r#" | ||
25 | fn foo() { break; } | ||
26 | //^^^^^ break outside of loop | ||
27 | "#, | ||
28 | ); | ||
29 | } | ||
30 | } | ||
diff --git a/crates/ide/src/diagnostics/field_shorthand.rs b/crates/ide/src/diagnostics/field_shorthand.rs deleted file mode 100644 index c7f4dab8e..000000000 --- a/crates/ide/src/diagnostics/field_shorthand.rs +++ /dev/null | |||
@@ -1,203 +0,0 @@ | |||
1 | //! Suggests shortening `Foo { field: field }` to `Foo { field }` in both | ||
2 | //! expressions and patterns. | ||
3 | |||
4 | use ide_db::{base_db::FileId, source_change::SourceChange}; | ||
5 | use syntax::{ast, match_ast, AstNode, SyntaxNode}; | ||
6 | use text_edit::TextEdit; | ||
7 | |||
8 | use crate::{diagnostics::fix, Diagnostic, Severity}; | ||
9 | |||
10 | pub(super) fn check(acc: &mut Vec<Diagnostic>, file_id: FileId, node: &SyntaxNode) { | ||
11 | match_ast! { | ||
12 | match node { | ||
13 | ast::RecordExpr(it) => check_expr_field_shorthand(acc, file_id, it), | ||
14 | ast::RecordPat(it) => check_pat_field_shorthand(acc, file_id, it), | ||
15 | _ => () | ||
16 | } | ||
17 | }; | ||
18 | } | ||
19 | |||
20 | fn check_expr_field_shorthand( | ||
21 | acc: &mut Vec<Diagnostic>, | ||
22 | file_id: FileId, | ||
23 | record_expr: ast::RecordExpr, | ||
24 | ) { | ||
25 | let record_field_list = match record_expr.record_expr_field_list() { | ||
26 | Some(it) => it, | ||
27 | None => return, | ||
28 | }; | ||
29 | for record_field in record_field_list.fields() { | ||
30 | let (name_ref, expr) = match record_field.name_ref().zip(record_field.expr()) { | ||
31 | Some(it) => it, | ||
32 | None => continue, | ||
33 | }; | ||
34 | |||
35 | let field_name = name_ref.syntax().text().to_string(); | ||
36 | let field_expr = expr.syntax().text().to_string(); | ||
37 | let field_name_is_tup_index = name_ref.as_tuple_field().is_some(); | ||
38 | if field_name != field_expr || field_name_is_tup_index { | ||
39 | continue; | ||
40 | } | ||
41 | |||
42 | let mut edit_builder = TextEdit::builder(); | ||
43 | edit_builder.delete(record_field.syntax().text_range()); | ||
44 | edit_builder.insert(record_field.syntax().text_range().start(), field_name); | ||
45 | let edit = edit_builder.finish(); | ||
46 | |||
47 | let field_range = record_field.syntax().text_range(); | ||
48 | acc.push( | ||
49 | Diagnostic::new("use-field-shorthand", "Shorthand struct initialization", field_range) | ||
50 | .severity(Severity::WeakWarning) | ||
51 | .with_fixes(Some(vec![fix( | ||
52 | "use_expr_field_shorthand", | ||
53 | "Use struct shorthand initialization", | ||
54 | SourceChange::from_text_edit(file_id, edit), | ||
55 | field_range, | ||
56 | )])), | ||
57 | ); | ||
58 | } | ||
59 | } | ||
60 | |||
61 | fn check_pat_field_shorthand( | ||
62 | acc: &mut Vec<Diagnostic>, | ||
63 | file_id: FileId, | ||
64 | record_pat: ast::RecordPat, | ||
65 | ) { | ||
66 | let record_pat_field_list = match record_pat.record_pat_field_list() { | ||
67 | Some(it) => it, | ||
68 | None => return, | ||
69 | }; | ||
70 | for record_pat_field in record_pat_field_list.fields() { | ||
71 | let (name_ref, pat) = match record_pat_field.name_ref().zip(record_pat_field.pat()) { | ||
72 | Some(it) => it, | ||
73 | None => continue, | ||
74 | }; | ||
75 | |||
76 | let field_name = name_ref.syntax().text().to_string(); | ||
77 | let field_pat = pat.syntax().text().to_string(); | ||
78 | let field_name_is_tup_index = name_ref.as_tuple_field().is_some(); | ||
79 | if field_name != field_pat || field_name_is_tup_index { | ||
80 | continue; | ||
81 | } | ||
82 | |||
83 | let mut edit_builder = TextEdit::builder(); | ||
84 | edit_builder.delete(record_pat_field.syntax().text_range()); | ||
85 | edit_builder.insert(record_pat_field.syntax().text_range().start(), field_name); | ||
86 | let edit = edit_builder.finish(); | ||
87 | |||
88 | let field_range = record_pat_field.syntax().text_range(); | ||
89 | acc.push( | ||
90 | Diagnostic::new("use-field-shorthand", "Shorthand struct pattern", field_range) | ||
91 | .severity(Severity::WeakWarning) | ||
92 | .with_fixes(Some(vec![fix( | ||
93 | "use_pat_field_shorthand", | ||
94 | "Use struct field shorthand", | ||
95 | SourceChange::from_text_edit(file_id, edit), | ||
96 | field_range, | ||
97 | )])), | ||
98 | ); | ||
99 | } | ||
100 | } | ||
101 | |||
102 | #[cfg(test)] | ||
103 | mod tests { | ||
104 | use crate::diagnostics::tests::{check_diagnostics, check_fix}; | ||
105 | |||
106 | #[test] | ||
107 | fn test_check_expr_field_shorthand() { | ||
108 | check_diagnostics( | ||
109 | r#" | ||
110 | struct A { a: &'static str } | ||
111 | fn main() { A { a: "hello" } } | ||
112 | "#, | ||
113 | ); | ||
114 | check_diagnostics( | ||
115 | r#" | ||
116 | struct A(usize); | ||
117 | fn main() { A { 0: 0 } } | ||
118 | "#, | ||
119 | ); | ||
120 | |||
121 | check_fix( | ||
122 | r#" | ||
123 | struct A { a: &'static str } | ||
124 | fn main() { | ||
125 | let a = "haha"; | ||
126 | A { a$0: a } | ||
127 | } | ||
128 | "#, | ||
129 | r#" | ||
130 | struct A { a: &'static str } | ||
131 | fn main() { | ||
132 | let a = "haha"; | ||
133 | A { a } | ||
134 | } | ||
135 | "#, | ||
136 | ); | ||
137 | |||
138 | check_fix( | ||
139 | r#" | ||
140 | struct A { a: &'static str, b: &'static str } | ||
141 | fn main() { | ||
142 | let a = "haha"; | ||
143 | let b = "bb"; | ||
144 | A { a$0: a, b } | ||
145 | } | ||
146 | "#, | ||
147 | r#" | ||
148 | struct A { a: &'static str, b: &'static str } | ||
149 | fn main() { | ||
150 | let a = "haha"; | ||
151 | let b = "bb"; | ||
152 | A { a, b } | ||
153 | } | ||
154 | "#, | ||
155 | ); | ||
156 | } | ||
157 | |||
158 | #[test] | ||
159 | fn test_check_pat_field_shorthand() { | ||
160 | check_diagnostics( | ||
161 | r#" | ||
162 | struct A { a: &'static str } | ||
163 | fn f(a: A) { let A { a: hello } = a; } | ||
164 | "#, | ||
165 | ); | ||
166 | check_diagnostics( | ||
167 | r#" | ||
168 | struct A(usize); | ||
169 | fn f(a: A) { let A { 0: 0 } = a; } | ||
170 | "#, | ||
171 | ); | ||
172 | |||
173 | check_fix( | ||
174 | r#" | ||
175 | struct A { a: &'static str } | ||
176 | fn f(a: A) { | ||
177 | let A { a$0: a } = a; | ||
178 | } | ||
179 | "#, | ||
180 | r#" | ||
181 | struct A { a: &'static str } | ||
182 | fn f(a: A) { | ||
183 | let A { a } = a; | ||
184 | } | ||
185 | "#, | ||
186 | ); | ||
187 | |||
188 | check_fix( | ||
189 | r#" | ||
190 | struct A { a: &'static str, b: &'static str } | ||
191 | fn f(a: A) { | ||
192 | let A { a$0: a, b } = a; | ||
193 | } | ||
194 | "#, | ||
195 | r#" | ||
196 | struct A { a: &'static str, b: &'static str } | ||
197 | fn f(a: A) { | ||
198 | let A { a, b } = a; | ||
199 | } | ||
200 | "#, | ||
201 | ); | ||
202 | } | ||
203 | } | ||
diff --git a/crates/ide/src/diagnostics/inactive_code.rs b/crates/ide/src/diagnostics/inactive_code.rs deleted file mode 100644 index d9d3e88c1..000000000 --- a/crates/ide/src/diagnostics/inactive_code.rs +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | use cfg::DnfExpr; | ||
2 | use stdx::format_to; | ||
3 | |||
4 | use crate::{ | ||
5 | diagnostics::{Diagnostic, DiagnosticsContext}, | ||
6 | Severity, | ||
7 | }; | ||
8 | |||
9 | // Diagnostic: inactive-code | ||
10 | // | ||
11 | // This diagnostic is shown for code with inactive `#[cfg]` attributes. | ||
12 | pub(super) fn inactive_code( | ||
13 | ctx: &DiagnosticsContext<'_>, | ||
14 | d: &hir::InactiveCode, | ||
15 | ) -> Option<Diagnostic> { | ||
16 | // If there's inactive code somewhere in a macro, don't propagate to the call-site. | ||
17 | if d.node.file_id.expansion_info(ctx.sema.db).is_some() { | ||
18 | return None; | ||
19 | } | ||
20 | |||
21 | let inactive = DnfExpr::new(d.cfg.clone()).why_inactive(&d.opts); | ||
22 | let mut message = "code is inactive due to #[cfg] directives".to_string(); | ||
23 | |||
24 | if let Some(inactive) = inactive { | ||
25 | format_to!(message, ": {}", inactive); | ||
26 | } | ||
27 | |||
28 | let res = Diagnostic::new( | ||
29 | "inactive-code", | ||
30 | message, | ||
31 | ctx.sema.diagnostics_display_range(d.node.clone()).range, | ||
32 | ) | ||
33 | .severity(Severity::WeakWarning) | ||
34 | .with_unused(true); | ||
35 | Some(res) | ||
36 | } | ||
37 | |||
38 | #[cfg(test)] | ||
39 | mod tests { | ||
40 | use crate::{diagnostics::tests::check_diagnostics_with_config, DiagnosticsConfig}; | ||
41 | |||
42 | pub(crate) fn check(ra_fixture: &str) { | ||
43 | let config = DiagnosticsConfig::default(); | ||
44 | check_diagnostics_with_config(config, ra_fixture) | ||
45 | } | ||
46 | |||
47 | #[test] | ||
48 | fn cfg_diagnostics() { | ||
49 | check( | ||
50 | r#" | ||
51 | fn f() { | ||
52 | // The three g̶e̶n̶d̶e̶r̶s̶ statements: | ||
53 | |||
54 | #[cfg(a)] fn f() {} // Item statement | ||
55 | //^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: a is disabled | ||
56 | #[cfg(a)] {} // Expression statement | ||
57 | //^^^^^^^^^^^^ code is inactive due to #[cfg] directives: a is disabled | ||
58 | #[cfg(a)] let x = 0; // let statement | ||
59 | //^^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: a is disabled | ||
60 | |||
61 | abc(#[cfg(a)] 0); | ||
62 | //^^^^^^^^^^^ code is inactive due to #[cfg] directives: a is disabled | ||
63 | let x = Struct { | ||
64 | #[cfg(a)] f: 0, | ||
65 | //^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: a is disabled | ||
66 | }; | ||
67 | match () { | ||
68 | () => (), | ||
69 | #[cfg(a)] () => (), | ||
70 | //^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: a is disabled | ||
71 | } | ||
72 | |||
73 | #[cfg(a)] 0 // Trailing expression of block | ||
74 | //^^^^^^^^^^^ code is inactive due to #[cfg] directives: a is disabled | ||
75 | } | ||
76 | "#, | ||
77 | ); | ||
78 | } | ||
79 | |||
80 | #[test] | ||
81 | fn inactive_item() { | ||
82 | // Additional tests in `cfg` crate. This only tests disabled cfgs. | ||
83 | |||
84 | check( | ||
85 | r#" | ||
86 | #[cfg(no)] pub fn f() {} | ||
87 | //^^^^^^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: no is disabled | ||
88 | |||
89 | #[cfg(no)] #[cfg(no2)] mod m; | ||
90 | //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: no and no2 are disabled | ||
91 | |||
92 | #[cfg(all(not(a), b))] enum E {} | ||
93 | //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: b is disabled | ||
94 | |||
95 | #[cfg(feature = "std")] use std; | ||
96 | //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: feature = "std" is disabled | ||
97 | "#, | ||
98 | ); | ||
99 | } | ||
100 | |||
101 | /// Tests that `cfg` attributes behind `cfg_attr` is handled properly. | ||
102 | #[test] | ||
103 | fn inactive_via_cfg_attr() { | ||
104 | cov_mark::check!(cfg_attr_active); | ||
105 | check( | ||
106 | r#" | ||
107 | #[cfg_attr(not(never), cfg(no))] fn f() {} | ||
108 | //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: no is disabled | ||
109 | |||
110 | #[cfg_attr(not(never), cfg(not(no)))] fn f() {} | ||
111 | |||
112 | #[cfg_attr(never, cfg(no))] fn g() {} | ||
113 | |||
114 | #[cfg_attr(not(never), inline, cfg(no))] fn h() {} | ||
115 | //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ code is inactive due to #[cfg] directives: no is disabled | ||
116 | "#, | ||
117 | ); | ||
118 | } | ||
119 | } | ||
diff --git a/crates/ide/src/diagnostics/incorrect_case.rs b/crates/ide/src/diagnostics/incorrect_case.rs deleted file mode 100644 index 832394400..000000000 --- a/crates/ide/src/diagnostics/incorrect_case.rs +++ /dev/null | |||
@@ -1,488 +0,0 @@ | |||
1 | use hir::{db::AstDatabase, InFile}; | ||
2 | use ide_assists::Assist; | ||
3 | use ide_db::base_db::FilePosition; | ||
4 | use syntax::AstNode; | ||
5 | |||
6 | use crate::{ | ||
7 | diagnostics::{unresolved_fix, Diagnostic, DiagnosticsContext}, | ||
8 | references::rename::rename_with_semantics, | ||
9 | Severity, | ||
10 | }; | ||
11 | |||
12 | // Diagnostic: incorrect-ident-case | ||
13 | // | ||
14 | // This diagnostic is triggered if an item name doesn't follow https://doc.rust-lang.org/1.0.0/style/style/naming/README.html[Rust naming convention]. | ||
15 | pub(super) fn incorrect_case(ctx: &DiagnosticsContext<'_>, d: &hir::IncorrectCase) -> Diagnostic { | ||
16 | Diagnostic::new( | ||
17 | "incorrect-ident-case", | ||
18 | format!( | ||
19 | "{} `{}` should have {} name, e.g. `{}`", | ||
20 | d.ident_type, d.ident_text, d.expected_case, d.suggested_text | ||
21 | ), | ||
22 | ctx.sema.diagnostics_display_range(InFile::new(d.file, d.ident.clone().into())).range, | ||
23 | ) | ||
24 | .severity(Severity::WeakWarning) | ||
25 | .with_fixes(fixes(ctx, d)) | ||
26 | } | ||
27 | |||
28 | fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::IncorrectCase) -> Option<Vec<Assist>> { | ||
29 | let root = ctx.sema.db.parse_or_expand(d.file)?; | ||
30 | let name_node = d.ident.to_node(&root); | ||
31 | |||
32 | let name_node = InFile::new(d.file, name_node.syntax()); | ||
33 | let frange = name_node.original_file_range(ctx.sema.db); | ||
34 | let file_position = FilePosition { file_id: frange.file_id, offset: frange.range.start() }; | ||
35 | |||
36 | let label = format!("Rename to {}", d.suggested_text); | ||
37 | let mut res = unresolved_fix("change_case", &label, frange.range); | ||
38 | if ctx.resolve.should_resolve(&res.id) { | ||
39 | let source_change = rename_with_semantics(&ctx.sema, file_position, &d.suggested_text); | ||
40 | res.source_change = Some(source_change.ok().unwrap_or_default()); | ||
41 | } | ||
42 | |||
43 | Some(vec![res]) | ||
44 | } | ||
45 | |||
46 | #[cfg(test)] | ||
47 | mod change_case { | ||
48 | use crate::{ | ||
49 | diagnostics::tests::{check_diagnostics, check_fix}, | ||
50 | fixture, AssistResolveStrategy, DiagnosticsConfig, | ||
51 | }; | ||
52 | |||
53 | #[test] | ||
54 | fn test_rename_incorrect_case() { | ||
55 | check_fix( | ||
56 | r#" | ||
57 | pub struct test_struct$0 { one: i32 } | ||
58 | |||
59 | pub fn some_fn(val: test_struct) -> test_struct { | ||
60 | test_struct { one: val.one + 1 } | ||
61 | } | ||
62 | "#, | ||
63 | r#" | ||
64 | pub struct TestStruct { one: i32 } | ||
65 | |||
66 | pub fn some_fn(val: TestStruct) -> TestStruct { | ||
67 | TestStruct { one: val.one + 1 } | ||
68 | } | ||
69 | "#, | ||
70 | ); | ||
71 | |||
72 | check_fix( | ||
73 | r#" | ||
74 | pub fn some_fn(NonSnakeCase$0: u8) -> u8 { | ||
75 | NonSnakeCase | ||
76 | } | ||
77 | "#, | ||
78 | r#" | ||
79 | pub fn some_fn(non_snake_case: u8) -> u8 { | ||
80 | non_snake_case | ||
81 | } | ||
82 | "#, | ||
83 | ); | ||
84 | |||
85 | check_fix( | ||
86 | r#" | ||
87 | pub fn SomeFn$0(val: u8) -> u8 { | ||
88 | if val != 0 { SomeFn(val - 1) } else { val } | ||
89 | } | ||
90 | "#, | ||
91 | r#" | ||
92 | pub fn some_fn(val: u8) -> u8 { | ||
93 | if val != 0 { some_fn(val - 1) } else { val } | ||
94 | } | ||
95 | "#, | ||
96 | ); | ||
97 | |||
98 | check_fix( | ||
99 | r#" | ||
100 | fn some_fn() { | ||
101 | let whatAWeird_Formatting$0 = 10; | ||
102 | another_func(whatAWeird_Formatting); | ||
103 | } | ||
104 | "#, | ||
105 | r#" | ||
106 | fn some_fn() { | ||
107 | let what_a_weird_formatting = 10; | ||
108 | another_func(what_a_weird_formatting); | ||
109 | } | ||
110 | "#, | ||
111 | ); | ||
112 | } | ||
113 | |||
114 | #[test] | ||
115 | fn test_uppercase_const_no_diagnostics() { | ||
116 | check_diagnostics( | ||
117 | r#" | ||
118 | fn foo() { | ||
119 | const ANOTHER_ITEM$0: &str = "some_item"; | ||
120 | } | ||
121 | "#, | ||
122 | ); | ||
123 | } | ||
124 | |||
125 | #[test] | ||
126 | fn test_rename_incorrect_case_struct_method() { | ||
127 | check_fix( | ||
128 | r#" | ||
129 | pub struct TestStruct; | ||
130 | |||
131 | impl TestStruct { | ||
132 | pub fn SomeFn$0() -> TestStruct { | ||
133 | TestStruct | ||
134 | } | ||
135 | } | ||
136 | "#, | ||
137 | r#" | ||
138 | pub struct TestStruct; | ||
139 | |||
140 | impl TestStruct { | ||
141 | pub fn some_fn() -> TestStruct { | ||
142 | TestStruct | ||
143 | } | ||
144 | } | ||
145 | "#, | ||
146 | ); | ||
147 | } | ||
148 | |||
149 | #[test] | ||
150 | fn test_single_incorrect_case_diagnostic_in_function_name_issue_6970() { | ||
151 | let input = r#"fn FOO$0() {}"#; | ||
152 | let expected = r#"fn foo() {}"#; | ||
153 | |||
154 | let (analysis, file_position) = fixture::position(input); | ||
155 | let diagnostics = analysis | ||
156 | .diagnostics( | ||
157 | &DiagnosticsConfig::default(), | ||
158 | AssistResolveStrategy::All, | ||
159 | file_position.file_id, | ||
160 | ) | ||
161 | .unwrap(); | ||
162 | assert_eq!(diagnostics.len(), 1); | ||
163 | |||
164 | check_fix(input, expected); | ||
165 | } | ||
166 | |||
167 | #[test] | ||
168 | fn incorrect_function_name() { | ||
169 | check_diagnostics( | ||
170 | r#" | ||
171 | fn NonSnakeCaseName() {} | ||
172 | // ^^^^^^^^^^^^^^^^ Function `NonSnakeCaseName` should have snake_case name, e.g. `non_snake_case_name` | ||
173 | "#, | ||
174 | ); | ||
175 | } | ||
176 | |||
177 | #[test] | ||
178 | fn incorrect_function_params() { | ||
179 | check_diagnostics( | ||
180 | r#" | ||
181 | fn foo(SomeParam: u8) {} | ||
182 | // ^^^^^^^^^ Parameter `SomeParam` should have snake_case name, e.g. `some_param` | ||
183 | |||
184 | fn foo2(ok_param: &str, CAPS_PARAM: u8) {} | ||
185 | // ^^^^^^^^^^ Parameter `CAPS_PARAM` should have snake_case name, e.g. `caps_param` | ||
186 | "#, | ||
187 | ); | ||
188 | } | ||
189 | |||
190 | #[test] | ||
191 | fn incorrect_variable_names() { | ||
192 | check_diagnostics( | ||
193 | r#" | ||
194 | fn foo() { | ||
195 | let SOME_VALUE = 10; | ||
196 | // ^^^^^^^^^^ Variable `SOME_VALUE` should have snake_case name, e.g. `some_value` | ||
197 | let AnotherValue = 20; | ||
198 | // ^^^^^^^^^^^^ Variable `AnotherValue` should have snake_case name, e.g. `another_value` | ||
199 | } | ||
200 | "#, | ||
201 | ); | ||
202 | } | ||
203 | |||
204 | #[test] | ||
205 | fn incorrect_struct_names() { | ||
206 | check_diagnostics( | ||
207 | r#" | ||
208 | struct non_camel_case_name {} | ||
209 | // ^^^^^^^^^^^^^^^^^^^ Structure `non_camel_case_name` should have CamelCase name, e.g. `NonCamelCaseName` | ||
210 | |||
211 | struct SCREAMING_CASE {} | ||
212 | // ^^^^^^^^^^^^^^ Structure `SCREAMING_CASE` should have CamelCase name, e.g. `ScreamingCase` | ||
213 | "#, | ||
214 | ); | ||
215 | } | ||
216 | |||
217 | #[test] | ||
218 | fn no_diagnostic_for_camel_cased_acronyms_in_struct_name() { | ||
219 | check_diagnostics( | ||
220 | r#" | ||
221 | struct AABB {} | ||
222 | "#, | ||
223 | ); | ||
224 | } | ||
225 | |||
226 | #[test] | ||
227 | fn incorrect_struct_field() { | ||
228 | check_diagnostics( | ||
229 | r#" | ||
230 | struct SomeStruct { SomeField: u8 } | ||
231 | // ^^^^^^^^^ Field `SomeField` should have snake_case name, e.g. `some_field` | ||
232 | "#, | ||
233 | ); | ||
234 | } | ||
235 | |||
236 | #[test] | ||
237 | fn incorrect_enum_names() { | ||
238 | check_diagnostics( | ||
239 | r#" | ||
240 | enum some_enum { Val(u8) } | ||
241 | // ^^^^^^^^^ Enum `some_enum` should have CamelCase name, e.g. `SomeEnum` | ||
242 | |||
243 | enum SOME_ENUM {} | ||
244 | // ^^^^^^^^^ Enum `SOME_ENUM` should have CamelCase name, e.g. `SomeEnum` | ||
245 | "#, | ||
246 | ); | ||
247 | } | ||
248 | |||
249 | #[test] | ||
250 | fn no_diagnostic_for_camel_cased_acronyms_in_enum_name() { | ||
251 | check_diagnostics( | ||
252 | r#" | ||
253 | enum AABB {} | ||
254 | "#, | ||
255 | ); | ||
256 | } | ||
257 | |||
258 | #[test] | ||
259 | fn incorrect_enum_variant_name() { | ||
260 | check_diagnostics( | ||
261 | r#" | ||
262 | enum SomeEnum { SOME_VARIANT(u8) } | ||
263 | // ^^^^^^^^^^^^ Variant `SOME_VARIANT` should have CamelCase name, e.g. `SomeVariant` | ||
264 | "#, | ||
265 | ); | ||
266 | } | ||
267 | |||
268 | #[test] | ||
269 | fn incorrect_const_name() { | ||
270 | check_diagnostics( | ||
271 | r#" | ||
272 | const some_weird_const: u8 = 10; | ||
273 | // ^^^^^^^^^^^^^^^^ Constant `some_weird_const` should have UPPER_SNAKE_CASE name, e.g. `SOME_WEIRD_CONST` | ||
274 | "#, | ||
275 | ); | ||
276 | } | ||
277 | |||
278 | #[test] | ||
279 | fn incorrect_static_name() { | ||
280 | check_diagnostics( | ||
281 | r#" | ||
282 | static some_weird_const: u8 = 10; | ||
283 | // ^^^^^^^^^^^^^^^^ Static variable `some_weird_const` should have UPPER_SNAKE_CASE name, e.g. `SOME_WEIRD_CONST` | ||
284 | "#, | ||
285 | ); | ||
286 | } | ||
287 | |||
288 | #[test] | ||
289 | fn fn_inside_impl_struct() { | ||
290 | check_diagnostics( | ||
291 | r#" | ||
292 | struct someStruct; | ||
293 | // ^^^^^^^^^^ Structure `someStruct` should have CamelCase name, e.g. `SomeStruct` | ||
294 | |||
295 | impl someStruct { | ||
296 | fn SomeFunc(&self) { | ||
297 | // ^^^^^^^^ Function `SomeFunc` should have snake_case name, e.g. `some_func` | ||
298 | let WHY_VAR_IS_CAPS = 10; | ||
299 | // ^^^^^^^^^^^^^^^ Variable `WHY_VAR_IS_CAPS` should have snake_case name, e.g. `why_var_is_caps` | ||
300 | } | ||
301 | } | ||
302 | "#, | ||
303 | ); | ||
304 | } | ||
305 | |||
306 | #[test] | ||
307 | fn no_diagnostic_for_enum_varinats() { | ||
308 | check_diagnostics( | ||
309 | r#" | ||
310 | enum Option { Some, None } | ||
311 | |||
312 | fn main() { | ||
313 | match Option::None { | ||
314 | None => (), | ||
315 | Some => (), | ||
316 | } | ||
317 | } | ||
318 | "#, | ||
319 | ); | ||
320 | } | ||
321 | |||
322 | #[test] | ||
323 | fn non_let_bind() { | ||
324 | check_diagnostics( | ||
325 | r#" | ||
326 | enum Option { Some, None } | ||
327 | |||
328 | fn main() { | ||
329 | match Option::None { | ||
330 | SOME_VAR @ None => (), | ||
331 | // ^^^^^^^^ Variable `SOME_VAR` should have snake_case name, e.g. `some_var` | ||
332 | Some => (), | ||
333 | } | ||
334 | } | ||
335 | "#, | ||
336 | ); | ||
337 | } | ||
338 | |||
339 | #[test] | ||
340 | fn allow_attributes_crate_attr() { | ||
341 | check_diagnostics( | ||
342 | r#" | ||
343 | #![allow(non_snake_case)] | ||
344 | |||
345 | mod F { | ||
346 | fn CheckItWorksWithCrateAttr(BAD_NAME_HI: u8) {} | ||
347 | } | ||
348 | "#, | ||
349 | ); | ||
350 | } | ||
351 | |||
352 | #[test] | ||
353 | #[ignore] | ||
354 | fn bug_trait_inside_fn() { | ||
355 | // FIXME: | ||
356 | // This is broken, and in fact, should not even be looked at by this | ||
357 | // lint in the first place. There's weird stuff going on in the | ||
358 | // collection phase. | ||
359 | // It's currently being brought in by: | ||
360 | // * validate_func on `a` recursing into modules | ||
361 | // * then it finds the trait and then the function while iterating | ||
362 | // through modules | ||
363 | // * then validate_func is called on Dirty | ||
364 | // * ... which then proceeds to look at some unknown module taking no | ||
365 | // attrs from either the impl or the fn a, and then finally to the root | ||
366 | // module | ||
367 | // | ||
368 | // It should find the attribute on the trait, but it *doesn't even see | ||
369 | // the trait* as far as I can tell. | ||
370 | |||
371 | check_diagnostics( | ||
372 | r#" | ||
373 | trait T { fn a(); } | ||
374 | struct U {} | ||
375 | impl T for U { | ||
376 | fn a() { | ||
377 | // this comes out of bitflags, mostly | ||
378 | #[allow(non_snake_case)] | ||
379 | trait __BitFlags { | ||
380 | const HiImAlsoBad: u8 = 2; | ||
381 | #[inline] | ||
382 | fn Dirty(&self) -> bool { | ||
383 | false | ||
384 | } | ||
385 | } | ||
386 | |||
387 | } | ||
388 | } | ||
389 | "#, | ||
390 | ); | ||
391 | } | ||
392 | |||
393 | #[test] | ||
394 | fn infinite_loop_inner_items() { | ||
395 | check_diagnostics( | ||
396 | r#" | ||
397 | fn qualify() { | ||
398 | mod foo { | ||
399 | use super::*; | ||
400 | } | ||
401 | } | ||
402 | "#, | ||
403 | ) | ||
404 | } | ||
405 | |||
406 | #[test] // Issue #8809. | ||
407 | fn parenthesized_parameter() { | ||
408 | check_diagnostics(r#"fn f((O): _) {}"#) | ||
409 | } | ||
410 | |||
411 | #[test] | ||
412 | fn ignores_extern_items() { | ||
413 | cov_mark::check!(extern_func_incorrect_case_ignored); | ||
414 | cov_mark::check!(extern_static_incorrect_case_ignored); | ||
415 | check_diagnostics( | ||
416 | r#" | ||
417 | extern { | ||
418 | fn NonSnakeCaseName(SOME_VAR: u8) -> u8; | ||
419 | pub static SomeStatic: u8 = 10; | ||
420 | } | ||
421 | "#, | ||
422 | ); | ||
423 | } | ||
424 | |||
425 | #[test] | ||
426 | #[ignore] | ||
427 | fn bug_traits_arent_checked() { | ||
428 | // FIXME: Traits and functions in traits aren't currently checked by | ||
429 | // r-a, even though rustc will complain about them. | ||
430 | check_diagnostics( | ||
431 | r#" | ||
432 | trait BAD_TRAIT { | ||
433 | // ^^^^^^^^^ Trait `BAD_TRAIT` should have CamelCase name, e.g. `BadTrait` | ||
434 | fn BAD_FUNCTION(); | ||
435 | // ^^^^^^^^^^^^ Function `BAD_FUNCTION` should have snake_case name, e.g. `bad_function` | ||
436 | fn BadFunction(); | ||
437 | // ^^^^^^^^^^^^ Function `BadFunction` should have snake_case name, e.g. `bad_function` | ||
438 | } | ||
439 | "#, | ||
440 | ); | ||
441 | } | ||
442 | |||
443 | #[test] | ||
444 | fn allow_attributes() { | ||
445 | check_diagnostics( | ||
446 | r#" | ||
447 | #[allow(non_snake_case)] | ||
448 | fn NonSnakeCaseName(SOME_VAR: u8) -> u8{ | ||
449 | // cov_flags generated output from elsewhere in this file | ||
450 | extern "C" { | ||
451 | #[no_mangle] | ||
452 | static lower_case: u8; | ||
453 | } | ||
454 | |||
455 | let OtherVar = SOME_VAR + 1; | ||
456 | OtherVar | ||
457 | } | ||
458 | |||
459 | #[allow(nonstandard_style)] | ||
460 | mod CheckNonstandardStyle { | ||
461 | fn HiImABadFnName() {} | ||
462 | } | ||
463 | |||
464 | #[allow(bad_style)] | ||
465 | mod CheckBadStyle { | ||
466 | fn HiImABadFnName() {} | ||
467 | } | ||
468 | |||
469 | mod F { | ||
470 | #![allow(non_snake_case)] | ||
471 | fn CheckItWorksWithModAttr(BAD_NAME_HI: u8) {} | ||
472 | } | ||
473 | |||
474 | #[allow(non_snake_case, non_camel_case_types)] | ||
475 | pub struct some_type { | ||
476 | SOME_FIELD: u8, | ||
477 | SomeField: u16, | ||
478 | } | ||
479 | |||
480 | #[allow(non_upper_case_globals)] | ||
481 | pub const some_const: u8 = 10; | ||
482 | |||
483 | #[allow(non_upper_case_globals)] | ||
484 | pub static SomeStatic: u8 = 10; | ||
485 | "#, | ||
486 | ); | ||
487 | } | ||
488 | } | ||
diff --git a/crates/ide/src/diagnostics/macro_error.rs b/crates/ide/src/diagnostics/macro_error.rs deleted file mode 100644 index 5f97f190d..000000000 --- a/crates/ide/src/diagnostics/macro_error.rs +++ /dev/null | |||
@@ -1,173 +0,0 @@ | |||
1 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
2 | |||
3 | // Diagnostic: macro-error | ||
4 | // | ||
5 | // This diagnostic is shown for macro expansion errors. | ||
6 | pub(super) fn macro_error(ctx: &DiagnosticsContext<'_>, d: &hir::MacroError) -> Diagnostic { | ||
7 | Diagnostic::new( | ||
8 | "macro-error", | ||
9 | d.message.clone(), | ||
10 | ctx.sema.diagnostics_display_range(d.node.clone()).range, | ||
11 | ) | ||
12 | .experimental() | ||
13 | } | ||
14 | |||
15 | #[cfg(test)] | ||
16 | mod tests { | ||
17 | use crate::{ | ||
18 | diagnostics::tests::{check_diagnostics, check_diagnostics_with_config}, | ||
19 | DiagnosticsConfig, | ||
20 | }; | ||
21 | |||
22 | #[test] | ||
23 | fn builtin_macro_fails_expansion() { | ||
24 | check_diagnostics( | ||
25 | r#" | ||
26 | #[rustc_builtin_macro] | ||
27 | macro_rules! include { () => {} } | ||
28 | |||
29 | include!("doesntexist"); | ||
30 | //^^^^^^^^^^^^^^^^^^^^^^^^ failed to load file `doesntexist` | ||
31 | "#, | ||
32 | ); | ||
33 | } | ||
34 | |||
35 | #[test] | ||
36 | fn include_macro_should_allow_empty_content() { | ||
37 | let mut config = DiagnosticsConfig::default(); | ||
38 | |||
39 | // FIXME: This is a false-positive, the file is actually linked in via | ||
40 | // `include!` macro | ||
41 | config.disabled.insert("unlinked-file".to_string()); | ||
42 | |||
43 | check_diagnostics_with_config( | ||
44 | config, | ||
45 | r#" | ||
46 | //- /lib.rs | ||
47 | #[rustc_builtin_macro] | ||
48 | macro_rules! include { () => {} } | ||
49 | |||
50 | include!("foo/bar.rs"); | ||
51 | //- /foo/bar.rs | ||
52 | // empty | ||
53 | "#, | ||
54 | ); | ||
55 | } | ||
56 | |||
57 | #[test] | ||
58 | fn good_out_dir_diagnostic() { | ||
59 | check_diagnostics( | ||
60 | r#" | ||
61 | #[rustc_builtin_macro] | ||
62 | macro_rules! include { () => {} } | ||
63 | #[rustc_builtin_macro] | ||
64 | macro_rules! env { () => {} } | ||
65 | #[rustc_builtin_macro] | ||
66 | macro_rules! concat { () => {} } | ||
67 | |||
68 | include!(concat!(env!("OUT_DIR"), "/out.rs")); | ||
69 | //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix | ||
70 | "#, | ||
71 | ); | ||
72 | } | ||
73 | |||
74 | #[test] | ||
75 | fn register_attr_and_tool() { | ||
76 | cov_mark::check!(register_attr); | ||
77 | cov_mark::check!(register_tool); | ||
78 | check_diagnostics( | ||
79 | r#" | ||
80 | #![register_tool(tool)] | ||
81 | #![register_attr(attr)] | ||
82 | |||
83 | #[tool::path] | ||
84 | #[attr] | ||
85 | struct S; | ||
86 | "#, | ||
87 | ); | ||
88 | // NB: we don't currently emit diagnostics here | ||
89 | } | ||
90 | |||
91 | #[test] | ||
92 | fn macro_diag_builtin() { | ||
93 | check_diagnostics( | ||
94 | r#" | ||
95 | #[rustc_builtin_macro] | ||
96 | macro_rules! env {} | ||
97 | |||
98 | #[rustc_builtin_macro] | ||
99 | macro_rules! include {} | ||
100 | |||
101 | #[rustc_builtin_macro] | ||
102 | macro_rules! compile_error {} | ||
103 | |||
104 | #[rustc_builtin_macro] | ||
105 | macro_rules! format_args { () => {} } | ||
106 | |||
107 | fn main() { | ||
108 | // Test a handful of built-in (eager) macros: | ||
109 | |||
110 | include!(invalid); | ||
111 | //^^^^^^^^^^^^^^^^^ could not convert tokens | ||
112 | include!("does not exist"); | ||
113 | //^^^^^^^^^^^^^^^^^^^^^^^^^^ failed to load file `does not exist` | ||
114 | |||
115 | env!(invalid); | ||
116 | //^^^^^^^^^^^^^ could not convert tokens | ||
117 | |||
118 | env!("OUT_DIR"); | ||
119 | //^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix | ||
120 | |||
121 | compile_error!("compile_error works"); | ||
122 | //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works | ||
123 | |||
124 | // Lazy: | ||
125 | |||
126 | format_args!(); | ||
127 | //^^^^^^^^^^^^^^ no rule matches input tokens | ||
128 | } | ||
129 | "#, | ||
130 | ); | ||
131 | } | ||
132 | |||
133 | #[test] | ||
134 | fn macro_rules_diag() { | ||
135 | check_diagnostics( | ||
136 | r#" | ||
137 | macro_rules! m { | ||
138 | () => {}; | ||
139 | } | ||
140 | fn f() { | ||
141 | m!(); | ||
142 | |||
143 | m!(hi); | ||
144 | //^^^^^^ leftover tokens | ||
145 | } | ||
146 | "#, | ||
147 | ); | ||
148 | } | ||
149 | #[test] | ||
150 | fn dollar_crate_in_builtin_macro() { | ||
151 | check_diagnostics( | ||
152 | r#" | ||
153 | #[macro_export] | ||
154 | #[rustc_builtin_macro] | ||
155 | macro_rules! format_args {} | ||
156 | |||
157 | #[macro_export] | ||
158 | macro_rules! arg { () => {} } | ||
159 | |||
160 | #[macro_export] | ||
161 | macro_rules! outer { | ||
162 | () => { | ||
163 | $crate::format_args!( "", $crate::arg!(1) ) | ||
164 | }; | ||
165 | } | ||
166 | |||
167 | fn f() { | ||
168 | outer!(); | ||
169 | } //^^^^^^^^ leftover tokens | ||
170 | "#, | ||
171 | ) | ||
172 | } | ||
173 | } | ||
diff --git a/crates/ide/src/diagnostics/mismatched_arg_count.rs b/crates/ide/src/diagnostics/mismatched_arg_count.rs deleted file mode 100644 index 08e1cfa5f..000000000 --- a/crates/ide/src/diagnostics/mismatched_arg_count.rs +++ /dev/null | |||
@@ -1,272 +0,0 @@ | |||
1 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
2 | |||
3 | // Diagnostic: mismatched-arg-count | ||
4 | // | ||
5 | // This diagnostic is triggered if a function is invoked with an incorrect amount of arguments. | ||
6 | pub(super) fn mismatched_arg_count( | ||
7 | ctx: &DiagnosticsContext<'_>, | ||
8 | d: &hir::MismatchedArgCount, | ||
9 | ) -> Diagnostic { | ||
10 | let s = if d.expected == 1 { "" } else { "s" }; | ||
11 | let message = format!("expected {} argument{}, found {}", d.expected, s, d.found); | ||
12 | Diagnostic::new( | ||
13 | "mismatched-arg-count", | ||
14 | message, | ||
15 | ctx.sema.diagnostics_display_range(d.call_expr.clone().map(|it| it.into())).range, | ||
16 | ) | ||
17 | } | ||
18 | |||
19 | #[cfg(test)] | ||
20 | mod tests { | ||
21 | use crate::diagnostics::tests::check_diagnostics; | ||
22 | |||
23 | #[test] | ||
24 | fn simple_free_fn_zero() { | ||
25 | check_diagnostics( | ||
26 | r#" | ||
27 | fn zero() {} | ||
28 | fn f() { zero(1); } | ||
29 | //^^^^^^^ expected 0 arguments, found 1 | ||
30 | "#, | ||
31 | ); | ||
32 | |||
33 | check_diagnostics( | ||
34 | r#" | ||
35 | fn zero() {} | ||
36 | fn f() { zero(); } | ||
37 | "#, | ||
38 | ); | ||
39 | } | ||
40 | |||
41 | #[test] | ||
42 | fn simple_free_fn_one() { | ||
43 | check_diagnostics( | ||
44 | r#" | ||
45 | fn one(arg: u8) {} | ||
46 | fn f() { one(); } | ||
47 | //^^^^^ expected 1 argument, found 0 | ||
48 | "#, | ||
49 | ); | ||
50 | |||
51 | check_diagnostics( | ||
52 | r#" | ||
53 | fn one(arg: u8) {} | ||
54 | fn f() { one(1); } | ||
55 | "#, | ||
56 | ); | ||
57 | } | ||
58 | |||
59 | #[test] | ||
60 | fn method_as_fn() { | ||
61 | check_diagnostics( | ||
62 | r#" | ||
63 | struct S; | ||
64 | impl S { fn method(&self) {} } | ||
65 | |||
66 | fn f() { | ||
67 | S::method(); | ||
68 | } //^^^^^^^^^^^ expected 1 argument, found 0 | ||
69 | "#, | ||
70 | ); | ||
71 | |||
72 | check_diagnostics( | ||
73 | r#" | ||
74 | struct S; | ||
75 | impl S { fn method(&self) {} } | ||
76 | |||
77 | fn f() { | ||
78 | S::method(&S); | ||
79 | S.method(); | ||
80 | } | ||
81 | "#, | ||
82 | ); | ||
83 | } | ||
84 | |||
85 | #[test] | ||
86 | fn method_with_arg() { | ||
87 | check_diagnostics( | ||
88 | r#" | ||
89 | struct S; | ||
90 | impl S { fn method(&self, arg: u8) {} } | ||
91 | |||
92 | fn f() { | ||
93 | S.method(); | ||
94 | } //^^^^^^^^^^ expected 1 argument, found 0 | ||
95 | "#, | ||
96 | ); | ||
97 | |||
98 | check_diagnostics( | ||
99 | r#" | ||
100 | struct S; | ||
101 | impl S { fn method(&self, arg: u8) {} } | ||
102 | |||
103 | fn f() { | ||
104 | S::method(&S, 0); | ||
105 | S.method(1); | ||
106 | } | ||
107 | "#, | ||
108 | ); | ||
109 | } | ||
110 | |||
111 | #[test] | ||
112 | fn method_unknown_receiver() { | ||
113 | // note: this is incorrect code, so there might be errors on this in the | ||
114 | // future, but we shouldn't emit an argument count diagnostic here | ||
115 | check_diagnostics( | ||
116 | r#" | ||
117 | trait Foo { fn method(&self, arg: usize) {} } | ||
118 | |||
119 | fn f() { | ||
120 | let x; | ||
121 | x.method(); | ||
122 | } | ||
123 | "#, | ||
124 | ); | ||
125 | } | ||
126 | |||
127 | #[test] | ||
128 | fn tuple_struct() { | ||
129 | check_diagnostics( | ||
130 | r#" | ||
131 | struct Tup(u8, u16); | ||
132 | fn f() { | ||
133 | Tup(0); | ||
134 | } //^^^^^^ expected 2 arguments, found 1 | ||
135 | "#, | ||
136 | ) | ||
137 | } | ||
138 | |||
139 | #[test] | ||
140 | fn enum_variant() { | ||
141 | check_diagnostics( | ||
142 | r#" | ||
143 | enum En { Variant(u8, u16), } | ||
144 | fn f() { | ||
145 | En::Variant(0); | ||
146 | } //^^^^^^^^^^^^^^ expected 2 arguments, found 1 | ||
147 | "#, | ||
148 | ) | ||
149 | } | ||
150 | |||
151 | #[test] | ||
152 | fn enum_variant_type_macro() { | ||
153 | check_diagnostics( | ||
154 | r#" | ||
155 | macro_rules! Type { | ||
156 | () => { u32 }; | ||
157 | } | ||
158 | enum Foo { | ||
159 | Bar(Type![]) | ||
160 | } | ||
161 | impl Foo { | ||
162 | fn new() { | ||
163 | Foo::Bar(0); | ||
164 | Foo::Bar(0, 1); | ||
165 | //^^^^^^^^^^^^^^ expected 1 argument, found 2 | ||
166 | Foo::Bar(); | ||
167 | //^^^^^^^^^^ expected 1 argument, found 0 | ||
168 | } | ||
169 | } | ||
170 | "#, | ||
171 | ); | ||
172 | } | ||
173 | |||
174 | #[test] | ||
175 | fn varargs() { | ||
176 | check_diagnostics( | ||
177 | r#" | ||
178 | extern "C" { | ||
179 | fn fixed(fixed: u8); | ||
180 | fn varargs(fixed: u8, ...); | ||
181 | fn varargs2(...); | ||
182 | } | ||
183 | |||
184 | fn f() { | ||
185 | unsafe { | ||
186 | fixed(0); | ||
187 | fixed(0, 1); | ||
188 | //^^^^^^^^^^^ expected 1 argument, found 2 | ||
189 | varargs(0); | ||
190 | varargs(0, 1); | ||
191 | varargs2(); | ||
192 | varargs2(0); | ||
193 | varargs2(0, 1); | ||
194 | } | ||
195 | } | ||
196 | "#, | ||
197 | ) | ||
198 | } | ||
199 | |||
200 | #[test] | ||
201 | fn arg_count_lambda() { | ||
202 | check_diagnostics( | ||
203 | r#" | ||
204 | fn main() { | ||
205 | let f = |()| (); | ||
206 | f(); | ||
207 | //^^^ expected 1 argument, found 0 | ||
208 | f(()); | ||
209 | f((), ()); | ||
210 | //^^^^^^^^^ expected 1 argument, found 2 | ||
211 | } | ||
212 | "#, | ||
213 | ) | ||
214 | } | ||
215 | |||
216 | #[test] | ||
217 | fn cfgd_out_call_arguments() { | ||
218 | check_diagnostics( | ||
219 | r#" | ||
220 | struct C(#[cfg(FALSE)] ()); | ||
221 | impl C { | ||
222 | fn new() -> Self { | ||
223 | Self( | ||
224 | #[cfg(FALSE)] | ||
225 | (), | ||
226 | ) | ||
227 | } | ||
228 | |||
229 | fn method(&self) {} | ||
230 | } | ||
231 | |||
232 | fn main() { | ||
233 | C::new().method(#[cfg(FALSE)] 0); | ||
234 | } | ||
235 | "#, | ||
236 | ); | ||
237 | } | ||
238 | |||
239 | #[test] | ||
240 | fn cfgd_out_fn_params() { | ||
241 | check_diagnostics( | ||
242 | r#" | ||
243 | fn foo(#[cfg(NEVER)] x: ()) {} | ||
244 | |||
245 | struct S; | ||
246 | |||
247 | impl S { | ||
248 | fn method(#[cfg(NEVER)] self) {} | ||
249 | fn method2(#[cfg(NEVER)] self, arg: u8) {} | ||
250 | fn method3(self, #[cfg(NEVER)] arg: u8) {} | ||
251 | } | ||
252 | |||
253 | extern "C" { | ||
254 | fn fixed(fixed: u8, #[cfg(NEVER)] ...); | ||
255 | fn varargs(#[cfg(not(NEVER))] ...); | ||
256 | } | ||
257 | |||
258 | fn main() { | ||
259 | foo(); | ||
260 | S::method(); | ||
261 | S::method2(0); | ||
262 | S::method3(S); | ||
263 | S.method3(); | ||
264 | unsafe { | ||
265 | fixed(0); | ||
266 | varargs(1, 2, 3); | ||
267 | } | ||
268 | } | ||
269 | "#, | ||
270 | ) | ||
271 | } | ||
272 | } | ||
diff --git a/crates/ide/src/diagnostics/missing_fields.rs b/crates/ide/src/diagnostics/missing_fields.rs deleted file mode 100644 index d01f05041..000000000 --- a/crates/ide/src/diagnostics/missing_fields.rs +++ /dev/null | |||
@@ -1,327 +0,0 @@ | |||
1 | use either::Either; | ||
2 | use hir::{db::AstDatabase, InFile}; | ||
3 | use ide_assists::Assist; | ||
4 | use ide_db::source_change::SourceChange; | ||
5 | use stdx::format_to; | ||
6 | use syntax::{algo, ast::make, AstNode, SyntaxNodePtr}; | ||
7 | use text_edit::TextEdit; | ||
8 | |||
9 | use crate::diagnostics::{fix, Diagnostic, DiagnosticsContext}; | ||
10 | |||
11 | // Diagnostic: missing-fields | ||
12 | // | ||
13 | // This diagnostic is triggered if record lacks some fields that exist in the corresponding structure. | ||
14 | // | ||
15 | // Example: | ||
16 | // | ||
17 | // ```rust | ||
18 | // struct A { a: u8, b: u8 } | ||
19 | // | ||
20 | // let a = A { a: 10 }; | ||
21 | // ``` | ||
22 | pub(super) fn missing_fields(ctx: &DiagnosticsContext<'_>, d: &hir::MissingFields) -> Diagnostic { | ||
23 | let mut message = String::from("Missing structure fields:\n"); | ||
24 | for field in &d.missed_fields { | ||
25 | format_to!(message, "- {}\n", field); | ||
26 | } | ||
27 | |||
28 | let ptr = InFile::new( | ||
29 | d.file, | ||
30 | d.field_list_parent_path | ||
31 | .clone() | ||
32 | .map(SyntaxNodePtr::from) | ||
33 | .unwrap_or_else(|| d.field_list_parent.clone().either(|it| it.into(), |it| it.into())), | ||
34 | ); | ||
35 | |||
36 | Diagnostic::new("missing-fields", message, ctx.sema.diagnostics_display_range(ptr).range) | ||
37 | .with_fixes(fixes(ctx, d)) | ||
38 | } | ||
39 | |||
40 | fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::MissingFields) -> Option<Vec<Assist>> { | ||
41 | // Note that although we could add a diagnostics to | ||
42 | // fill the missing tuple field, e.g : | ||
43 | // `struct A(usize);` | ||
44 | // `let a = A { 0: () }` | ||
45 | // but it is uncommon usage and it should not be encouraged. | ||
46 | if d.missed_fields.iter().any(|it| it.as_tuple_index().is_some()) { | ||
47 | return None; | ||
48 | } | ||
49 | |||
50 | let root = ctx.sema.db.parse_or_expand(d.file)?; | ||
51 | let field_list_parent = match &d.field_list_parent { | ||
52 | Either::Left(record_expr) => record_expr.to_node(&root), | ||
53 | // FIXE: patterns should be fixable as well. | ||
54 | Either::Right(_) => return None, | ||
55 | }; | ||
56 | let old_field_list = field_list_parent.record_expr_field_list()?; | ||
57 | let new_field_list = old_field_list.clone_for_update(); | ||
58 | for f in d.missed_fields.iter() { | ||
59 | let field = | ||
60 | make::record_expr_field(make::name_ref(&f.to_string()), Some(make::expr_unit())) | ||
61 | .clone_for_update(); | ||
62 | new_field_list.add_field(field); | ||
63 | } | ||
64 | |||
65 | let edit = { | ||
66 | let mut builder = TextEdit::builder(); | ||
67 | algo::diff(old_field_list.syntax(), new_field_list.syntax()).into_text_edit(&mut builder); | ||
68 | builder.finish() | ||
69 | }; | ||
70 | Some(vec![fix( | ||
71 | "fill_missing_fields", | ||
72 | "Fill struct fields", | ||
73 | SourceChange::from_text_edit(d.file.original_file(ctx.sema.db), edit), | ||
74 | ctx.sema.original_range(field_list_parent.syntax()).range, | ||
75 | )]) | ||
76 | } | ||
77 | |||
78 | #[cfg(test)] | ||
79 | mod tests { | ||
80 | use crate::diagnostics::tests::{check_diagnostics, check_fix}; | ||
81 | |||
82 | #[test] | ||
83 | fn missing_record_pat_field_diagnostic() { | ||
84 | check_diagnostics( | ||
85 | r#" | ||
86 | struct S { foo: i32, bar: () } | ||
87 | fn baz(s: S) { | ||
88 | let S { foo: _ } = s; | ||
89 | //^ Missing structure fields: | ||
90 | //| - bar | ||
91 | } | ||
92 | "#, | ||
93 | ); | ||
94 | } | ||
95 | |||
96 | #[test] | ||
97 | fn missing_record_pat_field_no_diagnostic_if_not_exhaustive() { | ||
98 | check_diagnostics( | ||
99 | r" | ||
100 | struct S { foo: i32, bar: () } | ||
101 | fn baz(s: S) -> i32 { | ||
102 | match s { | ||
103 | S { foo, .. } => foo, | ||
104 | } | ||
105 | } | ||
106 | ", | ||
107 | ) | ||
108 | } | ||
109 | |||
110 | #[test] | ||
111 | fn missing_record_pat_field_box() { | ||
112 | check_diagnostics( | ||
113 | r" | ||
114 | struct S { s: Box<u32> } | ||
115 | fn x(a: S) { | ||
116 | let S { box s } = a; | ||
117 | } | ||
118 | ", | ||
119 | ) | ||
120 | } | ||
121 | |||
122 | #[test] | ||
123 | fn missing_record_pat_field_ref() { | ||
124 | check_diagnostics( | ||
125 | r" | ||
126 | struct S { s: u32 } | ||
127 | fn x(a: S) { | ||
128 | let S { ref s } = a; | ||
129 | } | ||
130 | ", | ||
131 | ) | ||
132 | } | ||
133 | |||
134 | #[test] | ||
135 | fn range_mapping_out_of_macros() { | ||
136 | // FIXME: this is very wrong, but somewhat tricky to fix. | ||
137 | check_fix( | ||
138 | r#" | ||
139 | fn some() {} | ||
140 | fn items() {} | ||
141 | fn here() {} | ||
142 | |||
143 | macro_rules! id { ($($tt:tt)*) => { $($tt)*}; } | ||
144 | |||
145 | fn main() { | ||
146 | let _x = id![Foo { a: $042 }]; | ||
147 | } | ||
148 | |||
149 | pub struct Foo { pub a: i32, pub b: i32 } | ||
150 | "#, | ||
151 | r#" | ||
152 | fn some(, b: () ) {} | ||
153 | fn items() {} | ||
154 | fn here() {} | ||
155 | |||
156 | macro_rules! id { ($($tt:tt)*) => { $($tt)*}; } | ||
157 | |||
158 | fn main() { | ||
159 | let _x = id![Foo { a: 42 }]; | ||
160 | } | ||
161 | |||
162 | pub struct Foo { pub a: i32, pub b: i32 } | ||
163 | "#, | ||
164 | ); | ||
165 | } | ||
166 | |||
167 | #[test] | ||
168 | fn test_fill_struct_fields_empty() { | ||
169 | check_fix( | ||
170 | r#" | ||
171 | struct TestStruct { one: i32, two: i64 } | ||
172 | |||
173 | fn test_fn() { | ||
174 | let s = TestStruct {$0}; | ||
175 | } | ||
176 | "#, | ||
177 | r#" | ||
178 | struct TestStruct { one: i32, two: i64 } | ||
179 | |||
180 | fn test_fn() { | ||
181 | let s = TestStruct { one: (), two: () }; | ||
182 | } | ||
183 | "#, | ||
184 | ); | ||
185 | } | ||
186 | |||
187 | #[test] | ||
188 | fn test_fill_struct_fields_self() { | ||
189 | check_fix( | ||
190 | r#" | ||
191 | struct TestStruct { one: i32 } | ||
192 | |||
193 | impl TestStruct { | ||
194 | fn test_fn() { let s = Self {$0}; } | ||
195 | } | ||
196 | "#, | ||
197 | r#" | ||
198 | struct TestStruct { one: i32 } | ||
199 | |||
200 | impl TestStruct { | ||
201 | fn test_fn() { let s = Self { one: () }; } | ||
202 | } | ||
203 | "#, | ||
204 | ); | ||
205 | } | ||
206 | |||
207 | #[test] | ||
208 | fn test_fill_struct_fields_enum() { | ||
209 | check_fix( | ||
210 | r#" | ||
211 | enum Expr { | ||
212 | Bin { lhs: Box<Expr>, rhs: Box<Expr> } | ||
213 | } | ||
214 | |||
215 | impl Expr { | ||
216 | fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr { | ||
217 | Expr::Bin {$0 } | ||
218 | } | ||
219 | } | ||
220 | "#, | ||
221 | r#" | ||
222 | enum Expr { | ||
223 | Bin { lhs: Box<Expr>, rhs: Box<Expr> } | ||
224 | } | ||
225 | |||
226 | impl Expr { | ||
227 | fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr { | ||
228 | Expr::Bin { lhs: (), rhs: () } | ||
229 | } | ||
230 | } | ||
231 | "#, | ||
232 | ); | ||
233 | } | ||
234 | |||
235 | #[test] | ||
236 | fn test_fill_struct_fields_partial() { | ||
237 | check_fix( | ||
238 | r#" | ||
239 | struct TestStruct { one: i32, two: i64 } | ||
240 | |||
241 | fn test_fn() { | ||
242 | let s = TestStruct{ two: 2$0 }; | ||
243 | } | ||
244 | "#, | ||
245 | r" | ||
246 | struct TestStruct { one: i32, two: i64 } | ||
247 | |||
248 | fn test_fn() { | ||
249 | let s = TestStruct{ two: 2, one: () }; | ||
250 | } | ||
251 | ", | ||
252 | ); | ||
253 | } | ||
254 | |||
255 | #[test] | ||
256 | fn test_fill_struct_fields_raw_ident() { | ||
257 | check_fix( | ||
258 | r#" | ||
259 | struct TestStruct { r#type: u8 } | ||
260 | |||
261 | fn test_fn() { | ||
262 | TestStruct { $0 }; | ||
263 | } | ||
264 | "#, | ||
265 | r" | ||
266 | struct TestStruct { r#type: u8 } | ||
267 | |||
268 | fn test_fn() { | ||
269 | TestStruct { r#type: () }; | ||
270 | } | ||
271 | ", | ||
272 | ); | ||
273 | } | ||
274 | |||
275 | #[test] | ||
276 | fn test_fill_struct_fields_no_diagnostic() { | ||
277 | check_diagnostics( | ||
278 | r#" | ||
279 | struct TestStruct { one: i32, two: i64 } | ||
280 | |||
281 | fn test_fn() { | ||
282 | let one = 1; | ||
283 | let s = TestStruct{ one, two: 2 }; | ||
284 | } | ||
285 | "#, | ||
286 | ); | ||
287 | } | ||
288 | |||
289 | #[test] | ||
290 | fn test_fill_struct_fields_no_diagnostic_on_spread() { | ||
291 | check_diagnostics( | ||
292 | r#" | ||
293 | struct TestStruct { one: i32, two: i64 } | ||
294 | |||
295 | fn test_fn() { | ||
296 | let one = 1; | ||
297 | let s = TestStruct{ ..a }; | ||
298 | } | ||
299 | "#, | ||
300 | ); | ||
301 | } | ||
302 | |||
303 | #[test] | ||
304 | fn test_fill_struct_fields_blank_line() { | ||
305 | check_fix( | ||
306 | r#" | ||
307 | struct S { a: (), b: () } | ||
308 | |||
309 | fn f() { | ||
310 | S { | ||
311 | $0 | ||
312 | }; | ||
313 | } | ||
314 | "#, | ||
315 | r#" | ||
316 | struct S { a: (), b: () } | ||
317 | |||
318 | fn f() { | ||
319 | S { | ||
320 | a: (), | ||
321 | b: (), | ||
322 | }; | ||
323 | } | ||
324 | "#, | ||
325 | ); | ||
326 | } | ||
327 | } | ||
diff --git a/crates/ide/src/diagnostics/missing_match_arms.rs b/crates/ide/src/diagnostics/missing_match_arms.rs deleted file mode 100644 index b636489b3..000000000 --- a/crates/ide/src/diagnostics/missing_match_arms.rs +++ /dev/null | |||
@@ -1,929 +0,0 @@ | |||
1 | use hir::InFile; | ||
2 | |||
3 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
4 | |||
5 | // Diagnostic: missing-match-arm | ||
6 | // | ||
7 | // This diagnostic is triggered if `match` block is missing one or more match arms. | ||
8 | pub(super) fn missing_match_arms( | ||
9 | ctx: &DiagnosticsContext<'_>, | ||
10 | d: &hir::MissingMatchArms, | ||
11 | ) -> Diagnostic { | ||
12 | Diagnostic::new( | ||
13 | "missing-match-arm", | ||
14 | "missing match arm", | ||
15 | ctx.sema.diagnostics_display_range(InFile::new(d.file, d.match_expr.clone().into())).range, | ||
16 | ) | ||
17 | } | ||
18 | |||
19 | #[cfg(test)] | ||
20 | pub(super) mod tests { | ||
21 | use crate::diagnostics::tests::check_diagnostics; | ||
22 | |||
23 | fn check_diagnostics_no_bails(ra_fixture: &str) { | ||
24 | cov_mark::check_count!(validate_match_bailed_out, 0); | ||
25 | crate::diagnostics::tests::check_diagnostics(ra_fixture) | ||
26 | } | ||
27 | |||
28 | #[test] | ||
29 | fn empty_tuple() { | ||
30 | check_diagnostics_no_bails( | ||
31 | r#" | ||
32 | fn main() { | ||
33 | match () { } | ||
34 | //^^ missing match arm | ||
35 | match (()) { } | ||
36 | //^^^^ missing match arm | ||
37 | |||
38 | match () { _ => (), } | ||
39 | match () { () => (), } | ||
40 | match (()) { (()) => (), } | ||
41 | } | ||
42 | "#, | ||
43 | ); | ||
44 | } | ||
45 | |||
46 | #[test] | ||
47 | fn tuple_of_two_empty_tuple() { | ||
48 | check_diagnostics_no_bails( | ||
49 | r#" | ||
50 | fn main() { | ||
51 | match ((), ()) { } | ||
52 | //^^^^^^^^ missing match arm | ||
53 | |||
54 | match ((), ()) { ((), ()) => (), } | ||
55 | } | ||
56 | "#, | ||
57 | ); | ||
58 | } | ||
59 | |||
60 | #[test] | ||
61 | fn boolean() { | ||
62 | check_diagnostics_no_bails( | ||
63 | r#" | ||
64 | fn test_main() { | ||
65 | match false { } | ||
66 | //^^^^^ missing match arm | ||
67 | match false { true => (), } | ||
68 | //^^^^^ missing match arm | ||
69 | match (false, true) {} | ||
70 | //^^^^^^^^^^^^^ missing match arm | ||
71 | match (false, true) { (true, true) => (), } | ||
72 | //^^^^^^^^^^^^^ missing match arm | ||
73 | match (false, true) { | ||
74 | //^^^^^^^^^^^^^ missing match arm | ||
75 | (false, true) => (), | ||
76 | (false, false) => (), | ||
77 | (true, false) => (), | ||
78 | } | ||
79 | match (false, true) { (true, _x) => (), } | ||
80 | //^^^^^^^^^^^^^ missing match arm | ||
81 | |||
82 | match false { true => (), false => (), } | ||
83 | match (false, true) { | ||
84 | (false, _) => (), | ||
85 | (true, false) => (), | ||
86 | (_, true) => (), | ||
87 | } | ||
88 | match (false, true) { | ||
89 | (true, true) => (), | ||
90 | (true, false) => (), | ||
91 | (false, true) => (), | ||
92 | (false, false) => (), | ||
93 | } | ||
94 | match (false, true) { | ||
95 | (true, _x) => (), | ||
96 | (false, true) => (), | ||
97 | (false, false) => (), | ||
98 | } | ||
99 | match (false, true, false) { | ||
100 | (false, ..) => (), | ||
101 | (true, ..) => (), | ||
102 | } | ||
103 | match (false, true, false) { | ||
104 | (.., false) => (), | ||
105 | (.., true) => (), | ||
106 | } | ||
107 | match (false, true, false) { (..) => (), } | ||
108 | } | ||
109 | "#, | ||
110 | ); | ||
111 | } | ||
112 | |||
113 | #[test] | ||
114 | fn tuple_of_tuple_and_bools() { | ||
115 | check_diagnostics_no_bails( | ||
116 | r#" | ||
117 | fn main() { | ||
118 | match (false, ((), false)) {} | ||
119 | //^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
120 | match (false, ((), false)) { (true, ((), true)) => (), } | ||
121 | //^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
122 | match (false, ((), false)) { (true, _) => (), } | ||
123 | //^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
124 | |||
125 | match (false, ((), false)) { | ||
126 | (true, ((), true)) => (), | ||
127 | (true, ((), false)) => (), | ||
128 | (false, ((), true)) => (), | ||
129 | (false, ((), false)) => (), | ||
130 | } | ||
131 | match (false, ((), false)) { | ||
132 | (true, ((), true)) => (), | ||
133 | (true, ((), false)) => (), | ||
134 | (false, _) => (), | ||
135 | } | ||
136 | } | ||
137 | "#, | ||
138 | ); | ||
139 | } | ||
140 | |||
141 | #[test] | ||
142 | fn enums() { | ||
143 | check_diagnostics_no_bails( | ||
144 | r#" | ||
145 | enum Either { A, B, } | ||
146 | |||
147 | fn main() { | ||
148 | match Either::A { } | ||
149 | //^^^^^^^^^ missing match arm | ||
150 | match Either::B { Either::A => (), } | ||
151 | //^^^^^^^^^ missing match arm | ||
152 | |||
153 | match &Either::B { | ||
154 | //^^^^^^^^^^ missing match arm | ||
155 | Either::A => (), | ||
156 | } | ||
157 | |||
158 | match Either::B { | ||
159 | Either::A => (), Either::B => (), | ||
160 | } | ||
161 | match &Either::B { | ||
162 | Either::A => (), Either::B => (), | ||
163 | } | ||
164 | } | ||
165 | "#, | ||
166 | ); | ||
167 | } | ||
168 | |||
169 | #[test] | ||
170 | fn enum_containing_bool() { | ||
171 | check_diagnostics_no_bails( | ||
172 | r#" | ||
173 | enum Either { A(bool), B } | ||
174 | |||
175 | fn main() { | ||
176 | match Either::B { } | ||
177 | //^^^^^^^^^ missing match arm | ||
178 | match Either::B { | ||
179 | //^^^^^^^^^ missing match arm | ||
180 | Either::A(true) => (), Either::B => () | ||
181 | } | ||
182 | |||
183 | match Either::B { | ||
184 | Either::A(true) => (), | ||
185 | Either::A(false) => (), | ||
186 | Either::B => (), | ||
187 | } | ||
188 | match Either::B { | ||
189 | Either::B => (), | ||
190 | _ => (), | ||
191 | } | ||
192 | match Either::B { | ||
193 | Either::A(_) => (), | ||
194 | Either::B => (), | ||
195 | } | ||
196 | |||
197 | } | ||
198 | "#, | ||
199 | ); | ||
200 | } | ||
201 | |||
202 | #[test] | ||
203 | fn enum_different_sizes() { | ||
204 | check_diagnostics_no_bails( | ||
205 | r#" | ||
206 | enum Either { A(bool), B(bool, bool) } | ||
207 | |||
208 | fn main() { | ||
209 | match Either::A(false) { | ||
210 | //^^^^^^^^^^^^^^^^ missing match arm | ||
211 | Either::A(_) => (), | ||
212 | Either::B(false, _) => (), | ||
213 | } | ||
214 | |||
215 | match Either::A(false) { | ||
216 | Either::A(_) => (), | ||
217 | Either::B(true, _) => (), | ||
218 | Either::B(false, _) => (), | ||
219 | } | ||
220 | match Either::A(false) { | ||
221 | Either::A(true) | Either::A(false) => (), | ||
222 | Either::B(true, _) => (), | ||
223 | Either::B(false, _) => (), | ||
224 | } | ||
225 | } | ||
226 | "#, | ||
227 | ); | ||
228 | } | ||
229 | |||
230 | #[test] | ||
231 | fn tuple_of_enum_no_diagnostic() { | ||
232 | check_diagnostics_no_bails( | ||
233 | r#" | ||
234 | enum Either { A(bool), B(bool, bool) } | ||
235 | enum Either2 { C, D } | ||
236 | |||
237 | fn main() { | ||
238 | match (Either::A(false), Either2::C) { | ||
239 | (Either::A(true), _) | (Either::A(false), _) => (), | ||
240 | (Either::B(true, _), Either2::C) => (), | ||
241 | (Either::B(false, _), Either2::C) => (), | ||
242 | (Either::B(_, _), Either2::D) => (), | ||
243 | } | ||
244 | } | ||
245 | "#, | ||
246 | ); | ||
247 | } | ||
248 | |||
249 | #[test] | ||
250 | fn or_pattern_no_diagnostic() { | ||
251 | check_diagnostics_no_bails( | ||
252 | r#" | ||
253 | enum Either {A, B} | ||
254 | |||
255 | fn main() { | ||
256 | match (Either::A, Either::B) { | ||
257 | (Either::A | Either::B, _) => (), | ||
258 | } | ||
259 | }"#, | ||
260 | ) | ||
261 | } | ||
262 | |||
263 | #[test] | ||
264 | fn mismatched_types() { | ||
265 | cov_mark::check_count!(validate_match_bailed_out, 4); | ||
266 | // Match statements with arms that don't match the | ||
267 | // expression pattern do not fire this diagnostic. | ||
268 | check_diagnostics( | ||
269 | r#" | ||
270 | enum Either { A, B } | ||
271 | enum Either2 { C, D } | ||
272 | |||
273 | fn main() { | ||
274 | match Either::A { | ||
275 | Either2::C => (), | ||
276 | Either2::D => (), | ||
277 | } | ||
278 | match (true, false) { | ||
279 | (true, false, true) => (), | ||
280 | (true) => (), | ||
281 | } | ||
282 | match (true, false) { (true,) => {} } | ||
283 | match (0) { () => () } | ||
284 | match Unresolved::Bar { Unresolved::Baz => () } | ||
285 | } | ||
286 | "#, | ||
287 | ); | ||
288 | } | ||
289 | |||
290 | #[test] | ||
291 | fn mismatched_types_in_or_patterns() { | ||
292 | cov_mark::check_count!(validate_match_bailed_out, 2); | ||
293 | check_diagnostics( | ||
294 | r#" | ||
295 | fn main() { | ||
296 | match false { true | () => {} } | ||
297 | match (false,) { (true | (),) => {} } | ||
298 | } | ||
299 | "#, | ||
300 | ); | ||
301 | } | ||
302 | |||
303 | #[test] | ||
304 | fn malformed_match_arm_tuple_enum_missing_pattern() { | ||
305 | // We are testing to be sure we don't panic here when the match | ||
306 | // arm `Either::B` is missing its pattern. | ||
307 | check_diagnostics_no_bails( | ||
308 | r#" | ||
309 | enum Either { A, B(u32) } | ||
310 | |||
311 | fn main() { | ||
312 | match Either::A { | ||
313 | Either::A => (), | ||
314 | Either::B() => (), | ||
315 | } | ||
316 | } | ||
317 | "#, | ||
318 | ); | ||
319 | } | ||
320 | |||
321 | #[test] | ||
322 | fn malformed_match_arm_extra_fields() { | ||
323 | cov_mark::check_count!(validate_match_bailed_out, 2); | ||
324 | check_diagnostics( | ||
325 | r#" | ||
326 | enum A { B(isize, isize), C } | ||
327 | fn main() { | ||
328 | match A::B(1, 2) { | ||
329 | A::B(_, _, _) => (), | ||
330 | } | ||
331 | match A::B(1, 2) { | ||
332 | A::C(_) => (), | ||
333 | } | ||
334 | } | ||
335 | "#, | ||
336 | ); | ||
337 | } | ||
338 | |||
339 | #[test] | ||
340 | fn expr_diverges() { | ||
341 | cov_mark::check_count!(validate_match_bailed_out, 2); | ||
342 | check_diagnostics( | ||
343 | r#" | ||
344 | enum Either { A, B } | ||
345 | |||
346 | fn main() { | ||
347 | match loop {} { | ||
348 | Either::A => (), | ||
349 | Either::B => (), | ||
350 | } | ||
351 | match loop {} { | ||
352 | Either::A => (), | ||
353 | } | ||
354 | match loop { break Foo::A } { | ||
355 | //^^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
356 | Either::A => (), | ||
357 | } | ||
358 | match loop { break Foo::A } { | ||
359 | Either::A => (), | ||
360 | Either::B => (), | ||
361 | } | ||
362 | } | ||
363 | "#, | ||
364 | ); | ||
365 | } | ||
366 | |||
367 | #[test] | ||
368 | fn expr_partially_diverges() { | ||
369 | check_diagnostics_no_bails( | ||
370 | r#" | ||
371 | enum Either<T> { A(T), B } | ||
372 | |||
373 | fn foo() -> Either<!> { Either::B } | ||
374 | fn main() -> u32 { | ||
375 | match foo() { | ||
376 | Either::A(val) => val, | ||
377 | Either::B => 0, | ||
378 | } | ||
379 | } | ||
380 | "#, | ||
381 | ); | ||
382 | } | ||
383 | |||
384 | #[test] | ||
385 | fn enum_record() { | ||
386 | check_diagnostics_no_bails( | ||
387 | r#" | ||
388 | enum Either { A { foo: bool }, B } | ||
389 | |||
390 | fn main() { | ||
391 | let a = Either::A { foo: true }; | ||
392 | match a { } | ||
393 | //^ missing match arm | ||
394 | match a { Either::A { foo: true } => () } | ||
395 | //^ missing match arm | ||
396 | match a { | ||
397 | Either::A { } => (), | ||
398 | //^^^^^^^^^ Missing structure fields: | ||
399 | // | - foo | ||
400 | Either::B => (), | ||
401 | } | ||
402 | match a { | ||
403 | //^ missing match arm | ||
404 | Either::A { } => (), | ||
405 | } //^^^^^^^^^ Missing structure fields: | ||
406 | // | - foo | ||
407 | |||
408 | match a { | ||
409 | Either::A { foo: true } => (), | ||
410 | Either::A { foo: false } => (), | ||
411 | Either::B => (), | ||
412 | } | ||
413 | match a { | ||
414 | Either::A { foo: _ } => (), | ||
415 | Either::B => (), | ||
416 | } | ||
417 | } | ||
418 | "#, | ||
419 | ); | ||
420 | } | ||
421 | |||
422 | #[test] | ||
423 | fn enum_record_fields_out_of_order() { | ||
424 | check_diagnostics_no_bails( | ||
425 | r#" | ||
426 | enum Either { | ||
427 | A { foo: bool, bar: () }, | ||
428 | B, | ||
429 | } | ||
430 | |||
431 | fn main() { | ||
432 | let a = Either::A { foo: true, bar: () }; | ||
433 | match a { | ||
434 | //^ missing match arm | ||
435 | Either::A { bar: (), foo: false } => (), | ||
436 | Either::A { foo: true, bar: () } => (), | ||
437 | } | ||
438 | |||
439 | match a { | ||
440 | Either::A { bar: (), foo: false } => (), | ||
441 | Either::A { foo: true, bar: () } => (), | ||
442 | Either::B => (), | ||
443 | } | ||
444 | } | ||
445 | "#, | ||
446 | ); | ||
447 | } | ||
448 | |||
449 | #[test] | ||
450 | fn enum_record_ellipsis() { | ||
451 | check_diagnostics_no_bails( | ||
452 | r#" | ||
453 | enum Either { | ||
454 | A { foo: bool, bar: bool }, | ||
455 | B, | ||
456 | } | ||
457 | |||
458 | fn main() { | ||
459 | let a = Either::B; | ||
460 | match a { | ||
461 | //^ missing match arm | ||
462 | Either::A { foo: true, .. } => (), | ||
463 | Either::B => (), | ||
464 | } | ||
465 | match a { | ||
466 | //^ missing match arm | ||
467 | Either::A { .. } => (), | ||
468 | } | ||
469 | |||
470 | match a { | ||
471 | Either::A { foo: true, .. } => (), | ||
472 | Either::A { foo: false, .. } => (), | ||
473 | Either::B => (), | ||
474 | } | ||
475 | |||
476 | match a { | ||
477 | Either::A { .. } => (), | ||
478 | Either::B => (), | ||
479 | } | ||
480 | } | ||
481 | "#, | ||
482 | ); | ||
483 | } | ||
484 | |||
485 | #[test] | ||
486 | fn enum_tuple_partial_ellipsis() { | ||
487 | check_diagnostics_no_bails( | ||
488 | r#" | ||
489 | enum Either { | ||
490 | A(bool, bool, bool, bool), | ||
491 | B, | ||
492 | } | ||
493 | |||
494 | fn main() { | ||
495 | match Either::B { | ||
496 | //^^^^^^^^^ missing match arm | ||
497 | Either::A(true, .., true) => (), | ||
498 | Either::A(true, .., false) => (), | ||
499 | Either::A(false, .., false) => (), | ||
500 | Either::B => (), | ||
501 | } | ||
502 | match Either::B { | ||
503 | //^^^^^^^^^ missing match arm | ||
504 | Either::A(true, .., true) => (), | ||
505 | Either::A(true, .., false) => (), | ||
506 | Either::A(.., true) => (), | ||
507 | Either::B => (), | ||
508 | } | ||
509 | |||
510 | match Either::B { | ||
511 | Either::A(true, .., true) => (), | ||
512 | Either::A(true, .., false) => (), | ||
513 | Either::A(false, .., true) => (), | ||
514 | Either::A(false, .., false) => (), | ||
515 | Either::B => (), | ||
516 | } | ||
517 | match Either::B { | ||
518 | Either::A(true, .., true) => (), | ||
519 | Either::A(true, .., false) => (), | ||
520 | Either::A(.., true) => (), | ||
521 | Either::A(.., false) => (), | ||
522 | Either::B => (), | ||
523 | } | ||
524 | } | ||
525 | "#, | ||
526 | ); | ||
527 | } | ||
528 | |||
529 | #[test] | ||
530 | fn never() { | ||
531 | check_diagnostics_no_bails( | ||
532 | r#" | ||
533 | enum Never {} | ||
534 | |||
535 | fn enum_(never: Never) { | ||
536 | match never {} | ||
537 | } | ||
538 | fn enum_ref(never: &Never) { | ||
539 | match never {} | ||
540 | //^^^^^ missing match arm | ||
541 | } | ||
542 | fn bang(never: !) { | ||
543 | match never {} | ||
544 | } | ||
545 | "#, | ||
546 | ); | ||
547 | } | ||
548 | |||
549 | #[test] | ||
550 | fn unknown_type() { | ||
551 | cov_mark::check_count!(validate_match_bailed_out, 1); | ||
552 | |||
553 | check_diagnostics( | ||
554 | r#" | ||
555 | enum Option<T> { Some(T), None } | ||
556 | |||
557 | fn main() { | ||
558 | // `Never` is deliberately not defined so that it's an uninferred type. | ||
559 | match Option::<Never>::None { | ||
560 | None => (), | ||
561 | Some(never) => match never {}, | ||
562 | } | ||
563 | match Option::<Never>::None { | ||
564 | //^^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
565 | Option::Some(_never) => {}, | ||
566 | } | ||
567 | } | ||
568 | "#, | ||
569 | ); | ||
570 | } | ||
571 | |||
572 | #[test] | ||
573 | fn tuple_of_bools_with_ellipsis_at_end_missing_arm() { | ||
574 | check_diagnostics_no_bails( | ||
575 | r#" | ||
576 | fn main() { | ||
577 | match (false, true, false) { | ||
578 | //^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
579 | (false, ..) => (), | ||
580 | } | ||
581 | }"#, | ||
582 | ); | ||
583 | } | ||
584 | |||
585 | #[test] | ||
586 | fn tuple_of_bools_with_ellipsis_at_beginning_missing_arm() { | ||
587 | check_diagnostics_no_bails( | ||
588 | r#" | ||
589 | fn main() { | ||
590 | match (false, true, false) { | ||
591 | //^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
592 | (.., false) => (), | ||
593 | } | ||
594 | }"#, | ||
595 | ); | ||
596 | } | ||
597 | |||
598 | #[test] | ||
599 | fn tuple_of_bools_with_ellipsis_in_middle_missing_arm() { | ||
600 | check_diagnostics_no_bails( | ||
601 | r#" | ||
602 | fn main() { | ||
603 | match (false, true, false) { | ||
604 | //^^^^^^^^^^^^^^^^^^^^ missing match arm | ||
605 | (true, .., false) => (), | ||
606 | } | ||
607 | }"#, | ||
608 | ); | ||
609 | } | ||
610 | |||
611 | #[test] | ||
612 | fn record_struct() { | ||
613 | check_diagnostics_no_bails( | ||
614 | r#"struct Foo { a: bool } | ||
615 | fn main(f: Foo) { | ||
616 | match f {} | ||
617 | //^ missing match arm | ||
618 | match f { Foo { a: true } => () } | ||
619 | //^ missing match arm | ||
620 | match &f { Foo { a: true } => () } | ||
621 | //^^ missing match arm | ||
622 | match f { Foo { a: _ } => () } | ||
623 | match f { | ||
624 | Foo { a: true } => (), | ||
625 | Foo { a: false } => (), | ||
626 | } | ||
627 | match &f { | ||
628 | Foo { a: true } => (), | ||
629 | Foo { a: false } => (), | ||
630 | } | ||
631 | } | ||
632 | "#, | ||
633 | ); | ||
634 | } | ||
635 | |||
636 | #[test] | ||
637 | fn tuple_struct() { | ||
638 | check_diagnostics_no_bails( | ||
639 | r#"struct Foo(bool); | ||
640 | fn main(f: Foo) { | ||
641 | match f {} | ||
642 | //^ missing match arm | ||
643 | match f { Foo(true) => () } | ||
644 | //^ missing match arm | ||
645 | match f { | ||
646 | Foo(true) => (), | ||
647 | Foo(false) => (), | ||
648 | } | ||
649 | } | ||
650 | "#, | ||
651 | ); | ||
652 | } | ||
653 | |||
654 | #[test] | ||
655 | fn unit_struct() { | ||
656 | check_diagnostics_no_bails( | ||
657 | r#"struct Foo; | ||
658 | fn main(f: Foo) { | ||
659 | match f {} | ||
660 | //^ missing match arm | ||
661 | match f { Foo => () } | ||
662 | } | ||
663 | "#, | ||
664 | ); | ||
665 | } | ||
666 | |||
667 | #[test] | ||
668 | fn record_struct_ellipsis() { | ||
669 | check_diagnostics_no_bails( | ||
670 | r#"struct Foo { foo: bool, bar: bool } | ||
671 | fn main(f: Foo) { | ||
672 | match f { Foo { foo: true, .. } => () } | ||
673 | //^ missing match arm | ||
674 | match f { | ||
675 | //^ missing match arm | ||
676 | Foo { foo: true, .. } => (), | ||
677 | Foo { bar: false, .. } => () | ||
678 | } | ||
679 | match f { Foo { .. } => () } | ||
680 | match f { | ||
681 | Foo { foo: true, .. } => (), | ||
682 | Foo { foo: false, .. } => () | ||
683 | } | ||
684 | } | ||
685 | "#, | ||
686 | ); | ||
687 | } | ||
688 | |||
689 | #[test] | ||
690 | fn internal_or() { | ||
691 | check_diagnostics_no_bails( | ||
692 | r#" | ||
693 | fn main() { | ||
694 | enum Either { A(bool), B } | ||
695 | match Either::B { | ||
696 | //^^^^^^^^^ missing match arm | ||
697 | Either::A(true | false) => (), | ||
698 | } | ||
699 | } | ||
700 | "#, | ||
701 | ); | ||
702 | } | ||
703 | |||
704 | #[test] | ||
705 | fn no_panic_at_unimplemented_subpattern_type() { | ||
706 | cov_mark::check_count!(validate_match_bailed_out, 1); | ||
707 | |||
708 | check_diagnostics( | ||
709 | r#" | ||
710 | struct S { a: char} | ||
711 | fn main(v: S) { | ||
712 | match v { S{ a } => {} } | ||
713 | match v { S{ a: _x } => {} } | ||
714 | match v { S{ a: 'a' } => {} } | ||
715 | match v { S{..} => {} } | ||
716 | match v { _ => {} } | ||
717 | match v { } | ||
718 | //^ missing match arm | ||
719 | } | ||
720 | "#, | ||
721 | ); | ||
722 | } | ||
723 | |||
724 | #[test] | ||
725 | fn binding() { | ||
726 | check_diagnostics_no_bails( | ||
727 | r#" | ||
728 | fn main() { | ||
729 | match true { | ||
730 | _x @ true => {} | ||
731 | false => {} | ||
732 | } | ||
733 | match true { _x @ true => {} } | ||
734 | //^^^^ missing match arm | ||
735 | } | ||
736 | "#, | ||
737 | ); | ||
738 | } | ||
739 | |||
740 | #[test] | ||
741 | fn binding_ref_has_correct_type() { | ||
742 | cov_mark::check_count!(validate_match_bailed_out, 1); | ||
743 | |||
744 | // Asserts `PatKind::Binding(ref _x): bool`, not &bool. | ||
745 | // If that's not true match checking will panic with "incompatible constructors" | ||
746 | // FIXME: make facilities to test this directly like `tests::check_infer(..)` | ||
747 | check_diagnostics( | ||
748 | r#" | ||
749 | enum Foo { A } | ||
750 | fn main() { | ||
751 | // FIXME: this should not bail out but current behavior is such as the old algorithm. | ||
752 | // ExprValidator::validate_match(..) checks types of top level patterns incorrecly. | ||
753 | match Foo::A { | ||
754 | ref _x => {} | ||
755 | Foo::A => {} | ||
756 | } | ||
757 | match (true,) { | ||
758 | (ref _x,) => {} | ||
759 | (true,) => {} | ||
760 | } | ||
761 | } | ||
762 | "#, | ||
763 | ); | ||
764 | } | ||
765 | |||
766 | #[test] | ||
767 | fn enum_non_exhaustive() { | ||
768 | check_diagnostics_no_bails( | ||
769 | r#" | ||
770 | //- /lib.rs crate:lib | ||
771 | #[non_exhaustive] | ||
772 | pub enum E { A, B } | ||
773 | fn _local() { | ||
774 | match E::A { _ => {} } | ||
775 | match E::A { | ||
776 | E::A => {} | ||
777 | E::B => {} | ||
778 | } | ||
779 | match E::A { | ||
780 | E::A | E::B => {} | ||
781 | } | ||
782 | } | ||
783 | |||
784 | //- /main.rs crate:main deps:lib | ||
785 | use lib::E; | ||
786 | fn main() { | ||
787 | match E::A { _ => {} } | ||
788 | match E::A { | ||
789 | //^^^^ missing match arm | ||
790 | E::A => {} | ||
791 | E::B => {} | ||
792 | } | ||
793 | match E::A { | ||
794 | //^^^^ missing match arm | ||
795 | E::A | E::B => {} | ||
796 | } | ||
797 | } | ||
798 | "#, | ||
799 | ); | ||
800 | } | ||
801 | |||
802 | #[test] | ||
803 | fn match_guard() { | ||
804 | check_diagnostics_no_bails( | ||
805 | r#" | ||
806 | fn main() { | ||
807 | match true { | ||
808 | true if false => {} | ||
809 | true => {} | ||
810 | false => {} | ||
811 | } | ||
812 | match true { | ||
813 | //^^^^ missing match arm | ||
814 | true if false => {} | ||
815 | false => {} | ||
816 | } | ||
817 | } | ||
818 | "#, | ||
819 | ); | ||
820 | } | ||
821 | |||
822 | #[test] | ||
823 | fn pattern_type_is_of_substitution() { | ||
824 | cov_mark::check!(match_check_wildcard_expanded_to_substitutions); | ||
825 | check_diagnostics_no_bails( | ||
826 | r#" | ||
827 | struct Foo<T>(T); | ||
828 | struct Bar; | ||
829 | fn main() { | ||
830 | match Foo(Bar) { | ||
831 | _ | Foo(Bar) => {} | ||
832 | } | ||
833 | } | ||
834 | "#, | ||
835 | ); | ||
836 | } | ||
837 | |||
838 | #[test] | ||
839 | fn record_struct_no_such_field() { | ||
840 | cov_mark::check_count!(validate_match_bailed_out, 1); | ||
841 | |||
842 | check_diagnostics( | ||
843 | r#" | ||
844 | struct Foo { } | ||
845 | fn main(f: Foo) { | ||
846 | match f { Foo { bar } => () } | ||
847 | } | ||
848 | "#, | ||
849 | ); | ||
850 | } | ||
851 | |||
852 | #[test] | ||
853 | fn match_ergonomics_issue_9095() { | ||
854 | check_diagnostics_no_bails( | ||
855 | r#" | ||
856 | enum Foo<T> { A(T) } | ||
857 | fn main() { | ||
858 | match &Foo::A(true) { | ||
859 | _ => {} | ||
860 | Foo::A(_) => {} | ||
861 | } | ||
862 | } | ||
863 | "#, | ||
864 | ); | ||
865 | } | ||
866 | |||
867 | mod false_negatives { | ||
868 | //! The implementation of match checking here is a work in progress. As we roll this out, we | ||
869 | //! prefer false negatives to false positives (ideally there would be no false positives). This | ||
870 | //! test module should document known false negatives. Eventually we will have a complete | ||
871 | //! implementation of match checking and this module will be empty. | ||
872 | //! | ||
873 | //! The reasons for documenting known false negatives: | ||
874 | //! | ||
875 | //! 1. It acts as a backlog of work that can be done to improve the behavior of the system. | ||
876 | //! 2. It ensures the code doesn't panic when handling these cases. | ||
877 | use super::*; | ||
878 | |||
879 | #[test] | ||
880 | fn integers() { | ||
881 | cov_mark::check_count!(validate_match_bailed_out, 1); | ||
882 | |||
883 | // We don't currently check integer exhaustiveness. | ||
884 | check_diagnostics( | ||
885 | r#" | ||
886 | fn main() { | ||
887 | match 5 { | ||
888 | 10 => (), | ||
889 | 11..20 => (), | ||
890 | } | ||
891 | } | ||
892 | "#, | ||
893 | ); | ||
894 | } | ||
895 | |||
896 | #[test] | ||
897 | fn reference_patterns_at_top_level() { | ||
898 | cov_mark::check_count!(validate_match_bailed_out, 1); | ||
899 | |||
900 | check_diagnostics( | ||
901 | r#" | ||
902 | fn main() { | ||
903 | match &false { | ||
904 | &true => {} | ||
905 | } | ||
906 | } | ||
907 | "#, | ||
908 | ); | ||
909 | } | ||
910 | |||
911 | #[test] | ||
912 | fn reference_patterns_in_fields() { | ||
913 | cov_mark::check_count!(validate_match_bailed_out, 2); | ||
914 | |||
915 | check_diagnostics( | ||
916 | r#" | ||
917 | fn main() { | ||
918 | match (&false,) { | ||
919 | (true,) => {} | ||
920 | } | ||
921 | match (&false,) { | ||
922 | (&true,) => {} | ||
923 | } | ||
924 | } | ||
925 | "#, | ||
926 | ); | ||
927 | } | ||
928 | } | ||
929 | } | ||
diff --git a/crates/ide/src/diagnostics/missing_ok_or_some_in_tail_expr.rs b/crates/ide/src/diagnostics/missing_ok_or_some_in_tail_expr.rs deleted file mode 100644 index 06005d156..000000000 --- a/crates/ide/src/diagnostics/missing_ok_or_some_in_tail_expr.rs +++ /dev/null | |||
@@ -1,230 +0,0 @@ | |||
1 | use hir::db::AstDatabase; | ||
2 | use ide_assists::Assist; | ||
3 | use ide_db::source_change::SourceChange; | ||
4 | use syntax::AstNode; | ||
5 | use text_edit::TextEdit; | ||
6 | |||
7 | use crate::diagnostics::{fix, Diagnostic, DiagnosticsContext}; | ||
8 | |||
9 | // Diagnostic: missing-ok-or-some-in-tail-expr | ||
10 | // | ||
11 | // This diagnostic is triggered if a block that should return `Result` returns a value not wrapped in `Ok`, | ||
12 | // or if a block that should return `Option` returns a value not wrapped in `Some`. | ||
13 | // | ||
14 | // Example: | ||
15 | // | ||
16 | // ```rust | ||
17 | // fn foo() -> Result<u8, ()> { | ||
18 | // 10 | ||
19 | // } | ||
20 | // ``` | ||
21 | pub(super) fn missing_ok_or_some_in_tail_expr( | ||
22 | ctx: &DiagnosticsContext<'_>, | ||
23 | d: &hir::MissingOkOrSomeInTailExpr, | ||
24 | ) -> Diagnostic { | ||
25 | Diagnostic::new( | ||
26 | "missing-ok-or-some-in-tail-expr", | ||
27 | format!("wrap return expression in {}", d.required), | ||
28 | ctx.sema.diagnostics_display_range(d.expr.clone().map(|it| it.into())).range, | ||
29 | ) | ||
30 | .with_fixes(fixes(ctx, d)) | ||
31 | } | ||
32 | |||
33 | fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::MissingOkOrSomeInTailExpr) -> Option<Vec<Assist>> { | ||
34 | let root = ctx.sema.db.parse_or_expand(d.expr.file_id)?; | ||
35 | let tail_expr = d.expr.value.to_node(&root); | ||
36 | let tail_expr_range = tail_expr.syntax().text_range(); | ||
37 | let replacement = format!("{}({})", d.required, tail_expr.syntax()); | ||
38 | let edit = TextEdit::replace(tail_expr_range, replacement); | ||
39 | let source_change = | ||
40 | SourceChange::from_text_edit(d.expr.file_id.original_file(ctx.sema.db), edit); | ||
41 | let name = if d.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" }; | ||
42 | Some(vec![fix("wrap_tail_expr", name, source_change, tail_expr_range)]) | ||
43 | } | ||
44 | |||
45 | #[cfg(test)] | ||
46 | mod tests { | ||
47 | use crate::diagnostics::tests::{check_diagnostics, check_fix}; | ||
48 | |||
49 | #[test] | ||
50 | fn test_wrap_return_type_option() { | ||
51 | check_fix( | ||
52 | r#" | ||
53 | //- /main.rs crate:main deps:core | ||
54 | use core::option::Option::{self, Some, None}; | ||
55 | |||
56 | fn div(x: i32, y: i32) -> Option<i32> { | ||
57 | if y == 0 { | ||
58 | return None; | ||
59 | } | ||
60 | x / y$0 | ||
61 | } | ||
62 | //- /core/lib.rs crate:core | ||
63 | pub mod result { | ||
64 | pub enum Result<T, E> { Ok(T), Err(E) } | ||
65 | } | ||
66 | pub mod option { | ||
67 | pub enum Option<T> { Some(T), None } | ||
68 | } | ||
69 | "#, | ||
70 | r#" | ||
71 | use core::option::Option::{self, Some, None}; | ||
72 | |||
73 | fn div(x: i32, y: i32) -> Option<i32> { | ||
74 | if y == 0 { | ||
75 | return None; | ||
76 | } | ||
77 | Some(x / y) | ||
78 | } | ||
79 | "#, | ||
80 | ); | ||
81 | } | ||
82 | |||
83 | #[test] | ||
84 | fn test_wrap_return_type() { | ||
85 | check_fix( | ||
86 | r#" | ||
87 | //- /main.rs crate:main deps:core | ||
88 | use core::result::Result::{self, Ok, Err}; | ||
89 | |||
90 | fn div(x: i32, y: i32) -> Result<i32, ()> { | ||
91 | if y == 0 { | ||
92 | return Err(()); | ||
93 | } | ||
94 | x / y$0 | ||
95 | } | ||
96 | //- /core/lib.rs crate:core | ||
97 | pub mod result { | ||
98 | pub enum Result<T, E> { Ok(T), Err(E) } | ||
99 | } | ||
100 | pub mod option { | ||
101 | pub enum Option<T> { Some(T), None } | ||
102 | } | ||
103 | "#, | ||
104 | r#" | ||
105 | use core::result::Result::{self, Ok, Err}; | ||
106 | |||
107 | fn div(x: i32, y: i32) -> Result<i32, ()> { | ||
108 | if y == 0 { | ||
109 | return Err(()); | ||
110 | } | ||
111 | Ok(x / y) | ||
112 | } | ||
113 | "#, | ||
114 | ); | ||
115 | } | ||
116 | |||
117 | #[test] | ||
118 | fn test_wrap_return_type_handles_generic_functions() { | ||
119 | check_fix( | ||
120 | r#" | ||
121 | //- /main.rs crate:main deps:core | ||
122 | use core::result::Result::{self, Ok, Err}; | ||
123 | |||
124 | fn div<T>(x: T) -> Result<T, i32> { | ||
125 | if x == 0 { | ||
126 | return Err(7); | ||
127 | } | ||
128 | $0x | ||
129 | } | ||
130 | //- /core/lib.rs crate:core | ||
131 | pub mod result { | ||
132 | pub enum Result<T, E> { Ok(T), Err(E) } | ||
133 | } | ||
134 | pub mod option { | ||
135 | pub enum Option<T> { Some(T), None } | ||
136 | } | ||
137 | "#, | ||
138 | r#" | ||
139 | use core::result::Result::{self, Ok, Err}; | ||
140 | |||
141 | fn div<T>(x: T) -> Result<T, i32> { | ||
142 | if x == 0 { | ||
143 | return Err(7); | ||
144 | } | ||
145 | Ok(x) | ||
146 | } | ||
147 | "#, | ||
148 | ); | ||
149 | } | ||
150 | |||
151 | #[test] | ||
152 | fn test_wrap_return_type_handles_type_aliases() { | ||
153 | check_fix( | ||
154 | r#" | ||
155 | //- /main.rs crate:main deps:core | ||
156 | use core::result::Result::{self, Ok, Err}; | ||
157 | |||
158 | type MyResult<T> = Result<T, ()>; | ||
159 | |||
160 | fn div(x: i32, y: i32) -> MyResult<i32> { | ||
161 | if y == 0 { | ||
162 | return Err(()); | ||
163 | } | ||
164 | x $0/ y | ||
165 | } | ||
166 | //- /core/lib.rs crate:core | ||
167 | pub mod result { | ||
168 | pub enum Result<T, E> { Ok(T), Err(E) } | ||
169 | } | ||
170 | pub mod option { | ||
171 | pub enum Option<T> { Some(T), None } | ||
172 | } | ||
173 | "#, | ||
174 | r#" | ||
175 | use core::result::Result::{self, Ok, Err}; | ||
176 | |||
177 | type MyResult<T> = Result<T, ()>; | ||
178 | |||
179 | fn div(x: i32, y: i32) -> MyResult<i32> { | ||
180 | if y == 0 { | ||
181 | return Err(()); | ||
182 | } | ||
183 | Ok(x / y) | ||
184 | } | ||
185 | "#, | ||
186 | ); | ||
187 | } | ||
188 | |||
189 | #[test] | ||
190 | fn test_wrap_return_type_not_applicable_when_expr_type_does_not_match_ok_type() { | ||
191 | check_diagnostics( | ||
192 | r#" | ||
193 | //- /main.rs crate:main deps:core | ||
194 | use core::result::Result::{self, Ok, Err}; | ||
195 | |||
196 | fn foo() -> Result<(), i32> { 0 } | ||
197 | |||
198 | //- /core/lib.rs crate:core | ||
199 | pub mod result { | ||
200 | pub enum Result<T, E> { Ok(T), Err(E) } | ||
201 | } | ||
202 | pub mod option { | ||
203 | pub enum Option<T> { Some(T), None } | ||
204 | } | ||
205 | "#, | ||
206 | ); | ||
207 | } | ||
208 | |||
209 | #[test] | ||
210 | fn test_wrap_return_type_not_applicable_when_return_type_is_not_result_or_option() { | ||
211 | check_diagnostics( | ||
212 | r#" | ||
213 | //- /main.rs crate:main deps:core | ||
214 | use core::result::Result::{self, Ok, Err}; | ||
215 | |||
216 | enum SomeOtherEnum { Ok(i32), Err(String) } | ||
217 | |||
218 | fn foo() -> SomeOtherEnum { 0 } | ||
219 | |||
220 | //- /core/lib.rs crate:core | ||
221 | pub mod result { | ||
222 | pub enum Result<T, E> { Ok(T), Err(E) } | ||
223 | } | ||
224 | pub mod option { | ||
225 | pub enum Option<T> { Some(T), None } | ||
226 | } | ||
227 | "#, | ||
228 | ); | ||
229 | } | ||
230 | } | ||
diff --git a/crates/ide/src/diagnostics/missing_unsafe.rs b/crates/ide/src/diagnostics/missing_unsafe.rs deleted file mode 100644 index 5c47e8d0a..000000000 --- a/crates/ide/src/diagnostics/missing_unsafe.rs +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
2 | |||
3 | // Diagnostic: missing-unsafe | ||
4 | // | ||
5 | // This diagnostic is triggered if an operation marked as `unsafe` is used outside of an `unsafe` function or block. | ||
6 | pub(super) fn missing_unsafe(ctx: &DiagnosticsContext<'_>, d: &hir::MissingUnsafe) -> Diagnostic { | ||
7 | Diagnostic::new( | ||
8 | "missing-unsafe", | ||
9 | "this operation is unsafe and requires an unsafe function or block", | ||
10 | ctx.sema.diagnostics_display_range(d.expr.clone().map(|it| it.into())).range, | ||
11 | ) | ||
12 | } | ||
13 | |||
14 | #[cfg(test)] | ||
15 | mod tests { | ||
16 | use crate::diagnostics::tests::check_diagnostics; | ||
17 | |||
18 | #[test] | ||
19 | fn missing_unsafe_diagnostic_with_raw_ptr() { | ||
20 | check_diagnostics( | ||
21 | r#" | ||
22 | fn main() { | ||
23 | let x = &5 as *const usize; | ||
24 | unsafe { let y = *x; } | ||
25 | let z = *x; | ||
26 | } //^^ this operation is unsafe and requires an unsafe function or block | ||
27 | "#, | ||
28 | ) | ||
29 | } | ||
30 | |||
31 | #[test] | ||
32 | fn missing_unsafe_diagnostic_with_unsafe_call() { | ||
33 | check_diagnostics( | ||
34 | r#" | ||
35 | struct HasUnsafe; | ||
36 | |||
37 | impl HasUnsafe { | ||
38 | unsafe fn unsafe_fn(&self) { | ||
39 | let x = &5 as *const usize; | ||
40 | let y = *x; | ||
41 | } | ||
42 | } | ||
43 | |||
44 | unsafe fn unsafe_fn() { | ||
45 | let x = &5 as *const usize; | ||
46 | let y = *x; | ||
47 | } | ||
48 | |||
49 | fn main() { | ||
50 | unsafe_fn(); | ||
51 | //^^^^^^^^^^^ this operation is unsafe and requires an unsafe function or block | ||
52 | HasUnsafe.unsafe_fn(); | ||
53 | //^^^^^^^^^^^^^^^^^^^^^ this operation is unsafe and requires an unsafe function or block | ||
54 | unsafe { | ||
55 | unsafe_fn(); | ||
56 | HasUnsafe.unsafe_fn(); | ||
57 | } | ||
58 | } | ||
59 | "#, | ||
60 | ); | ||
61 | } | ||
62 | |||
63 | #[test] | ||
64 | fn missing_unsafe_diagnostic_with_static_mut() { | ||
65 | check_diagnostics( | ||
66 | r#" | ||
67 | struct Ty { | ||
68 | a: u8, | ||
69 | } | ||
70 | |||
71 | static mut STATIC_MUT: Ty = Ty { a: 0 }; | ||
72 | |||
73 | fn main() { | ||
74 | let x = STATIC_MUT.a; | ||
75 | //^^^^^^^^^^ this operation is unsafe and requires an unsafe function or block | ||
76 | unsafe { | ||
77 | let x = STATIC_MUT.a; | ||
78 | } | ||
79 | } | ||
80 | "#, | ||
81 | ); | ||
82 | } | ||
83 | |||
84 | #[test] | ||
85 | fn no_missing_unsafe_diagnostic_with_safe_intrinsic() { | ||
86 | check_diagnostics( | ||
87 | r#" | ||
88 | extern "rust-intrinsic" { | ||
89 | pub fn bitreverse(x: u32) -> u32; // Safe intrinsic | ||
90 | pub fn floorf32(x: f32) -> f32; // Unsafe intrinsic | ||
91 | } | ||
92 | |||
93 | fn main() { | ||
94 | let _ = bitreverse(12); | ||
95 | let _ = floorf32(12.0); | ||
96 | //^^^^^^^^^^^^^^ this operation is unsafe and requires an unsafe function or block | ||
97 | } | ||
98 | "#, | ||
99 | ); | ||
100 | } | ||
101 | } | ||
diff --git a/crates/ide/src/diagnostics/no_such_field.rs b/crates/ide/src/diagnostics/no_such_field.rs deleted file mode 100644 index edc63c246..000000000 --- a/crates/ide/src/diagnostics/no_such_field.rs +++ /dev/null | |||
@@ -1,286 +0,0 @@ | |||
1 | use hir::{db::AstDatabase, HasSource, HirDisplay, Semantics}; | ||
2 | use ide_db::{base_db::FileId, source_change::SourceChange, RootDatabase}; | ||
3 | use syntax::{ | ||
4 | ast::{self, edit::IndentLevel, make}, | ||
5 | AstNode, | ||
6 | }; | ||
7 | use text_edit::TextEdit; | ||
8 | |||
9 | use crate::{ | ||
10 | diagnostics::{fix, Diagnostic, DiagnosticsContext}, | ||
11 | Assist, | ||
12 | }; | ||
13 | |||
14 | // Diagnostic: no-such-field | ||
15 | // | ||
16 | // This diagnostic is triggered if created structure does not have field provided in record. | ||
17 | pub(super) fn no_such_field(ctx: &DiagnosticsContext<'_>, d: &hir::NoSuchField) -> Diagnostic { | ||
18 | Diagnostic::new( | ||
19 | "no-such-field", | ||
20 | "no such field", | ||
21 | ctx.sema.diagnostics_display_range(d.field.clone().map(|it| it.into())).range, | ||
22 | ) | ||
23 | .with_fixes(fixes(ctx, d)) | ||
24 | } | ||
25 | |||
26 | fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::NoSuchField) -> Option<Vec<Assist>> { | ||
27 | let root = ctx.sema.db.parse_or_expand(d.field.file_id)?; | ||
28 | missing_record_expr_field_fixes( | ||
29 | &ctx.sema, | ||
30 | d.field.file_id.original_file(ctx.sema.db), | ||
31 | &d.field.value.to_node(&root), | ||
32 | ) | ||
33 | } | ||
34 | |||
35 | fn missing_record_expr_field_fixes( | ||
36 | sema: &Semantics<RootDatabase>, | ||
37 | usage_file_id: FileId, | ||
38 | record_expr_field: &ast::RecordExprField, | ||
39 | ) -> Option<Vec<Assist>> { | ||
40 | let record_lit = ast::RecordExpr::cast(record_expr_field.syntax().parent()?.parent()?)?; | ||
41 | let def_id = sema.resolve_variant(record_lit)?; | ||
42 | let module; | ||
43 | let def_file_id; | ||
44 | let record_fields = match def_id { | ||
45 | hir::VariantDef::Struct(s) => { | ||
46 | module = s.module(sema.db); | ||
47 | let source = s.source(sema.db)?; | ||
48 | def_file_id = source.file_id; | ||
49 | let fields = source.value.field_list()?; | ||
50 | record_field_list(fields)? | ||
51 | } | ||
52 | hir::VariantDef::Union(u) => { | ||
53 | module = u.module(sema.db); | ||
54 | let source = u.source(sema.db)?; | ||
55 | def_file_id = source.file_id; | ||
56 | source.value.record_field_list()? | ||
57 | } | ||
58 | hir::VariantDef::Variant(e) => { | ||
59 | module = e.module(sema.db); | ||
60 | let source = e.source(sema.db)?; | ||
61 | def_file_id = source.file_id; | ||
62 | let fields = source.value.field_list()?; | ||
63 | record_field_list(fields)? | ||
64 | } | ||
65 | }; | ||
66 | let def_file_id = def_file_id.original_file(sema.db); | ||
67 | |||
68 | let new_field_type = sema.type_of_expr(&record_expr_field.expr()?)?; | ||
69 | if new_field_type.is_unknown() { | ||
70 | return None; | ||
71 | } | ||
72 | let new_field = make::record_field( | ||
73 | None, | ||
74 | make::name(&record_expr_field.field_name()?.text()), | ||
75 | make::ty(&new_field_type.display_source_code(sema.db, module.into()).ok()?), | ||
76 | ); | ||
77 | |||
78 | let last_field = record_fields.fields().last()?; | ||
79 | let last_field_syntax = last_field.syntax(); | ||
80 | let indent = IndentLevel::from_node(last_field_syntax); | ||
81 | |||
82 | let mut new_field = new_field.to_string(); | ||
83 | if usage_file_id != def_file_id { | ||
84 | new_field = format!("pub(crate) {}", new_field); | ||
85 | } | ||
86 | new_field = format!("\n{}{}", indent, new_field); | ||
87 | |||
88 | let needs_comma = !last_field_syntax.to_string().ends_with(','); | ||
89 | if needs_comma { | ||
90 | new_field = format!(",{}", new_field); | ||
91 | } | ||
92 | |||
93 | let source_change = SourceChange::from_text_edit( | ||
94 | def_file_id, | ||
95 | TextEdit::insert(last_field_syntax.text_range().end(), new_field), | ||
96 | ); | ||
97 | |||
98 | return Some(vec![fix( | ||
99 | "create_field", | ||
100 | "Create field", | ||
101 | source_change, | ||
102 | record_expr_field.syntax().text_range(), | ||
103 | )]); | ||
104 | |||
105 | fn record_field_list(field_def_list: ast::FieldList) -> Option<ast::RecordFieldList> { | ||
106 | match field_def_list { | ||
107 | ast::FieldList::RecordFieldList(it) => Some(it), | ||
108 | ast::FieldList::TupleFieldList(_) => None, | ||
109 | } | ||
110 | } | ||
111 | } | ||
112 | |||
113 | #[cfg(test)] | ||
114 | mod tests { | ||
115 | use crate::diagnostics::tests::{check_diagnostics, check_fix}; | ||
116 | |||
117 | #[test] | ||
118 | fn no_such_field_diagnostics() { | ||
119 | check_diagnostics( | ||
120 | r#" | ||
121 | struct S { foo: i32, bar: () } | ||
122 | impl S { | ||
123 | fn new() -> S { | ||
124 | S { | ||
125 | //^ Missing structure fields: | ||
126 | //| - bar | ||
127 | foo: 92, | ||
128 | baz: 62, | ||
129 | //^^^^^^^ no such field | ||
130 | } | ||
131 | } | ||
132 | } | ||
133 | "#, | ||
134 | ); | ||
135 | } | ||
136 | #[test] | ||
137 | fn no_such_field_with_feature_flag_diagnostics() { | ||
138 | check_diagnostics( | ||
139 | r#" | ||
140 | //- /lib.rs crate:foo cfg:feature=foo | ||
141 | struct MyStruct { | ||
142 | my_val: usize, | ||
143 | #[cfg(feature = "foo")] | ||
144 | bar: bool, | ||
145 | } | ||
146 | |||
147 | impl MyStruct { | ||
148 | #[cfg(feature = "foo")] | ||
149 | pub(crate) fn new(my_val: usize, bar: bool) -> Self { | ||
150 | Self { my_val, bar } | ||
151 | } | ||
152 | #[cfg(not(feature = "foo"))] | ||
153 | pub(crate) fn new(my_val: usize, _bar: bool) -> Self { | ||
154 | Self { my_val } | ||
155 | } | ||
156 | } | ||
157 | "#, | ||
158 | ); | ||
159 | } | ||
160 | |||
161 | #[test] | ||
162 | fn no_such_field_enum_with_feature_flag_diagnostics() { | ||
163 | check_diagnostics( | ||
164 | r#" | ||
165 | //- /lib.rs crate:foo cfg:feature=foo | ||
166 | enum Foo { | ||
167 | #[cfg(not(feature = "foo"))] | ||
168 | Buz, | ||
169 | #[cfg(feature = "foo")] | ||
170 | Bar, | ||
171 | Baz | ||
172 | } | ||
173 | |||
174 | fn test_fn(f: Foo) { | ||
175 | match f { | ||
176 | Foo::Bar => {}, | ||
177 | Foo::Baz => {}, | ||
178 | } | ||
179 | } | ||
180 | "#, | ||
181 | ); | ||
182 | } | ||
183 | |||
184 | #[test] | ||
185 | fn no_such_field_with_feature_flag_diagnostics_on_struct_lit() { | ||
186 | check_diagnostics( | ||
187 | r#" | ||
188 | //- /lib.rs crate:foo cfg:feature=foo | ||
189 | struct S { | ||
190 | #[cfg(feature = "foo")] | ||
191 | foo: u32, | ||
192 | #[cfg(not(feature = "foo"))] | ||
193 | bar: u32, | ||
194 | } | ||
195 | |||
196 | impl S { | ||
197 | #[cfg(feature = "foo")] | ||
198 | fn new(foo: u32) -> Self { | ||
199 | Self { foo } | ||
200 | } | ||
201 | #[cfg(not(feature = "foo"))] | ||
202 | fn new(bar: u32) -> Self { | ||
203 | Self { bar } | ||
204 | } | ||
205 | fn new2(bar: u32) -> Self { | ||
206 | #[cfg(feature = "foo")] | ||
207 | { Self { foo: bar } } | ||
208 | #[cfg(not(feature = "foo"))] | ||
209 | { Self { bar } } | ||
210 | } | ||
211 | fn new2(val: u32) -> Self { | ||
212 | Self { | ||
213 | #[cfg(feature = "foo")] | ||
214 | foo: val, | ||
215 | #[cfg(not(feature = "foo"))] | ||
216 | bar: val, | ||
217 | } | ||
218 | } | ||
219 | } | ||
220 | "#, | ||
221 | ); | ||
222 | } | ||
223 | |||
224 | #[test] | ||
225 | fn no_such_field_with_type_macro() { | ||
226 | check_diagnostics( | ||
227 | r#" | ||
228 | macro_rules! Type { () => { u32 }; } | ||
229 | struct Foo { bar: Type![] } | ||
230 | |||
231 | impl Foo { | ||
232 | fn new() -> Self { | ||
233 | Foo { bar: 0 } | ||
234 | } | ||
235 | } | ||
236 | "#, | ||
237 | ); | ||
238 | } | ||
239 | |||
240 | #[test] | ||
241 | fn test_add_field_from_usage() { | ||
242 | check_fix( | ||
243 | r" | ||
244 | fn main() { | ||
245 | Foo { bar: 3, baz$0: false}; | ||
246 | } | ||
247 | struct Foo { | ||
248 | bar: i32 | ||
249 | } | ||
250 | ", | ||
251 | r" | ||
252 | fn main() { | ||
253 | Foo { bar: 3, baz: false}; | ||
254 | } | ||
255 | struct Foo { | ||
256 | bar: i32, | ||
257 | baz: bool | ||
258 | } | ||
259 | ", | ||
260 | ) | ||
261 | } | ||
262 | |||
263 | #[test] | ||
264 | fn test_add_field_in_other_file_from_usage() { | ||
265 | check_fix( | ||
266 | r#" | ||
267 | //- /main.rs | ||
268 | mod foo; | ||
269 | |||
270 | fn main() { | ||
271 | foo::Foo { bar: 3, $0baz: false}; | ||
272 | } | ||
273 | //- /foo.rs | ||
274 | struct Foo { | ||
275 | bar: i32 | ||
276 | } | ||
277 | "#, | ||
278 | r#" | ||
279 | struct Foo { | ||
280 | bar: i32, | ||
281 | pub(crate) baz: bool | ||
282 | } | ||
283 | "#, | ||
284 | ) | ||
285 | } | ||
286 | } | ||
diff --git a/crates/ide/src/diagnostics/remove_this_semicolon.rs b/crates/ide/src/diagnostics/remove_this_semicolon.rs deleted file mode 100644 index 814cb0f8c..000000000 --- a/crates/ide/src/diagnostics/remove_this_semicolon.rs +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | use hir::db::AstDatabase; | ||
2 | use ide_db::source_change::SourceChange; | ||
3 | use syntax::{ast, AstNode}; | ||
4 | use text_edit::TextEdit; | ||
5 | |||
6 | use crate::{ | ||
7 | diagnostics::{fix, Diagnostic, DiagnosticsContext}, | ||
8 | Assist, | ||
9 | }; | ||
10 | |||
11 | // Diagnostic: remove-this-semicolon | ||
12 | // | ||
13 | // This diagnostic is triggered when there's an erroneous `;` at the end of the block. | ||
14 | pub(super) fn remove_this_semicolon( | ||
15 | ctx: &DiagnosticsContext<'_>, | ||
16 | d: &hir::RemoveThisSemicolon, | ||
17 | ) -> Diagnostic { | ||
18 | Diagnostic::new( | ||
19 | "remove-this-semicolon", | ||
20 | "remove this semicolon", | ||
21 | ctx.sema.diagnostics_display_range(d.expr.clone().map(|it| it.into())).range, | ||
22 | ) | ||
23 | .with_fixes(fixes(ctx, d)) | ||
24 | } | ||
25 | |||
26 | fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::RemoveThisSemicolon) -> Option<Vec<Assist>> { | ||
27 | let root = ctx.sema.db.parse_or_expand(d.expr.file_id)?; | ||
28 | |||
29 | let semicolon = d | ||
30 | .expr | ||
31 | .value | ||
32 | .to_node(&root) | ||
33 | .syntax() | ||
34 | .parent() | ||
35 | .and_then(ast::ExprStmt::cast) | ||
36 | .and_then(|expr| expr.semicolon_token())? | ||
37 | .text_range(); | ||
38 | |||
39 | let edit = TextEdit::delete(semicolon); | ||
40 | let source_change = | ||
41 | SourceChange::from_text_edit(d.expr.file_id.original_file(ctx.sema.db), edit); | ||
42 | |||
43 | Some(vec![fix("remove_semicolon", "Remove this semicolon", source_change, semicolon)]) | ||
44 | } | ||
45 | |||
46 | #[cfg(test)] | ||
47 | mod tests { | ||
48 | use crate::diagnostics::tests::{check_diagnostics, check_fix}; | ||
49 | |||
50 | #[test] | ||
51 | fn missing_semicolon() { | ||
52 | check_diagnostics( | ||
53 | r#" | ||
54 | fn test() -> i32 { 123; } | ||
55 | //^^^ remove this semicolon | ||
56 | "#, | ||
57 | ); | ||
58 | } | ||
59 | |||
60 | #[test] | ||
61 | fn remove_semicolon() { | ||
62 | check_fix(r#"fn f() -> i32 { 92$0; }"#, r#"fn f() -> i32 { 92 }"#); | ||
63 | } | ||
64 | } | ||
diff --git a/crates/ide/src/diagnostics/replace_filter_map_next_with_find_map.rs b/crates/ide/src/diagnostics/replace_filter_map_next_with_find_map.rs deleted file mode 100644 index f3b011495..000000000 --- a/crates/ide/src/diagnostics/replace_filter_map_next_with_find_map.rs +++ /dev/null | |||
@@ -1,182 +0,0 @@ | |||
1 | use hir::{db::AstDatabase, InFile}; | ||
2 | use ide_db::source_change::SourceChange; | ||
3 | use syntax::{ | ||
4 | ast::{self, ArgListOwner}, | ||
5 | AstNode, TextRange, | ||
6 | }; | ||
7 | use text_edit::TextEdit; | ||
8 | |||
9 | use crate::{ | ||
10 | diagnostics::{fix, Diagnostic, DiagnosticsContext}, | ||
11 | Assist, Severity, | ||
12 | }; | ||
13 | |||
14 | // Diagnostic: replace-filter-map-next-with-find-map | ||
15 | // | ||
16 | // This diagnostic is triggered when `.filter_map(..).next()` is used, rather than the more concise `.find_map(..)`. | ||
17 | pub(super) fn replace_filter_map_next_with_find_map( | ||
18 | ctx: &DiagnosticsContext<'_>, | ||
19 | d: &hir::ReplaceFilterMapNextWithFindMap, | ||
20 | ) -> Diagnostic { | ||
21 | Diagnostic::new( | ||
22 | "replace-filter-map-next-with-find-map", | ||
23 | "replace filter_map(..).next() with find_map(..)", | ||
24 | ctx.sema.diagnostics_display_range(InFile::new(d.file, d.next_expr.clone().into())).range, | ||
25 | ) | ||
26 | .severity(Severity::WeakWarning) | ||
27 | .with_fixes(fixes(ctx, d)) | ||
28 | } | ||
29 | |||
30 | fn fixes( | ||
31 | ctx: &DiagnosticsContext<'_>, | ||
32 | d: &hir::ReplaceFilterMapNextWithFindMap, | ||
33 | ) -> Option<Vec<Assist>> { | ||
34 | let root = ctx.sema.db.parse_or_expand(d.file)?; | ||
35 | let next_expr = d.next_expr.to_node(&root); | ||
36 | let next_call = ast::MethodCallExpr::cast(next_expr.syntax().clone())?; | ||
37 | |||
38 | let filter_map_call = ast::MethodCallExpr::cast(next_call.receiver()?.syntax().clone())?; | ||
39 | let filter_map_name_range = filter_map_call.name_ref()?.ident_token()?.text_range(); | ||
40 | let filter_map_args = filter_map_call.arg_list()?; | ||
41 | |||
42 | let range_to_replace = | ||
43 | TextRange::new(filter_map_name_range.start(), next_expr.syntax().text_range().end()); | ||
44 | let replacement = format!("find_map{}", filter_map_args.syntax().text()); | ||
45 | let trigger_range = next_expr.syntax().text_range(); | ||
46 | |||
47 | let edit = TextEdit::replace(range_to_replace, replacement); | ||
48 | |||
49 | let source_change = SourceChange::from_text_edit(d.file.original_file(ctx.sema.db), edit); | ||
50 | |||
51 | Some(vec![fix( | ||
52 | "replace_with_find_map", | ||
53 | "Replace filter_map(..).next() with find_map()", | ||
54 | source_change, | ||
55 | trigger_range, | ||
56 | )]) | ||
57 | } | ||
58 | |||
59 | #[cfg(test)] | ||
60 | mod tests { | ||
61 | use crate::diagnostics::tests::check_fix; | ||
62 | |||
63 | // Register the required standard library types to make the tests work | ||
64 | #[track_caller] | ||
65 | fn check_diagnostics(ra_fixture: &str) { | ||
66 | let prefix = r#" | ||
67 | //- /main.rs crate:main deps:core | ||
68 | use core::iter::Iterator; | ||
69 | use core::option::Option::{self, Some, None}; | ||
70 | "#; | ||
71 | let suffix = r#" | ||
72 | //- /core/lib.rs crate:core | ||
73 | pub mod option { | ||
74 | pub enum Option<T> { Some(T), None } | ||
75 | } | ||
76 | pub mod iter { | ||
77 | pub trait Iterator { | ||
78 | type Item; | ||
79 | fn filter_map<B, F>(self, f: F) -> FilterMap where F: FnMut(Self::Item) -> Option<B> { FilterMap } | ||
80 | fn next(&mut self) -> Option<Self::Item>; | ||
81 | } | ||
82 | pub struct FilterMap {} | ||
83 | impl Iterator for FilterMap { | ||
84 | type Item = i32; | ||
85 | fn next(&mut self) -> i32 { 7 } | ||
86 | } | ||
87 | } | ||
88 | "#; | ||
89 | crate::diagnostics::tests::check_diagnostics(&format!("{}{}{}", prefix, ra_fixture, suffix)) | ||
90 | } | ||
91 | |||
92 | #[test] | ||
93 | fn replace_filter_map_next_with_find_map2() { | ||
94 | check_diagnostics( | ||
95 | r#" | ||
96 | fn foo() { | ||
97 | let m = [1, 2, 3].iter().filter_map(|x| if *x == 2 { Some (4) } else { None }).next(); | ||
98 | } //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ replace filter_map(..).next() with find_map(..) | ||
99 | "#, | ||
100 | ); | ||
101 | } | ||
102 | |||
103 | #[test] | ||
104 | fn replace_filter_map_next_with_find_map_no_diagnostic_without_next() { | ||
105 | check_diagnostics( | ||
106 | r#" | ||
107 | fn foo() { | ||
108 | let m = [1, 2, 3] | ||
109 | .iter() | ||
110 | .filter_map(|x| if *x == 2 { Some (4) } else { None }) | ||
111 | .len(); | ||
112 | } | ||
113 | "#, | ||
114 | ); | ||
115 | } | ||
116 | |||
117 | #[test] | ||
118 | fn replace_filter_map_next_with_find_map_no_diagnostic_with_intervening_methods() { | ||
119 | check_diagnostics( | ||
120 | r#" | ||
121 | fn foo() { | ||
122 | let m = [1, 2, 3] | ||
123 | .iter() | ||
124 | .filter_map(|x| if *x == 2 { Some (4) } else { None }) | ||
125 | .map(|x| x + 2) | ||
126 | .len(); | ||
127 | } | ||
128 | "#, | ||
129 | ); | ||
130 | } | ||
131 | |||
132 | #[test] | ||
133 | fn replace_filter_map_next_with_find_map_no_diagnostic_if_not_in_chain() { | ||
134 | check_diagnostics( | ||
135 | r#" | ||
136 | fn foo() { | ||
137 | let m = [1, 2, 3] | ||
138 | .iter() | ||
139 | .filter_map(|x| if *x == 2 { Some (4) } else { None }); | ||
140 | let n = m.next(); | ||
141 | } | ||
142 | "#, | ||
143 | ); | ||
144 | } | ||
145 | |||
146 | #[test] | ||
147 | fn replace_with_wind_map() { | ||
148 | check_fix( | ||
149 | r#" | ||
150 | //- /main.rs crate:main deps:core | ||
151 | use core::iter::Iterator; | ||
152 | use core::option::Option::{self, Some, None}; | ||
153 | fn foo() { | ||
154 | let m = [1, 2, 3].iter().$0filter_map(|x| if *x == 2 { Some (4) } else { None }).next(); | ||
155 | } | ||
156 | //- /core/lib.rs crate:core | ||
157 | pub mod option { | ||
158 | pub enum Option<T> { Some(T), None } | ||
159 | } | ||
160 | pub mod iter { | ||
161 | pub trait Iterator { | ||
162 | type Item; | ||
163 | fn filter_map<B, F>(self, f: F) -> FilterMap where F: FnMut(Self::Item) -> Option<B> { FilterMap } | ||
164 | fn next(&mut self) -> Option<Self::Item>; | ||
165 | } | ||
166 | pub struct FilterMap {} | ||
167 | impl Iterator for FilterMap { | ||
168 | type Item = i32; | ||
169 | fn next(&mut self) -> i32 { 7 } | ||
170 | } | ||
171 | } | ||
172 | "#, | ||
173 | r#" | ||
174 | use core::iter::Iterator; | ||
175 | use core::option::Option::{self, Some, None}; | ||
176 | fn foo() { | ||
177 | let m = [1, 2, 3].iter().find_map(|x| if *x == 2 { Some (4) } else { None }); | ||
178 | } | ||
179 | "#, | ||
180 | ) | ||
181 | } | ||
182 | } | ||
diff --git a/crates/ide/src/diagnostics/unimplemented_builtin_macro.rs b/crates/ide/src/diagnostics/unimplemented_builtin_macro.rs deleted file mode 100644 index 09faa3bbc..000000000 --- a/crates/ide/src/diagnostics/unimplemented_builtin_macro.rs +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | use crate::{ | ||
2 | diagnostics::{Diagnostic, DiagnosticsContext}, | ||
3 | Severity, | ||
4 | }; | ||
5 | |||
6 | // Diagnostic: unimplemented-builtin-macro | ||
7 | // | ||
8 | // This diagnostic is shown for builtin macros which are not yet implemented by rust-analyzer | ||
9 | pub(super) fn unimplemented_builtin_macro( | ||
10 | ctx: &DiagnosticsContext<'_>, | ||
11 | d: &hir::UnimplementedBuiltinMacro, | ||
12 | ) -> Diagnostic { | ||
13 | Diagnostic::new( | ||
14 | "unimplemented-builtin-macro", | ||
15 | "unimplemented built-in macro".to_string(), | ||
16 | ctx.sema.diagnostics_display_range(d.node.clone()).range, | ||
17 | ) | ||
18 | .severity(Severity::WeakWarning) | ||
19 | } | ||
diff --git a/crates/ide/src/diagnostics/unlinked_file.rs b/crates/ide/src/diagnostics/unlinked_file.rs deleted file mode 100644 index a5b2e3399..000000000 --- a/crates/ide/src/diagnostics/unlinked_file.rs +++ /dev/null | |||
@@ -1,304 +0,0 @@ | |||
1 | //! Diagnostic emitted for files that aren't part of any crate. | ||
2 | |||
3 | use hir::db::DefDatabase; | ||
4 | use ide_db::{ | ||
5 | base_db::{FileId, FileLoader, SourceDatabase, SourceDatabaseExt}, | ||
6 | source_change::SourceChange, | ||
7 | RootDatabase, | ||
8 | }; | ||
9 | use syntax::{ | ||
10 | ast::{self, ModuleItemOwner, NameOwner}, | ||
11 | AstNode, TextRange, TextSize, | ||
12 | }; | ||
13 | use text_edit::TextEdit; | ||
14 | |||
15 | use crate::{ | ||
16 | diagnostics::{fix, DiagnosticsContext}, | ||
17 | Assist, Diagnostic, | ||
18 | }; | ||
19 | |||
20 | #[derive(Debug)] | ||
21 | pub(crate) struct UnlinkedFile { | ||
22 | pub(crate) file: FileId, | ||
23 | } | ||
24 | |||
25 | // Diagnostic: unlinked-file | ||
26 | // | ||
27 | // This diagnostic is shown for files that are not included in any crate, or files that are part of | ||
28 | // crates rust-analyzer failed to discover. The file will not have IDE features available. | ||
29 | pub(super) fn unlinked_file(ctx: &DiagnosticsContext, d: &UnlinkedFile) -> Diagnostic { | ||
30 | // Limit diagnostic to the first few characters in the file. This matches how VS Code | ||
31 | // renders it with the full span, but on other editors, and is less invasive. | ||
32 | let range = ctx.sema.db.parse(d.file).syntax_node().text_range(); | ||
33 | // FIXME: This is wrong if one of the first three characters is not ascii: `//Ы`. | ||
34 | let range = range.intersect(TextRange::up_to(TextSize::of("..."))).unwrap_or(range); | ||
35 | |||
36 | Diagnostic::new("unlinked-file", "file not included in module tree", range) | ||
37 | .with_fixes(fixes(ctx, d)) | ||
38 | } | ||
39 | |||
40 | fn fixes(ctx: &DiagnosticsContext, d: &UnlinkedFile) -> Option<Vec<Assist>> { | ||
41 | // If there's an existing module that could add `mod` or `pub mod` items to include the unlinked file, | ||
42 | // suggest that as a fix. | ||
43 | |||
44 | let source_root = ctx.sema.db.source_root(ctx.sema.db.file_source_root(d.file)); | ||
45 | let our_path = source_root.path_for_file(&d.file)?; | ||
46 | let module_name = our_path.name_and_extension()?.0; | ||
47 | |||
48 | // Candidates to look for: | ||
49 | // - `mod.rs` in the same folder | ||
50 | // - we also check `main.rs` and `lib.rs` | ||
51 | // - `$dir.rs` in the parent folder, where `$dir` is the directory containing `self.file_id` | ||
52 | let parent = our_path.parent()?; | ||
53 | let mut paths = vec![parent.join("mod.rs")?, parent.join("lib.rs")?, parent.join("main.rs")?]; | ||
54 | |||
55 | // `submod/bla.rs` -> `submod.rs` | ||
56 | if let Some(newmod) = (|| { | ||
57 | let name = parent.name_and_extension()?.0; | ||
58 | parent.parent()?.join(&format!("{}.rs", name)) | ||
59 | })() { | ||
60 | paths.push(newmod); | ||
61 | } | ||
62 | |||
63 | for path in &paths { | ||
64 | if let Some(parent_id) = source_root.file_for_path(path) { | ||
65 | for krate in ctx.sema.db.relevant_crates(*parent_id).iter() { | ||
66 | let crate_def_map = ctx.sema.db.crate_def_map(*krate); | ||
67 | for (_, module) in crate_def_map.modules() { | ||
68 | if module.origin.is_inline() { | ||
69 | // We don't handle inline `mod parent {}`s, they use different paths. | ||
70 | continue; | ||
71 | } | ||
72 | |||
73 | if module.origin.file_id() == Some(*parent_id) { | ||
74 | return make_fixes(ctx.sema.db, *parent_id, module_name, d.file); | ||
75 | } | ||
76 | } | ||
77 | } | ||
78 | } | ||
79 | } | ||
80 | |||
81 | None | ||
82 | } | ||
83 | |||
84 | fn make_fixes( | ||
85 | db: &RootDatabase, | ||
86 | parent_file_id: FileId, | ||
87 | new_mod_name: &str, | ||
88 | added_file_id: FileId, | ||
89 | ) -> Option<Vec<Assist>> { | ||
90 | fn is_outline_mod(item: &ast::Item) -> bool { | ||
91 | matches!(item, ast::Item::Module(m) if m.item_list().is_none()) | ||
92 | } | ||
93 | |||
94 | let mod_decl = format!("mod {};", new_mod_name); | ||
95 | let pub_mod_decl = format!("pub mod {};", new_mod_name); | ||
96 | |||
97 | let ast: ast::SourceFile = db.parse(parent_file_id).tree(); | ||
98 | |||
99 | let mut mod_decl_builder = TextEdit::builder(); | ||
100 | let mut pub_mod_decl_builder = TextEdit::builder(); | ||
101 | |||
102 | // If there's an existing `mod m;` statement matching the new one, don't emit a fix (it's | ||
103 | // probably `#[cfg]`d out). | ||
104 | for item in ast.items() { | ||
105 | if let ast::Item::Module(m) = item { | ||
106 | if let Some(name) = m.name() { | ||
107 | if m.item_list().is_none() && name.to_string() == new_mod_name { | ||
108 | cov_mark::hit!(unlinked_file_skip_fix_when_mod_already_exists); | ||
109 | return None; | ||
110 | } | ||
111 | } | ||
112 | } | ||
113 | } | ||
114 | |||
115 | // If there are existing `mod m;` items, append after them (after the first group of them, rather). | ||
116 | match ast | ||
117 | .items() | ||
118 | .skip_while(|item| !is_outline_mod(item)) | ||
119 | .take_while(|item| is_outline_mod(item)) | ||
120 | .last() | ||
121 | { | ||
122 | Some(last) => { | ||
123 | cov_mark::hit!(unlinked_file_append_to_existing_mods); | ||
124 | let offset = last.syntax().text_range().end(); | ||
125 | mod_decl_builder.insert(offset, format!("\n{}", mod_decl)); | ||
126 | pub_mod_decl_builder.insert(offset, format!("\n{}", pub_mod_decl)); | ||
127 | } | ||
128 | None => { | ||
129 | // Prepend before the first item in the file. | ||
130 | match ast.items().next() { | ||
131 | Some(item) => { | ||
132 | cov_mark::hit!(unlinked_file_prepend_before_first_item); | ||
133 | let offset = item.syntax().text_range().start(); | ||
134 | mod_decl_builder.insert(offset, format!("{}\n\n", mod_decl)); | ||
135 | pub_mod_decl_builder.insert(offset, format!("{}\n\n", pub_mod_decl)); | ||
136 | } | ||
137 | None => { | ||
138 | // No items in the file, so just append at the end. | ||
139 | cov_mark::hit!(unlinked_file_empty_file); | ||
140 | let offset = ast.syntax().text_range().end(); | ||
141 | mod_decl_builder.insert(offset, format!("{}\n", mod_decl)); | ||
142 | pub_mod_decl_builder.insert(offset, format!("{}\n", pub_mod_decl)); | ||
143 | } | ||
144 | } | ||
145 | } | ||
146 | } | ||
147 | |||
148 | let trigger_range = db.parse(added_file_id).tree().syntax().text_range(); | ||
149 | Some(vec![ | ||
150 | fix( | ||
151 | "add_mod_declaration", | ||
152 | &format!("Insert `{}`", mod_decl), | ||
153 | SourceChange::from_text_edit(parent_file_id, mod_decl_builder.finish()), | ||
154 | trigger_range, | ||
155 | ), | ||
156 | fix( | ||
157 | "add_pub_mod_declaration", | ||
158 | &format!("Insert `{}`", pub_mod_decl), | ||
159 | SourceChange::from_text_edit(parent_file_id, pub_mod_decl_builder.finish()), | ||
160 | trigger_range, | ||
161 | ), | ||
162 | ]) | ||
163 | } | ||
164 | |||
165 | #[cfg(test)] | ||
166 | mod tests { | ||
167 | use crate::diagnostics::tests::{check_diagnostics, check_fix, check_fixes, check_no_fix}; | ||
168 | |||
169 | #[test] | ||
170 | fn unlinked_file_prepend_first_item() { | ||
171 | cov_mark::check!(unlinked_file_prepend_before_first_item); | ||
172 | // Only tests the first one for `pub mod` since the rest are the same | ||
173 | check_fixes( | ||
174 | r#" | ||
175 | //- /main.rs | ||
176 | fn f() {} | ||
177 | //- /foo.rs | ||
178 | $0 | ||
179 | "#, | ||
180 | vec![ | ||
181 | r#" | ||
182 | mod foo; | ||
183 | |||
184 | fn f() {} | ||
185 | "#, | ||
186 | r#" | ||
187 | pub mod foo; | ||
188 | |||
189 | fn f() {} | ||
190 | "#, | ||
191 | ], | ||
192 | ); | ||
193 | } | ||
194 | |||
195 | #[test] | ||
196 | fn unlinked_file_append_mod() { | ||
197 | cov_mark::check!(unlinked_file_append_to_existing_mods); | ||
198 | check_fix( | ||
199 | r#" | ||
200 | //- /main.rs | ||
201 | //! Comment on top | ||
202 | |||
203 | mod preexisting; | ||
204 | |||
205 | mod preexisting2; | ||
206 | |||
207 | struct S; | ||
208 | |||
209 | mod preexisting_bottom;) | ||
210 | //- /foo.rs | ||
211 | $0 | ||
212 | "#, | ||
213 | r#" | ||
214 | //! Comment on top | ||
215 | |||
216 | mod preexisting; | ||
217 | |||
218 | mod preexisting2; | ||
219 | mod foo; | ||
220 | |||
221 | struct S; | ||
222 | |||
223 | mod preexisting_bottom;) | ||
224 | "#, | ||
225 | ); | ||
226 | } | ||
227 | |||
228 | #[test] | ||
229 | fn unlinked_file_insert_in_empty_file() { | ||
230 | cov_mark::check!(unlinked_file_empty_file); | ||
231 | check_fix( | ||
232 | r#" | ||
233 | //- /main.rs | ||
234 | //- /foo.rs | ||
235 | $0 | ||
236 | "#, | ||
237 | r#" | ||
238 | mod foo; | ||
239 | "#, | ||
240 | ); | ||
241 | } | ||
242 | |||
243 | #[test] | ||
244 | fn unlinked_file_old_style_modrs() { | ||
245 | check_fix( | ||
246 | r#" | ||
247 | //- /main.rs | ||
248 | mod submod; | ||
249 | //- /submod/mod.rs | ||
250 | // in mod.rs | ||
251 | //- /submod/foo.rs | ||
252 | $0 | ||
253 | "#, | ||
254 | r#" | ||
255 | // in mod.rs | ||
256 | mod foo; | ||
257 | "#, | ||
258 | ); | ||
259 | } | ||
260 | |||
261 | #[test] | ||
262 | fn unlinked_file_new_style_mod() { | ||
263 | check_fix( | ||
264 | r#" | ||
265 | //- /main.rs | ||
266 | mod submod; | ||
267 | //- /submod.rs | ||
268 | //- /submod/foo.rs | ||
269 | $0 | ||
270 | "#, | ||
271 | r#" | ||
272 | mod foo; | ||
273 | "#, | ||
274 | ); | ||
275 | } | ||
276 | |||
277 | #[test] | ||
278 | fn unlinked_file_with_cfg_off() { | ||
279 | cov_mark::check!(unlinked_file_skip_fix_when_mod_already_exists); | ||
280 | check_no_fix( | ||
281 | r#" | ||
282 | //- /main.rs | ||
283 | #[cfg(never)] | ||
284 | mod foo; | ||
285 | |||
286 | //- /foo.rs | ||
287 | $0 | ||
288 | "#, | ||
289 | ); | ||
290 | } | ||
291 | |||
292 | #[test] | ||
293 | fn unlinked_file_with_cfg_on() { | ||
294 | check_diagnostics( | ||
295 | r#" | ||
296 | //- /main.rs | ||
297 | #[cfg(not(never))] | ||
298 | mod foo; | ||
299 | |||
300 | //- /foo.rs | ||
301 | "#, | ||
302 | ); | ||
303 | } | ||
304 | } | ||
diff --git a/crates/ide/src/diagnostics/unresolved_extern_crate.rs b/crates/ide/src/diagnostics/unresolved_extern_crate.rs deleted file mode 100644 index 2ea79c2ee..000000000 --- a/crates/ide/src/diagnostics/unresolved_extern_crate.rs +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
2 | |||
3 | // Diagnostic: unresolved-extern-crate | ||
4 | // | ||
5 | // This diagnostic is triggered if rust-analyzer is unable to discover referred extern crate. | ||
6 | pub(super) fn unresolved_extern_crate( | ||
7 | ctx: &DiagnosticsContext<'_>, | ||
8 | d: &hir::UnresolvedExternCrate, | ||
9 | ) -> Diagnostic { | ||
10 | Diagnostic::new( | ||
11 | "unresolved-extern-crate", | ||
12 | "unresolved extern crate", | ||
13 | ctx.sema.diagnostics_display_range(d.decl.clone().map(|it| it.into())).range, | ||
14 | ) | ||
15 | } | ||
16 | |||
17 | #[cfg(test)] | ||
18 | mod tests { | ||
19 | use crate::diagnostics::tests::check_diagnostics; | ||
20 | |||
21 | #[test] | ||
22 | fn unresolved_extern_crate() { | ||
23 | check_diagnostics( | ||
24 | r#" | ||
25 | //- /main.rs crate:main deps:core | ||
26 | extern crate core; | ||
27 | extern crate doesnotexist; | ||
28 | //^^^^^^^^^^^^^^^^^^^^^^^^^^ unresolved extern crate | ||
29 | //- /lib.rs crate:core | ||
30 | "#, | ||
31 | ); | ||
32 | } | ||
33 | |||
34 | #[test] | ||
35 | fn extern_crate_self_as() { | ||
36 | cov_mark::check!(extern_crate_self_as); | ||
37 | check_diagnostics( | ||
38 | r#" | ||
39 | //- /lib.rs | ||
40 | extern crate doesnotexist; | ||
41 | //^^^^^^^^^^^^^^^^^^^^^^^^^^ unresolved extern crate | ||
42 | // Should not error. | ||
43 | extern crate self as foo; | ||
44 | struct Foo; | ||
45 | use foo::Foo as Bar; | ||
46 | "#, | ||
47 | ); | ||
48 | } | ||
49 | } | ||
diff --git a/crates/ide/src/diagnostics/unresolved_import.rs b/crates/ide/src/diagnostics/unresolved_import.rs deleted file mode 100644 index 1cbf96ba1..000000000 --- a/crates/ide/src/diagnostics/unresolved_import.rs +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
2 | |||
3 | // Diagnostic: unresolved-import | ||
4 | // | ||
5 | // This diagnostic is triggered if rust-analyzer is unable to resolve a path in | ||
6 | // a `use` declaration. | ||
7 | pub(super) fn unresolved_import( | ||
8 | ctx: &DiagnosticsContext<'_>, | ||
9 | d: &hir::UnresolvedImport, | ||
10 | ) -> Diagnostic { | ||
11 | Diagnostic::new( | ||
12 | "unresolved-import", | ||
13 | "unresolved import", | ||
14 | ctx.sema.diagnostics_display_range(d.decl.clone().map(|it| it.into())).range, | ||
15 | ) | ||
16 | // This currently results in false positives in the following cases: | ||
17 | // - `cfg_if!`-generated code in libstd (we don't load the sysroot correctly) | ||
18 | // - `core::arch` (we don't handle `#[path = "../<path>"]` correctly) | ||
19 | // - proc macros and/or proc macro generated code | ||
20 | .experimental() | ||
21 | } | ||
22 | |||
23 | #[cfg(test)] | ||
24 | mod tests { | ||
25 | use crate::diagnostics::tests::check_diagnostics; | ||
26 | |||
27 | #[test] | ||
28 | fn unresolved_import() { | ||
29 | check_diagnostics( | ||
30 | r#" | ||
31 | use does_exist; | ||
32 | use does_not_exist; | ||
33 | //^^^^^^^^^^^^^^ unresolved import | ||
34 | |||
35 | mod does_exist {} | ||
36 | "#, | ||
37 | ); | ||
38 | } | ||
39 | |||
40 | #[test] | ||
41 | fn unresolved_import_in_use_tree() { | ||
42 | // Only the relevant part of a nested `use` item should be highlighted. | ||
43 | check_diagnostics( | ||
44 | r#" | ||
45 | use does_exist::{Exists, DoesntExist}; | ||
46 | //^^^^^^^^^^^ unresolved import | ||
47 | |||
48 | use {does_not_exist::*, does_exist}; | ||
49 | //^^^^^^^^^^^^^^^^^ unresolved import | ||
50 | |||
51 | use does_not_exist::{ | ||
52 | a, | ||
53 | //^ unresolved import | ||
54 | b, | ||
55 | //^ unresolved import | ||
56 | c, | ||
57 | //^ unresolved import | ||
58 | }; | ||
59 | |||
60 | mod does_exist { | ||
61 | pub struct Exists; | ||
62 | } | ||
63 | "#, | ||
64 | ); | ||
65 | } | ||
66 | |||
67 | #[test] | ||
68 | fn dedup_unresolved_import_from_unresolved_crate() { | ||
69 | check_diagnostics( | ||
70 | r#" | ||
71 | //- /main.rs crate:main | ||
72 | mod a { | ||
73 | extern crate doesnotexist; | ||
74 | //^^^^^^^^^^^^^^^^^^^^^^^^^^ unresolved extern crate | ||
75 | |||
76 | // Should not error, since we already errored for the missing crate. | ||
77 | use doesnotexist::{self, bla, *}; | ||
78 | |||
79 | use crate::doesnotexist; | ||
80 | //^^^^^^^^^^^^^^^^^^^ unresolved import | ||
81 | } | ||
82 | |||
83 | mod m { | ||
84 | use super::doesnotexist; | ||
85 | //^^^^^^^^^^^^^^^^^^^ unresolved import | ||
86 | } | ||
87 | "#, | ||
88 | ); | ||
89 | } | ||
90 | } | ||
diff --git a/crates/ide/src/diagnostics/unresolved_macro_call.rs b/crates/ide/src/diagnostics/unresolved_macro_call.rs deleted file mode 100644 index 15b6a2730..000000000 --- a/crates/ide/src/diagnostics/unresolved_macro_call.rs +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | use hir::{db::AstDatabase, InFile}; | ||
2 | use syntax::{AstNode, SyntaxNodePtr}; | ||
3 | |||
4 | use crate::diagnostics::{Diagnostic, DiagnosticsContext}; | ||
5 | |||
6 | // Diagnostic: unresolved-macro-call | ||
7 | // | ||
8 | // This diagnostic is triggered if rust-analyzer is unable to resolve the path | ||
9 | // to a macro in a macro invocation. | ||
10 | pub(super) fn unresolved_macro_call( | ||
11 | ctx: &DiagnosticsContext<'_>, | ||
12 | d: &hir::UnresolvedMacroCall, | ||
13 | ) -> Diagnostic { | ||
14 | let last_path_segment = ctx.sema.db.parse_or_expand(d.macro_call.file_id).and_then(|root| { | ||
15 | d.macro_call | ||
16 | .value | ||
17 | .to_node(&root) | ||
18 | .path() | ||
19 | .and_then(|it| it.segment()) | ||
20 | .and_then(|it| it.name_ref()) | ||
21 | .map(|it| InFile::new(d.macro_call.file_id, SyntaxNodePtr::new(it.syntax()))) | ||
22 | }); | ||
23 | let diagnostics = last_path_segment.unwrap_or_else(|| d.macro_call.clone().map(|it| it.into())); | ||
24 | |||
25 | Diagnostic::new( | ||
26 | "unresolved-macro-call", | ||
27 | format!("unresolved macro `{}!`", d.path), | ||
28 | ctx.sema.diagnostics_display_range(diagnostics).range, | ||
29 | ) | ||
30 | .experimental() | ||
31 | } | ||
32 | |||
33 | #[cfg(test)] | ||
34 | mod tests { | ||
35 | use crate::diagnostics::tests::check_diagnostics; | ||
36 | |||
37 | #[test] | ||
38 | fn unresolved_macro_diag() { | ||
39 | check_diagnostics( | ||
40 | r#" | ||
41 | fn f() { | ||
42 | m!(); | ||
43 | } //^ unresolved macro `m!` | ||
44 | |||
45 | "#, | ||
46 | ); | ||
47 | } | ||
48 | |||
49 | #[test] | ||
50 | fn test_unresolved_macro_range() { | ||
51 | check_diagnostics( | ||
52 | r#" | ||
53 | foo::bar!(92); | ||
54 | //^^^ unresolved macro `foo::bar!` | ||
55 | "#, | ||
56 | ); | ||
57 | } | ||
58 | |||
59 | #[test] | ||
60 | fn unresolved_legacy_scope_macro() { | ||
61 | check_diagnostics( | ||
62 | r#" | ||
63 | macro_rules! m { () => {} } | ||
64 | |||
65 | m!(); m2!(); | ||
66 | //^^ unresolved macro `self::m2!` | ||
67 | "#, | ||
68 | ); | ||
69 | } | ||
70 | |||
71 | #[test] | ||
72 | fn unresolved_module_scope_macro() { | ||
73 | check_diagnostics( | ||
74 | r#" | ||
75 | mod mac { | ||
76 | #[macro_export] | ||
77 | macro_rules! m { () => {} } } | ||
78 | |||
79 | self::m!(); self::m2!(); | ||
80 | //^^ unresolved macro `self::m2!` | ||
81 | "#, | ||
82 | ); | ||
83 | } | ||
84 | } | ||
diff --git a/crates/ide/src/diagnostics/unresolved_module.rs b/crates/ide/src/diagnostics/unresolved_module.rs deleted file mode 100644 index 977b46414..000000000 --- a/crates/ide/src/diagnostics/unresolved_module.rs +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | use hir::db::AstDatabase; | ||
2 | use ide_assists::Assist; | ||
3 | use ide_db::{base_db::AnchoredPathBuf, source_change::FileSystemEdit}; | ||
4 | use syntax::AstNode; | ||
5 | |||
6 | use crate::diagnostics::{fix, Diagnostic, DiagnosticsContext}; | ||
7 | |||
8 | // Diagnostic: unresolved-module | ||
9 | // | ||
10 | // This diagnostic is triggered if rust-analyzer is unable to discover referred module. | ||
11 | pub(super) fn unresolved_module( | ||
12 | ctx: &DiagnosticsContext<'_>, | ||
13 | d: &hir::UnresolvedModule, | ||
14 | ) -> Diagnostic { | ||
15 | Diagnostic::new( | ||
16 | "unresolved-module", | ||
17 | "unresolved module", | ||
18 | ctx.sema.diagnostics_display_range(d.decl.clone().map(|it| it.into())).range, | ||
19 | ) | ||
20 | .with_fixes(fixes(ctx, d)) | ||
21 | } | ||
22 | |||
23 | fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::UnresolvedModule) -> Option<Vec<Assist>> { | ||
24 | let root = ctx.sema.db.parse_or_expand(d.decl.file_id)?; | ||
25 | let unresolved_module = d.decl.value.to_node(&root); | ||
26 | Some(vec![fix( | ||
27 | "create_module", | ||
28 | "Create module", | ||
29 | FileSystemEdit::CreateFile { | ||
30 | dst: AnchoredPathBuf { | ||
31 | anchor: d.decl.file_id.original_file(ctx.sema.db), | ||
32 | path: d.candidate.clone(), | ||
33 | }, | ||
34 | initial_contents: "".to_string(), | ||
35 | } | ||
36 | .into(), | ||
37 | unresolved_module.syntax().text_range(), | ||
38 | )]) | ||
39 | } | ||
40 | |||
41 | #[cfg(test)] | ||
42 | mod tests { | ||
43 | use expect_test::expect; | ||
44 | |||
45 | use crate::diagnostics::tests::{check_diagnostics, check_expect}; | ||
46 | |||
47 | #[test] | ||
48 | fn unresolved_module() { | ||
49 | check_diagnostics( | ||
50 | r#" | ||
51 | //- /lib.rs | ||
52 | mod foo; | ||
53 | mod bar; | ||
54 | //^^^^^^^^ unresolved module | ||
55 | mod baz {} | ||
56 | //- /foo.rs | ||
57 | "#, | ||
58 | ); | ||
59 | } | ||
60 | |||
61 | #[test] | ||
62 | fn test_unresolved_module_diagnostic() { | ||
63 | check_expect( | ||
64 | r#"mod foo;"#, | ||
65 | expect![[r#" | ||
66 | [ | ||
67 | Diagnostic { | ||
68 | code: DiagnosticCode( | ||
69 | "unresolved-module", | ||
70 | ), | ||
71 | message: "unresolved module", | ||
72 | range: 0..8, | ||
73 | severity: Error, | ||
74 | unused: false, | ||
75 | experimental: false, | ||
76 | fixes: Some( | ||
77 | [ | ||
78 | Assist { | ||
79 | id: AssistId( | ||
80 | "create_module", | ||
81 | QuickFix, | ||
82 | ), | ||
83 | label: "Create module", | ||
84 | group: None, | ||
85 | target: 0..8, | ||
86 | source_change: Some( | ||
87 | SourceChange { | ||
88 | source_file_edits: {}, | ||
89 | file_system_edits: [ | ||
90 | CreateFile { | ||
91 | dst: AnchoredPathBuf { | ||
92 | anchor: FileId( | ||
93 | 0, | ||
94 | ), | ||
95 | path: "foo.rs", | ||
96 | }, | ||
97 | initial_contents: "", | ||
98 | }, | ||
99 | ], | ||
100 | is_snippet: false, | ||
101 | }, | ||
102 | ), | ||
103 | }, | ||
104 | ], | ||
105 | ), | ||
106 | }, | ||
107 | ] | ||
108 | "#]], | ||
109 | ); | ||
110 | } | ||
111 | } | ||
diff --git a/crates/ide/src/diagnostics/unresolved_proc_macro.rs b/crates/ide/src/diagnostics/unresolved_proc_macro.rs deleted file mode 100644 index 3dc6ab451..000000000 --- a/crates/ide/src/diagnostics/unresolved_proc_macro.rs +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | use crate::{ | ||
2 | diagnostics::{Diagnostic, DiagnosticsContext}, | ||
3 | Severity, | ||
4 | }; | ||
5 | |||
6 | // Diagnostic: unresolved-proc-macro | ||
7 | // | ||
8 | // This diagnostic is shown when a procedural macro can not be found. This usually means that | ||
9 | // procedural macro support is simply disabled (and hence is only a weak hint instead of an error), | ||
10 | // but can also indicate project setup problems. | ||
11 | // | ||
12 | // If you are seeing a lot of "proc macro not expanded" warnings, you can add this option to the | ||
13 | // `rust-analyzer.diagnostics.disabled` list to prevent them from showing. Alternatively you can | ||
14 | // enable support for procedural macros (see `rust-analyzer.procMacro.enable`). | ||
15 | pub(super) fn unresolved_proc_macro( | ||
16 | ctx: &DiagnosticsContext<'_>, | ||
17 | d: &hir::UnresolvedProcMacro, | ||
18 | ) -> Diagnostic { | ||
19 | // Use more accurate position if available. | ||
20 | let display_range = d | ||
21 | .precise_location | ||
22 | .unwrap_or_else(|| ctx.sema.diagnostics_display_range(d.node.clone()).range); | ||
23 | // FIXME: it would be nice to tell the user whether proc macros are currently disabled | ||
24 | let message = match &d.macro_name { | ||
25 | Some(name) => format!("proc macro `{}` not expanded", name), | ||
26 | None => "proc macro not expanded".to_string(), | ||
27 | }; | ||
28 | |||
29 | Diagnostic::new("unresolved-proc-macro", message, display_range).severity(Severity::WeakWarning) | ||
30 | } | ||
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs index 38e2e866b..cf679edd3 100644 --- a/crates/ide/src/fixture.rs +++ b/crates/ide/src/fixture.rs | |||
@@ -12,14 +12,6 @@ pub(crate) fn file(ra_fixture: &str) -> (Analysis, FileId) { | |||
12 | (host.analysis(), change_fixture.files[0]) | 12 | (host.analysis(), change_fixture.files[0]) |
13 | } | 13 | } |
14 | 14 | ||
15 | /// Creates analysis for many files. | ||
16 | pub(crate) fn files(ra_fixture: &str) -> (Analysis, Vec<FileId>) { | ||
17 | let mut host = AnalysisHost::default(); | ||
18 | let change_fixture = ChangeFixture::parse(ra_fixture); | ||
19 | host.db.apply_change(change_fixture.change); | ||
20 | (host.analysis(), change_fixture.files) | ||
21 | } | ||
22 | |||
23 | /// Creates analysis from a multi-file fixture, returns positions marked with $0. | 15 | /// Creates analysis from a multi-file fixture, returns positions marked with $0. |
24 | pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) { | 16 | pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) { |
25 | let mut host = AnalysisHost::default(); | 17 | let mut host = AnalysisHost::default(); |
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 0511efae3..0019b7ba5 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
@@ -24,7 +24,6 @@ mod display; | |||
24 | 24 | ||
25 | mod annotations; | 25 | mod annotations; |
26 | mod call_hierarchy; | 26 | mod call_hierarchy; |
27 | mod diagnostics; | ||
28 | mod expand_macro; | 27 | mod expand_macro; |
29 | mod extend_selection; | 28 | mod extend_selection; |
30 | mod file_structure; | 29 | mod file_structure; |
@@ -71,7 +70,6 @@ use crate::display::ToNav; | |||
71 | pub use crate::{ | 70 | pub use crate::{ |
72 | annotations::{Annotation, AnnotationConfig, AnnotationKind}, | 71 | annotations::{Annotation, AnnotationConfig, AnnotationKind}, |
73 | call_hierarchy::CallItem, | 72 | call_hierarchy::CallItem, |
74 | diagnostics::{Diagnostic, DiagnosticsConfig, Severity}, | ||
75 | display::navigation_target::NavigationTarget, | 73 | display::navigation_target::NavigationTarget, |
76 | expand_macro::ExpandedMacro, | 74 | expand_macro::ExpandedMacro, |
77 | file_structure::{StructureNode, StructureNodeKind}, | 75 | file_structure::{StructureNode, StructureNodeKind}, |
@@ -109,6 +107,7 @@ pub use ide_db::{ | |||
109 | symbol_index::Query, | 107 | symbol_index::Query, |
110 | RootDatabase, SymbolKind, | 108 | RootDatabase, SymbolKind, |
111 | }; | 109 | }; |
110 | pub use ide_diagnostics::{Diagnostic, DiagnosticsConfig, Severity}; | ||
112 | pub use ide_ssr::SsrError; | 111 | pub use ide_ssr::SsrError; |
113 | pub use syntax::{TextRange, TextSize}; | 112 | pub use syntax::{TextRange, TextSize}; |
114 | pub use text_edit::{Indel, TextEdit}; | 113 | pub use text_edit::{Indel, TextEdit}; |
@@ -549,7 +548,7 @@ impl Analysis { | |||
549 | resolve: AssistResolveStrategy, | 548 | resolve: AssistResolveStrategy, |
550 | file_id: FileId, | 549 | file_id: FileId, |
551 | ) -> Cancellable<Vec<Diagnostic>> { | 550 | ) -> Cancellable<Vec<Diagnostic>> { |
552 | self.with_db(|db| diagnostics::diagnostics(db, config, &resolve, file_id)) | 551 | self.with_db(|db| ide_diagnostics::diagnostics(db, config, &resolve, file_id)) |
553 | } | 552 | } |
554 | 553 | ||
555 | /// Convenience function to return assists + quick fixes for diagnostics | 554 | /// Convenience function to return assists + quick fixes for diagnostics |
@@ -568,7 +567,7 @@ impl Analysis { | |||
568 | self.with_db(|db| { | 567 | self.with_db(|db| { |
569 | let ssr_assists = ssr::ssr_assists(db, &resolve, frange); | 568 | let ssr_assists = ssr::ssr_assists(db, &resolve, frange); |
570 | let diagnostic_assists = if include_fixes { | 569 | let diagnostic_assists = if include_fixes { |
571 | diagnostics::diagnostics(db, diagnostics_config, &resolve, frange.file_id) | 570 | ide_diagnostics::diagnostics(db, diagnostics_config, &resolve, frange.file_id) |
572 | .into_iter() | 571 | .into_iter() |
573 | .flat_map(|it| it.fixes.unwrap_or_default()) | 572 | .flat_map(|it| it.fixes.unwrap_or_default()) |
574 | .filter(|it| it.target.intersect(frange.range).is_some()) | 573 | .filter(|it| it.target.intersect(frange.range).is_some()) |