diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-13 18:07:04 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-13 18:07:04 +0100 |
commit | 60ca03e8aa00956d1511969da5f1844a02483bc9 (patch) | |
tree | 7729eb4ae1ef7a4cf0e0be42dfc2ef36c65cec1e /crates/ide/src/diagnostics | |
parent | 8e5f469da8d5ed0e4c0519c883498097aeadd7ac (diff) | |
parent | 8d391ec981562785ec92ce3afe950972c523f925 (diff) |
Merge #9252
9252: internal: refactor mismatched args count diagnostic r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide/src/diagnostics')
-rw-r--r-- | crates/ide/src/diagnostics/break_outside_of_loop.rs | 30 | ||||
-rw-r--r-- | crates/ide/src/diagnostics/fixes/create_field.rs | 155 | ||||
-rw-r--r-- | crates/ide/src/diagnostics/mismatched_arg_count.rs | 272 | ||||
-rw-r--r-- | crates/ide/src/diagnostics/missing_unsafe.rs | 101 | ||||
-rw-r--r-- | crates/ide/src/diagnostics/no_such_field.rs | 286 | ||||
-rw-r--r-- | crates/ide/src/diagnostics/unimplemented_builtin_macro.rs | 19 |
6 files changed, 708 insertions, 155 deletions
diff --git a/crates/ide/src/diagnostics/break_outside_of_loop.rs b/crates/ide/src/diagnostics/break_outside_of_loop.rs new file mode 100644 index 000000000..80e68f3cc --- /dev/null +++ b/crates/ide/src/diagnostics/break_outside_of_loop.rs | |||
@@ -0,0 +1,30 @@ | |||
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/fixes/create_field.rs b/crates/ide/src/diagnostics/fixes/create_field.rs index f6e45967a..8b1378917 100644 --- a/crates/ide/src/diagnostics/fixes/create_field.rs +++ b/crates/ide/src/diagnostics/fixes/create_field.rs | |||
@@ -1,156 +1 @@ | |||
1 | use hir::{db::AstDatabase, diagnostics::NoSuchField, 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, DiagnosticWithFixes}, | ||
11 | Assist, AssistResolveStrategy, | ||
12 | }; | ||
13 | impl DiagnosticWithFixes for NoSuchField { | ||
14 | fn fixes( | ||
15 | &self, | ||
16 | sema: &Semantics<RootDatabase>, | ||
17 | _resolve: &AssistResolveStrategy, | ||
18 | ) -> Option<Vec<Assist>> { | ||
19 | let root = sema.db.parse_or_expand(self.file)?; | ||
20 | missing_record_expr_field_fixes( | ||
21 | sema, | ||
22 | self.file.original_file(sema.db), | ||
23 | &self.field.to_node(&root), | ||
24 | ) | ||
25 | } | ||
26 | } | ||
27 | |||
28 | fn missing_record_expr_field_fixes( | ||
29 | sema: &Semantics<RootDatabase>, | ||
30 | usage_file_id: FileId, | ||
31 | record_expr_field: &ast::RecordExprField, | ||
32 | ) -> Option<Vec<Assist>> { | ||
33 | let record_lit = ast::RecordExpr::cast(record_expr_field.syntax().parent()?.parent()?)?; | ||
34 | let def_id = sema.resolve_variant(record_lit)?; | ||
35 | let module; | ||
36 | let def_file_id; | ||
37 | let record_fields = match def_id { | ||
38 | hir::VariantDef::Struct(s) => { | ||
39 | module = s.module(sema.db); | ||
40 | let source = s.source(sema.db)?; | ||
41 | def_file_id = source.file_id; | ||
42 | let fields = source.value.field_list()?; | ||
43 | record_field_list(fields)? | ||
44 | } | ||
45 | hir::VariantDef::Union(u) => { | ||
46 | module = u.module(sema.db); | ||
47 | let source = u.source(sema.db)?; | ||
48 | def_file_id = source.file_id; | ||
49 | source.value.record_field_list()? | ||
50 | } | ||
51 | hir::VariantDef::Variant(e) => { | ||
52 | module = e.module(sema.db); | ||
53 | let source = e.source(sema.db)?; | ||
54 | def_file_id = source.file_id; | ||
55 | let fields = source.value.field_list()?; | ||
56 | record_field_list(fields)? | ||
57 | } | ||
58 | }; | ||
59 | let def_file_id = def_file_id.original_file(sema.db); | ||
60 | |||
61 | let new_field_type = sema.type_of_expr(&record_expr_field.expr()?)?; | ||
62 | if new_field_type.is_unknown() { | ||
63 | return None; | ||
64 | } | ||
65 | let new_field = make::record_field( | ||
66 | None, | ||
67 | make::name(&record_expr_field.field_name()?.text()), | ||
68 | make::ty(&new_field_type.display_source_code(sema.db, module.into()).ok()?), | ||
69 | ); | ||
70 | |||
71 | let last_field = record_fields.fields().last()?; | ||
72 | let last_field_syntax = last_field.syntax(); | ||
73 | let indent = IndentLevel::from_node(last_field_syntax); | ||
74 | |||
75 | let mut new_field = new_field.to_string(); | ||
76 | if usage_file_id != def_file_id { | ||
77 | new_field = format!("pub(crate) {}", new_field); | ||
78 | } | ||
79 | new_field = format!("\n{}{}", indent, new_field); | ||
80 | |||
81 | let needs_comma = !last_field_syntax.to_string().ends_with(','); | ||
82 | if needs_comma { | ||
83 | new_field = format!(",{}", new_field); | ||
84 | } | ||
85 | |||
86 | let source_change = SourceChange::from_text_edit( | ||
87 | def_file_id, | ||
88 | TextEdit::insert(last_field_syntax.text_range().end(), new_field), | ||
89 | ); | ||
90 | |||
91 | return Some(vec![fix( | ||
92 | "create_field", | ||
93 | "Create field", | ||
94 | source_change, | ||
95 | record_expr_field.syntax().text_range(), | ||
96 | )]); | ||
97 | |||
98 | fn record_field_list(field_def_list: ast::FieldList) -> Option<ast::RecordFieldList> { | ||
99 | match field_def_list { | ||
100 | ast::FieldList::RecordFieldList(it) => Some(it), | ||
101 | ast::FieldList::TupleFieldList(_) => None, | ||
102 | } | ||
103 | } | ||
104 | } | ||
105 | |||
106 | #[cfg(test)] | ||
107 | mod tests { | ||
108 | use crate::diagnostics::tests::check_fix; | ||
109 | |||
110 | #[test] | ||
111 | fn test_add_field_from_usage() { | ||
112 | check_fix( | ||
113 | r" | ||
114 | fn main() { | ||
115 | Foo { bar: 3, baz$0: false}; | ||
116 | } | ||
117 | struct Foo { | ||
118 | bar: i32 | ||
119 | } | ||
120 | ", | ||
121 | r" | ||
122 | fn main() { | ||
123 | Foo { bar: 3, baz: false}; | ||
124 | } | ||
125 | struct Foo { | ||
126 | bar: i32, | ||
127 | baz: bool | ||
128 | } | ||
129 | ", | ||
130 | ) | ||
131 | } | ||
132 | |||
133 | #[test] | ||
134 | fn test_add_field_in_other_file_from_usage() { | ||
135 | check_fix( | ||
136 | r#" | ||
137 | //- /main.rs | ||
138 | mod foo; | ||
139 | |||
140 | fn main() { | ||
141 | foo::Foo { bar: 3, $0baz: false}; | ||
142 | } | ||
143 | //- /foo.rs | ||
144 | struct Foo { | ||
145 | bar: i32 | ||
146 | } | ||
147 | "#, | ||
148 | r#" | ||
149 | struct Foo { | ||
150 | bar: i32, | ||
151 | pub(crate) baz: bool | ||
152 | } | ||
153 | "#, | ||
154 | ) | ||
155 | } | ||
156 | } | ||
diff --git a/crates/ide/src/diagnostics/mismatched_arg_count.rs b/crates/ide/src/diagnostics/mismatched_arg_count.rs new file mode 100644 index 000000000..08e1cfa5f --- /dev/null +++ b/crates/ide/src/diagnostics/mismatched_arg_count.rs | |||
@@ -0,0 +1,272 @@ | |||
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_unsafe.rs b/crates/ide/src/diagnostics/missing_unsafe.rs new file mode 100644 index 000000000..5c47e8d0a --- /dev/null +++ b/crates/ide/src/diagnostics/missing_unsafe.rs | |||
@@ -0,0 +1,101 @@ | |||
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 new file mode 100644 index 000000000..61962de28 --- /dev/null +++ b/crates/ide/src/diagnostics/no_such_field.rs | |||
@@ -0,0 +1,286 @@ | |||
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".to_string(), | ||
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/unimplemented_builtin_macro.rs b/crates/ide/src/diagnostics/unimplemented_builtin_macro.rs new file mode 100644 index 000000000..09faa3bbc --- /dev/null +++ b/crates/ide/src/diagnostics/unimplemented_builtin_macro.rs | |||
@@ -0,0 +1,19 @@ | |||
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 | } | ||