mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore CompletionItem immutability

Browse Source
This commit is contained in:
Aleksey Kladov 2020-04-24 01:17:33 +02:00
parent 6654b9aff3
commit 953b5f23cc
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/ra_ide/src/completion/completion_item.rs
View File

@ -190,7 +190,7 @@ pub fn documentation(&self) -> Option<Documentation> {
}
/// What string is used for filtering.
pub fn lookup(&self) -> &str {
self.lookup.as_deref().unwrap_or_else(|| self.label())
self.lookup.as_deref().unwrap_or(&self.label)
}
pub fn kind(&self) -> Option<CompletionItemKind> {
@ -205,10 +205,6 @@ pub fn score(&self) -> Option<CompletionScore> {
self.score
}
pub fn set_score(&mut self, score: CompletionScore) {
self.score = Some(score);
}
pub fn trigger_call_info(&self) -> bool {
self.trigger_call_info
}
@ -310,7 +306,6 @@ pub(crate) fn set_deprecated(mut self, deprecated: bool) -> Builder {
self.deprecated = Some(deprecated);
self
}
#[allow(unused)]
pub(crate) fn set_score(mut self, score: CompletionScore) -> Builder {
self.score = Some(score);
self

45
crates/ra_ide/src/completion/presentation.rs
View File

@ -23,22 +23,20 @@ pub(crate) fn add_field(
ty: &Type,
) {
let is_deprecated = is_deprecated(field, ctx.db);
let mut completion_item = CompletionItem::new(
CompletionKind::Reference,
ctx.source_range(),
field.name(ctx.db).to_string(),
)
.kind(CompletionItemKind::Field)
.detail(ty.display(ctx.db).to_string())
.set_documentation(field.docs(ctx.db))
.set_deprecated(is_deprecated)
.build();
let ty = ty.display(ctx.db).to_string();
let name = field.name(ctx.db);
let mut completion_item =
CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.to_string())
.kind(CompletionItemKind::Field)
.detail(ty.clone())
.set_documentation(field.docs(ctx.db))
.set_deprecated(is_deprecated);
if let Some(score) = compute_score(&completion_item, ctx) {
completion_item.set_score(score);
if let Some(score) = compute_score(ctx, &ty, &name.to_string()) {
completion_item = completion_item.set_score(score);
}
self.add(completion_item);
completion_item.add_to(self);
}
pub(crate) fn add_tuple_field(&mut self, ctx: &CompletionContext, field: usize, ty: &Type) {
@ -308,8 +306,9 @@ pub(crate) fn add_enum_variant(
}
pub(crate) fn compute_score(
completion_item: &CompletionItem,
ctx: &CompletionContext,
ty: &str,
name: &str,
) -> Option<CompletionScore> {
let (active_name, active_type) = if let Some(record_field) = &ctx.record_field_syntax {
if let Some((struct_field, _)) = ctx.sema.resolve_record_field(record_field) {
@ -334,16 +333,14 @@ pub(crate) fn compute_score(
// Compute score
// For the same type
if let Some(a_parameter_type) = completion_item.detail() {
if &active_type == a_parameter_type {
// If same type + same name then go top position
let res = if active_name == completion_item.label() {
CompletionScore::TypeAndNameMatch
} else {
CompletionScore::TypeMatch
};
return Some(res);
}
if &active_type == ty {
// If same type + same name then go top position
let res = if active_name == name {
CompletionScore::TypeAndNameMatch
} else {
CompletionScore::TypeMatch
};
return Some(res);
}
None
}