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

convert TypeLocation::GenericArg to struct variant

Browse source
This commit is contained in:
Max Heller 2023-08-08 20:37:23 -04:00
parent 0b57fa3931
commit 400f618a5c
4 changed files with 52 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ide-completion/src/context/analysis.rs
View file

@ -838,7 +838,15 @@ fn classify_name_ref(
})();
(args, in_trait, param)
});
override_location.unwrap_or(TypeLocation::GenericArg(location))
let (arg_list, of_trait, corresponding_param) = match location {
Some((arg_list, of_trait, param)) => (Some(arg_list), of_trait, param),
_ => (None, None, None),
};
override_location.unwrap_or(TypeLocation::GenericArg {
args: arg_list,
of_trait,
corresponding_param,
})
};
let type_location = |node: &SyntaxNode| {
@ -899,9 +907,8 @@ fn classify_name_ref(
ast::GenericArg(it) => generic_arg_location(it),
// is this case needed?
ast::GenericArgList(it) => {
let location = find_opt_node_in_file_compensated(sema, original_file, Some(it))
.map(|node| (node, None, None));
TypeLocation::GenericArg(location)
let args = find_opt_node_in_file_compensated(sema, original_file, Some(it));
TypeLocation::GenericArg { args, of_trait: None, corresponding_param: None }
},
ast::TupleField(_) => TypeLocation::TupleField,
_ => return None,