language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename XSignature -> XData

Browse source
This commit is contained in:
Aleksey Kladov 2019-06-18 20:07:35 +03:00
parent 1541b2d689
commit 0caec7d250
10 changed files with 66 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_ide_api/src/call_info.rs
View file

@ -35,7 +35,7 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
// If we have a calling expression let's find which argument we are on
let num_params = call_info.parameters().len();
let has_self = function.signature(db).has_self_param();
let has_self = function.data(db).has_self_param();
if num_params == 1 {
if !has_self {

4
crates/ra_ide_api/src/completion/complete_dot.rs
View file

@ -37,8 +37,8 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty) {
ctx.analyzer.iterate_method_candidates(ctx.db, receiver, None, |_ty, func| {
let sig = func.signature(ctx.db);
if sig.has_self_param() {
let data = func.data(ctx.db);
if data.has_self_param() {
acc.add_function(ctx, func);
}
None::<()>

4
crates/ra_ide_api/src/completion/complete_path.rs
View file

@ -49,8 +49,8 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
ty.iterate_impl_items(ctx.db, krate, |item| {
match item {
hir::ImplItem::Method(func) => {
let sig = func.signature(ctx.db);
if !sig.has_self_param() {
let data = func.data(ctx.db);
if !data.has_self_param() {
acc.add_function(ctx, func);
}
}

12
crates/ra_ide_api/src/completion/presentation.rs
View file

@ -98,13 +98,13 @@ impl Completions {
name: Option<String>,
func: hir::Function,
) {
let sig = func.signature(ctx.db);
let name = name.unwrap_or_else(|| sig.name().to_string());
let data = func.data(ctx.db);
let name = name.unwrap_or_else(|| data.name().to_string());
let ast_node = func.source(ctx.db).ast;
let detail = function_label(&ast_node);
let mut builder = CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name)
.kind(if sig.has_self_param() {
.kind(if data.has_self_param() {
CompletionItemKind::Method
} else {
CompletionItemKind::Function
@ -115,10 +115,10 @@ impl Completions {
if ctx.use_item_syntax.is_none() && !ctx.is_call {
tested_by!(inserts_parens_for_function_calls);
let snippet =
if sig.params().is_empty() || sig.has_self_param() && sig.params().len() == 1 {
format!("{}()$0", sig.name())
if data.params().is_empty() || data.has_self_param() && data.params().len() == 1 {
format!("{}()$0", data.name())
} else {
format!("{}($0)", sig.name())
format!("{}($0)", data.name())
};
builder = builder.insert_snippet(snippet);
}