diff options
Diffstat (limited to 'crates/ide_completion/src/completions')
-rw-r--r-- | crates/ide_completion/src/completions/attribute.rs | 939 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/attribute/derive.rs | 147 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/attribute/lint.rs | 187 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/dot.rs | 84 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/flyimport.rs | 8 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/fn_param.rs | 15 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/keyword.rs | 249 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/lifetime.rs | 12 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/macro_in_item_position.rs | 19 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/mod_.rs | 6 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/pattern.rs | 49 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/qualified_path.rs | 92 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/record.rs | 43 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/snippet.rs | 8 | ||||
-rw-r--r-- | crates/ide_completion/src/completions/unqualified_path.rs | 94 |
15 files changed, 1392 insertions, 560 deletions
diff --git a/crates/ide_completion/src/completions/attribute.rs b/crates/ide_completion/src/completions/attribute.rs index b1505c74b..c48bb9e66 100644 --- a/crates/ide_completion/src/completions/attribute.rs +++ b/crates/ide_completion/src/completions/attribute.rs | |||
@@ -3,9 +3,9 @@ | |||
3 | //! This module uses a bit of static metadata to provide completions | 3 | //! This module uses a bit of static metadata to provide completions |
4 | //! for built-in attributes. | 4 | //! for built-in attributes. |
5 | 5 | ||
6 | use itertools::Itertools; | 6 | use once_cell::sync::Lazy; |
7 | use rustc_hash::FxHashSet; | 7 | use rustc_hash::{FxHashMap, FxHashSet}; |
8 | use syntax::{ast, AstNode, T}; | 8 | use syntax::{algo::non_trivia_sibling, ast, AstNode, Direction, NodeOrToken, SyntaxKind, T}; |
9 | 9 | ||
10 | use crate::{ | 10 | use crate::{ |
11 | context::CompletionContext, | 11 | context::CompletionContext, |
@@ -14,33 +14,45 @@ use crate::{ | |||
14 | Completions, | 14 | Completions, |
15 | }; | 15 | }; |
16 | 16 | ||
17 | pub(crate) fn complete_attribute(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { | 17 | mod derive; |
18 | if ctx.mod_declaration_under_caret.is_some() { | 18 | mod lint; |
19 | return None; | 19 | pub(crate) use self::lint::LintCompletion; |
20 | } | ||
21 | 20 | ||
21 | pub(crate) fn complete_attribute(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { | ||
22 | let attribute = ctx.attribute_under_caret.as_ref()?; | 22 | let attribute = ctx.attribute_under_caret.as_ref()?; |
23 | match (attribute.path(), attribute.token_tree()) { | 23 | match (attribute.path().and_then(|p| p.as_single_name_ref()), attribute.token_tree()) { |
24 | (Some(path), Some(token_tree)) => { | 24 | (Some(path), Some(token_tree)) => match path.text().as_str() { |
25 | let path = path.syntax().text(); | 25 | "derive" => derive::complete_derive(acc, ctx, token_tree), |
26 | if path == "derive" { | 26 | "feature" => lint::complete_lint(acc, ctx, token_tree, FEATURES), |
27 | complete_derive(acc, ctx, token_tree) | 27 | "allow" | "warn" | "deny" | "forbid" => { |
28 | } else if path == "feature" { | 28 | lint::complete_lint(acc, ctx, token_tree.clone(), lint::DEFAULT_LINT_COMPLETIONS); |
29 | complete_lint(acc, ctx, token_tree, FEATURES) | 29 | lint::complete_lint(acc, ctx, token_tree, CLIPPY_LINTS); |
30 | } else if path == "allow" || path == "warn" || path == "deny" || path == "forbid" { | ||
31 | complete_lint(acc, ctx, token_tree.clone(), DEFAULT_LINT_COMPLETIONS); | ||
32 | complete_lint(acc, ctx, token_tree, CLIPPY_LINTS); | ||
33 | } | 30 | } |
34 | } | 31 | _ => (), |
35 | (_, Some(_token_tree)) => {} | 32 | }, |
36 | _ => complete_attribute_start(acc, ctx, attribute), | 33 | (None, Some(_)) => (), |
34 | _ => complete_new_attribute(acc, ctx, attribute), | ||
37 | } | 35 | } |
38 | Some(()) | 36 | Some(()) |
39 | } | 37 | } |
40 | 38 | ||
41 | fn complete_attribute_start(acc: &mut Completions, ctx: &CompletionContext, attribute: &ast::Attr) { | 39 | fn complete_new_attribute(acc: &mut Completions, ctx: &CompletionContext, attribute: &ast::Attr) { |
42 | let is_inner = attribute.kind() == ast::AttrKind::Inner; | 40 | let is_inner = attribute.kind() == ast::AttrKind::Inner; |
43 | for attr_completion in ATTRIBUTES.iter().filter(|compl| is_inner || !compl.prefer_inner) { | 41 | let attribute_annotated_item_kind = |
42 | attribute.syntax().parent().map(|it| it.kind()).filter(|_| { | ||
43 | is_inner | ||
44 | // If we got nothing coming after the attribute it could be anything so filter it the kind out | ||
45 | || non_trivia_sibling(attribute.syntax().clone().into(), Direction::Next).is_some() | ||
46 | }); | ||
47 | let attributes = attribute_annotated_item_kind.and_then(|kind| { | ||
48 | if ast::Expr::can_cast(kind) { | ||
49 | Some(EXPR_ATTRIBUTES) | ||
50 | } else { | ||
51 | KIND_TO_ATTRIBUTES.get(&kind).copied() | ||
52 | } | ||
53 | }); | ||
54 | |||
55 | let add_completion = |attr_completion: &AttrCompletion| { | ||
44 | let mut item = CompletionItem::new( | 56 | let mut item = CompletionItem::new( |
45 | CompletionKind::Attribute, | 57 | CompletionKind::Attribute, |
46 | ctx.source_range(), | 58 | ctx.source_range(), |
@@ -56,9 +68,19 @@ fn complete_attribute_start(acc: &mut Completions, ctx: &CompletionContext, attr | |||
56 | item.insert_snippet(cap, snippet); | 68 | item.insert_snippet(cap, snippet); |
57 | } | 69 | } |
58 | 70 | ||
59 | if attribute.kind() == ast::AttrKind::Inner || !attr_completion.prefer_inner { | 71 | if is_inner || !attr_completion.prefer_inner { |
60 | acc.add(item.build()); | 72 | acc.add(item.build()); |
61 | } | 73 | } |
74 | }; | ||
75 | |||
76 | match attributes { | ||
77 | Some(applicable) => applicable | ||
78 | .iter() | ||
79 | .flat_map(|name| ATTRIBUTES.binary_search_by(|attr| attr.key().cmp(name)).ok()) | ||
80 | .flat_map(|idx| ATTRIBUTES.get(idx)) | ||
81 | .for_each(add_completion), | ||
82 | None if is_inner => ATTRIBUTES.iter().for_each(add_completion), | ||
83 | None => ATTRIBUTES.iter().filter(|compl| !compl.prefer_inner).for_each(add_completion), | ||
62 | } | 84 | } |
63 | } | 85 | } |
64 | 86 | ||
@@ -70,6 +92,10 @@ struct AttrCompletion { | |||
70 | } | 92 | } |
71 | 93 | ||
72 | impl AttrCompletion { | 94 | impl AttrCompletion { |
95 | fn key(&self) -> &'static str { | ||
96 | self.lookup.unwrap_or(self.label) | ||
97 | } | ||
98 | |||
73 | const fn prefer_inner(self) -> AttrCompletion { | 99 | const fn prefer_inner(self) -> AttrCompletion { |
74 | AttrCompletion { prefer_inner: true, ..self } | 100 | AttrCompletion { prefer_inner: true, ..self } |
75 | } | 101 | } |
@@ -83,30 +109,122 @@ const fn attr( | |||
83 | AttrCompletion { label, lookup, snippet, prefer_inner: false } | 109 | AttrCompletion { label, lookup, snippet, prefer_inner: false } |
84 | } | 110 | } |
85 | 111 | ||
112 | macro_rules! attrs { | ||
113 | // attributes applicable to all items | ||
114 | [@ { item $($tt:tt)* } {$($acc:tt)*}] => { | ||
115 | attrs!(@ { $($tt)* } { $($acc)*, "deprecated", "doc", "dochidden", "docalias", "must_use", "no_mangle" }) | ||
116 | }; | ||
117 | // attributes applicable to all adts | ||
118 | [@ { adt $($tt:tt)* } {$($acc:tt)*}] => { | ||
119 | attrs!(@ { $($tt)* } { $($acc)*, "derive", "repr" }) | ||
120 | }; | ||
121 | // attributes applicable to all linkable things aka functions/statics | ||
122 | [@ { linkable $($tt:tt)* } {$($acc:tt)*}] => { | ||
123 | attrs!(@ { $($tt)* } { $($acc)*, "export_name", "link_name", "link_section" }) | ||
124 | }; | ||
125 | // error fallback for nicer error message | ||
126 | [@ { $ty:ident $($tt:tt)* } {$($acc:tt)*}] => { | ||
127 | compile_error!(concat!("unknown attr subtype ", stringify!($ty))) | ||
128 | }; | ||
129 | // general push down accumulation | ||
130 | [@ { $lit:literal $($tt:tt)*} {$($acc:tt)*}] => { | ||
131 | attrs!(@ { $($tt)* } { $($acc)*, $lit }) | ||
132 | }; | ||
133 | [@ {$($tt:tt)+} {$($tt2:tt)*}] => { | ||
134 | compile_error!(concat!("Unexpected input ", stringify!($($tt)+))) | ||
135 | }; | ||
136 | // final output construction | ||
137 | [@ {} {$($tt:tt)*}] => { &[$($tt)*] as _ }; | ||
138 | // starting matcher | ||
139 | [$($tt:tt),*] => { | ||
140 | attrs!(@ { $($tt)* } { "allow", "cfg", "cfg_attr", "deny", "forbid", "warn" }) | ||
141 | }; | ||
142 | } | ||
143 | |||
144 | #[rustfmt::skip] | ||
145 | static KIND_TO_ATTRIBUTES: Lazy<FxHashMap<SyntaxKind, &[&str]>> = Lazy::new(|| { | ||
146 | use SyntaxKind::*; | ||
147 | std::array::IntoIter::new([ | ||
148 | ( | ||
149 | SOURCE_FILE, | ||
150 | attrs!( | ||
151 | item, | ||
152 | "crate_name", "feature", "no_implicit_prelude", "no_main", "no_std", | ||
153 | "recursion_limit", "type_length_limit", "windows_subsystem" | ||
154 | ), | ||
155 | ), | ||
156 | (MODULE, attrs!(item, "no_implicit_prelude", "path")), | ||
157 | (ITEM_LIST, attrs!(item, "no_implicit_prelude")), | ||
158 | (MACRO_RULES, attrs!(item, "macro_export", "macro_use")), | ||
159 | (MACRO_DEF, attrs!(item)), | ||
160 | (EXTERN_CRATE, attrs!(item, "macro_use", "no_link")), | ||
161 | (USE, attrs!(item)), | ||
162 | (TYPE_ALIAS, attrs!(item)), | ||
163 | (STRUCT, attrs!(item, adt, "non_exhaustive")), | ||
164 | (ENUM, attrs!(item, adt, "non_exhaustive")), | ||
165 | (UNION, attrs!(item, adt)), | ||
166 | (CONST, attrs!(item)), | ||
167 | ( | ||
168 | FN, | ||
169 | attrs!( | ||
170 | item, linkable, | ||
171 | "cold", "ignore", "inline", "must_use", "panic_handler", "proc_macro", | ||
172 | "proc_macro_derive", "proc_macro_attribute", "should_panic", "target_feature", | ||
173 | "test", "track_caller" | ||
174 | ), | ||
175 | ), | ||
176 | (STATIC, attrs!(item, linkable, "global_allocator", "used")), | ||
177 | (TRAIT, attrs!(item, "must_use")), | ||
178 | (IMPL, attrs!(item, "automatically_derived")), | ||
179 | (ASSOC_ITEM_LIST, attrs!(item)), | ||
180 | (EXTERN_BLOCK, attrs!(item, "link")), | ||
181 | (EXTERN_ITEM_LIST, attrs!(item, "link")), | ||
182 | (MACRO_CALL, attrs!()), | ||
183 | (SELF_PARAM, attrs!()), | ||
184 | (PARAM, attrs!()), | ||
185 | (RECORD_FIELD, attrs!()), | ||
186 | (VARIANT, attrs!("non_exhaustive")), | ||
187 | (TYPE_PARAM, attrs!()), | ||
188 | (CONST_PARAM, attrs!()), | ||
189 | (LIFETIME_PARAM, attrs!()), | ||
190 | (LET_STMT, attrs!()), | ||
191 | (EXPR_STMT, attrs!()), | ||
192 | (LITERAL, attrs!()), | ||
193 | (RECORD_EXPR_FIELD_LIST, attrs!()), | ||
194 | (RECORD_EXPR_FIELD, attrs!()), | ||
195 | (MATCH_ARM_LIST, attrs!()), | ||
196 | (MATCH_ARM, attrs!()), | ||
197 | (IDENT_PAT, attrs!()), | ||
198 | (RECORD_PAT_FIELD, attrs!()), | ||
199 | ]) | ||
200 | .collect() | ||
201 | }); | ||
202 | const EXPR_ATTRIBUTES: &[&str] = attrs!(); | ||
203 | |||
86 | /// https://doc.rust-lang.org/reference/attributes.html#built-in-attributes-index | 204 | /// https://doc.rust-lang.org/reference/attributes.html#built-in-attributes-index |
205 | // Keep these sorted for the binary search! | ||
87 | const ATTRIBUTES: &[AttrCompletion] = &[ | 206 | const ATTRIBUTES: &[AttrCompletion] = &[ |
88 | attr("allow(…)", Some("allow"), Some("allow(${0:lint})")), | 207 | attr("allow(…)", Some("allow"), Some("allow(${0:lint})")), |
89 | attr("automatically_derived", None, None), | 208 | attr("automatically_derived", None, None), |
90 | attr("cfg_attr(…)", Some("cfg_attr"), Some("cfg_attr(${1:predicate}, ${0:attr})")), | ||
91 | attr("cfg(…)", Some("cfg"), Some("cfg(${0:predicate})")), | 209 | attr("cfg(…)", Some("cfg"), Some("cfg(${0:predicate})")), |
210 | attr("cfg_attr(…)", Some("cfg_attr"), Some("cfg_attr(${1:predicate}, ${0:attr})")), | ||
92 | attr("cold", None, None), | 211 | attr("cold", None, None), |
93 | attr(r#"crate_name = """#, Some("crate_name"), Some(r#"crate_name = "${0:crate_name}""#)) | 212 | attr(r#"crate_name = """#, Some("crate_name"), Some(r#"crate_name = "${0:crate_name}""#)) |
94 | .prefer_inner(), | 213 | .prefer_inner(), |
95 | attr("deny(…)", Some("deny"), Some("deny(${0:lint})")), | 214 | attr("deny(…)", Some("deny"), Some("deny(${0:lint})")), |
96 | attr(r#"deprecated"#, Some("deprecated"), Some(r#"deprecated"#)), | 215 | attr(r#"deprecated"#, Some("deprecated"), Some(r#"deprecated"#)), |
97 | attr("derive(…)", Some("derive"), Some(r#"derive(${0:Debug})"#)), | 216 | attr("derive(…)", Some("derive"), Some(r#"derive(${0:Debug})"#)), |
217 | attr(r#"doc = "…""#, Some("doc"), Some(r#"doc = "${0:docs}""#)), | ||
218 | attr(r#"doc(alias = "…")"#, Some("docalias"), Some(r#"doc(alias = "${0:docs}")"#)), | ||
219 | attr(r#"doc(hidden)"#, Some("dochidden"), Some(r#"doc(hidden)"#)), | ||
98 | attr( | 220 | attr( |
99 | r#"export_name = "…""#, | 221 | r#"export_name = "…""#, |
100 | Some("export_name"), | 222 | Some("export_name"), |
101 | Some(r#"export_name = "${0:exported_symbol_name}""#), | 223 | Some(r#"export_name = "${0:exported_symbol_name}""#), |
102 | ), | 224 | ), |
103 | attr(r#"doc(alias = "…")"#, Some("docalias"), Some(r#"doc(alias = "${0:docs}")"#)), | ||
104 | attr(r#"doc = "…""#, Some("doc"), Some(r#"doc = "${0:docs}""#)), | ||
105 | attr(r#"doc(hidden)"#, Some("dochidden"), Some(r#"doc(hidden)"#)), | ||
106 | attr("feature(…)", Some("feature"), Some("feature(${0:flag})")).prefer_inner(), | 225 | attr("feature(…)", Some("feature"), Some("feature(${0:flag})")).prefer_inner(), |
107 | attr("forbid(…)", Some("forbid"), Some("forbid(${0:lint})")), | 226 | attr("forbid(…)", Some("forbid"), Some("forbid(${0:lint})")), |
108 | // FIXME: resolve through macro resolution? | 227 | attr("global_allocator", None, None), |
109 | attr("global_allocator", None, None).prefer_inner(), | ||
110 | attr(r#"ignore = "…""#, Some("ignore"), Some(r#"ignore = "${0:reason}""#)), | 228 | attr(r#"ignore = "…""#, Some("ignore"), Some(r#"ignore = "${0:reason}""#)), |
111 | attr("inline", Some("inline"), Some("inline")), | 229 | attr("inline", Some("inline"), Some("inline")), |
112 | attr("link", None, None), | 230 | attr("link", None, None), |
@@ -119,13 +237,13 @@ const ATTRIBUTES: &[AttrCompletion] = &[ | |||
119 | attr("macro_export", None, None), | 237 | attr("macro_export", None, None), |
120 | attr("macro_use", None, None), | 238 | attr("macro_use", None, None), |
121 | attr(r#"must_use"#, Some("must_use"), Some(r#"must_use"#)), | 239 | attr(r#"must_use"#, Some("must_use"), Some(r#"must_use"#)), |
122 | attr("no_link", None, None).prefer_inner(), | ||
123 | attr("no_implicit_prelude", None, None).prefer_inner(), | 240 | attr("no_implicit_prelude", None, None).prefer_inner(), |
241 | attr("no_link", None, None).prefer_inner(), | ||
124 | attr("no_main", None, None).prefer_inner(), | 242 | attr("no_main", None, None).prefer_inner(), |
125 | attr("no_mangle", None, None), | 243 | attr("no_mangle", None, None), |
126 | attr("no_std", None, None).prefer_inner(), | 244 | attr("no_std", None, None).prefer_inner(), |
127 | attr("non_exhaustive", None, None), | 245 | attr("non_exhaustive", None, None), |
128 | attr("panic_handler", None, None).prefer_inner(), | 246 | attr("panic_handler", None, None), |
129 | attr(r#"path = "…""#, Some("path"), Some(r#"path ="${0:path}""#)), | 247 | attr(r#"path = "…""#, Some("path"), Some(r#"path ="${0:path}""#)), |
130 | attr("proc_macro", None, None), | 248 | attr("proc_macro", None, None), |
131 | attr("proc_macro_attribute", None, None), | 249 | attr("proc_macro_attribute", None, None), |
@@ -153,381 +271,539 @@ const ATTRIBUTES: &[AttrCompletion] = &[ | |||
153 | .prefer_inner(), | 271 | .prefer_inner(), |
154 | ]; | 272 | ]; |
155 | 273 | ||
156 | fn complete_derive(acc: &mut Completions, ctx: &CompletionContext, derive_input: ast::TokenTree) { | 274 | fn parse_comma_sep_input(derive_input: ast::TokenTree) -> Option<FxHashSet<String>> { |
157 | if let Ok(existing_derives) = parse_comma_sep_input(derive_input) { | 275 | let (l_paren, r_paren) = derive_input.l_paren_token().zip(derive_input.r_paren_token())?; |
158 | for derive_completion in DEFAULT_DERIVE_COMPLETIONS | 276 | let mut input_derives = FxHashSet::default(); |
159 | .iter() | 277 | let mut tokens = derive_input |
160 | .filter(|completion| !existing_derives.contains(completion.label)) | 278 | .syntax() |
161 | { | 279 | .children_with_tokens() |
162 | let mut components = vec![derive_completion.label]; | 280 | .filter_map(NodeOrToken::into_token) |
163 | components.extend( | 281 | .skip_while(|token| token != &l_paren) |
164 | derive_completion | 282 | .skip(1) |
165 | .dependencies | 283 | .take_while(|token| token != &r_paren) |
166 | .iter() | 284 | .peekable(); |
167 | .filter(|&&dependency| !existing_derives.contains(dependency)), | 285 | let mut input = String::new(); |
168 | ); | 286 | while tokens.peek().is_some() { |
169 | let lookup = components.join(", "); | 287 | for token in tokens.by_ref().take_while(|t| t.kind() != T![,]) { |
170 | let label = components.iter().rev().join(", "); | 288 | input.push_str(token.text()); |
171 | let mut item = | ||
172 | CompletionItem::new(CompletionKind::Attribute, ctx.source_range(), label); | ||
173 | item.lookup_by(lookup).kind(CompletionItemKind::Attribute); | ||
174 | item.add_to(acc); | ||
175 | } | 289 | } |
176 | 290 | ||
177 | for custom_derive_name in get_derive_names_in_scope(ctx).difference(&existing_derives) { | 291 | if !input.is_empty() { |
178 | let mut item = CompletionItem::new( | 292 | input_derives.insert(input.trim().to_owned()); |
179 | CompletionKind::Attribute, | ||
180 | ctx.source_range(), | ||
181 | custom_derive_name, | ||
182 | ); | ||
183 | item.kind(CompletionItemKind::Attribute); | ||
184 | item.add_to(acc); | ||
185 | } | 293 | } |
186 | } | ||
187 | } | ||
188 | |||
189 | fn complete_lint( | ||
190 | acc: &mut Completions, | ||
191 | ctx: &CompletionContext, | ||
192 | derive_input: ast::TokenTree, | ||
193 | lints_completions: &[LintCompletion], | ||
194 | ) { | ||
195 | if let Ok(existing_lints) = parse_comma_sep_input(derive_input) { | ||
196 | for lint_completion in lints_completions | ||
197 | .into_iter() | ||
198 | .filter(|completion| !existing_lints.contains(completion.label)) | ||
199 | { | ||
200 | let mut item = CompletionItem::new( | ||
201 | CompletionKind::Attribute, | ||
202 | ctx.source_range(), | ||
203 | lint_completion.label, | ||
204 | ); | ||
205 | item.kind(CompletionItemKind::Attribute).detail(lint_completion.description); | ||
206 | item.add_to(acc) | ||
207 | } | ||
208 | } | ||
209 | } | ||
210 | |||
211 | fn parse_comma_sep_input(derive_input: ast::TokenTree) -> Result<FxHashSet<String>, ()> { | ||
212 | match (derive_input.left_delimiter_token(), derive_input.right_delimiter_token()) { | ||
213 | (Some(left_paren), Some(right_paren)) | ||
214 | if left_paren.kind() == T!['('] && right_paren.kind() == T![')'] => | ||
215 | { | ||
216 | let mut input_derives = FxHashSet::default(); | ||
217 | let mut current_derive = String::new(); | ||
218 | for token in derive_input | ||
219 | .syntax() | ||
220 | .children_with_tokens() | ||
221 | .filter_map(|token| token.into_token()) | ||
222 | .skip_while(|token| token != &left_paren) | ||
223 | .skip(1) | ||
224 | .take_while(|token| token != &right_paren) | ||
225 | { | ||
226 | if T![,] == token.kind() { | ||
227 | if !current_derive.is_empty() { | ||
228 | input_derives.insert(current_derive); | ||
229 | current_derive = String::new(); | ||
230 | } | ||
231 | } else { | ||
232 | current_derive.push_str(token.text().trim()); | ||
233 | } | ||
234 | } | ||
235 | 294 | ||
236 | if !current_derive.is_empty() { | 295 | input.clear(); |
237 | input_derives.insert(current_derive); | ||
238 | } | ||
239 | Ok(input_derives) | ||
240 | } | ||
241 | _ => Err(()), | ||
242 | } | 296 | } |
243 | } | ||
244 | |||
245 | fn get_derive_names_in_scope(ctx: &CompletionContext) -> FxHashSet<String> { | ||
246 | let mut result = FxHashSet::default(); | ||
247 | ctx.scope.process_all_names(&mut |name, scope_def| { | ||
248 | if let hir::ScopeDef::MacroDef(mac) = scope_def { | ||
249 | // FIXME kind() doesn't check whether proc-macro is a derive | ||
250 | if mac.kind() == hir::MacroKind::Derive || mac.kind() == hir::MacroKind::ProcMacro { | ||
251 | result.insert(name.to_string()); | ||
252 | } | ||
253 | } | ||
254 | }); | ||
255 | result | ||
256 | } | ||
257 | |||
258 | struct DeriveCompletion { | ||
259 | label: &'static str, | ||
260 | dependencies: &'static [&'static str], | ||
261 | } | ||
262 | |||
263 | /// Standard Rust derives and the information about their dependencies | ||
264 | /// (the dependencies are needed so that the main derive don't break the compilation when added) | ||
265 | const DEFAULT_DERIVE_COMPLETIONS: &[DeriveCompletion] = &[ | ||
266 | DeriveCompletion { label: "Clone", dependencies: &[] }, | ||
267 | DeriveCompletion { label: "Copy", dependencies: &["Clone"] }, | ||
268 | DeriveCompletion { label: "Debug", dependencies: &[] }, | ||
269 | DeriveCompletion { label: "Default", dependencies: &[] }, | ||
270 | DeriveCompletion { label: "Hash", dependencies: &[] }, | ||
271 | DeriveCompletion { label: "PartialEq", dependencies: &[] }, | ||
272 | DeriveCompletion { label: "Eq", dependencies: &["PartialEq"] }, | ||
273 | DeriveCompletion { label: "PartialOrd", dependencies: &["PartialEq"] }, | ||
274 | DeriveCompletion { label: "Ord", dependencies: &["PartialOrd", "Eq", "PartialEq"] }, | ||
275 | ]; | ||
276 | 297 | ||
277 | pub(crate) struct LintCompletion { | 298 | Some(input_derives) |
278 | pub(crate) label: &'static str, | ||
279 | pub(crate) description: &'static str, | ||
280 | } | 299 | } |
281 | 300 | ||
282 | #[rustfmt::skip] | ||
283 | const DEFAULT_LINT_COMPLETIONS: &[LintCompletion] = &[ | ||
284 | LintCompletion { label: "absolute_paths_not_starting_with_crate", description: r#"fully qualified paths that start with a module name instead of `crate`, `self`, or an extern crate name"# }, | ||
285 | LintCompletion { label: "anonymous_parameters", description: r#"detects anonymous parameters"# }, | ||
286 | LintCompletion { label: "box_pointers", description: r#"use of owned (Box type) heap memory"# }, | ||
287 | LintCompletion { label: "deprecated_in_future", description: r#"detects use of items that will be deprecated in a future version"# }, | ||
288 | LintCompletion { label: "elided_lifetimes_in_paths", description: r#"hidden lifetime parameters in types are deprecated"# }, | ||
289 | LintCompletion { label: "explicit_outlives_requirements", description: r#"outlives requirements can be inferred"# }, | ||
290 | LintCompletion { label: "indirect_structural_match", description: r#"pattern with const indirectly referencing non-structural-match type"# }, | ||
291 | LintCompletion { label: "keyword_idents", description: r#"detects edition keywords being used as an identifier"# }, | ||
292 | LintCompletion { label: "macro_use_extern_crate", description: r#"the `#[macro_use]` attribute is now deprecated in favor of using macros via the module system"# }, | ||
293 | LintCompletion { label: "meta_variable_misuse", description: r#"possible meta-variable misuse at macro definition"# }, | ||
294 | LintCompletion { label: "missing_copy_implementations", description: r#"detects potentially-forgotten implementations of `Copy`"# }, | ||
295 | LintCompletion { label: "missing_crate_level_docs", description: r#"detects crates with no crate-level documentation"# }, | ||
296 | LintCompletion { label: "missing_debug_implementations", description: r#"detects missing implementations of Debug"# }, | ||
297 | LintCompletion { label: "missing_docs", description: r#"detects missing documentation for public members"# }, | ||
298 | LintCompletion { label: "missing_doc_code_examples", description: r#"detects publicly-exported items without code samples in their documentation"# }, | ||
299 | LintCompletion { label: "non_ascii_idents", description: r#"detects non-ASCII identifiers"# }, | ||
300 | LintCompletion { label: "private_doc_tests", description: r#"detects code samples in docs of private items not documented by rustdoc"# }, | ||
301 | LintCompletion { label: "single_use_lifetimes", description: r#"detects lifetime parameters that are only used once"# }, | ||
302 | LintCompletion { label: "trivial_casts", description: r#"detects trivial casts which could be removed"# }, | ||
303 | LintCompletion { label: "trivial_numeric_casts", description: r#"detects trivial casts of numeric types which could be removed"# }, | ||
304 | LintCompletion { label: "unaligned_references", description: r#"detects unaligned references to fields of packed structs"# }, | ||
305 | LintCompletion { label: "unreachable_pub", description: r#"`pub` items not reachable from crate root"# }, | ||
306 | LintCompletion { label: "unsafe_code", description: r#"usage of `unsafe` code"# }, | ||
307 | LintCompletion { label: "unsafe_op_in_unsafe_fn", description: r#"unsafe operations in unsafe functions without an explicit unsafe block are deprecated"# }, | ||
308 | LintCompletion { label: "unstable_features", description: r#"enabling unstable features (deprecated. do not use)"# }, | ||
309 | LintCompletion { label: "unused_crate_dependencies", description: r#"crate dependencies that are never used"# }, | ||
310 | LintCompletion { label: "unused_extern_crates", description: r#"extern crates that are never used"# }, | ||
311 | LintCompletion { label: "unused_import_braces", description: r#"unnecessary braces around an imported item"# }, | ||
312 | LintCompletion { label: "unused_lifetimes", description: r#"detects lifetime parameters that are never used"# }, | ||
313 | LintCompletion { label: "unused_qualifications", description: r#"detects unnecessarily qualified names"# }, | ||
314 | LintCompletion { label: "unused_results", description: r#"unused result of an expression in a statement"# }, | ||
315 | LintCompletion { label: "variant_size_differences", description: r#"detects enums with widely varying variant sizes"# }, | ||
316 | LintCompletion { label: "array_into_iter", description: r#"detects calling `into_iter` on arrays"# }, | ||
317 | LintCompletion { label: "asm_sub_register", description: r#"using only a subset of a register for inline asm inputs"# }, | ||
318 | LintCompletion { label: "bare_trait_objects", description: r#"suggest using `dyn Trait` for trait objects"# }, | ||
319 | LintCompletion { label: "bindings_with_variant_name", description: r#"detects pattern bindings with the same name as one of the matched variants"# }, | ||
320 | LintCompletion { label: "cenum_impl_drop_cast", description: r#"a C-like enum implementing Drop is cast"# }, | ||
321 | LintCompletion { label: "clashing_extern_declarations", description: r#"detects when an extern fn has been declared with the same name but different types"# }, | ||
322 | LintCompletion { label: "coherence_leak_check", description: r#"distinct impls distinguished only by the leak-check code"# }, | ||
323 | LintCompletion { label: "confusable_idents", description: r#"detects visually confusable pairs between identifiers"# }, | ||
324 | LintCompletion { label: "dead_code", description: r#"detect unused, unexported items"# }, | ||
325 | LintCompletion { label: "deprecated", description: r#"detects use of deprecated items"# }, | ||
326 | LintCompletion { label: "ellipsis_inclusive_range_patterns", description: r#"`...` range patterns are deprecated"# }, | ||
327 | LintCompletion { label: "exported_private_dependencies", description: r#"public interface leaks type from a private dependency"# }, | ||
328 | LintCompletion { label: "illegal_floating_point_literal_pattern", description: r#"floating-point literals cannot be used in patterns"# }, | ||
329 | LintCompletion { label: "improper_ctypes", description: r#"proper use of libc types in foreign modules"# }, | ||
330 | LintCompletion { label: "improper_ctypes_definitions", description: r#"proper use of libc types in foreign item definitions"# }, | ||
331 | LintCompletion { label: "incomplete_features", description: r#"incomplete features that may function improperly in some or all cases"# }, | ||
332 | LintCompletion { label: "inline_no_sanitize", description: r#"detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`"# }, | ||
333 | LintCompletion { label: "intra_doc_link_resolution_failure", description: r#"failures in resolving intra-doc link targets"# }, | ||
334 | LintCompletion { label: "invalid_codeblock_attributes", description: r#"codeblock attribute looks a lot like a known one"# }, | ||
335 | LintCompletion { label: "invalid_value", description: r#"an invalid value is being created (such as a NULL reference)"# }, | ||
336 | LintCompletion { label: "irrefutable_let_patterns", description: r#"detects irrefutable patterns in if-let and while-let statements"# }, | ||
337 | LintCompletion { label: "late_bound_lifetime_arguments", description: r#"detects generic lifetime arguments in path segments with late bound lifetime parameters"# }, | ||
338 | LintCompletion { label: "mixed_script_confusables", description: r#"detects Unicode scripts whose mixed script confusables codepoints are solely used"# }, | ||
339 | LintCompletion { label: "mutable_borrow_reservation_conflict", description: r#"reservation of a two-phased borrow conflicts with other shared borrows"# }, | ||
340 | LintCompletion { label: "non_camel_case_types", description: r#"types, variants, traits and type parameters should have camel case names"# }, | ||
341 | LintCompletion { label: "non_shorthand_field_patterns", description: r#"using `Struct { x: x }` instead of `Struct { x }` in a pattern"# }, | ||
342 | LintCompletion { label: "non_snake_case", description: r#"variables, methods, functions, lifetime parameters and modules should have snake case names"# }, | ||
343 | LintCompletion { label: "non_upper_case_globals", description: r#"static constants should have uppercase identifiers"# }, | ||
344 | LintCompletion { label: "no_mangle_generic_items", description: r#"generic items must be mangled"# }, | ||
345 | LintCompletion { label: "overlapping_patterns", description: r#"detects overlapping patterns"# }, | ||
346 | LintCompletion { label: "path_statements", description: r#"path statements with no effect"# }, | ||
347 | LintCompletion { label: "private_in_public", description: r#"detect private items in public interfaces not caught by the old implementation"# }, | ||
348 | LintCompletion { label: "proc_macro_derive_resolution_fallback", description: r#"detects proc macro derives using inaccessible names from parent modules"# }, | ||
349 | LintCompletion { label: "redundant_semicolons", description: r#"detects unnecessary trailing semicolons"# }, | ||
350 | LintCompletion { label: "renamed_and_removed_lints", description: r#"lints that have been renamed or removed"# }, | ||
351 | LintCompletion { label: "safe_packed_borrows", description: r#"safe borrows of fields of packed structs were erroneously allowed"# }, | ||
352 | LintCompletion { label: "stable_features", description: r#"stable features found in `#[feature]` directive"# }, | ||
353 | LintCompletion { label: "trivial_bounds", description: r#"these bounds don't depend on an type parameters"# }, | ||
354 | LintCompletion { label: "type_alias_bounds", description: r#"bounds in type aliases are not enforced"# }, | ||
355 | LintCompletion { label: "tyvar_behind_raw_pointer", description: r#"raw pointer to an inference variable"# }, | ||
356 | LintCompletion { label: "uncommon_codepoints", description: r#"detects uncommon Unicode codepoints in identifiers"# }, | ||
357 | LintCompletion { label: "unconditional_recursion", description: r#"functions that cannot return without calling themselves"# }, | ||
358 | LintCompletion { label: "unknown_lints", description: r#"unrecognized lint attribute"# }, | ||
359 | LintCompletion { label: "unnameable_test_items", description: r#"detects an item that cannot be named being marked as `#[test_case]`"# }, | ||
360 | LintCompletion { label: "unreachable_code", description: r#"detects unreachable code paths"# }, | ||
361 | LintCompletion { label: "unreachable_patterns", description: r#"detects unreachable patterns"# }, | ||
362 | LintCompletion { label: "unstable_name_collisions", description: r#"detects name collision with an existing but unstable method"# }, | ||
363 | LintCompletion { label: "unused_allocation", description: r#"detects unnecessary allocations that can be eliminated"# }, | ||
364 | LintCompletion { label: "unused_assignments", description: r#"detect assignments that will never be read"# }, | ||
365 | LintCompletion { label: "unused_attributes", description: r#"detects attributes that were not used by the compiler"# }, | ||
366 | LintCompletion { label: "unused_braces", description: r#"unnecessary braces around an expression"# }, | ||
367 | LintCompletion { label: "unused_comparisons", description: r#"comparisons made useless by limits of the types involved"# }, | ||
368 | LintCompletion { label: "unused_doc_comments", description: r#"detects doc comments that aren't used by rustdoc"# }, | ||
369 | LintCompletion { label: "unused_features", description: r#"unused features found in crate-level `#[feature]` directives"# }, | ||
370 | LintCompletion { label: "unused_imports", description: r#"imports that are never used"# }, | ||
371 | LintCompletion { label: "unused_labels", description: r#"detects labels that are never used"# }, | ||
372 | LintCompletion { label: "unused_macros", description: r#"detects macros that were not used"# }, | ||
373 | LintCompletion { label: "unused_must_use", description: r#"unused result of a type flagged as `#[must_use]`"# }, | ||
374 | LintCompletion { label: "unused_mut", description: r#"detect mut variables which don't need to be mutable"# }, | ||
375 | LintCompletion { label: "unused_parens", description: r#"`if`, `match`, `while` and `return` do not need parentheses"# }, | ||
376 | LintCompletion { label: "unused_unsafe", description: r#"unnecessary use of an `unsafe` block"# }, | ||
377 | LintCompletion { label: "unused_variables", description: r#"detect variables which are not used in any way"# }, | ||
378 | LintCompletion { label: "warnings", description: r#"mass-change the level for lints which produce warnings"# }, | ||
379 | LintCompletion { label: "where_clauses_object_safety", description: r#"checks the object safety of where clauses"# }, | ||
380 | LintCompletion { label: "while_true", description: r#"suggest using `loop { }` instead of `while true { }`"# }, | ||
381 | LintCompletion { label: "ambiguous_associated_items", description: r#"ambiguous associated items"# }, | ||
382 | LintCompletion { label: "arithmetic_overflow", description: r#"arithmetic operation overflows"# }, | ||
383 | LintCompletion { label: "conflicting_repr_hints", description: r#"conflicts between `#[repr(..)]` hints that were previously accepted and used in practice"# }, | ||
384 | LintCompletion { label: "const_err", description: r#"constant evaluation detected erroneous expression"# }, | ||
385 | LintCompletion { label: "ill_formed_attribute_input", description: r#"ill-formed attribute inputs that were previously accepted and used in practice"# }, | ||
386 | LintCompletion { label: "incomplete_include", description: r#"trailing content in included file"# }, | ||
387 | LintCompletion { label: "invalid_type_param_default", description: r#"type parameter default erroneously allowed in invalid location"# }, | ||
388 | LintCompletion { label: "macro_expanded_macro_exports_accessed_by_absolute_paths", description: r#"macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths"# }, | ||
389 | LintCompletion { label: "missing_fragment_specifier", description: r#"detects missing fragment specifiers in unused `macro_rules!` patterns"# }, | ||
390 | LintCompletion { label: "mutable_transmutes", description: r#"mutating transmuted &mut T from &T may cause undefined behavior"# }, | ||
391 | LintCompletion { label: "no_mangle_const_items", description: r#"const items will not have their symbols exported"# }, | ||
392 | LintCompletion { label: "order_dependent_trait_objects", description: r#"trait-object types were treated as different depending on marker-trait order"# }, | ||
393 | LintCompletion { label: "overflowing_literals", description: r#"literal out of range for its type"# }, | ||
394 | LintCompletion { label: "patterns_in_fns_without_body", description: r#"patterns in functions without body were erroneously allowed"# }, | ||
395 | LintCompletion { label: "pub_use_of_private_extern_crate", description: r#"detect public re-exports of private extern crates"# }, | ||
396 | LintCompletion { label: "soft_unstable", description: r#"a feature gate that doesn't break dependent crates"# }, | ||
397 | LintCompletion { label: "unconditional_panic", description: r#"operation will cause a panic at runtime"# }, | ||
398 | LintCompletion { label: "unknown_crate_types", description: r#"unknown crate type found in `#[crate_type]` directive"# }, | ||
399 | ]; | ||
400 | |||
401 | #[cfg(test)] | 301 | #[cfg(test)] |
402 | mod tests { | 302 | mod tests { |
303 | use super::*; | ||
304 | |||
403 | use expect_test::{expect, Expect}; | 305 | use expect_test::{expect, Expect}; |
404 | 306 | ||
405 | use crate::{test_utils::completion_list, CompletionKind}; | 307 | use crate::{test_utils::completion_list, CompletionKind}; |
406 | 308 | ||
309 | #[test] | ||
310 | fn attributes_are_sorted() { | ||
311 | let mut attrs = ATTRIBUTES.iter().map(|attr| attr.key()); | ||
312 | let mut prev = attrs.next().unwrap(); | ||
313 | |||
314 | attrs.for_each(|next| { | ||
315 | assert!( | ||
316 | prev < next, | ||
317 | r#"ATTRIBUTES array is not sorted, "{}" should come after "{}""#, | ||
318 | prev, | ||
319 | next | ||
320 | ); | ||
321 | prev = next; | ||
322 | }); | ||
323 | } | ||
324 | |||
407 | fn check(ra_fixture: &str, expect: Expect) { | 325 | fn check(ra_fixture: &str, expect: Expect) { |
408 | let actual = completion_list(ra_fixture, CompletionKind::Attribute); | 326 | let actual = completion_list(ra_fixture, CompletionKind::Attribute); |
409 | expect.assert_eq(&actual); | 327 | expect.assert_eq(&actual); |
410 | } | 328 | } |
411 | 329 | ||
412 | #[test] | 330 | #[test] |
413 | fn empty_derive_completion() { | 331 | fn test_attribute_completion_inside_nested_attr() { |
332 | check(r#"#[cfg($0)]"#, expect![[]]) | ||
333 | } | ||
334 | |||
335 | #[test] | ||
336 | fn test_attribute_completion_with_existing_attr() { | ||
414 | check( | 337 | check( |
415 | r#" | 338 | r#"#[no_mangle] #[$0] mcall!();"#, |
416 | #[derive($0)] | ||
417 | struct Test {} | ||
418 | "#, | ||
419 | expect![[r#" | 339 | expect![[r#" |
420 | at Clone | 340 | at allow(…) |
421 | at Clone, Copy | 341 | at cfg(…) |
422 | at Debug | 342 | at cfg_attr(…) |
423 | at Default | 343 | at deny(…) |
424 | at Hash | 344 | at forbid(…) |
425 | at PartialEq | 345 | at warn(…) |
426 | at PartialEq, Eq | 346 | "#]], |
427 | at PartialEq, PartialOrd | 347 | ) |
428 | at PartialEq, Eq, PartialOrd, Ord | 348 | } |
349 | |||
350 | #[test] | ||
351 | fn complete_attribute_on_source_file() { | ||
352 | check( | ||
353 | r#"#![$0]"#, | ||
354 | expect![[r#" | ||
355 | at allow(…) | ||
356 | at cfg(…) | ||
357 | at cfg_attr(…) | ||
358 | at deny(…) | ||
359 | at forbid(…) | ||
360 | at warn(…) | ||
361 | at deprecated | ||
362 | at doc = "…" | ||
363 | at doc(hidden) | ||
364 | at doc(alias = "…") | ||
365 | at must_use | ||
366 | at no_mangle | ||
367 | at crate_name = "" | ||
368 | at feature(…) | ||
369 | at no_implicit_prelude | ||
370 | at no_main | ||
371 | at no_std | ||
372 | at recursion_limit = … | ||
373 | at type_length_limit = … | ||
374 | at windows_subsystem = "…" | ||
429 | "#]], | 375 | "#]], |
430 | ); | 376 | ); |
431 | } | 377 | } |
432 | 378 | ||
433 | #[test] | 379 | #[test] |
434 | fn no_completion_for_incorrect_derive() { | 380 | fn complete_attribute_on_module() { |
435 | check( | 381 | check( |
436 | r#" | 382 | r#"#[$0] mod foo;"#, |
437 | #[derive{$0)] | 383 | expect![[r#" |
438 | struct Test {} | 384 | at allow(…) |
439 | "#, | 385 | at cfg(…) |
440 | expect![[r#""#]], | 386 | at cfg_attr(…) |
441 | ) | 387 | at deny(…) |
388 | at forbid(…) | ||
389 | at warn(…) | ||
390 | at deprecated | ||
391 | at doc = "…" | ||
392 | at doc(hidden) | ||
393 | at doc(alias = "…") | ||
394 | at must_use | ||
395 | at no_mangle | ||
396 | at path = "…" | ||
397 | "#]], | ||
398 | ); | ||
399 | check( | ||
400 | r#"mod foo {#![$0]}"#, | ||
401 | expect![[r#" | ||
402 | at allow(…) | ||
403 | at cfg(…) | ||
404 | at cfg_attr(…) | ||
405 | at deny(…) | ||
406 | at forbid(…) | ||
407 | at warn(…) | ||
408 | at deprecated | ||
409 | at doc = "…" | ||
410 | at doc(hidden) | ||
411 | at doc(alias = "…") | ||
412 | at must_use | ||
413 | at no_mangle | ||
414 | at no_implicit_prelude | ||
415 | "#]], | ||
416 | ); | ||
442 | } | 417 | } |
443 | 418 | ||
444 | #[test] | 419 | #[test] |
445 | fn derive_with_input_completion() { | 420 | fn complete_attribute_on_macro_rules() { |
446 | check( | 421 | check( |
447 | r#" | 422 | r#"#[$0] macro_rules! foo {}"#, |
448 | #[derive(serde::Serialize, PartialEq, $0)] | ||
449 | struct Test {} | ||
450 | "#, | ||
451 | expect![[r#" | 423 | expect![[r#" |
452 | at Clone | 424 | at allow(…) |
453 | at Clone, Copy | 425 | at cfg(…) |
454 | at Debug | 426 | at cfg_attr(…) |
455 | at Default | 427 | at deny(…) |
456 | at Hash | 428 | at forbid(…) |
457 | at Eq | 429 | at warn(…) |
458 | at PartialOrd | 430 | at deprecated |
459 | at Eq, PartialOrd, Ord | 431 | at doc = "…" |
432 | at doc(hidden) | ||
433 | at doc(alias = "…") | ||
434 | at must_use | ||
435 | at no_mangle | ||
436 | at macro_export | ||
437 | at macro_use | ||
460 | "#]], | 438 | "#]], |
461 | ) | 439 | ); |
462 | } | 440 | } |
463 | 441 | ||
464 | #[test] | 442 | #[test] |
465 | fn test_attribute_completion() { | 443 | fn complete_attribute_on_macro_def() { |
466 | check( | 444 | check( |
467 | r#"#[$0]"#, | 445 | r#"#[$0] macro foo {}"#, |
468 | expect![[r#" | 446 | expect![[r#" |
469 | at allow(…) | 447 | at allow(…) |
470 | at automatically_derived | 448 | at cfg(…) |
471 | at cfg_attr(…) | 449 | at cfg_attr(…) |
450 | at deny(…) | ||
451 | at forbid(…) | ||
452 | at warn(…) | ||
453 | at deprecated | ||
454 | at doc = "…" | ||
455 | at doc(hidden) | ||
456 | at doc(alias = "…") | ||
457 | at must_use | ||
458 | at no_mangle | ||
459 | "#]], | ||
460 | ); | ||
461 | } | ||
462 | |||
463 | #[test] | ||
464 | fn complete_attribute_on_extern_crate() { | ||
465 | check( | ||
466 | r#"#[$0] extern crate foo;"#, | ||
467 | expect![[r#" | ||
468 | at allow(…) | ||
472 | at cfg(…) | 469 | at cfg(…) |
473 | at cold | 470 | at cfg_attr(…) |
474 | at deny(…) | 471 | at deny(…) |
472 | at forbid(…) | ||
473 | at warn(…) | ||
475 | at deprecated | 474 | at deprecated |
475 | at doc = "…" | ||
476 | at doc(hidden) | ||
477 | at doc(alias = "…") | ||
478 | at must_use | ||
479 | at no_mangle | ||
480 | at macro_use | ||
481 | "#]], | ||
482 | ); | ||
483 | } | ||
484 | |||
485 | #[test] | ||
486 | fn complete_attribute_on_use() { | ||
487 | check( | ||
488 | r#"#[$0] use foo;"#, | ||
489 | expect![[r#" | ||
490 | at allow(…) | ||
491 | at cfg(…) | ||
492 | at cfg_attr(…) | ||
493 | at deny(…) | ||
494 | at forbid(…) | ||
495 | at warn(…) | ||
496 | at deprecated | ||
497 | at doc = "…" | ||
498 | at doc(hidden) | ||
499 | at doc(alias = "…") | ||
500 | at must_use | ||
501 | at no_mangle | ||
502 | "#]], | ||
503 | ); | ||
504 | } | ||
505 | |||
506 | #[test] | ||
507 | fn complete_attribute_on_type_alias() { | ||
508 | check( | ||
509 | r#"#[$0] type foo = ();"#, | ||
510 | expect![[r#" | ||
511 | at allow(…) | ||
512 | at cfg(…) | ||
513 | at cfg_attr(…) | ||
514 | at deny(…) | ||
515 | at forbid(…) | ||
516 | at warn(…) | ||
517 | at deprecated | ||
518 | at doc = "…" | ||
519 | at doc(hidden) | ||
520 | at doc(alias = "…") | ||
521 | at must_use | ||
522 | at no_mangle | ||
523 | "#]], | ||
524 | ); | ||
525 | } | ||
526 | |||
527 | #[test] | ||
528 | fn complete_attribute_on_struct() { | ||
529 | check( | ||
530 | r#"#[$0] struct Foo;"#, | ||
531 | expect![[r#" | ||
532 | at allow(…) | ||
533 | at cfg(…) | ||
534 | at cfg_attr(…) | ||
535 | at deny(…) | ||
536 | at forbid(…) | ||
537 | at warn(…) | ||
538 | at deprecated | ||
539 | at doc = "…" | ||
540 | at doc(hidden) | ||
541 | at doc(alias = "…") | ||
542 | at must_use | ||
543 | at no_mangle | ||
476 | at derive(…) | 544 | at derive(…) |
477 | at export_name = "…" | 545 | at repr(…) |
546 | at non_exhaustive | ||
547 | "#]], | ||
548 | ); | ||
549 | } | ||
550 | |||
551 | #[test] | ||
552 | fn complete_attribute_on_enum() { | ||
553 | check( | ||
554 | r#"#[$0] enum Foo {}"#, | ||
555 | expect![[r#" | ||
556 | at allow(…) | ||
557 | at cfg(…) | ||
558 | at cfg_attr(…) | ||
559 | at deny(…) | ||
560 | at forbid(…) | ||
561 | at warn(…) | ||
562 | at deprecated | ||
563 | at doc = "…" | ||
564 | at doc(hidden) | ||
478 | at doc(alias = "…") | 565 | at doc(alias = "…") |
566 | at must_use | ||
567 | at no_mangle | ||
568 | at derive(…) | ||
569 | at repr(…) | ||
570 | at non_exhaustive | ||
571 | "#]], | ||
572 | ); | ||
573 | } | ||
574 | |||
575 | #[test] | ||
576 | fn complete_attribute_on_const() { | ||
577 | check( | ||
578 | r#"#[$0] const FOO: () = ();"#, | ||
579 | expect![[r#" | ||
580 | at allow(…) | ||
581 | at cfg(…) | ||
582 | at cfg_attr(…) | ||
583 | at deny(…) | ||
584 | at forbid(…) | ||
585 | at warn(…) | ||
586 | at deprecated | ||
479 | at doc = "…" | 587 | at doc = "…" |
480 | at doc(hidden) | 588 | at doc(hidden) |
589 | at doc(alias = "…") | ||
590 | at must_use | ||
591 | at no_mangle | ||
592 | "#]], | ||
593 | ); | ||
594 | } | ||
595 | |||
596 | #[test] | ||
597 | fn complete_attribute_on_static() { | ||
598 | check( | ||
599 | r#"#[$0] static FOO: () = ()"#, | ||
600 | expect![[r#" | ||
601 | at allow(…) | ||
602 | at cfg(…) | ||
603 | at cfg_attr(…) | ||
604 | at deny(…) | ||
481 | at forbid(…) | 605 | at forbid(…) |
482 | at ignore = "…" | 606 | at warn(…) |
483 | at inline | 607 | at deprecated |
484 | at link | 608 | at doc = "…" |
609 | at doc(hidden) | ||
610 | at doc(alias = "…") | ||
611 | at must_use | ||
612 | at no_mangle | ||
613 | at export_name = "…" | ||
485 | at link_name = "…" | 614 | at link_name = "…" |
486 | at link_section = "…" | 615 | at link_section = "…" |
487 | at macro_export | 616 | at global_allocator |
488 | at macro_use | 617 | at used |
618 | "#]], | ||
619 | ); | ||
620 | } | ||
621 | |||
622 | #[test] | ||
623 | fn complete_attribute_on_trait() { | ||
624 | check( | ||
625 | r#"#[$0] trait Foo {}"#, | ||
626 | expect![[r#" | ||
627 | at allow(…) | ||
628 | at cfg(…) | ||
629 | at cfg_attr(…) | ||
630 | at deny(…) | ||
631 | at forbid(…) | ||
632 | at warn(…) | ||
633 | at deprecated | ||
634 | at doc = "…" | ||
635 | at doc(hidden) | ||
636 | at doc(alias = "…") | ||
637 | at must_use | ||
638 | at no_mangle | ||
639 | at must_use | ||
640 | "#]], | ||
641 | ); | ||
642 | } | ||
643 | |||
644 | #[test] | ||
645 | fn complete_attribute_on_impl() { | ||
646 | check( | ||
647 | r#"#[$0] impl () {}"#, | ||
648 | expect![[r#" | ||
649 | at allow(…) | ||
650 | at cfg(…) | ||
651 | at cfg_attr(…) | ||
652 | at deny(…) | ||
653 | at forbid(…) | ||
654 | at warn(…) | ||
655 | at deprecated | ||
656 | at doc = "…" | ||
657 | at doc(hidden) | ||
658 | at doc(alias = "…") | ||
659 | at must_use | ||
660 | at no_mangle | ||
661 | at automatically_derived | ||
662 | "#]], | ||
663 | ); | ||
664 | check( | ||
665 | r#"impl () {#![$0]}"#, | ||
666 | expect![[r#" | ||
667 | at allow(…) | ||
668 | at cfg(…) | ||
669 | at cfg_attr(…) | ||
670 | at deny(…) | ||
671 | at forbid(…) | ||
672 | at warn(…) | ||
673 | at deprecated | ||
674 | at doc = "…" | ||
675 | at doc(hidden) | ||
676 | at doc(alias = "…") | ||
489 | at must_use | 677 | at must_use |
490 | at no_mangle | 678 | at no_mangle |
679 | "#]], | ||
680 | ); | ||
681 | } | ||
682 | |||
683 | #[test] | ||
684 | fn complete_attribute_on_extern_block() { | ||
685 | check( | ||
686 | r#"#[$0] extern {}"#, | ||
687 | expect![[r#" | ||
688 | at allow(…) | ||
689 | at cfg(…) | ||
690 | at cfg_attr(…) | ||
691 | at deny(…) | ||
692 | at forbid(…) | ||
693 | at warn(…) | ||
694 | at deprecated | ||
695 | at doc = "…" | ||
696 | at doc(hidden) | ||
697 | at doc(alias = "…") | ||
698 | at must_use | ||
699 | at no_mangle | ||
700 | at link | ||
701 | "#]], | ||
702 | ); | ||
703 | check( | ||
704 | r#"extern {#![$0]}"#, | ||
705 | expect![[r#" | ||
706 | at allow(…) | ||
707 | at cfg(…) | ||
708 | at cfg_attr(…) | ||
709 | at deny(…) | ||
710 | at forbid(…) | ||
711 | at warn(…) | ||
712 | at deprecated | ||
713 | at doc = "…" | ||
714 | at doc(hidden) | ||
715 | at doc(alias = "…") | ||
716 | at must_use | ||
717 | at no_mangle | ||
718 | at link | ||
719 | "#]], | ||
720 | ); | ||
721 | } | ||
722 | |||
723 | #[test] | ||
724 | fn complete_attribute_on_variant() { | ||
725 | check( | ||
726 | r#"enum Foo { #[$0] Bar }"#, | ||
727 | expect![[r#" | ||
728 | at allow(…) | ||
729 | at cfg(…) | ||
730 | at cfg_attr(…) | ||
731 | at deny(…) | ||
732 | at forbid(…) | ||
733 | at warn(…) | ||
491 | at non_exhaustive | 734 | at non_exhaustive |
492 | at path = "…" | 735 | "#]], |
736 | ); | ||
737 | } | ||
738 | |||
739 | #[test] | ||
740 | fn complete_attribute_on_fn() { | ||
741 | check( | ||
742 | r#"#[$0] fn main() {}"#, | ||
743 | expect![[r#" | ||
744 | at allow(…) | ||
745 | at cfg(…) | ||
746 | at cfg_attr(…) | ||
747 | at deny(…) | ||
748 | at forbid(…) | ||
749 | at warn(…) | ||
750 | at deprecated | ||
751 | at doc = "…" | ||
752 | at doc(hidden) | ||
753 | at doc(alias = "…") | ||
754 | at must_use | ||
755 | at no_mangle | ||
756 | at export_name = "…" | ||
757 | at link_name = "…" | ||
758 | at link_section = "…" | ||
759 | at cold | ||
760 | at ignore = "…" | ||
761 | at inline | ||
762 | at must_use | ||
763 | at panic_handler | ||
493 | at proc_macro | 764 | at proc_macro |
494 | at proc_macro_attribute | ||
495 | at proc_macro_derive(…) | 765 | at proc_macro_derive(…) |
496 | at repr(…) | 766 | at proc_macro_attribute |
497 | at should_panic | 767 | at should_panic |
498 | at target_feature = "…" | 768 | at target_feature = "…" |
499 | at test | 769 | at test |
500 | at track_caller | 770 | at track_caller |
501 | at used | ||
502 | at warn(…) | ||
503 | "#]], | 771 | "#]], |
504 | ) | 772 | ); |
505 | } | 773 | } |
506 | 774 | ||
507 | #[test] | 775 | #[test] |
508 | fn test_attribute_completion_inside_nested_attr() { | 776 | fn complete_attribute_on_expr() { |
509 | check(r#"#[cfg($0)]"#, expect![[]]) | 777 | check( |
778 | r#"fn main() { #[$0] foo() }"#, | ||
779 | expect![[r#" | ||
780 | at allow(…) | ||
781 | at cfg(…) | ||
782 | at cfg_attr(…) | ||
783 | at deny(…) | ||
784 | at forbid(…) | ||
785 | at warn(…) | ||
786 | "#]], | ||
787 | ); | ||
510 | } | 788 | } |
511 | 789 | ||
512 | #[test] | 790 | #[test] |
513 | fn test_inner_attribute_completion() { | 791 | fn complete_attribute_in_source_file_end() { |
514 | check( | 792 | check( |
515 | r"#![$0]", | 793 | r#"#[$0]"#, |
516 | expect![[r#" | 794 | expect![[r#" |
517 | at allow(…) | 795 | at allow(…) |
518 | at automatically_derived | 796 | at automatically_derived |
519 | at cfg_attr(…) | ||
520 | at cfg(…) | 797 | at cfg(…) |
798 | at cfg_attr(…) | ||
521 | at cold | 799 | at cold |
522 | at crate_name = "" | ||
523 | at deny(…) | 800 | at deny(…) |
524 | at deprecated | 801 | at deprecated |
525 | at derive(…) | 802 | at derive(…) |
526 | at export_name = "…" | ||
527 | at doc(alias = "…") | ||
528 | at doc = "…" | 803 | at doc = "…" |
804 | at doc(alias = "…") | ||
529 | at doc(hidden) | 805 | at doc(hidden) |
530 | at feature(…) | 806 | at export_name = "…" |
531 | at forbid(…) | 807 | at forbid(…) |
532 | at global_allocator | 808 | at global_allocator |
533 | at ignore = "…" | 809 | at ignore = "…" |
@@ -538,27 +814,20 @@ struct Test {} | |||
538 | at macro_export | 814 | at macro_export |
539 | at macro_use | 815 | at macro_use |
540 | at must_use | 816 | at must_use |
541 | at no_link | ||
542 | at no_implicit_prelude | ||
543 | at no_main | ||
544 | at no_mangle | 817 | at no_mangle |
545 | at no_std | ||
546 | at non_exhaustive | 818 | at non_exhaustive |
547 | at panic_handler | 819 | at panic_handler |
548 | at path = "…" | 820 | at path = "…" |
549 | at proc_macro | 821 | at proc_macro |
550 | at proc_macro_attribute | 822 | at proc_macro_attribute |
551 | at proc_macro_derive(…) | 823 | at proc_macro_derive(…) |
552 | at recursion_limit = … | ||
553 | at repr(…) | 824 | at repr(…) |
554 | at should_panic | 825 | at should_panic |
555 | at target_feature = "…" | 826 | at target_feature = "…" |
556 | at test | 827 | at test |
557 | at track_caller | 828 | at track_caller |
558 | at type_length_limit = … | ||
559 | at used | 829 | at used |
560 | at warn(…) | 830 | at warn(…) |
561 | at windows_subsystem = "…" | ||
562 | "#]], | 831 | "#]], |
563 | ); | 832 | ); |
564 | } | 833 | } |
diff --git a/crates/ide_completion/src/completions/attribute/derive.rs b/crates/ide_completion/src/completions/attribute/derive.rs new file mode 100644 index 000000000..0bc3eab98 --- /dev/null +++ b/crates/ide_completion/src/completions/attribute/derive.rs | |||
@@ -0,0 +1,147 @@ | |||
1 | //! Completion for derives | ||
2 | use itertools::Itertools; | ||
3 | use rustc_hash::FxHashSet; | ||
4 | use syntax::ast; | ||
5 | |||
6 | use crate::{ | ||
7 | context::CompletionContext, | ||
8 | item::{CompletionItem, CompletionItemKind, CompletionKind}, | ||
9 | Completions, | ||
10 | }; | ||
11 | |||
12 | pub(super) fn complete_derive( | ||
13 | acc: &mut Completions, | ||
14 | ctx: &CompletionContext, | ||
15 | derive_input: ast::TokenTree, | ||
16 | ) { | ||
17 | if let Some(existing_derives) = super::parse_comma_sep_input(derive_input) { | ||
18 | for derive_completion in DEFAULT_DERIVE_COMPLETIONS | ||
19 | .iter() | ||
20 | .filter(|completion| !existing_derives.contains(completion.label)) | ||
21 | { | ||
22 | let mut components = vec![derive_completion.label]; | ||
23 | components.extend( | ||
24 | derive_completion | ||
25 | .dependencies | ||
26 | .iter() | ||
27 | .filter(|&&dependency| !existing_derives.contains(dependency)), | ||
28 | ); | ||
29 | let lookup = components.join(", "); | ||
30 | let label = components.iter().rev().join(", "); | ||
31 | let mut item = | ||
32 | CompletionItem::new(CompletionKind::Attribute, ctx.source_range(), label); | ||
33 | item.lookup_by(lookup).kind(CompletionItemKind::Attribute); | ||
34 | item.add_to(acc); | ||
35 | } | ||
36 | |||
37 | for custom_derive_name in get_derive_names_in_scope(ctx).difference(&existing_derives) { | ||
38 | let mut item = CompletionItem::new( | ||
39 | CompletionKind::Attribute, | ||
40 | ctx.source_range(), | ||
41 | custom_derive_name, | ||
42 | ); | ||
43 | item.kind(CompletionItemKind::Attribute); | ||
44 | item.add_to(acc); | ||
45 | } | ||
46 | } | ||
47 | } | ||
48 | |||
49 | fn get_derive_names_in_scope(ctx: &CompletionContext) -> FxHashSet<String> { | ||
50 | let mut result = FxHashSet::default(); | ||
51 | ctx.scope.process_all_names(&mut |name, scope_def| { | ||
52 | if let hir::ScopeDef::MacroDef(mac) = scope_def { | ||
53 | if mac.kind() == hir::MacroKind::Derive { | ||
54 | result.insert(name.to_string()); | ||
55 | } | ||
56 | } | ||
57 | }); | ||
58 | result | ||
59 | } | ||
60 | |||
61 | struct DeriveCompletion { | ||
62 | label: &'static str, | ||
63 | dependencies: &'static [&'static str], | ||
64 | } | ||
65 | |||
66 | /// Standard Rust derives and the information about their dependencies | ||
67 | /// (the dependencies are needed so that the main derive don't break the compilation when added) | ||
68 | const DEFAULT_DERIVE_COMPLETIONS: &[DeriveCompletion] = &[ | ||
69 | DeriveCompletion { label: "Clone", dependencies: &[] }, | ||
70 | DeriveCompletion { label: "Copy", dependencies: &["Clone"] }, | ||
71 | DeriveCompletion { label: "Debug", dependencies: &[] }, | ||
72 | DeriveCompletion { label: "Default", dependencies: &[] }, | ||
73 | DeriveCompletion { label: "Hash", dependencies: &[] }, | ||
74 | DeriveCompletion { label: "PartialEq", dependencies: &[] }, | ||
75 | DeriveCompletion { label: "Eq", dependencies: &["PartialEq"] }, | ||
76 | DeriveCompletion { label: "PartialOrd", dependencies: &["PartialEq"] }, | ||
77 | DeriveCompletion { label: "Ord", dependencies: &["PartialOrd", "Eq", "PartialEq"] }, | ||
78 | ]; | ||
79 | |||
80 | #[cfg(test)] | ||
81 | mod tests { | ||
82 | use expect_test::{expect, Expect}; | ||
83 | |||
84 | use crate::{test_utils::completion_list, CompletionKind}; | ||
85 | |||
86 | fn check(ra_fixture: &str, expect: Expect) { | ||
87 | let actual = completion_list(ra_fixture, CompletionKind::Attribute); | ||
88 | expect.assert_eq(&actual); | ||
89 | } | ||
90 | |||
91 | #[test] | ||
92 | fn no_completion_for_incorrect_derive() { | ||
93 | check(r#"#[derive{$0)] struct Test;"#, expect![[]]) | ||
94 | } | ||
95 | |||
96 | #[test] | ||
97 | fn empty_derive() { | ||
98 | check( | ||
99 | r#"#[derive($0)] struct Test;"#, | ||
100 | expect![[r#" | ||
101 | at Clone | ||
102 | at Clone, Copy | ||
103 | at Debug | ||
104 | at Default | ||
105 | at Hash | ||
106 | at PartialEq | ||
107 | at PartialEq, Eq | ||
108 | at PartialEq, PartialOrd | ||
109 | at PartialEq, Eq, PartialOrd, Ord | ||
110 | "#]], | ||
111 | ); | ||
112 | } | ||
113 | |||
114 | #[test] | ||
115 | fn derive_with_input() { | ||
116 | check( | ||
117 | r#"#[derive(serde::Serialize, PartialEq, $0)] struct Test;"#, | ||
118 | expect![[r#" | ||
119 | at Clone | ||
120 | at Clone, Copy | ||
121 | at Debug | ||
122 | at Default | ||
123 | at Hash | ||
124 | at Eq | ||
125 | at PartialOrd | ||
126 | at Eq, PartialOrd, Ord | ||
127 | "#]], | ||
128 | ) | ||
129 | } | ||
130 | |||
131 | #[test] | ||
132 | fn derive_with_input2() { | ||
133 | check( | ||
134 | r#"#[derive($0 serde::Serialize, PartialEq)] struct Test;"#, | ||
135 | expect![[r#" | ||
136 | at Clone | ||
137 | at Clone, Copy | ||
138 | at Debug | ||
139 | at Default | ||
140 | at Hash | ||
141 | at Eq | ||
142 | at PartialOrd | ||
143 | at Eq, PartialOrd, Ord | ||
144 | "#]], | ||
145 | ) | ||
146 | } | ||
147 | } | ||
diff --git a/crates/ide_completion/src/completions/attribute/lint.rs b/crates/ide_completion/src/completions/attribute/lint.rs new file mode 100644 index 000000000..403630dce --- /dev/null +++ b/crates/ide_completion/src/completions/attribute/lint.rs | |||
@@ -0,0 +1,187 @@ | |||
1 | //! Completion for lints | ||
2 | use syntax::ast; | ||
3 | |||
4 | use crate::{ | ||
5 | context::CompletionContext, | ||
6 | item::{CompletionItem, CompletionItemKind, CompletionKind}, | ||
7 | Completions, | ||
8 | }; | ||
9 | |||
10 | pub(super) fn complete_lint( | ||
11 | acc: &mut Completions, | ||
12 | ctx: &CompletionContext, | ||
13 | derive_input: ast::TokenTree, | ||
14 | lints_completions: &[LintCompletion], | ||
15 | ) { | ||
16 | if let Some(existing_lints) = super::parse_comma_sep_input(derive_input) { | ||
17 | for lint_completion in lints_completions | ||
18 | .into_iter() | ||
19 | .filter(|completion| !existing_lints.contains(completion.label)) | ||
20 | { | ||
21 | let mut item = CompletionItem::new( | ||
22 | CompletionKind::Attribute, | ||
23 | ctx.source_range(), | ||
24 | lint_completion.label, | ||
25 | ); | ||
26 | item.kind(CompletionItemKind::Attribute).detail(lint_completion.description); | ||
27 | item.add_to(acc) | ||
28 | } | ||
29 | } | ||
30 | } | ||
31 | |||
32 | pub(crate) struct LintCompletion { | ||
33 | pub(crate) label: &'static str, | ||
34 | pub(crate) description: &'static str, | ||
35 | } | ||
36 | |||
37 | #[rustfmt::skip] | ||
38 | pub(super) const DEFAULT_LINT_COMPLETIONS: &[LintCompletion] = &[ | ||
39 | LintCompletion { label: "absolute_paths_not_starting_with_crate", description: r#"fully qualified paths that start with a module name instead of `crate`, `self`, or an extern crate name"# }, | ||
40 | LintCompletion { label: "anonymous_parameters", description: r#"detects anonymous parameters"# }, | ||
41 | LintCompletion { label: "box_pointers", description: r#"use of owned (Box type) heap memory"# }, | ||
42 | LintCompletion { label: "deprecated_in_future", description: r#"detects use of items that will be deprecated in a future version"# }, | ||
43 | LintCompletion { label: "elided_lifetimes_in_paths", description: r#"hidden lifetime parameters in types are deprecated"# }, | ||
44 | LintCompletion { label: "explicit_outlives_requirements", description: r#"outlives requirements can be inferred"# }, | ||
45 | LintCompletion { label: "indirect_structural_match", description: r#"pattern with const indirectly referencing non-structural-match type"# }, | ||
46 | LintCompletion { label: "keyword_idents", description: r#"detects edition keywords being used as an identifier"# }, | ||
47 | LintCompletion { label: "macro_use_extern_crate", description: r#"the `#[macro_use]` attribute is now deprecated in favor of using macros via the module system"# }, | ||
48 | LintCompletion { label: "meta_variable_misuse", description: r#"possible meta-variable misuse at macro definition"# }, | ||
49 | LintCompletion { label: "missing_copy_implementations", description: r#"detects potentially-forgotten implementations of `Copy`"# }, | ||
50 | LintCompletion { label: "missing_crate_level_docs", description: r#"detects crates with no crate-level documentation"# }, | ||
51 | LintCompletion { label: "missing_debug_implementations", description: r#"detects missing implementations of Debug"# }, | ||
52 | LintCompletion { label: "missing_docs", description: r#"detects missing documentation for public members"# }, | ||
53 | LintCompletion { label: "missing_doc_code_examples", description: r#"detects publicly-exported items without code samples in their documentation"# }, | ||
54 | LintCompletion { label: "non_ascii_idents", description: r#"detects non-ASCII identifiers"# }, | ||
55 | LintCompletion { label: "private_doc_tests", description: r#"detects code samples in docs of private items not documented by rustdoc"# }, | ||
56 | LintCompletion { label: "single_use_lifetimes", description: r#"detects lifetime parameters that are only used once"# }, | ||
57 | LintCompletion { label: "trivial_casts", description: r#"detects trivial casts which could be removed"# }, | ||
58 | LintCompletion { label: "trivial_numeric_casts", description: r#"detects trivial casts of numeric types which could be removed"# }, | ||
59 | LintCompletion { label: "unaligned_references", description: r#"detects unaligned references to fields of packed structs"# }, | ||
60 | LintCompletion { label: "unreachable_pub", description: r#"`pub` items not reachable from crate root"# }, | ||
61 | LintCompletion { label: "unsafe_code", description: r#"usage of `unsafe` code"# }, | ||
62 | LintCompletion { label: "unsafe_op_in_unsafe_fn", description: r#"unsafe operations in unsafe functions without an explicit unsafe block are deprecated"# }, | ||
63 | LintCompletion { label: "unstable_features", description: r#"enabling unstable features (deprecated. do not use)"# }, | ||
64 | LintCompletion { label: "unused_crate_dependencies", description: r#"crate dependencies that are never used"# }, | ||
65 | LintCompletion { label: "unused_extern_crates", description: r#"extern crates that are never used"# }, | ||
66 | LintCompletion { label: "unused_import_braces", description: r#"unnecessary braces around an imported item"# }, | ||
67 | LintCompletion { label: "unused_lifetimes", description: r#"detects lifetime parameters that are never used"# }, | ||
68 | LintCompletion { label: "unused_qualifications", description: r#"detects unnecessarily qualified names"# }, | ||
69 | LintCompletion { label: "unused_results", description: r#"unused result of an expression in a statement"# }, | ||
70 | LintCompletion { label: "variant_size_differences", description: r#"detects enums with widely varying variant sizes"# }, | ||
71 | LintCompletion { label: "array_into_iter", description: r#"detects calling `into_iter` on arrays"# }, | ||
72 | LintCompletion { label: "asm_sub_register", description: r#"using only a subset of a register for inline asm inputs"# }, | ||
73 | LintCompletion { label: "bare_trait_objects", description: r#"suggest using `dyn Trait` for trait objects"# }, | ||
74 | LintCompletion { label: "bindings_with_variant_name", description: r#"detects pattern bindings with the same name as one of the matched variants"# }, | ||
75 | LintCompletion { label: "cenum_impl_drop_cast", description: r#"a C-like enum implementing Drop is cast"# }, | ||
76 | LintCompletion { label: "clashing_extern_declarations", description: r#"detects when an extern fn has been declared with the same name but different types"# }, | ||
77 | LintCompletion { label: "coherence_leak_check", description: r#"distinct impls distinguished only by the leak-check code"# }, | ||
78 | LintCompletion { label: "confusable_idents", description: r#"detects visually confusable pairs between identifiers"# }, | ||
79 | LintCompletion { label: "dead_code", description: r#"detect unused, unexported items"# }, | ||
80 | LintCompletion { label: "deprecated", description: r#"detects use of deprecated items"# }, | ||
81 | LintCompletion { label: "ellipsis_inclusive_range_patterns", description: r#"`...` range patterns are deprecated"# }, | ||
82 | LintCompletion { label: "exported_private_dependencies", description: r#"public interface leaks type from a private dependency"# }, | ||
83 | LintCompletion { label: "illegal_floating_point_literal_pattern", description: r#"floating-point literals cannot be used in patterns"# }, | ||
84 | LintCompletion { label: "improper_ctypes", description: r#"proper use of libc types in foreign modules"# }, | ||
85 | LintCompletion { label: "improper_ctypes_definitions", description: r#"proper use of libc types in foreign item definitions"# }, | ||
86 | LintCompletion { label: "incomplete_features", description: r#"incomplete features that may function improperly in some or all cases"# }, | ||
87 | LintCompletion { label: "inline_no_sanitize", description: r#"detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`"# }, | ||
88 | LintCompletion { label: "intra_doc_link_resolution_failure", description: r#"failures in resolving intra-doc link targets"# }, | ||
89 | LintCompletion { label: "invalid_codeblock_attributes", description: r#"codeblock attribute looks a lot like a known one"# }, | ||
90 | LintCompletion { label: "invalid_value", description: r#"an invalid value is being created (such as a NULL reference)"# }, | ||
91 | LintCompletion { label: "irrefutable_let_patterns", description: r#"detects irrefutable patterns in if-let and while-let statements"# }, | ||
92 | LintCompletion { label: "late_bound_lifetime_arguments", description: r#"detects generic lifetime arguments in path segments with late bound lifetime parameters"# }, | ||
93 | LintCompletion { label: "mixed_script_confusables", description: r#"detects Unicode scripts whose mixed script confusables codepoints are solely used"# }, | ||
94 | LintCompletion { label: "mutable_borrow_reservation_conflict", description: r#"reservation of a two-phased borrow conflicts with other shared borrows"# }, | ||
95 | LintCompletion { label: "non_camel_case_types", description: r#"types, variants, traits and type parameters should have camel case names"# }, | ||
96 | LintCompletion { label: "non_shorthand_field_patterns", description: r#"using `Struct { x: x }` instead of `Struct { x }` in a pattern"# }, | ||
97 | LintCompletion { label: "non_snake_case", description: r#"variables, methods, functions, lifetime parameters and modules should have snake case names"# }, | ||
98 | LintCompletion { label: "non_upper_case_globals", description: r#"static constants should have uppercase identifiers"# }, | ||
99 | LintCompletion { label: "no_mangle_generic_items", description: r#"generic items must be mangled"# }, | ||
100 | LintCompletion { label: "overlapping_patterns", description: r#"detects overlapping patterns"# }, | ||
101 | LintCompletion { label: "path_statements", description: r#"path statements with no effect"# }, | ||
102 | LintCompletion { label: "private_in_public", description: r#"detect private items in public interfaces not caught by the old implementation"# }, | ||
103 | LintCompletion { label: "proc_macro_derive_resolution_fallback", description: r#"detects proc macro derives using inaccessible names from parent modules"# }, | ||
104 | LintCompletion { label: "redundant_semicolons", description: r#"detects unnecessary trailing semicolons"# }, | ||
105 | LintCompletion { label: "renamed_and_removed_lints", description: r#"lints that have been renamed or removed"# }, | ||
106 | LintCompletion { label: "safe_packed_borrows", description: r#"safe borrows of fields of packed structs were erroneously allowed"# }, | ||
107 | LintCompletion { label: "stable_features", description: r#"stable features found in `#[feature]` directive"# }, | ||
108 | LintCompletion { label: "trivial_bounds", description: r#"these bounds don't depend on an type parameters"# }, | ||
109 | LintCompletion { label: "type_alias_bounds", description: r#"bounds in type aliases are not enforced"# }, | ||
110 | LintCompletion { label: "tyvar_behind_raw_pointer", description: r#"raw pointer to an inference variable"# }, | ||
111 | LintCompletion { label: "uncommon_codepoints", description: r#"detects uncommon Unicode codepoints in identifiers"# }, | ||
112 | LintCompletion { label: "unconditional_recursion", description: r#"functions that cannot return without calling themselves"# }, | ||
113 | LintCompletion { label: "unknown_lints", description: r#"unrecognized lint attribute"# }, | ||
114 | LintCompletion { label: "unnameable_test_items", description: r#"detects an item that cannot be named being marked as `#[test_case]`"# }, | ||
115 | LintCompletion { label: "unreachable_code", description: r#"detects unreachable code paths"# }, | ||
116 | LintCompletion { label: "unreachable_patterns", description: r#"detects unreachable patterns"# }, | ||
117 | LintCompletion { label: "unstable_name_collisions", description: r#"detects name collision with an existing but unstable method"# }, | ||
118 | LintCompletion { label: "unused_allocation", description: r#"detects unnecessary allocations that can be eliminated"# }, | ||
119 | LintCompletion { label: "unused_assignments", description: r#"detect assignments that will never be read"# }, | ||
120 | LintCompletion { label: "unused_attributes", description: r#"detects attributes that were not used by the compiler"# }, | ||
121 | LintCompletion { label: "unused_braces", description: r#"unnecessary braces around an expression"# }, | ||
122 | LintCompletion { label: "unused_comparisons", description: r#"comparisons made useless by limits of the types involved"# }, | ||
123 | LintCompletion { label: "unused_doc_comments", description: r#"detects doc comments that aren't used by rustdoc"# }, | ||
124 | LintCompletion { label: "unused_features", description: r#"unused features found in crate-level `#[feature]` directives"# }, | ||
125 | LintCompletion { label: "unused_imports", description: r#"imports that are never used"# }, | ||
126 | LintCompletion { label: "unused_labels", description: r#"detects labels that are never used"# }, | ||
127 | LintCompletion { label: "unused_macros", description: r#"detects macros that were not used"# }, | ||
128 | LintCompletion { label: "unused_must_use", description: r#"unused result of a type flagged as `#[must_use]`"# }, | ||
129 | LintCompletion { label: "unused_mut", description: r#"detect mut variables which don't need to be mutable"# }, | ||
130 | LintCompletion { label: "unused_parens", description: r#"`if`, `match`, `while` and `return` do not need parentheses"# }, | ||
131 | LintCompletion { label: "unused_unsafe", description: r#"unnecessary use of an `unsafe` block"# }, | ||
132 | LintCompletion { label: "unused_variables", description: r#"detect variables which are not used in any way"# }, | ||
133 | LintCompletion { label: "warnings", description: r#"mass-change the level for lints which produce warnings"# }, | ||
134 | LintCompletion { label: "where_clauses_object_safety", description: r#"checks the object safety of where clauses"# }, | ||
135 | LintCompletion { label: "while_true", description: r#"suggest using `loop { }` instead of `while true { }`"# }, | ||
136 | LintCompletion { label: "ambiguous_associated_items", description: r#"ambiguous associated items"# }, | ||
137 | LintCompletion { label: "arithmetic_overflow", description: r#"arithmetic operation overflows"# }, | ||
138 | LintCompletion { label: "conflicting_repr_hints", description: r#"conflicts between `#[repr(..)]` hints that were previously accepted and used in practice"# }, | ||
139 | LintCompletion { label: "const_err", description: r#"constant evaluation detected erroneous expression"# }, | ||
140 | LintCompletion { label: "ill_formed_attribute_input", description: r#"ill-formed attribute inputs that were previously accepted and used in practice"# }, | ||
141 | LintCompletion { label: "incomplete_include", description: r#"trailing content in included file"# }, | ||
142 | LintCompletion { label: "invalid_type_param_default", description: r#"type parameter default erroneously allowed in invalid location"# }, | ||
143 | LintCompletion { label: "macro_expanded_macro_exports_accessed_by_absolute_paths", description: r#"macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths"# }, | ||
144 | LintCompletion { label: "missing_fragment_specifier", description: r#"detects missing fragment specifiers in unused `macro_rules!` patterns"# }, | ||
145 | LintCompletion { label: "mutable_transmutes", description: r#"mutating transmuted &mut T from &T may cause undefined behavior"# }, | ||
146 | LintCompletion { label: "no_mangle_const_items", description: r#"const items will not have their symbols exported"# }, | ||
147 | LintCompletion { label: "order_dependent_trait_objects", description: r#"trait-object types were treated as different depending on marker-trait order"# }, | ||
148 | LintCompletion { label: "overflowing_literals", description: r#"literal out of range for its type"# }, | ||
149 | LintCompletion { label: "patterns_in_fns_without_body", description: r#"patterns in functions without body were erroneously allowed"# }, | ||
150 | LintCompletion { label: "pub_use_of_private_extern_crate", description: r#"detect public re-exports of private extern crates"# }, | ||
151 | LintCompletion { label: "soft_unstable", description: r#"a feature gate that doesn't break dependent crates"# }, | ||
152 | LintCompletion { label: "unconditional_panic", description: r#"operation will cause a panic at runtime"# }, | ||
153 | LintCompletion { label: "unknown_crate_types", description: r#"unknown crate type found in `#[crate_type]` directive"# }, | ||
154 | ]; | ||
155 | |||
156 | #[cfg(test)] | ||
157 | mod tests { | ||
158 | |||
159 | use crate::test_utils::check_edit; | ||
160 | |||
161 | #[test] | ||
162 | fn check_empty() { | ||
163 | check_edit( | ||
164 | "deprecated", | ||
165 | r#"#[allow($0)] struct Test;"#, | ||
166 | r#"#[allow(deprecated)] struct Test;"#, | ||
167 | ) | ||
168 | } | ||
169 | |||
170 | #[test] | ||
171 | fn check_with_existing() { | ||
172 | check_edit( | ||
173 | "deprecated", | ||
174 | r#"#[allow(keyword_idents, $0)] struct Test;"#, | ||
175 | r#"#[allow(keyword_idents, deprecated)] struct Test;"#, | ||
176 | ) | ||
177 | } | ||
178 | |||
179 | #[test] | ||
180 | fn check_qualified() { | ||
181 | check_edit( | ||
182 | "deprecated", | ||
183 | r#"#[allow(keyword_idents, $0)] struct Test;"#, | ||
184 | r#"#[allow(keyword_idents, deprecated)] struct Test;"#, | ||
185 | ) | ||
186 | } | ||
187 | } | ||
diff --git a/crates/ide_completion/src/completions/dot.rs b/crates/ide_completion/src/completions/dot.rs index fd9738743..302c9ccbd 100644 --- a/crates/ide_completion/src/completions/dot.rs +++ b/crates/ide_completion/src/completions/dot.rs | |||
@@ -1,6 +1,7 @@ | |||
1 | //! Completes references after dot (fields and method calls). | 1 | //! Completes references after dot (fields and method calls). |
2 | 2 | ||
3 | use hir::{HasVisibility, Type}; | 3 | use either::Either; |
4 | use hir::{HasVisibility, ScopeDef}; | ||
4 | use rustc_hash::FxHashSet; | 5 | use rustc_hash::FxHashSet; |
5 | 6 | ||
6 | use crate::{context::CompletionContext, Completions}; | 7 | use crate::{context::CompletionContext, Completions}; |
@@ -9,7 +10,7 @@ use crate::{context::CompletionContext, Completions}; | |||
9 | pub(crate) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) { | 10 | pub(crate) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) { |
10 | let dot_receiver = match &ctx.dot_receiver { | 11 | let dot_receiver = match &ctx.dot_receiver { |
11 | Some(expr) => expr, | 12 | Some(expr) => expr, |
12 | _ => return, | 13 | _ => return complete_undotted_self(acc, ctx), |
13 | }; | 14 | }; |
14 | 15 | ||
15 | let receiver_ty = match ctx.sema.type_of_expr(&dot_receiver) { | 16 | let receiver_ty = match ctx.sema.type_of_expr(&dot_receiver) { |
@@ -20,12 +21,43 @@ pub(crate) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) { | |||
20 | if ctx.is_call { | 21 | if ctx.is_call { |
21 | cov_mark::hit!(test_no_struct_field_completion_for_method_call); | 22 | cov_mark::hit!(test_no_struct_field_completion_for_method_call); |
22 | } else { | 23 | } else { |
23 | complete_fields(acc, ctx, &receiver_ty); | 24 | complete_fields(ctx, &receiver_ty, |field, ty| match field { |
25 | Either::Left(field) => acc.add_field(ctx, None, field, &ty), | ||
26 | Either::Right(tuple_idx) => acc.add_tuple_field(ctx, None, tuple_idx, &ty), | ||
27 | }); | ||
24 | } | 28 | } |
25 | complete_methods(acc, ctx, &receiver_ty); | 29 | complete_methods(ctx, &receiver_ty, |func| acc.add_method(ctx, func, None, None)); |
30 | } | ||
31 | |||
32 | fn complete_undotted_self(acc: &mut Completions, ctx: &CompletionContext) { | ||
33 | if !ctx.is_trivial_path || !ctx.config.enable_self_on_the_fly { | ||
34 | return; | ||
35 | } | ||
36 | ctx.scope.process_all_names(&mut |name, def| { | ||
37 | if let ScopeDef::Local(local) = &def { | ||
38 | if local.is_self(ctx.db) { | ||
39 | let ty = local.ty(ctx.db); | ||
40 | complete_fields(ctx, &ty, |field, ty| match field { | ||
41 | either::Either::Left(field) => { | ||
42 | acc.add_field(ctx, Some(name.clone()), field, &ty) | ||
43 | } | ||
44 | either::Either::Right(tuple_idx) => { | ||
45 | acc.add_tuple_field(ctx, Some(name.clone()), tuple_idx, &ty) | ||
46 | } | ||
47 | }); | ||
48 | complete_methods(ctx, &ty, |func| { | ||
49 | acc.add_method(ctx, func, Some(name.clone()), None) | ||
50 | }); | ||
51 | } | ||
52 | } | ||
53 | }); | ||
26 | } | 54 | } |
27 | 55 | ||
28 | fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: &Type) { | 56 | fn complete_fields( |
57 | ctx: &CompletionContext, | ||
58 | receiver: &hir::Type, | ||
59 | mut f: impl FnMut(Either<hir::Field, usize>, hir::Type), | ||
60 | ) { | ||
29 | for receiver in receiver.autoderef(ctx.db) { | 61 | for receiver in receiver.autoderef(ctx.db) { |
30 | for (field, ty) in receiver.fields(ctx.db) { | 62 | for (field, ty) in receiver.fields(ctx.db) { |
31 | if ctx.scope.module().map_or(false, |m| !field.is_visible_from(ctx.db, m)) { | 63 | if ctx.scope.module().map_or(false, |m| !field.is_visible_from(ctx.db, m)) { |
@@ -33,16 +65,20 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: &Ty | |||
33 | // field is editable, we should show the completion | 65 | // field is editable, we should show the completion |
34 | continue; | 66 | continue; |
35 | } | 67 | } |
36 | acc.add_field(ctx, field, &ty); | 68 | f(Either::Left(field), ty); |
37 | } | 69 | } |
38 | for (i, ty) in receiver.tuple_fields(ctx.db).into_iter().enumerate() { | 70 | for (i, ty) in receiver.tuple_fields(ctx.db).into_iter().enumerate() { |
39 | // FIXME: Handle visibility | 71 | // FIXME: Handle visibility |
40 | acc.add_tuple_field(ctx, i, &ty); | 72 | f(Either::Right(i), ty); |
41 | } | 73 | } |
42 | } | 74 | } |
43 | } | 75 | } |
44 | 76 | ||
45 | fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: &Type) { | 77 | fn complete_methods( |
78 | ctx: &CompletionContext, | ||
79 | receiver: &hir::Type, | ||
80 | mut f: impl FnMut(hir::Function), | ||
81 | ) { | ||
46 | if let Some(krate) = ctx.krate { | 82 | if let Some(krate) = ctx.krate { |
47 | let mut seen_methods = FxHashSet::default(); | 83 | let mut seen_methods = FxHashSet::default(); |
48 | let traits_in_scope = ctx.scope.traits_in_scope(); | 84 | let traits_in_scope = ctx.scope.traits_in_scope(); |
@@ -51,7 +87,7 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: &T | |||
51 | && ctx.scope.module().map_or(true, |m| func.is_visible_from(ctx.db, m)) | 87 | && ctx.scope.module().map_or(true, |m| func.is_visible_from(ctx.db, m)) |
52 | && seen_methods.insert(func.name(ctx.db)) | 88 | && seen_methods.insert(func.name(ctx.db)) |
53 | { | 89 | { |
54 | acc.add_method(ctx, func, None); | 90 | f(func); |
55 | } | 91 | } |
56 | None::<()> | 92 | None::<()> |
57 | }); | 93 | }); |
@@ -484,4 +520,34 @@ impl S { | |||
484 | "#]], | 520 | "#]], |
485 | ); | 521 | ); |
486 | } | 522 | } |
523 | |||
524 | #[test] | ||
525 | fn completes_bare_fields_and_methods_in_methods() { | ||
526 | check( | ||
527 | r#" | ||
528 | struct Foo { field: i32 } | ||
529 | |||
530 | impl Foo { fn foo(&self) { $0 } }"#, | ||
531 | expect![[r#" | ||
532 | lc self &Foo | ||
533 | sp Self | ||
534 | st Foo | ||
535 | fd self.field i32 | ||
536 | me self.foo() fn(&self) | ||
537 | "#]], | ||
538 | ); | ||
539 | check( | ||
540 | r#" | ||
541 | struct Foo(i32); | ||
542 | |||
543 | impl Foo { fn foo(&mut self) { $0 } }"#, | ||
544 | expect![[r#" | ||
545 | lc self &mut Foo | ||
546 | sp Self | ||
547 | st Foo | ||
548 | fd self.0 i32 | ||
549 | me self.foo() fn(&mut self) | ||
550 | "#]], | ||
551 | ); | ||
552 | } | ||
487 | } | 553 | } |
diff --git a/crates/ide_completion/src/completions/flyimport.rs b/crates/ide_completion/src/completions/flyimport.rs index 9d5b61562..df27e7a84 100644 --- a/crates/ide_completion/src/completions/flyimport.rs +++ b/crates/ide_completion/src/completions/flyimport.rs | |||
@@ -111,11 +111,9 @@ pub(crate) fn import_on_the_fly(acc: &mut Completions, ctx: &CompletionContext) | |||
111 | return None; | 111 | return None; |
112 | } | 112 | } |
113 | if ctx.use_item_syntax.is_some() | 113 | if ctx.use_item_syntax.is_some() |
114 | || ctx.attribute_under_caret.is_some() | 114 | || ctx.is_path_disallowed() |
115 | || ctx.mod_declaration_under_caret.is_some() | 115 | || ctx.expects_item() |
116 | || ctx.record_lit_syntax.is_some() | 116 | || ctx.expects_assoc_item() |
117 | || ctx.has_trait_parent | ||
118 | || ctx.has_impl_parent | ||
119 | { | 117 | { |
120 | return None; | 118 | return None; |
121 | } | 119 | } |
diff --git a/crates/ide_completion/src/completions/fn_param.rs b/crates/ide_completion/src/completions/fn_param.rs index 0ea558489..cb90e8a3e 100644 --- a/crates/ide_completion/src/completions/fn_param.rs +++ b/crates/ide_completion/src/completions/fn_param.rs | |||
@@ -128,4 +128,19 @@ fn outer(text: String) { | |||
128 | "#]], | 128 | "#]], |
129 | ) | 129 | ) |
130 | } | 130 | } |
131 | |||
132 | #[test] | ||
133 | fn completes_non_ident_pat_param() { | ||
134 | check( | ||
135 | r#" | ||
136 | struct Bar { bar: u32 } | ||
137 | |||
138 | fn foo(Bar { bar }: Bar) {} | ||
139 | fn foo2($0) {} | ||
140 | "#, | ||
141 | expect![[r#" | ||
142 | bn Bar { bar }: Bar | ||
143 | "#]], | ||
144 | ) | ||
145 | } | ||
131 | } | 146 | } |
diff --git a/crates/ide_completion/src/completions/keyword.rs b/crates/ide_completion/src/completions/keyword.rs index 61b667104..0d035c611 100644 --- a/crates/ide_completion/src/completions/keyword.rs +++ b/crates/ide_completion/src/completions/keyword.rs | |||
@@ -2,9 +2,12 @@ | |||
2 | 2 | ||
3 | use std::iter; | 3 | use std::iter; |
4 | 4 | ||
5 | use syntax::SyntaxKind; | 5 | use syntax::{SyntaxKind, T}; |
6 | 6 | ||
7 | use crate::{CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions}; | 7 | use crate::{ |
8 | patterns::ImmediateLocation, CompletionContext, CompletionItem, CompletionItemKind, | ||
9 | CompletionKind, Completions, | ||
10 | }; | ||
8 | 11 | ||
9 | pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) { | 12 | pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) { |
10 | // complete keyword "crate" in use stmt | 13 | // complete keyword "crate" in use stmt |
@@ -44,111 +47,105 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte | |||
44 | cov_mark::hit!(no_keyword_completion_in_comments); | 47 | cov_mark::hit!(no_keyword_completion_in_comments); |
45 | return; | 48 | return; |
46 | } | 49 | } |
47 | if ctx.record_lit_syntax.is_some() { | 50 | if matches!(ctx.completion_location, Some(ImmediateLocation::RecordExpr(_))) { |
48 | cov_mark::hit!(no_keyword_completion_in_record_lit); | 51 | cov_mark::hit!(no_keyword_completion_in_record_lit); |
49 | return; | 52 | return; |
50 | } | 53 | } |
54 | let mut add_keyword = |kw, snippet| add_keyword(ctx, acc, kw, snippet); | ||
51 | 55 | ||
52 | let has_trait_or_impl_parent = ctx.has_impl_parent || ctx.has_trait_parent; | 56 | let expects_assoc_item = ctx.expects_assoc_item(); |
53 | if ctx.trait_as_prev_sibling || ctx.impl_as_prev_sibling { | 57 | let has_block_expr_parent = ctx.has_block_expr_parent(); |
54 | add_keyword(ctx, acc, "where", "where "); | 58 | let expects_item = ctx.expects_item(); |
59 | |||
60 | if ctx.has_impl_or_trait_prev_sibling() { | ||
61 | add_keyword("where", "where "); | ||
55 | return; | 62 | return; |
56 | } | 63 | } |
57 | if ctx.unsafe_is_prev { | 64 | if ctx.previous_token_is(T![unsafe]) { |
58 | if ctx.has_item_list_or_source_file_parent || ctx.block_expr_parent { | 65 | if expects_item || expects_assoc_item || has_block_expr_parent { |
59 | add_keyword(ctx, acc, "fn", "fn $0() {}") | 66 | add_keyword("fn", "fn $1($2) {\n $0\n}") |
60 | } | 67 | } |
61 | 68 | ||
62 | if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent { | 69 | if expects_item || has_block_expr_parent { |
63 | add_keyword(ctx, acc, "trait", "trait $0 {}"); | 70 | add_keyword("trait", "trait $1 {\n $0\n}"); |
64 | add_keyword(ctx, acc, "impl", "impl $0 {}"); | 71 | add_keyword("impl", "impl $1 {\n $0\n}"); |
65 | } | 72 | } |
66 | 73 | ||
67 | return; | 74 | return; |
68 | } | 75 | } |
69 | if ctx.has_item_list_or_source_file_parent || has_trait_or_impl_parent || ctx.block_expr_parent | ||
70 | { | ||
71 | add_keyword(ctx, acc, "fn", "fn $0() {}"); | ||
72 | } | ||
73 | if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent { | ||
74 | add_keyword(ctx, acc, "use", "use "); | ||
75 | add_keyword(ctx, acc, "impl", "impl $0 {}"); | ||
76 | add_keyword(ctx, acc, "trait", "trait $0 {}"); | ||
77 | } | ||
78 | 76 | ||
79 | if ctx.has_item_list_or_source_file_parent { | 77 | if expects_item || ctx.expects_non_trait_assoc_item() || ctx.expect_record_field() { |
80 | add_keyword(ctx, acc, "enum", "enum $0 {}"); | 78 | add_keyword("pub(crate)", "pub(crate) "); |
81 | add_keyword(ctx, acc, "struct", "struct $0"); | 79 | add_keyword("pub", "pub "); |
82 | add_keyword(ctx, acc, "union", "union $0 {}"); | ||
83 | } | 80 | } |
84 | 81 | ||
85 | if ctx.is_expr { | 82 | if expects_item || expects_assoc_item || has_block_expr_parent { |
86 | add_keyword(ctx, acc, "match", "match $0 {}"); | 83 | add_keyword("unsafe", "unsafe "); |
87 | add_keyword(ctx, acc, "while", "while $0 {}"); | 84 | add_keyword("fn", "fn $1($2) {\n $0\n}"); |
88 | add_keyword(ctx, acc, "while let", "while let $1 = $0 {}"); | 85 | add_keyword("const", "const $0"); |
89 | add_keyword(ctx, acc, "loop", "loop {$0}"); | 86 | add_keyword("type", "type $0"); |
90 | add_keyword(ctx, acc, "if", "if $0 {}"); | ||
91 | add_keyword(ctx, acc, "if let", "if let $1 = $0 {}"); | ||
92 | add_keyword(ctx, acc, "for", "for $1 in $0 {}"); | ||
93 | } | 87 | } |
94 | 88 | ||
95 | if ctx.if_is_prev || ctx.block_expr_parent { | 89 | if expects_item || has_block_expr_parent { |
96 | add_keyword(ctx, acc, "let", "let "); | 90 | add_keyword("use", "use $0"); |
91 | add_keyword("impl", "impl $1 {\n $0\n}"); | ||
92 | add_keyword("trait", "trait $1 {\n $0\n}"); | ||
93 | add_keyword("static", "static $0"); | ||
94 | add_keyword("extern", "extern $0"); | ||
95 | add_keyword("mod", "mod $0"); | ||
97 | } | 96 | } |
98 | 97 | ||
99 | if ctx.after_if { | 98 | if expects_item { |
100 | add_keyword(ctx, acc, "else", "else {$0}"); | 99 | add_keyword("enum", "enum $1 {\n $0\n}"); |
101 | add_keyword(ctx, acc, "else if", "else if $0 {}"); | 100 | add_keyword("struct", "struct $0"); |
102 | } | 101 | add_keyword("union", "union $1 {\n $0\n}"); |
103 | if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent { | ||
104 | add_keyword(ctx, acc, "mod", "mod $0"); | ||
105 | } | 102 | } |
106 | if ctx.bind_pat_parent || ctx.ref_pat_parent { | 103 | |
107 | add_keyword(ctx, acc, "mut", "mut "); | 104 | if ctx.expects_expression() { |
105 | if !has_block_expr_parent { | ||
106 | add_keyword("unsafe", "unsafe {\n $0\n}"); | ||
107 | } | ||
108 | add_keyword("match", "match $1 {\n $0\n}"); | ||
109 | add_keyword("while", "while $1 {\n $0\n}"); | ||
110 | add_keyword("while let", "while let $1 = $2 {\n $0\n}"); | ||
111 | add_keyword("loop", "loop {\n $0\n}"); | ||
112 | add_keyword("if", "if $1 {\n $0\n}"); | ||
113 | add_keyword("if let", "if let $1 = $2 {\n $0\n}"); | ||
114 | add_keyword("for", "for $1 in $2 {\n $0\n}"); | ||
108 | } | 115 | } |
109 | if ctx.has_item_list_or_source_file_parent || has_trait_or_impl_parent || ctx.block_expr_parent | 116 | |
110 | { | 117 | if ctx.previous_token_is(T![if]) || ctx.previous_token_is(T![while]) || has_block_expr_parent { |
111 | add_keyword(ctx, acc, "const", "const "); | 118 | add_keyword("let", "let "); |
112 | add_keyword(ctx, acc, "type", "type "); | ||
113 | } | 119 | } |
114 | if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent { | 120 | |
115 | add_keyword(ctx, acc, "static", "static "); | 121 | if ctx.after_if() { |
116 | }; | 122 | add_keyword("else", "else {\n $0\n}"); |
117 | if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent { | 123 | add_keyword("else if", "else if $1 {\n $0\n}"); |
118 | add_keyword(ctx, acc, "extern", "extern "); | ||
119 | } | 124 | } |
120 | if ctx.has_item_list_or_source_file_parent | 125 | |
121 | || has_trait_or_impl_parent | 126 | if ctx.expects_ident_pat_or_ref_expr() { |
122 | || ctx.block_expr_parent | 127 | add_keyword("mut", "mut "); |
123 | || ctx.is_match_arm | ||
124 | { | ||
125 | add_keyword(ctx, acc, "unsafe", "unsafe "); | ||
126 | } | 128 | } |
129 | |||
127 | if ctx.in_loop_body { | 130 | if ctx.in_loop_body { |
128 | if ctx.can_be_stmt { | 131 | if ctx.can_be_stmt { |
129 | add_keyword(ctx, acc, "continue", "continue;"); | 132 | add_keyword("continue", "continue;"); |
130 | add_keyword(ctx, acc, "break", "break;"); | 133 | add_keyword("break", "break;"); |
131 | } else { | 134 | } else { |
132 | add_keyword(ctx, acc, "continue", "continue"); | 135 | add_keyword("continue", "continue"); |
133 | add_keyword(ctx, acc, "break", "break"); | 136 | add_keyword("break", "break"); |
134 | } | 137 | } |
135 | } | 138 | } |
136 | if ctx.has_item_list_or_source_file_parent || ctx.has_impl_parent | ctx.has_field_list_parent { | ||
137 | add_keyword(ctx, acc, "pub(crate)", "pub(crate) "); | ||
138 | add_keyword(ctx, acc, "pub", "pub "); | ||
139 | } | ||
140 | 139 | ||
141 | if !ctx.is_trivial_path { | 140 | if !ctx.is_trivial_path { |
142 | return; | 141 | return; |
143 | } | 142 | } |
144 | let fn_def = match &ctx.function_syntax { | 143 | let fn_def = match &ctx.function_def { |
145 | Some(it) => it, | 144 | Some(it) => it, |
146 | None => return, | 145 | None => return, |
147 | }; | 146 | }; |
148 | 147 | ||
149 | add_keyword( | 148 | add_keyword( |
150 | ctx, | ||
151 | acc, | ||
152 | "return", | 149 | "return", |
153 | match (ctx.can_be_stmt, fn_def.ret_type().is_some()) { | 150 | match (ctx.can_be_stmt, fn_def.ret_type().is_some()) { |
154 | (true, true) => "return $0;", | 151 | (true, true) => "return $0;", |
@@ -165,15 +162,12 @@ fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet | |||
165 | 162 | ||
166 | match ctx.config.snippet_cap { | 163 | match ctx.config.snippet_cap { |
167 | Some(cap) => { | 164 | Some(cap) => { |
168 | let tmp; | 165 | if snippet.ends_with('}') && ctx.incomplete_let { |
169 | let snippet = if snippet.ends_with('}') && ctx.incomplete_let { | ||
170 | cov_mark::hit!(let_semi); | 166 | cov_mark::hit!(let_semi); |
171 | tmp = format!("{};", snippet); | 167 | item.insert_snippet(cap, format!("{};", snippet)); |
172 | &tmp | ||
173 | } else { | 168 | } else { |
174 | snippet | 169 | item.insert_snippet(cap, snippet); |
175 | }; | 170 | } |
176 | item.insert_snippet(cap, snippet); | ||
177 | } | 171 | } |
178 | None => { | 172 | None => { |
179 | item.insert_text(if snippet.contains('$') { kw } else { snippet }); | 173 | item.insert_text(if snippet.contains('$') { kw } else { snippet }); |
@@ -236,21 +230,21 @@ mod tests { | |||
236 | check( | 230 | check( |
237 | r"m$0", | 231 | r"m$0", |
238 | expect![[r#" | 232 | expect![[r#" |
233 | kw pub(crate) | ||
234 | kw pub | ||
235 | kw unsafe | ||
239 | kw fn | 236 | kw fn |
237 | kw const | ||
238 | kw type | ||
240 | kw use | 239 | kw use |
241 | kw impl | 240 | kw impl |
242 | kw trait | 241 | kw trait |
242 | kw static | ||
243 | kw extern | ||
244 | kw mod | ||
243 | kw enum | 245 | kw enum |
244 | kw struct | 246 | kw struct |
245 | kw union | 247 | kw union |
246 | kw mod | ||
247 | kw const | ||
248 | kw type | ||
249 | kw static | ||
250 | kw extern | ||
251 | kw unsafe | ||
252 | kw pub(crate) | ||
253 | kw pub | ||
254 | "#]], | 248 | "#]], |
255 | ); | 249 | ); |
256 | } | 250 | } |
@@ -260,10 +254,16 @@ mod tests { | |||
260 | check( | 254 | check( |
261 | r"fn quux() { $0 }", | 255 | r"fn quux() { $0 }", |
262 | expect![[r#" | 256 | expect![[r#" |
257 | kw unsafe | ||
263 | kw fn | 258 | kw fn |
259 | kw const | ||
260 | kw type | ||
264 | kw use | 261 | kw use |
265 | kw impl | 262 | kw impl |
266 | kw trait | 263 | kw trait |
264 | kw static | ||
265 | kw extern | ||
266 | kw mod | ||
267 | kw match | 267 | kw match |
268 | kw while | 268 | kw while |
269 | kw while let | 269 | kw while let |
@@ -272,12 +272,6 @@ mod tests { | |||
272 | kw if let | 272 | kw if let |
273 | kw for | 273 | kw for |
274 | kw let | 274 | kw let |
275 | kw mod | ||
276 | kw const | ||
277 | kw type | ||
278 | kw static | ||
279 | kw extern | ||
280 | kw unsafe | ||
281 | kw return | 275 | kw return |
282 | "#]], | 276 | "#]], |
283 | ); | 277 | ); |
@@ -288,10 +282,16 @@ mod tests { | |||
288 | check( | 282 | check( |
289 | r"fn quux() { if true { $0 } }", | 283 | r"fn quux() { if true { $0 } }", |
290 | expect![[r#" | 284 | expect![[r#" |
285 | kw unsafe | ||
291 | kw fn | 286 | kw fn |
287 | kw const | ||
288 | kw type | ||
292 | kw use | 289 | kw use |
293 | kw impl | 290 | kw impl |
294 | kw trait | 291 | kw trait |
292 | kw static | ||
293 | kw extern | ||
294 | kw mod | ||
295 | kw match | 295 | kw match |
296 | kw while | 296 | kw while |
297 | kw while let | 297 | kw while let |
@@ -300,12 +300,6 @@ mod tests { | |||
300 | kw if let | 300 | kw if let |
301 | kw for | 301 | kw for |
302 | kw let | 302 | kw let |
303 | kw mod | ||
304 | kw const | ||
305 | kw type | ||
306 | kw static | ||
307 | kw extern | ||
308 | kw unsafe | ||
309 | kw return | 303 | kw return |
310 | "#]], | 304 | "#]], |
311 | ); | 305 | ); |
@@ -316,10 +310,16 @@ mod tests { | |||
316 | check( | 310 | check( |
317 | r#"fn quux() { if true { () } $0 }"#, | 311 | r#"fn quux() { if true { () } $0 }"#, |
318 | expect![[r#" | 312 | expect![[r#" |
313 | kw unsafe | ||
319 | kw fn | 314 | kw fn |
315 | kw const | ||
316 | kw type | ||
320 | kw use | 317 | kw use |
321 | kw impl | 318 | kw impl |
322 | kw trait | 319 | kw trait |
320 | kw static | ||
321 | kw extern | ||
322 | kw mod | ||
323 | kw match | 323 | kw match |
324 | kw while | 324 | kw while |
325 | kw while let | 325 | kw while let |
@@ -330,19 +330,15 @@ mod tests { | |||
330 | kw let | 330 | kw let |
331 | kw else | 331 | kw else |
332 | kw else if | 332 | kw else if |
333 | kw mod | ||
334 | kw const | ||
335 | kw type | ||
336 | kw static | ||
337 | kw extern | ||
338 | kw unsafe | ||
339 | kw return | 333 | kw return |
340 | "#]], | 334 | "#]], |
341 | ); | 335 | ); |
342 | check_edit( | 336 | check_edit( |
343 | "else", | 337 | "else", |
344 | r#"fn quux() { if true { () } $0 }"#, | 338 | r#"fn quux() { if true { () } $0 }"#, |
345 | r#"fn quux() { if true { () } else {$0} }"#, | 339 | r#"fn quux() { if true { () } else { |
340 | $0 | ||
341 | } }"#, | ||
346 | ); | 342 | ); |
347 | } | 343 | } |
348 | 344 | ||
@@ -355,6 +351,7 @@ fn quux() -> i32 { | |||
355 | } | 351 | } |
356 | "#, | 352 | "#, |
357 | expect![[r#" | 353 | expect![[r#" |
354 | kw unsafe | ||
358 | kw match | 355 | kw match |
359 | kw while | 356 | kw while |
360 | kw while let | 357 | kw while let |
@@ -362,7 +359,6 @@ fn quux() -> i32 { | |||
362 | kw if | 359 | kw if |
363 | kw if let | 360 | kw if let |
364 | kw for | 361 | kw for |
365 | kw unsafe | ||
366 | kw return | 362 | kw return |
367 | "#]], | 363 | "#]], |
368 | ); | 364 | ); |
@@ -373,10 +369,10 @@ fn quux() -> i32 { | |||
373 | check( | 369 | check( |
374 | r"trait My { $0 }", | 370 | r"trait My { $0 }", |
375 | expect![[r#" | 371 | expect![[r#" |
372 | kw unsafe | ||
376 | kw fn | 373 | kw fn |
377 | kw const | 374 | kw const |
378 | kw type | 375 | kw type |
379 | kw unsafe | ||
380 | "#]], | 376 | "#]], |
381 | ); | 377 | ); |
382 | } | 378 | } |
@@ -386,12 +382,27 @@ fn quux() -> i32 { | |||
386 | check( | 382 | check( |
387 | r"impl My { $0 }", | 383 | r"impl My { $0 }", |
388 | expect![[r#" | 384 | expect![[r#" |
385 | kw pub(crate) | ||
386 | kw pub | ||
387 | kw unsafe | ||
389 | kw fn | 388 | kw fn |
390 | kw const | 389 | kw const |
391 | kw type | 390 | kw type |
392 | kw unsafe | 391 | "#]], |
392 | ); | ||
393 | } | ||
394 | |||
395 | #[test] | ||
396 | fn test_keywords_in_impl_def_with_attr() { | ||
397 | check( | ||
398 | r"impl My { #[foo] $0 }", | ||
399 | expect![[r#" | ||
393 | kw pub(crate) | 400 | kw pub(crate) |
394 | kw pub | 401 | kw pub |
402 | kw unsafe | ||
403 | kw fn | ||
404 | kw const | ||
405 | kw type | ||
395 | "#]], | 406 | "#]], |
396 | ); | 407 | ); |
397 | } | 408 | } |
@@ -401,10 +412,16 @@ fn quux() -> i32 { | |||
401 | check( | 412 | check( |
402 | r"fn my() { loop { $0 } }", | 413 | r"fn my() { loop { $0 } }", |
403 | expect![[r#" | 414 | expect![[r#" |
415 | kw unsafe | ||
404 | kw fn | 416 | kw fn |
417 | kw const | ||
418 | kw type | ||
405 | kw use | 419 | kw use |
406 | kw impl | 420 | kw impl |
407 | kw trait | 421 | kw trait |
422 | kw static | ||
423 | kw extern | ||
424 | kw mod | ||
408 | kw match | 425 | kw match |
409 | kw while | 426 | kw while |
410 | kw while let | 427 | kw while let |
@@ -413,12 +430,6 @@ fn quux() -> i32 { | |||
413 | kw if let | 430 | kw if let |
414 | kw for | 431 | kw for |
415 | kw let | 432 | kw let |
416 | kw mod | ||
417 | kw const | ||
418 | kw type | ||
419 | kw static | ||
420 | kw extern | ||
421 | kw unsafe | ||
422 | kw continue | 433 | kw continue |
423 | kw break | 434 | kw break |
424 | kw return | 435 | kw return |
@@ -565,6 +576,7 @@ pub mod future { | |||
565 | check( | 576 | check( |
566 | r#"fn main() { let _ = $0 }"#, | 577 | r#"fn main() { let _ = $0 }"#, |
567 | expect![[r#" | 578 | expect![[r#" |
579 | kw unsafe | ||
568 | kw match | 580 | kw match |
569 | kw while | 581 | kw while |
570 | kw while let | 582 | kw while let |
@@ -625,6 +637,7 @@ fn foo() { | |||
625 | } | 637 | } |
626 | "#, | 638 | "#, |
627 | expect![[r#" | 639 | expect![[r#" |
640 | kw unsafe | ||
628 | kw match | 641 | kw match |
629 | kw while | 642 | kw while |
630 | kw while let | 643 | kw while let |
@@ -646,7 +659,9 @@ fn foo() { | |||
646 | fn main() { let x = $0 } | 659 | fn main() { let x = $0 } |
647 | "#, | 660 | "#, |
648 | r#" | 661 | r#" |
649 | fn main() { let x = match $0 {}; } | 662 | fn main() { let x = match $1 { |
663 | $0 | ||
664 | }; } | ||
650 | "#, | 665 | "#, |
651 | ); | 666 | ); |
652 | 667 | ||
@@ -660,7 +675,9 @@ fn main() { | |||
660 | "#, | 675 | "#, |
661 | r#" | 676 | r#" |
662 | fn main() { | 677 | fn main() { |
663 | let x = if $0 {}; | 678 | let x = if $1 { |
679 | $0 | ||
680 | }; | ||
664 | let y = 92; | 681 | let y = 92; |
665 | } | 682 | } |
666 | "#, | 683 | "#, |
@@ -676,7 +693,9 @@ fn main() { | |||
676 | "#, | 693 | "#, |
677 | r#" | 694 | r#" |
678 | fn main() { | 695 | fn main() { |
679 | let x = loop {$0}; | 696 | let x = loop { |
697 | $0 | ||
698 | }; | ||
680 | bar(); | 699 | bar(); |
681 | } | 700 | } |
682 | "#, | 701 | "#, |
diff --git a/crates/ide_completion/src/completions/lifetime.rs b/crates/ide_completion/src/completions/lifetime.rs index 5eeddf7a4..8ccccb646 100644 --- a/crates/ide_completion/src/completions/lifetime.rs +++ b/crates/ide_completion/src/completions/lifetime.rs | |||
@@ -8,19 +8,23 @@ pub(crate) fn complete_lifetime(acc: &mut Completions, ctx: &CompletionContext) | |||
8 | if !ctx.lifetime_allowed { | 8 | if !ctx.lifetime_allowed { |
9 | return; | 9 | return; |
10 | } | 10 | } |
11 | let lp_string; | ||
11 | let param_lifetime = match ( | 12 | let param_lifetime = match ( |
12 | &ctx.lifetime_syntax, | 13 | &ctx.lifetime_syntax, |
13 | ctx.lifetime_param_syntax.as_ref().and_then(|lp| lp.lifetime()), | 14 | ctx.lifetime_param_syntax.as_ref().and_then(|lp| lp.lifetime()), |
14 | ) { | 15 | ) { |
15 | (Some(lt), Some(lp)) if lp == lt.clone() => return, | 16 | (Some(lt), Some(lp)) if lp == lt.clone() => return, |
16 | (Some(_), Some(lp)) => Some(lp.to_string()), | 17 | (Some(_), Some(lp)) => { |
18 | lp_string = lp.to_string(); | ||
19 | Some(&*lp_string) | ||
20 | } | ||
17 | _ => None, | 21 | _ => None, |
18 | }; | 22 | }; |
19 | 23 | ||
20 | ctx.scope.process_all_names(&mut |name, res| { | 24 | ctx.scope.process_all_names(&mut |name, res| { |
21 | if let ScopeDef::GenericParam(hir::GenericParam::LifetimeParam(_)) = res { | 25 | if let ScopeDef::GenericParam(hir::GenericParam::LifetimeParam(_)) = res { |
22 | if param_lifetime != Some(name.to_string()) { | 26 | if param_lifetime != Some(&*name.to_string()) { |
23 | acc.add_resolution(ctx, name.to_string(), &res); | 27 | acc.add_resolution(ctx, name, &res); |
24 | } | 28 | } |
25 | } | 29 | } |
26 | }); | 30 | }); |
@@ -36,7 +40,7 @@ pub(crate) fn complete_label(acc: &mut Completions, ctx: &CompletionContext) { | |||
36 | } | 40 | } |
37 | ctx.scope.process_all_names(&mut |name, res| { | 41 | ctx.scope.process_all_names(&mut |name, res| { |
38 | if let ScopeDef::Label(_) = res { | 42 | if let ScopeDef::Label(_) = res { |
39 | acc.add_resolution(ctx, name.to_string(), &res); | 43 | acc.add_resolution(ctx, name, &res); |
40 | } | 44 | } |
41 | }); | 45 | }); |
42 | } | 46 | } |
diff --git a/crates/ide_completion/src/completions/macro_in_item_position.rs b/crates/ide_completion/src/completions/macro_in_item_position.rs index 2be299ac2..202e71215 100644 --- a/crates/ide_completion/src/completions/macro_in_item_position.rs +++ b/crates/ide_completion/src/completions/macro_in_item_position.rs | |||
@@ -2,15 +2,22 @@ | |||
2 | 2 | ||
3 | use crate::{CompletionContext, Completions}; | 3 | use crate::{CompletionContext, Completions}; |
4 | 4 | ||
5 | // Ideally this should be removed and moved into `(un)qualified_path` respectively | ||
5 | pub(crate) fn complete_macro_in_item_position(acc: &mut Completions, ctx: &CompletionContext) { | 6 | pub(crate) fn complete_macro_in_item_position(acc: &mut Completions, ctx: &CompletionContext) { |
6 | // Show only macros in top level. | 7 | // Show only macros in top level. |
7 | if ctx.is_new_item { | 8 | if !ctx.is_new_item { |
8 | ctx.scope.process_all_names(&mut |name, res| { | 9 | return; |
9 | if let hir::ScopeDef::MacroDef(mac) = res { | ||
10 | acc.add_macro(ctx, Some(name.to_string()), mac); | ||
11 | } | ||
12 | }) | ||
13 | } | 10 | } |
11 | |||
12 | ctx.scope.process_all_names(&mut |name, res| { | ||
13 | if let hir::ScopeDef::MacroDef(mac) = res { | ||
14 | acc.add_macro(ctx, Some(name.clone()), mac); | ||
15 | } | ||
16 | // FIXME: This should be done in qualified_path/unqualified_path instead? | ||
17 | if let hir::ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) = res { | ||
18 | acc.add_resolution(ctx, name, &res); | ||
19 | } | ||
20 | }) | ||
14 | } | 21 | } |
15 | 22 | ||
16 | #[cfg(test)] | 23 | #[cfg(test)] |
diff --git a/crates/ide_completion/src/completions/mod_.rs b/crates/ide_completion/src/completions/mod_.rs index 4f9415736..6a5746fb9 100644 --- a/crates/ide_completion/src/completions/mod_.rs +++ b/crates/ide_completion/src/completions/mod_.rs | |||
@@ -9,14 +9,14 @@ use ide_db::{ | |||
9 | }; | 9 | }; |
10 | use rustc_hash::FxHashSet; | 10 | use rustc_hash::FxHashSet; |
11 | 11 | ||
12 | use crate::CompletionItem; | 12 | use crate::{patterns::ImmediateLocation, CompletionItem}; |
13 | 13 | ||
14 | use crate::{context::CompletionContext, item::CompletionKind, Completions}; | 14 | use crate::{context::CompletionContext, item::CompletionKind, Completions}; |
15 | 15 | ||
16 | /// Complete mod declaration, i.e. `mod $0 ;` | 16 | /// Complete mod declaration, i.e. `mod $0 ;` |
17 | pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { | 17 | pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { |
18 | let mod_under_caret = match &ctx.mod_declaration_under_caret { | 18 | let mod_under_caret = match &ctx.completion_location { |
19 | Some(mod_under_caret) if mod_under_caret.item_list().is_none() => mod_under_caret, | 19 | Some(ImmediateLocation::ModDeclaration(mod_under_caret)) => mod_under_caret, |
20 | _ => return None, | 20 | _ => return None, |
21 | }; | 21 | }; |
22 | 22 | ||
diff --git a/crates/ide_completion/src/completions/pattern.rs b/crates/ide_completion/src/completions/pattern.rs index 8dc9ab73c..8a728c67e 100644 --- a/crates/ide_completion/src/completions/pattern.rs +++ b/crates/ide_completion/src/completions/pattern.rs | |||
@@ -1,17 +1,15 @@ | |||
1 | //! Completes constants and paths in patterns. | 1 | //! Completes constants and paths in patterns. |
2 | 2 | ||
3 | use crate::{CompletionContext, Completions}; | 3 | use crate::{context::PatternRefutability, CompletionContext, Completions}; |
4 | 4 | ||
5 | /// Completes constants and paths in patterns. | 5 | /// Completes constants and paths in patterns. |
6 | pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) { | 6 | pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) { |
7 | if !(ctx.is_pat_binding_or_const || ctx.is_irrefutable_pat_binding) { | 7 | let refutable = match ctx.is_pat_or_const { |
8 | return; | 8 | Some(it) => it == PatternRefutability::Refutable, |
9 | } | 9 | None => return, |
10 | if ctx.record_pat_syntax.is_some() { | 10 | }; |
11 | return; | ||
12 | } | ||
13 | 11 | ||
14 | if !ctx.is_irrefutable_pat_binding { | 12 | if refutable { |
15 | if let Some(hir::Adt::Enum(e)) = | 13 | if let Some(hir::Adt::Enum(e)) = |
16 | ctx.expected_type.as_ref().and_then(|ty| ty.strip_references().as_adt()) | 14 | ctx.expected_type.as_ref().and_then(|ty| ty.strip_references().as_adt()) |
17 | { | 15 | { |
@@ -31,14 +29,14 @@ pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) { | |||
31 | acc.add_struct_pat(ctx, *strukt, Some(name.clone())); | 29 | acc.add_struct_pat(ctx, *strukt, Some(name.clone())); |
32 | true | 30 | true |
33 | } | 31 | } |
34 | hir::ModuleDef::Variant(variant) if !ctx.is_irrefutable_pat_binding => { | 32 | hir::ModuleDef::Variant(variant) if refutable => { |
35 | acc.add_variant_pat(ctx, *variant, Some(name.clone())); | 33 | acc.add_variant_pat(ctx, *variant, Some(name.clone())); |
36 | true | 34 | true |
37 | } | 35 | } |
38 | hir::ModuleDef::Adt(hir::Adt::Enum(..)) | 36 | hir::ModuleDef::Adt(hir::Adt::Enum(..)) |
39 | | hir::ModuleDef::Variant(..) | 37 | | hir::ModuleDef::Variant(..) |
40 | | hir::ModuleDef::Const(..) | 38 | | hir::ModuleDef::Const(..) |
41 | | hir::ModuleDef::Module(..) => !ctx.is_irrefutable_pat_binding, | 39 | | hir::ModuleDef::Module(..) => refutable, |
42 | _ => false, | 40 | _ => false, |
43 | }, | 41 | }, |
44 | hir::ScopeDef::MacroDef(_) => true, | 42 | hir::ScopeDef::MacroDef(_) => true, |
@@ -47,13 +45,13 @@ pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) { | |||
47 | acc.add_struct_pat(ctx, strukt, Some(name.clone())); | 45 | acc.add_struct_pat(ctx, strukt, Some(name.clone())); |
48 | true | 46 | true |
49 | } | 47 | } |
50 | Some(hir::Adt::Enum(_)) => !ctx.is_irrefutable_pat_binding, | 48 | Some(hir::Adt::Enum(_)) => refutable, |
51 | _ => true, | 49 | _ => true, |
52 | }, | 50 | }, |
53 | _ => false, | 51 | _ => false, |
54 | }; | 52 | }; |
55 | if add_resolution { | 53 | if add_resolution { |
56 | acc.add_resolution(ctx, name.to_string(), &res); | 54 | acc.add_resolution(ctx, name, &res); |
57 | } | 55 | } |
58 | }); | 56 | }); |
59 | } | 57 | } |
@@ -402,4 +400,31 @@ impl Foo { | |||
402 | "#]], | 400 | "#]], |
403 | ) | 401 | ) |
404 | } | 402 | } |
403 | |||
404 | #[test] | ||
405 | fn completes_in_record_field_pat() { | ||
406 | check_snippet( | ||
407 | r#" | ||
408 | struct Foo { bar: Bar } | ||
409 | struct Bar(u32); | ||
410 | fn outer(Foo { bar: $0 }: Foo) {} | ||
411 | "#, | ||
412 | expect![[r#" | ||
413 | bn Foo Foo { bar$1 }$0 | ||
414 | bn Bar Bar($1)$0 | ||
415 | "#]], | ||
416 | ) | ||
417 | } | ||
418 | |||
419 | #[test] | ||
420 | fn skips_in_record_field_pat_name() { | ||
421 | check_snippet( | ||
422 | r#" | ||
423 | struct Foo { bar: Bar } | ||
424 | struct Bar(u32); | ||
425 | fn outer(Foo { bar$0 }: Foo) {} | ||
426 | "#, | ||
427 | expect![[r#""#]], | ||
428 | ) | ||
429 | } | ||
405 | } | 430 | } |
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs index eedb44873..de58ce1cd 100644 --- a/crates/ide_completion/src/completions/qualified_path.rs +++ b/crates/ide_completion/src/completions/qualified_path.rs | |||
@@ -1,27 +1,39 @@ | |||
1 | //! Completion of paths, i.e. `some::prefix::$0`. | 1 | //! Completion of paths, i.e. `some::prefix::$0`. |
2 | 2 | ||
3 | use hir::{Adt, HasVisibility, PathResolution, ScopeDef}; | 3 | use hir::HasVisibility; |
4 | use rustc_hash::FxHashSet; | 4 | use rustc_hash::FxHashSet; |
5 | use syntax::AstNode; | 5 | use syntax::AstNode; |
6 | 6 | ||
7 | use crate::{CompletionContext, Completions}; | 7 | use crate::{CompletionContext, Completions}; |
8 | 8 | ||
9 | pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionContext) { | 9 | pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionContext) { |
10 | if ctx.is_path_disallowed() || ctx.expects_item() { | ||
11 | return; | ||
12 | } | ||
10 | let path = match &ctx.path_qual { | 13 | let path = match &ctx.path_qual { |
11 | Some(path) => path.clone(), | 14 | Some(path) => path.clone(), |
12 | None => return, | 15 | None => return, |
13 | }; | 16 | }; |
14 | 17 | ||
15 | if ctx.attribute_under_caret.is_some() || ctx.mod_declaration_under_caret.is_some() { | ||
16 | return; | ||
17 | } | ||
18 | |||
19 | let context_module = ctx.scope.module(); | ||
20 | |||
21 | let resolution = match ctx.sema.resolve_path(&path) { | 18 | let resolution = match ctx.sema.resolve_path(&path) { |
22 | Some(res) => res, | 19 | Some(res) => res, |
23 | None => return, | 20 | None => return, |
24 | }; | 21 | }; |
22 | let context_module = ctx.scope.module(); | ||
23 | if ctx.expects_assoc_item() { | ||
24 | if let hir::PathResolution::Def(hir::ModuleDef::Module(module)) = resolution { | ||
25 | let module_scope = module.scope(ctx.db, context_module); | ||
26 | for (name, def) in module_scope { | ||
27 | if let hir::ScopeDef::MacroDef(macro_def) = def { | ||
28 | acc.add_macro(ctx, Some(name.clone()), macro_def); | ||
29 | } | ||
30 | if let hir::ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) = def { | ||
31 | acc.add_resolution(ctx, name, &def); | ||
32 | } | ||
33 | } | ||
34 | } | ||
35 | return; | ||
36 | } | ||
25 | 37 | ||
26 | // Add associated types on type parameters and `Self`. | 38 | // Add associated types on type parameters and `Self`. |
27 | resolution.assoc_type_shorthand_candidates(ctx.db, |_, alias| { | 39 | resolution.assoc_type_shorthand_candidates(ctx.db, |_, alias| { |
@@ -30,11 +42,11 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon | |||
30 | }); | 42 | }); |
31 | 43 | ||
32 | match resolution { | 44 | match resolution { |
33 | PathResolution::Def(hir::ModuleDef::Module(module)) => { | 45 | hir::PathResolution::Def(hir::ModuleDef::Module(module)) => { |
34 | let module_scope = module.scope(ctx.db, context_module); | 46 | let module_scope = module.scope(ctx.db, context_module); |
35 | for (name, def) in module_scope { | 47 | for (name, def) in module_scope { |
36 | if ctx.use_item_syntax.is_some() { | 48 | if ctx.use_item_syntax.is_some() { |
37 | if let ScopeDef::Unknown = def { | 49 | if let hir::ScopeDef::Unknown = def { |
38 | if let Some(name_ref) = ctx.name_ref_syntax.as_ref() { | 50 | if let Some(name_ref) = ctx.name_ref_syntax.as_ref() { |
39 | if name_ref.syntax().text() == name.to_string().as_str() { | 51 | if name_ref.syntax().text() == name.to_string().as_str() { |
40 | // for `use self::foo$0`, don't suggest `foo` as a completion | 52 | // for `use self::foo$0`, don't suggest `foo` as a completion |
@@ -45,20 +57,20 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon | |||
45 | } | 57 | } |
46 | } | 58 | } |
47 | 59 | ||
48 | acc.add_resolution(ctx, name.to_string(), &def); | 60 | acc.add_resolution(ctx, name, &def); |
49 | } | 61 | } |
50 | } | 62 | } |
51 | PathResolution::Def(def @ hir::ModuleDef::Adt(_)) | 63 | hir::PathResolution::Def(def @ hir::ModuleDef::Adt(_)) |
52 | | PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_)) | 64 | | hir::PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_)) |
53 | | PathResolution::Def(def @ hir::ModuleDef::BuiltinType(_)) => { | 65 | | hir::PathResolution::Def(def @ hir::ModuleDef::BuiltinType(_)) => { |
54 | if let hir::ModuleDef::Adt(Adt::Enum(e)) = def { | 66 | if let hir::ModuleDef::Adt(hir::Adt::Enum(e)) = def { |
55 | add_enum_variants(ctx, acc, e); | 67 | add_enum_variants(ctx, acc, e); |
56 | } | 68 | } |
57 | let ty = match def { | 69 | let ty = match def { |
58 | hir::ModuleDef::Adt(adt) => adt.ty(ctx.db), | 70 | hir::ModuleDef::Adt(adt) => adt.ty(ctx.db), |
59 | hir::ModuleDef::TypeAlias(a) => { | 71 | hir::ModuleDef::TypeAlias(a) => { |
60 | let ty = a.ty(ctx.db); | 72 | let ty = a.ty(ctx.db); |
61 | if let Some(Adt::Enum(e)) = ty.as_adt() { | 73 | if let Some(hir::Adt::Enum(e)) = ty.as_adt() { |
62 | cov_mark::hit!(completes_variant_through_alias); | 74 | cov_mark::hit!(completes_variant_through_alias); |
63 | add_enum_variants(ctx, acc, e); | 75 | add_enum_variants(ctx, acc, e); |
64 | } | 76 | } |
@@ -105,7 +117,7 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon | |||
105 | }); | 117 | }); |
106 | } | 118 | } |
107 | } | 119 | } |
108 | PathResolution::Def(hir::ModuleDef::Trait(t)) => { | 120 | hir::PathResolution::Def(hir::ModuleDef::Trait(t)) => { |
109 | // Handles `Trait::assoc` as well as `<Ty as Trait>::assoc`. | 121 | // Handles `Trait::assoc` as well as `<Ty as Trait>::assoc`. |
110 | for item in t.items(ctx.db) { | 122 | for item in t.items(ctx.db) { |
111 | if context_module.map_or(false, |m| !item.is_visible_from(ctx.db, m)) { | 123 | if context_module.map_or(false, |m| !item.is_visible_from(ctx.db, m)) { |
@@ -118,15 +130,15 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon | |||
118 | } | 130 | } |
119 | } | 131 | } |
120 | } | 132 | } |
121 | PathResolution::TypeParam(_) | PathResolution::SelfType(_) => { | 133 | hir::PathResolution::TypeParam(_) | hir::PathResolution::SelfType(_) => { |
122 | if let Some(krate) = ctx.krate { | 134 | if let Some(krate) = ctx.krate { |
123 | let ty = match resolution { | 135 | let ty = match resolution { |
124 | PathResolution::TypeParam(param) => param.ty(ctx.db), | 136 | hir::PathResolution::TypeParam(param) => param.ty(ctx.db), |
125 | PathResolution::SelfType(impl_def) => impl_def.self_ty(ctx.db), | 137 | hir::PathResolution::SelfType(impl_def) => impl_def.self_ty(ctx.db), |
126 | _ => return, | 138 | _ => return, |
127 | }; | 139 | }; |
128 | 140 | ||
129 | if let Some(Adt::Enum(e)) = ty.as_adt() { | 141 | if let Some(hir::Adt::Enum(e)) = ty.as_adt() { |
130 | add_enum_variants(ctx, acc, e); | 142 | add_enum_variants(ctx, acc, e); |
131 | } | 143 | } |
132 | 144 | ||
@@ -596,7 +608,7 @@ fn main() { T::$0; } | |||
596 | macro_rules! foo { () => {} } | 608 | macro_rules! foo { () => {} } |
597 | 609 | ||
598 | fn main() { let _ = crate::$0 } | 610 | fn main() { let _ = crate::$0 } |
599 | "#, | 611 | "#, |
600 | expect![[r##" | 612 | expect![[r##" |
601 | fn main() fn() | 613 | fn main() fn() |
602 | ma foo!(…) #[macro_export] macro_rules! foo | 614 | ma foo!(…) #[macro_export] macro_rules! foo |
@@ -605,6 +617,44 @@ fn main() { let _ = crate::$0 } | |||
605 | } | 617 | } |
606 | 618 | ||
607 | #[test] | 619 | #[test] |
620 | fn completes_in_assoc_item_list() { | ||
621 | check( | ||
622 | r#" | ||
623 | #[macro_export] | ||
624 | macro_rules! foo { () => {} } | ||
625 | mod bar {} | ||
626 | |||
627 | struct MyStruct {} | ||
628 | impl MyStruct { | ||
629 | crate::$0 | ||
630 | } | ||
631 | "#, | ||
632 | expect![[r##" | ||
633 | md bar | ||
634 | ma foo! #[macro_export] macro_rules! foo | ||
635 | "##]], | ||
636 | ); | ||
637 | } | ||
638 | |||
639 | #[test] | ||
640 | #[ignore] // FIXME doesn't complete anything atm | ||
641 | fn completes_in_item_list() { | ||
642 | check( | ||
643 | r#" | ||
644 | struct MyStruct {} | ||
645 | macro_rules! foo {} | ||
646 | mod bar {} | ||
647 | |||
648 | crate::$0 | ||
649 | "#, | ||
650 | expect![[r#" | ||
651 | md bar | ||
652 | ma foo! macro_rules! foo | ||
653 | "#]], | ||
654 | ) | ||
655 | } | ||
656 | |||
657 | #[test] | ||
608 | fn test_super_super_completion() { | 658 | fn test_super_super_completion() { |
609 | check( | 659 | check( |
610 | r#" | 660 | r#" |
diff --git a/crates/ide_completion/src/completions/record.rs b/crates/ide_completion/src/completions/record.rs index 2f95b8687..0ac47cdbe 100644 --- a/crates/ide_completion/src/completions/record.rs +++ b/crates/ide_completion/src/completions/record.rs | |||
@@ -2,41 +2,44 @@ | |||
2 | use ide_db::{helpers::FamousDefs, SymbolKind}; | 2 | use ide_db::{helpers::FamousDefs, SymbolKind}; |
3 | use syntax::ast::Expr; | 3 | use syntax::ast::Expr; |
4 | 4 | ||
5 | use crate::{item::CompletionKind, CompletionContext, CompletionItem, Completions}; | 5 | use crate::{ |
6 | item::CompletionKind, patterns::ImmediateLocation, CompletionContext, CompletionItem, | ||
7 | Completions, | ||
8 | }; | ||
6 | 9 | ||
7 | pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { | 10 | pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { |
8 | let missing_fields = match (ctx.record_pat_syntax.as_ref(), ctx.record_lit_syntax.as_ref()) { | 11 | let missing_fields = match &ctx.completion_location { |
9 | (None, None) => return None, | 12 | Some(ImmediateLocation::RecordExpr(record_expr)) => { |
10 | (Some(_), Some(_)) => unreachable!("A record cannot be both a literal and a pattern"), | 13 | let ty = ctx.sema.type_of_expr(&Expr::RecordExpr(record_expr.clone())); |
11 | (Some(record_pat), _) => ctx.sema.record_pattern_missing_fields(record_pat), | ||
12 | (_, Some(record_lit)) => { | ||
13 | let ty = ctx.sema.type_of_expr(&Expr::RecordExpr(record_lit.clone())); | ||
14 | let default_trait = FamousDefs(&ctx.sema, ctx.krate).core_default_Default(); | 14 | let default_trait = FamousDefs(&ctx.sema, ctx.krate).core_default_Default(); |
15 | let impl_default_trait = default_trait | 15 | let impl_default_trait = default_trait |
16 | .and_then(|default_trait| ty.map(|ty| ty.impls_trait(ctx.db, default_trait, &[]))) | 16 | .zip(ty) |
17 | .unwrap_or(false); | 17 | .map_or(false, |(default_trait, ty)| ty.impls_trait(ctx.db, default_trait, &[])); |
18 | 18 | ||
19 | let missing_fields = ctx.sema.record_literal_missing_fields(record_lit); | 19 | let missing_fields = ctx.sema.record_literal_missing_fields(record_expr); |
20 | if impl_default_trait && !missing_fields.is_empty() { | 20 | if impl_default_trait && !missing_fields.is_empty() { |
21 | let completion_text = "..Default::default()"; | 21 | let completion_text = "..Default::default()"; |
22 | let completion_text = completion_text | ||
23 | .strip_prefix(ctx.token.to_string().as_str()) | ||
24 | .unwrap_or(completion_text); | ||
25 | let mut item = CompletionItem::new( | 22 | let mut item = CompletionItem::new( |
26 | CompletionKind::Snippet, | 23 | CompletionKind::Snippet, |
27 | ctx.source_range(), | 24 | ctx.source_range(), |
28 | "..Default::default()", | 25 | completion_text, |
29 | ); | 26 | ); |
27 | let completion_text = | ||
28 | completion_text.strip_prefix(ctx.token.text()).unwrap_or(completion_text); | ||
30 | item.insert_text(completion_text).kind(SymbolKind::Field); | 29 | item.insert_text(completion_text).kind(SymbolKind::Field); |
31 | item.add_to(acc); | 30 | item.add_to(acc); |
32 | } | 31 | } |
33 | 32 | ||
34 | missing_fields | 33 | missing_fields |
35 | } | 34 | } |
35 | Some(ImmediateLocation::RecordPat(record_pat)) => { | ||
36 | ctx.sema.record_pattern_missing_fields(record_pat) | ||
37 | } | ||
38 | _ => return None, | ||
36 | }; | 39 | }; |
37 | 40 | ||
38 | for (field, ty) in missing_fields { | 41 | for (field, ty) in missing_fields { |
39 | acc.add_field(ctx, field, &ty); | 42 | acc.add_field(ctx, None, field, &ty); |
40 | } | 43 | } |
41 | 44 | ||
42 | Some(()) | 45 | Some(()) |
@@ -108,8 +111,6 @@ fn process(f: S) { | |||
108 | check_snippet( | 111 | check_snippet( |
109 | test_code, | 112 | test_code, |
110 | expect![[r#" | 113 | expect![[r#" |
111 | sn pd | ||
112 | sn ppd | ||
113 | fd ..Default::default() | 114 | fd ..Default::default() |
114 | "#]], | 115 | "#]], |
115 | ); | 116 | ); |
@@ -179,13 +180,7 @@ fn process(f: S) { | |||
179 | "#]], | 180 | "#]], |
180 | ); | 181 | ); |
181 | 182 | ||
182 | check_snippet( | 183 | check_snippet(test_code, expect![[r#""#]]); |
183 | test_code, | ||
184 | expect![[r#" | ||
185 | sn pd | ||
186 | sn ppd | ||
187 | "#]], | ||
188 | ); | ||
189 | } | 184 | } |
190 | 185 | ||
191 | #[test] | 186 | #[test] |
diff --git a/crates/ide_completion/src/completions/snippet.rs b/crates/ide_completion/src/completions/snippet.rs index 7f7830976..defc25b00 100644 --- a/crates/ide_completion/src/completions/snippet.rs +++ b/crates/ide_completion/src/completions/snippet.rs | |||
@@ -14,7 +14,7 @@ fn snippet(ctx: &CompletionContext, cap: SnippetCap, label: &str, snippet: &str) | |||
14 | } | 14 | } |
15 | 15 | ||
16 | pub(crate) fn complete_expr_snippet(acc: &mut Completions, ctx: &CompletionContext) { | 16 | pub(crate) fn complete_expr_snippet(acc: &mut Completions, ctx: &CompletionContext) { |
17 | if !(ctx.is_trivial_path && ctx.function_syntax.is_some()) { | 17 | if !(ctx.is_trivial_path && ctx.function_def.is_some()) { |
18 | return; | 18 | return; |
19 | } | 19 | } |
20 | let cap = match ctx.config.snippet_cap { | 20 | let cap = match ctx.config.snippet_cap { |
@@ -22,8 +22,10 @@ pub(crate) fn complete_expr_snippet(acc: &mut Completions, ctx: &CompletionConte | |||
22 | None => return, | 22 | None => return, |
23 | }; | 23 | }; |
24 | 24 | ||
25 | snippet(ctx, cap, "pd", "eprintln!(\"$0 = {:?}\", $0);").add_to(acc); | 25 | if ctx.can_be_stmt { |
26 | snippet(ctx, cap, "ppd", "eprintln!(\"$0 = {:#?}\", $0);").add_to(acc); | 26 | snippet(ctx, cap, "pd", "eprintln!(\"$0 = {:?}\", $0);").add_to(acc); |
27 | snippet(ctx, cap, "ppd", "eprintln!(\"$0 = {:#?}\", $0);").add_to(acc); | ||
28 | } | ||
27 | } | 29 | } |
28 | 30 | ||
29 | pub(crate) fn complete_item_snippet(acc: &mut Completions, ctx: &CompletionContext) { | 31 | pub(crate) fn complete_item_snippet(acc: &mut Completions, ctx: &CompletionContext) { |
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs index 7875500c1..20188a7dd 100644 --- a/crates/ide_completion/src/completions/unqualified_path.rs +++ b/crates/ide_completion/src/completions/unqualified_path.rs | |||
@@ -1,7 +1,6 @@ | |||
1 | //! Completion of names from the current scope, e.g. locals and imported items. | 1 | //! Completion of names from the current scope, e.g. locals and imported items. |
2 | 2 | ||
3 | use hir::ScopeDef; | 3 | use hir::ScopeDef; |
4 | use syntax::AstNode; | ||
5 | 4 | ||
6 | use crate::{CompletionContext, Completions}; | 5 | use crate::{CompletionContext, Completions}; |
7 | 6 | ||
@@ -9,11 +8,29 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC | |||
9 | if !ctx.is_trivial_path { | 8 | if !ctx.is_trivial_path { |
10 | return; | 9 | return; |
11 | } | 10 | } |
12 | if ctx.record_lit_syntax.is_some() | 11 | if ctx.is_path_disallowed() || ctx.expects_item() { |
13 | || ctx.record_pat_syntax.is_some() | 12 | return; |
14 | || ctx.attribute_under_caret.is_some() | 13 | } |
15 | || ctx.mod_declaration_under_caret.is_some() | 14 | |
16 | { | 15 | if ctx.expects_assoc_item() { |
16 | ctx.scope.process_all_names(&mut |name, def| { | ||
17 | if let ScopeDef::MacroDef(macro_def) = def { | ||
18 | acc.add_macro(ctx, Some(name.clone()), macro_def); | ||
19 | } | ||
20 | if let ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) = def { | ||
21 | acc.add_resolution(ctx, name, &def); | ||
22 | } | ||
23 | }); | ||
24 | return; | ||
25 | } | ||
26 | |||
27 | if ctx.expects_use_tree() { | ||
28 | cov_mark::hit!(only_completes_modules_in_import); | ||
29 | ctx.scope.process_all_names(&mut |name, res| { | ||
30 | if let ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) = res { | ||
31 | acc.add_resolution(ctx, name, &res); | ||
32 | } | ||
33 | }); | ||
17 | return; | 34 | return; |
18 | } | 35 | } |
19 | 36 | ||
@@ -30,15 +47,7 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC | |||
30 | cov_mark::hit!(skip_lifetime_completion); | 47 | cov_mark::hit!(skip_lifetime_completion); |
31 | return; | 48 | return; |
32 | } | 49 | } |
33 | if ctx.use_item_syntax.is_some() { | 50 | acc.add_resolution(ctx, name, &res); |
34 | if let (ScopeDef::Unknown, Some(name_ref)) = (&res, &ctx.name_ref_syntax) { | ||
35 | if name_ref.syntax().text() == name.to_string().as_str() { | ||
36 | cov_mark::hit!(self_fulfilling_completion); | ||
37 | return; | ||
38 | } | ||
39 | } | ||
40 | } | ||
41 | acc.add_resolution(ctx, name.to_string(), &res); | ||
42 | }); | 51 | }); |
43 | } | 52 | } |
44 | 53 | ||
@@ -61,15 +70,17 @@ mod tests { | |||
61 | } | 70 | } |
62 | 71 | ||
63 | #[test] | 72 | #[test] |
64 | fn self_fulfilling_completion() { | 73 | fn only_completes_modules_in_import() { |
65 | cov_mark::check!(self_fulfilling_completion); | 74 | cov_mark::check!(only_completes_modules_in_import); |
66 | check( | 75 | check( |
67 | r#" | 76 | r#" |
68 | use foo$0 | 77 | use f$0 |
69 | use std::collections; | 78 | |
79 | struct Foo; | ||
80 | mod foo {} | ||
70 | "#, | 81 | "#, |
71 | expect![[r#" | 82 | expect![[r#" |
72 | ?? collections | 83 | md foo |
73 | "#]], | 84 | "#]], |
74 | ); | 85 | ); |
75 | } | 86 | } |
@@ -86,7 +97,7 @@ fn quux(x: Option<Enum>) { | |||
86 | } | 97 | } |
87 | } | 98 | } |
88 | "#, | 99 | "#, |
89 | expect![[""]], | 100 | expect![[r#""#]], |
90 | ); | 101 | ); |
91 | } | 102 | } |
92 | 103 | ||
@@ -102,7 +113,7 @@ fn quux(x: Option<Enum>) { | |||
102 | } | 113 | } |
103 | } | 114 | } |
104 | "#, | 115 | "#, |
105 | expect![[""]], | 116 | expect![[r#""#]], |
106 | ); | 117 | ); |
107 | } | 118 | } |
108 | 119 | ||
@@ -651,7 +662,7 @@ fn f() {} | |||
651 | } | 662 | } |
652 | 663 | ||
653 | #[test] | 664 | #[test] |
654 | fn completes_type_or_trait_in_impl_block() { | 665 | fn completes_target_type_or_trait_in_impl_block() { |
655 | check( | 666 | check( |
656 | r#" | 667 | r#" |
657 | trait MyTrait {} | 668 | trait MyTrait {} |
@@ -666,4 +677,41 @@ impl My$0 | |||
666 | "#]], | 677 | "#]], |
667 | ) | 678 | ) |
668 | } | 679 | } |
680 | |||
681 | #[test] | ||
682 | fn completes_in_assoc_item_list() { | ||
683 | check( | ||
684 | r#" | ||
685 | macro_rules! foo {} | ||
686 | mod bar {} | ||
687 | |||
688 | struct MyStruct {} | ||
689 | impl MyStruct { | ||
690 | $0 | ||
691 | } | ||
692 | "#, | ||
693 | expect![[r#" | ||
694 | md bar | ||
695 | ma foo! macro_rules! foo | ||
696 | "#]], | ||
697 | ) | ||
698 | } | ||
699 | |||
700 | // FIXME: The completions here currently come from `macro_in_item_position`, but they shouldn't | ||
701 | #[test] | ||
702 | fn completes_in_item_list() { | ||
703 | check( | ||
704 | r#" | ||
705 | struct MyStruct {} | ||
706 | macro_rules! foo {} | ||
707 | mod bar {} | ||
708 | |||
709 | $0 | ||
710 | "#, | ||
711 | expect![[r#" | ||
712 | md bar | ||
713 | ma foo!(…) macro_rules! foo | ||
714 | "#]], | ||
715 | ) | ||
716 | } | ||
669 | } | 717 | } |