diff options
Diffstat (limited to 'crates/ra_analysis/src/completion')
-rw-r--r-- | crates/ra_analysis/src/completion/complete_dot.rs | 98 | ||||
-rw-r--r-- | crates/ra_analysis/src/completion/completion_context.rs | 34 | ||||
-rw-r--r-- | crates/ra_analysis/src/completion/completion_item.rs | 1 |
3 files changed, 128 insertions, 5 deletions
diff --git a/crates/ra_analysis/src/completion/complete_dot.rs b/crates/ra_analysis/src/completion/complete_dot.rs new file mode 100644 index 000000000..fa62da210 --- /dev/null +++ b/crates/ra_analysis/src/completion/complete_dot.rs | |||
@@ -0,0 +1,98 @@ | |||
1 | use ra_syntax::ast::AstNode; | ||
2 | use hir::{Ty, Def}; | ||
3 | |||
4 | use crate::Cancelable; | ||
5 | use crate::completion::{CompletionContext, Completions, CompletionKind, CompletionItem, CompletionItemKind}; | ||
6 | |||
7 | /// Complete dot accesses, i.e. fields or methods (currently only fields). | ||
8 | pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) -> Cancelable<()> { | ||
9 | let module = if let Some(module) = &ctx.module { | ||
10 | module | ||
11 | } else { | ||
12 | return Ok(()); | ||
13 | }; | ||
14 | let function = if let Some(fn_def) = ctx.enclosing_fn { | ||
15 | hir::source_binder::function_from_module(ctx.db, module, fn_def) | ||
16 | } else { | ||
17 | return Ok(()); | ||
18 | }; | ||
19 | let receiver = if let Some(receiver) = ctx.dot_receiver { | ||
20 | receiver | ||
21 | } else { | ||
22 | return Ok(()); | ||
23 | }; | ||
24 | let infer_result = function.infer(ctx.db)?; | ||
25 | let receiver_ty = if let Some(ty) = infer_result.type_of_node(receiver.syntax()) { | ||
26 | ty | ||
27 | } else { | ||
28 | return Ok(()); | ||
29 | }; | ||
30 | if !ctx.is_method_call { | ||
31 | complete_fields(acc, ctx, receiver_ty)?; | ||
32 | } | ||
33 | Ok(()) | ||
34 | } | ||
35 | |||
36 | fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, ty: Ty) -> Cancelable<()> { | ||
37 | // TODO: autoderef etc. | ||
38 | match ty { | ||
39 | Ty::Adt { def_id, .. } => { | ||
40 | match def_id.resolve(ctx.db)? { | ||
41 | Def::Struct(s) => { | ||
42 | let variant_data = s.variant_data(ctx.db)?; | ||
43 | for field in variant_data.fields() { | ||
44 | CompletionItem::new(CompletionKind::Reference, field.name().to_string()) | ||
45 | .kind(CompletionItemKind::Field) | ||
46 | .add_to(acc); | ||
47 | } | ||
48 | } | ||
49 | // TODO unions | ||
50 | _ => {} | ||
51 | } | ||
52 | } | ||
53 | Ty::Tuple(fields) => { | ||
54 | for (i, _ty) in fields.iter().enumerate() { | ||
55 | CompletionItem::new(CompletionKind::Reference, i.to_string()) | ||
56 | .kind(CompletionItemKind::Field) | ||
57 | .add_to(acc); | ||
58 | } | ||
59 | } | ||
60 | _ => {} | ||
61 | }; | ||
62 | Ok(()) | ||
63 | } | ||
64 | |||
65 | #[cfg(test)] | ||
66 | mod tests { | ||
67 | use crate::completion::*; | ||
68 | |||
69 | fn check_ref_completion(code: &str, expected_completions: &str) { | ||
70 | check_completion(code, expected_completions, CompletionKind::Reference); | ||
71 | } | ||
72 | |||
73 | #[test] | ||
74 | fn test_struct_field_completion() { | ||
75 | check_ref_completion( | ||
76 | r" | ||
77 | struct A { the_field: u32 } | ||
78 | fn foo(a: A) { | ||
79 | a.<|> | ||
80 | } | ||
81 | ", | ||
82 | r#"the_field"#, | ||
83 | ); | ||
84 | } | ||
85 | |||
86 | #[test] | ||
87 | fn test_no_struct_field_completion_for_method_call() { | ||
88 | check_ref_completion( | ||
89 | r" | ||
90 | struct A { the_field: u32 } | ||
91 | fn foo(a: A) { | ||
92 | a.<|>() | ||
93 | } | ||
94 | ", | ||
95 | r#""#, | ||
96 | ); | ||
97 | } | ||
98 | } | ||
diff --git a/crates/ra_analysis/src/completion/completion_context.rs b/crates/ra_analysis/src/completion/completion_context.rs index 064fbc6f7..12e98e870 100644 --- a/crates/ra_analysis/src/completion/completion_context.rs +++ b/crates/ra_analysis/src/completion/completion_context.rs | |||
@@ -31,6 +31,10 @@ pub(super) struct CompletionContext<'a> { | |||
31 | pub(super) is_stmt: bool, | 31 | pub(super) is_stmt: bool, |
32 | /// Something is typed at the "top" level, in module or impl/trait. | 32 | /// Something is typed at the "top" level, in module or impl/trait. |
33 | pub(super) is_new_item: bool, | 33 | pub(super) is_new_item: bool, |
34 | /// The receiver if this is a field or method access, i.e. writing something.<|> | ||
35 | pub(super) dot_receiver: Option<ast::Expr<'a>>, | ||
36 | /// If this is a method call in particular, i.e. the () are already there. | ||
37 | pub(super) is_method_call: bool, | ||
34 | } | 38 | } |
35 | 39 | ||
36 | impl<'a> CompletionContext<'a> { | 40 | impl<'a> CompletionContext<'a> { |
@@ -54,6 +58,8 @@ impl<'a> CompletionContext<'a> { | |||
54 | after_if: false, | 58 | after_if: false, |
55 | is_stmt: false, | 59 | is_stmt: false, |
56 | is_new_item: false, | 60 | is_new_item: false, |
61 | dot_receiver: None, | ||
62 | is_method_call: false, | ||
57 | }; | 63 | }; |
58 | ctx.fill(original_file, position.offset); | 64 | ctx.fill(original_file, position.offset); |
59 | Ok(Some(ctx)) | 65 | Ok(Some(ctx)) |
@@ -105,6 +111,12 @@ impl<'a> CompletionContext<'a> { | |||
105 | _ => (), | 111 | _ => (), |
106 | } | 112 | } |
107 | 113 | ||
114 | self.enclosing_fn = self | ||
115 | .leaf | ||
116 | .ancestors() | ||
117 | .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE) | ||
118 | .find_map(ast::FnDef::cast); | ||
119 | |||
108 | let parent = match name_ref.syntax().parent() { | 120 | let parent = match name_ref.syntax().parent() { |
109 | Some(it) => it, | 121 | Some(it) => it, |
110 | None => return, | 122 | None => return, |
@@ -120,11 +132,6 @@ impl<'a> CompletionContext<'a> { | |||
120 | } | 132 | } |
121 | if path.qualifier().is_none() { | 133 | if path.qualifier().is_none() { |
122 | self.is_trivial_path = true; | 134 | self.is_trivial_path = true; |
123 | self.enclosing_fn = self | ||
124 | .leaf | ||
125 | .ancestors() | ||
126 | .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE) | ||
127 | .find_map(ast::FnDef::cast); | ||
128 | 135 | ||
129 | self.is_stmt = match name_ref | 136 | self.is_stmt = match name_ref |
130 | .syntax() | 137 | .syntax() |
@@ -145,6 +152,23 @@ impl<'a> CompletionContext<'a> { | |||
145 | } | 152 | } |
146 | } | 153 | } |
147 | } | 154 | } |
155 | if let Some(_field_expr) = ast::FieldExpr::cast(parent) { | ||
156 | self.dot_receiver = self | ||
157 | .leaf | ||
158 | .ancestors() | ||
159 | .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE) | ||
160 | .find_map(ast::FieldExpr::cast) | ||
161 | .and_then(ast::FieldExpr::expr); | ||
162 | } | ||
163 | if let Some(_method_call_expr) = ast::MethodCallExpr::cast(parent) { | ||
164 | self.dot_receiver = self | ||
165 | .leaf | ||
166 | .ancestors() | ||
167 | .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE) | ||
168 | .find_map(ast::MethodCallExpr::cast) | ||
169 | .and_then(ast::MethodCallExpr::expr); | ||
170 | self.is_method_call = true; | ||
171 | } | ||
148 | } | 172 | } |
149 | } | 173 | } |
150 | 174 | ||
diff --git a/crates/ra_analysis/src/completion/completion_item.rs b/crates/ra_analysis/src/completion/completion_item.rs index 6d466c8bd..c9f9f495d 100644 --- a/crates/ra_analysis/src/completion/completion_item.rs +++ b/crates/ra_analysis/src/completion/completion_item.rs | |||
@@ -30,6 +30,7 @@ pub enum CompletionItemKind { | |||
30 | Struct, | 30 | Struct, |
31 | Enum, | 31 | Enum, |
32 | Binding, | 32 | Binding, |
33 | Field, | ||
33 | } | 34 | } |
34 | 35 | ||
35 | #[derive(Debug, PartialEq, Eq)] | 36 | #[derive(Debug, PartialEq, Eq)] |