language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add basic parameter name hints heuristics

Browse source
This commit is contained in:
Kirill Bulatov 2020-02-23 12:49:53 +03:00
parent 1651ce0ebe
commit c200dba167
2 changed files with 186 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_ide/src/display/function_signature.rs
View file

@ -38,6 +38,8 @@ pub struct FunctionSignature {
pub ret_type: Option<String>,
/// Where predicates
pub where_predicates: Vec<String>,
/// Self param presence
pub has_self_param: bool,
}
impl FunctionSignature {
@ -78,6 +80,7 @@ impl FunctionSignature {
generic_parameters: generic_parameters(&node),
where_predicates: where_predicates(&node),
doc: None,
has_self_param: false,
}
.with_doc_opt(st.docs(db)),
)
@ -115,6 +118,7 @@ impl FunctionSignature {
generic_parameters: vec![],
where_predicates: vec![],
doc: None,
has_self_param: false,
}
.with_doc_opt(variant.docs(db)),
)
@ -136,6 +140,7 @@ impl FunctionSignature {
generic_parameters: vec![],
where_predicates: vec![],
doc: None,
has_self_param: false,
}
.with_doc_opt(macro_def.docs(db)),
)
@ -144,16 +149,18 @@ impl FunctionSignature {
impl From<&'_ ast::FnDef> for FunctionSignature {
fn from(node: &ast::FnDef) -> FunctionSignature {
fn param_list(node: &ast::FnDef) -> Vec<String> {
fn param_list(node: &ast::FnDef) -> (bool, Vec<String>) {
let mut res = vec![];
let mut has_self_param = false;
if let Some(param_list) = node.param_list() {
if let Some(self_param) = param_list.self_param() {
has_self_param = true;
res.push(self_param.syntax().text().to_string())
}
res.extend(param_list.params().map(|param| param.syntax().text().to_string()));
}
res
(has_self_param, res)
}
fn param_name_list(node: &ast::FnDef) -> Vec<String> {
@ -183,6 +190,8 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
res
}
let (has_self_param, parameters) = param_list(node);
FunctionSignature {
kind: CallableKind::Function,
visibility: node.visibility().map(|n| n.syntax().text().to_string()),
@ -191,12 +200,13 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
.ret_type()
.and_then(|r| r.type_ref())
.map(|n| n.syntax().text().to_string()),
parameters: param_list(node),
parameters,
parameter_names: param_name_list(node),
generic_parameters: generic_parameters(node),
where_predicates: where_predicates(node),
// docs are processed separately
doc: None,
has_self_param,
}
}
}