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

Allow hints after 'fn' keyword if it's an impl trait block

Browse source
This commit is contained in:
Igor Aleksanov 2020-10-17 11:03:07 +03:00
parent 8f303daf45
commit 6f573bd84f
3 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ide/src/completion/patterns.rs
View file

@ -9,7 +9,7 @@ use syntax::{
};
#[cfg(test)]
use crate::completion::test_utils::check_pattern_is_applicable;
use crate::completion::test_utils::{check_pattern_is_applicable, check_pattern_is_not_applicable};
pub(crate) fn has_trait_parent(element: SyntaxElement) -> bool {
not_same_range_ancestor(element)
@ -34,6 +34,22 @@ pub(crate) fn has_impl_parent(element: SyntaxElement) -> bool {
fn test_has_impl_parent() {
check_pattern_is_applicable(r"impl A { f<|> }", has_impl_parent);
}
pub(crate) fn has_impl_trait_parent(element: SyntaxElement) -> bool {
not_same_range_ancestor(element)
.filter(|it| it.kind() == ASSOC_ITEM_LIST)
.and_then(|it| it.parent())
.filter(|it| it.kind() == IMPL)
.map(|it| ast::Impl::cast(it).unwrap())
.map(|it| it.trait_().is_some())
.unwrap_or(false)
}
#[test]
fn test_has_impl_trait_parent() {
check_pattern_is_applicable(r"impl Foo for Bar { f<|> }", has_impl_trait_parent);
check_pattern_is_not_applicable(r"impl A { f<|> }", has_impl_trait_parent);
}
pub(crate) fn has_field_list_parent(element: SyntaxElement) -> bool {
not_same_range_ancestor(element).filter(|it| it.kind() == RECORD_FIELD_LIST).is_some()
}