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

Scan all ancestors for the impl trait block check

Browse Source
This commit is contained in:
Igor Aleksanov 2020-10-17 11:17:58 +03:00
parent 6f573bd84f
commit 99c435939c
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/ide/src/completion/completion_context.rs
View File

@ -18,8 +18,8 @@ use crate::{
patterns::{ patterns::{
fn_is_prev, for_is_prev2, has_bind_pat_parent, has_block_expr_parent, fn_is_prev, for_is_prev2, has_bind_pat_parent, has_block_expr_parent,
has_field_list_parent, has_impl_as_prev_sibling, has_impl_parent, has_field_list_parent, has_impl_as_prev_sibling, has_impl_parent,
has_impl_trait_parent, has_item_list_or_source_file_parent, has_ref_parent, has_item_list_or_source_file_parent, has_ref_parent, has_trait_as_prev_sibling,
has_trait_as_prev_sibling, has_trait_parent, if_is_prev, is_in_loop_body, is_match_arm, has_trait_parent, if_is_prev, inside_impl_trait_block, is_in_loop_body, is_match_arm,
unsafe_is_prev, unsafe_is_prev,
}, },
CompletionConfig, CompletionConfig,
@ -87,7 +87,7 @@ pub(crate) struct CompletionContext<'a> {
pub(super) in_loop_body: bool, pub(super) in_loop_body: bool,
pub(super) has_trait_parent: bool, pub(super) has_trait_parent: bool,
pub(super) has_impl_parent: bool, pub(super) has_impl_parent: bool,
pub(super) has_impl_trait_parent: bool, pub(super) inside_impl_trait_block: bool,
pub(super) has_field_list_parent: bool, pub(super) has_field_list_parent: bool,
pub(super) trait_as_prev_sibling: bool, pub(super) trait_as_prev_sibling: bool,
pub(super) impl_as_prev_sibling: bool, pub(super) impl_as_prev_sibling: bool,
@ -172,7 +172,7 @@ impl<'a> CompletionContext<'a> {
block_expr_parent: false, block_expr_parent: false,
has_trait_parent: false, has_trait_parent: false,
has_impl_parent: false, has_impl_parent: false,
has_impl_trait_parent: false, inside_impl_trait_block: false,
has_field_list_parent: false, has_field_list_parent: false,
trait_as_prev_sibling: false, trait_as_prev_sibling: false,
impl_as_prev_sibling: false, impl_as_prev_sibling: false,
@ -234,7 +234,7 @@ impl<'a> CompletionContext<'a> {
/// Exception for this case is `impl Trait for Foo`, where we would like to hint trait method names. /// Exception for this case is `impl Trait for Foo`, where we would like to hint trait method names.
/// - `for _ i<|>` -- obviously, it'll be "in" keyword. /// - `for _ i<|>` -- obviously, it'll be "in" keyword.
pub(crate) fn no_completion_required(&self) -> bool { pub(crate) fn no_completion_required(&self) -> bool {
(self.fn_is_prev && !self.has_impl_trait_parent) || self.for_is_prev2 (self.fn_is_prev && !self.inside_impl_trait_block) || self.for_is_prev2
} }
/// The range of the identifier that is being completed. /// The range of the identifier that is being completed.
@ -260,7 +260,7 @@ impl<'a> CompletionContext<'a> {
self.in_loop_body = is_in_loop_body(syntax_element.clone()); self.in_loop_body = is_in_loop_body(syntax_element.clone());
self.has_trait_parent = has_trait_parent(syntax_element.clone()); self.has_trait_parent = has_trait_parent(syntax_element.clone());
self.has_impl_parent = has_impl_parent(syntax_element.clone()); self.has_impl_parent = has_impl_parent(syntax_element.clone());
self.has_impl_trait_parent = has_impl_trait_parent(syntax_element.clone()); self.inside_impl_trait_block = inside_impl_trait_block(syntax_element.clone());
self.has_field_list_parent = has_field_list_parent(syntax_element.clone()); self.has_field_list_parent = has_field_list_parent(syntax_element.clone());
self.impl_as_prev_sibling = has_impl_as_prev_sibling(syntax_element.clone()); self.impl_as_prev_sibling = has_impl_as_prev_sibling(syntax_element.clone());
self.trait_as_prev_sibling = has_trait_as_prev_sibling(syntax_element.clone()); self.trait_as_prev_sibling = has_trait_as_prev_sibling(syntax_element.clone());

19
crates/ide/src/completion/patterns.rs
View File

@ -35,19 +35,22 @@ fn test_has_impl_parent() {
check_pattern_is_applicable(r"impl A { f<|> }", has_impl_parent); check_pattern_is_applicable(r"impl A { f<|> }", has_impl_parent);
} }
pub(crate) fn has_impl_trait_parent(element: SyntaxElement) -> bool { pub(crate) fn inside_impl_trait_block(element: SyntaxElement) -> bool {
not_same_range_ancestor(element) // Here we search `impl` keyword up through the all ancestors, unlike in `has_impl_parent`,
.filter(|it| it.kind() == ASSOC_ITEM_LIST) // where we only check the first parent with different text range.
.and_then(|it| it.parent()) element
.filter(|it| it.kind() == IMPL) .ancestors()
.find(|it| it.kind() == IMPL)
.map(|it| ast::Impl::cast(it).unwrap()) .map(|it| ast::Impl::cast(it).unwrap())
.map(|it| it.trait_().is_some()) .map(|it| it.trait_().is_some())
.unwrap_or(false) .unwrap_or(false)
} }
#[test] #[test]
fn test_has_impl_trait_parent() { fn test_inside_impl_trait_block() {
check_pattern_is_applicable(r"impl Foo for Bar { f<|> }", has_impl_trait_parent); check_pattern_is_applicable(r"impl Foo for Bar { f<|> }", inside_impl_trait_block);
check_pattern_is_not_applicable(r"impl A { f<|> }", has_impl_trait_parent); check_pattern_is_applicable(r"impl Foo for Bar { fn f<|> }", inside_impl_trait_block);
check_pattern_is_not_applicable(r"impl A { f<|> }", inside_impl_trait_block);
check_pattern_is_not_applicable(r"impl A { fn f<|> }", inside_impl_trait_block);
} }
pub(crate) fn has_field_list_parent(element: SyntaxElement) -> bool { pub(crate) fn has_field_list_parent(element: SyntaxElement) -> bool {