Skip to content

Commit 7e8527f

Browse files
lnicolalnicola
committedFeb 12, 2019
Implement completion for associated items
·
nightly2020-01-13
1 parent 3714800 commit 7e8527f

7 files changed

+265
-1
lines changed
 

‎crates/ra_hir/src/ty/method_resolution.rs

+20
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,24 @@ impl Ty {
174174
}
175175
None
176176
}
177+
178+
// This would be nicer if it just returned an iterator, but that runs into
179+
// lifetime problems, because we need to borrow temp `CrateImplBlocks`.
180+
pub fn iterate_impl_items<T>(
181+
self,
182+
db: &impl HirDatabase,
183+
mut callback: impl FnMut(ImplItem) -> Option<T>,
184+
) -> Option<T> {
185+
let krate = def_crate(db, &self)?;
186+
let impls = db.impls_in_crate(krate);
187+
188+
for (_, impl_block) in impls.lookup_impl_blocks(db, &self) {
189+
for item in impl_block.items() {
190+
if let Some(result) = callback(*item) {
191+
return Some(result);
192+
}
193+
}
194+
}
195+
None
196+
}
177197
}

‎crates/ra_ide_api/src/completion.rs

+22
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,25 @@ pub fn function_label(node: &ast::FnDef) -> Option<String> {
8080

8181
Some(label.trim().to_owned())
8282
}
83+
84+
pub fn const_label(node: &ast::ConstDef) -> String {
85+
let label: String = node
86+
.syntax()
87+
.children()
88+
.filter(|child| ast::Comment::cast(child).is_none())
89+
.map(|node| node.text().to_string())
90+
.collect();
91+
92+
label.trim().to_owned()
93+
}
94+
95+
pub fn type_label(node: &ast::TypeDef) -> String {
96+
let label: String = node
97+
.syntax()
98+
.children()
99+
.filter(|child| ast::Comment::cast(child).is_none())
100+
.map(|node| node.text().to_string())
101+
.collect();
102+
103+
label.trim().to_owned()
104+
}

‎crates/ra_ide_api/src/completion/complete_path.rs

+103-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use join_to_string::join;
22
use hir::{Docs, Resolution};
3-
use ra_syntax::AstNode;
3+
use ra_syntax::{AstNode, ast::NameOwner};
44
use test_utils::tested_by;
55

66
use crate::completion::{CompletionItem, CompletionItemKind, Completions, CompletionKind, CompletionContext};
@@ -58,6 +58,51 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
5858
}
5959
});
6060
}
61+
hir::ModuleDef::Struct(s) => {
62+
let ty = s.ty(ctx.db);
63+
ty.iterate_impl_items(ctx.db, |item| match item {
64+
hir::ImplItem::Method(func) => {
65+
let sig = func.signature(ctx.db);
66+
if !sig.has_self_param() {
67+
CompletionItem::new(
68+
CompletionKind::Reference,
69+
ctx.source_range(),
70+
sig.name().to_string(),
71+
)
72+
.from_function(ctx, func)
73+
.kind(CompletionItemKind::Method)
74+
.add_to(acc);
75+
}
76+
None::<()>
77+
}
78+
hir::ImplItem::Const(ct) => {
79+
let source = ct.source(ctx.db);
80+
if let Some(name) = source.1.name() {
81+
CompletionItem::new(
82+
CompletionKind::Reference,
83+
ctx.source_range(),
84+
name.text().to_string(),
85+
)
86+
.from_const(ctx, ct)
87+
.add_to(acc);
88+
}
89+
None::<()>
90+
}
91+
hir::ImplItem::Type(ty) => {
92+
let source = ty.source(ctx.db);
93+
if let Some(name) = source.1.name() {
94+
CompletionItem::new(
95+
CompletionKind::Reference,
96+
ctx.source_range(),
97+
name.text().to_string(),
98+
)
99+
.from_type(ctx, ty)
100+
.add_to(acc);
101+
}
102+
None::<()>
103+
}
104+
});
105+
}
61106
_ => return,
62107
};
63108
}
@@ -197,6 +242,63 @@ mod tests {
197242
);
198243
}
199244

