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

Merge #7940

Browse Source 
7940: Cleanup r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-03-09 14:46:10 +00:00 committed by GitHub
commit ab99eff7b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/ide_completion/src/item.rs
View File

@ -208,7 +208,7 @@ pub(crate) fn new(
lookup: None,
kind: None,
text_edit: None,
deprecated: None,
deprecated: false,
trigger_call_info: None,
score: None,
ref_match: None,
@ -308,7 +308,7 @@ pub(crate) struct Builder {
lookup: Option<String>,
kind: Option<CompletionItemKind>,
text_edit: Option<TextEdit>,
deprecated: Option<bool>,
deprecated: bool,
trigger_call_info: Option<bool>,
score: Option<CompletionScore>,
ref_match: Option<(Mutability, CompletionScore)>,
@ -355,7 +355,7 @@ pub(crate) fn build(self) -> CompletionItem {
lookup,
kind: self.kind,
completion_kind: self.completion_kind,
deprecated: self.deprecated.unwrap_or(false),
deprecated: self.deprecated,
trigger_call_info: self.trigger_call_info.unwrap_or(false),
score: self.score,
ref_match: self.ref_match,
@ -415,7 +415,7 @@ pub(crate) fn set_documentation(mut self, docs: Option<Documentation>) -> Builde
self
}
pub(crate) fn set_deprecated(mut self, deprecated: bool) -> Builder {
self.deprecated = Some(deprecated);
self.deprecated = deprecated;
self
}
pub(crate) fn set_score(mut self, score: CompletionScore) -> Builder {
@ -430,11 +430,8 @@ pub(crate) fn add_import(mut self, import_to_add: Option<ImportEdit>) -> Builder
self.import_to_add = import_to_add;
self
}
pub(crate) fn set_ref_match(
mut self,
ref_match: Option<(Mutability, CompletionScore)>,
) -> Builder {
self.ref_match = ref_match;
pub(crate) fn ref_match(mut self, ref_match: (Mutability, CompletionScore)) -> Builder {
self.ref_match = Some(ref_match);
self
}
}

8
crates/ide_completion/src/render.rs
View File

@ -246,7 +246,6 @@ fn render_resolution(
}
};
let mut ref_match = None;
if let ScopeDef::Local(local) = resolution {
if let Some((active_name, active_type)) = self.ctx.active_name_and_type() {
let ty = local.ty(self.ctx.db());
@ -255,7 +254,11 @@ fn render_resolution(
{
item = item.set_score(score);
}
ref_match = refed_type_matches(&active_type, &active_name, &ty, &local_name);
if let Some(ref_match) =
refed_type_matches(&active_type, &active_name, &ty, &local_name)
{
item = item.ref_match(ref_match);
}
}
}
@ -285,7 +288,6 @@ fn render_resolution(
Some(
item.kind(kind)
.add_import(import_to_add)
.set_ref_match(ref_match)
.set_documentation(self.docs(resolution))
.set_deprecated(self.is_deprecated(resolution))
.build(),

52
crates/rust-analyzer/src/to_proto.rs
View File

@ -173,20 +173,20 @@ pub(crate) fn snippet_text_edit_vec(
pub(crate) fn completion_item(
line_index: &LineIndex,
completion_item: CompletionItem,
item: CompletionItem,
) -> Vec<lsp_types::CompletionItem> {
fn set_score(res: &mut lsp_types::CompletionItem, label: &str) {
res.preselect = Some(true);
fn set_score(lsp_item: &mut lsp_types::CompletionItem, label: &str) {
lsp_item.preselect = Some(true);
// HACK: sort preselect items first
res.sort_text = Some(format!(" {}", label));
lsp_item.sort_text = Some(format!(" {}", label));
}
let mut additional_text_edits = Vec::new();
let mut text_edit = None;
// LSP does not allow arbitrary edits in completion, so we have to do a
// non-trivial mapping here.
let source_range = completion_item.source_range();
for indel in completion_item.text_edit().iter() {
let source_range = item.source_range();
for indel in item.text_edit().iter() {
if indel.delete.contains_range(source_range) {
text_edit = Some(if indel.delete == source_range {
self::text_edit(line_index, indel.clone())
@ -207,46 +207,46 @@ fn set_score(res: &mut lsp_types::CompletionItem, label: &str) {
}
let text_edit = text_edit.unwrap();
let mut res = lsp_types::CompletionItem {
label: completion_item.label().to_string(),
detail: completion_item.detail().map(|it| it.to_string()),
filter_text: Some(completion_item.lookup().to_string()),
kind: completion_item.kind().map(completion_item_kind),
let mut lsp_item = lsp_types::CompletionItem {
label: item.label().to_string(),
detail: item.detail().map(|it| it.to_string()),
filter_text: Some(item.lookup().to_string()),
kind: item.kind().map(completion_item_kind),
text_edit: Some(text_edit.into()),
additional_text_edits: Some(additional_text_edits),
documentation: completion_item.documentation().map(documentation),
deprecated: Some(completion_item.deprecated()),
documentation: item.documentation().map(documentation),
deprecated: Some(item.deprecated()),
..Default::default()
};
if completion_item.score().is_some() {
set_score(&mut res, completion_item.label());
if item.score().is_some() {
set_score(&mut lsp_item, item.label());
}
if completion_item.deprecated() {
res.tags = Some(vec![lsp_types::CompletionItemTag::Deprecated])
if item.deprecated() {
lsp_item.tags = Some(vec![lsp_types::CompletionItemTag::Deprecated])
}
if completion_item.trigger_call_info() {
res.command = Some(command::trigger_parameter_hints());
if item.trigger_call_info() {
lsp_item.command = Some(command::trigger_parameter_hints());
}
let mut all_results = match completion_item.ref_match() {
let mut res = match item.ref_match() {
Some(ref_match) => {
let mut refed = res.clone();
let mut refed = lsp_item.clone();
let (mutability, _score) = ref_match;
let label = format!("&{}{}", mutability.as_keyword_for_ref(), refed.label);
set_score(&mut refed, &label);
refed.label = label;
vec![res, refed]
vec![lsp_item, refed]
}
None => vec![res],
None => vec![lsp_item],
};
for mut r in all_results.iter_mut() {
r.insert_text_format = Some(insert_text_format(completion_item.insert_text_format()));
for mut r in res.iter_mut() {
r.insert_text_format = Some(insert_text_format(item.insert_text_format()));
}
all_results
res
}
pub(crate) fn signature_help(