245+
#[test]
246+
fn completes_struct_associated_method() {
247+
check_reference_completion(
248+
"struct_associated_method",
249+
"
250+
//- /lib.rs
251+
/// A Struct
252+
struct S;
253+
254+
impl S {
255+
/// An associated method
256+
fn m() { }
257+
}
258+
259+
fn foo() { let _ = S::<|> }
260+
",
261+
);
262+
}
263+
264+
#[test]
265+
fn completes_struct_associated_const() {
266+
check_reference_completion(
267+
"struct_associated_const",
268+
"
269+
//- /lib.rs
270+
/// A Struct
271+
struct S;
272+
273+
impl S {
274+
/// An associated const
275+
const C: i32 = 42;
276+
}
277+
278+
fn foo() { let _ = S::<|> }
279+
",
280+
);
281+
}
282+
283+
#[test]
284+
fn completes_struct_associated_type() {
285+
check_reference_completion(
286+
"struct_associated_type",
287+
"
288+
//- /lib.rs
289+
/// A Struct
290+
struct S;
291+
292+
impl S {
293+
/// An associated type
294+
type T = i32;
295+
}
296+
297+
fn foo() { let _ = S::<|> }
298+
",
299+
);
300+
}
301+
200302
#[test]
201303
fn completes_use_paths_across_crates() {
202304
check_reference_completion(

‎crates/ra_ide_api/src/completion/completion_item.rs

+34
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use test_utils::tested_by;
88
use crate::completion::{
99
completion_context::CompletionContext,
1010
function_label,
11+
const_label,
12+
type_label
1113
};
1214

1315
/// `CompletionItem` describes a single completion variant in the editor pop-up.
@@ -267,6 +269,28 @@ impl Builder {
267269
self.kind = Some(CompletionItemKind::Function);
268270
self
269271
}
272+
273+
pub(super) fn from_const(mut self, ctx: &CompletionContext, ct: hir::Const) -> Builder {
274+
if let Some(docs) = ct.docs(ctx.db) {
275+
self.documentation = Some(docs);
276+
}
277+
278+
self.detail = Some(const_item_label(ctx, ct));
279+
self.kind = Some(CompletionItemKind::Const);
280+
281+
self
282+
}
283+
284+
pub(super) fn from_type(mut self, ctx: &CompletionContext, ty: hir::Type) -> Builder {
285+
if let Some(docs) = ty.docs(ctx.db) {
286+
self.documentation = Some(docs);
287+
}
288+
289+
self.detail = Some(type_item_label(ctx, ty));
290+
self.kind = Some(CompletionItemKind::TypeAlias);
291+
292+
self
293+
}
270294
}
271295

272296
impl<'a> Into<CompletionItem> for Builder {
@@ -305,6 +329,16 @@ fn function_item_label(ctx: &CompletionContext, function: hir::Function) -> Opti
305329
function_label(&node)
306330
}
307331

332+
fn const_item_label(ctx: &CompletionContext, ct: hir::Const) -> String {
333+
let node = ct.source(ctx.db).1;
334+
const_label(&node)
335+
}
336+
337+
fn type_item_label(ctx: &CompletionContext, ty: hir::Type) -> String {
338+
let node = ty.source(ctx.db).1;
339+
type_label(&node)
340+
}
341+
308342
#[cfg(test)]
309343
pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> {
310344
use crate::mock_analysis::{single_file_with_position, analysis_and_position};

‎crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_const.snap

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
created: "2019-02-12T09:57:51.107816726Z"
3+
creator: insta@0.6.2
4+
source: crates/ra_ide_api/src/completion/completion_item.rs
5+
expression: kind_completions
6+
---
7+
[
8+
CompletionItem {
9+
completion_kind: Reference,
10+
label: "C",
11+
kind: Some(
12+
Const
13+
),
14+
detail: Some(
15+
"const C: i32 = 42;"
16+
),
17+
documentation: Some(
18+
Documentation(
19+
"An associated const"
20+
)
21+
),
22+
lookup: None,
23+
insert_text: None,
24+
insert_text_format: PlainText,
25+
source_range: [107; 107),
26+
text_edit: None
27+
}
28+
]

‎crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_method.snap

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
created: "2019-02-12T09:57:51.106389138Z"
3+
creator: insta@0.6.2
4+
source: crates/ra_ide_api/src/completion/completion_item.rs
5+
expression: kind_completions
6+
---
7+
[
8+
CompletionItem {
9+
completion_kind: Reference,
10+
label: "m",
11+
kind: Some(
12+
Method
13+
),
14+
detail: Some(
15+
"fn m()"
16+
),
17+
documentation: Some(
18+
Documentation(
19+
"An associated method"
20+
)
21+
),
22+
lookup: None,
23+
insert_text: Some(
24+
"m()$0"
25+
),
26+
insert_text_format: Snippet,
27+
source_range: [100; 100),
28+
text_edit: None
29+
}
30+
]

‎crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_type.snap

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
created: "2019-02-12T09:33:54.719956203Z"
3+
creator: insta@0.6.2
4+
source: crates/ra_ide_api/src/completion/completion_item.rs
5+
expression: kind_completions
6+
---
7+
[
8+
CompletionItem {
9+
completion_kind: Reference,
10+
label: "T",
11+
kind: Some(
12+
TypeAlias
13+
),
14+
detail: Some(
15+
"type T = i32;"
16+
),
17+
documentation: Some(
18+
Documentation(
19+
"An associated type"
20+
)
21+
),
22+
lookup: None,
23+
insert_text: None,
24+
insert_text_format: PlainText,
25+
source_range: [101; 101),
26+
text_edit: None
27+
}
28+
]

0 commit comments

Comments
 (0)
Please sign in to comment.