Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/ide_completion/src/patterns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ fn maximize_name_ref(name_ref: &ast::NameRef) -> SyntaxNode {
}

fn find_node_with_range<N: AstNode>(syntax: &SyntaxNode, range: TextRange) -> Option<N> {
let range = syntax.text_range().intersect(range)?;
syntax.covering_element(range).ancestors().find_map(N::cast)
}

Expand Down
31 changes: 27 additions & 4 deletions crates/ide_completion/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig {
},
};

pub(crate) fn completion_list(code: &str) -> String {
completion_list_with_config(TEST_CONFIG, code)
pub(crate) fn completion_list(ra_fixture: &str) -> String {
completion_list_with_config(TEST_CONFIG, ra_fixture)
}

fn completion_list_with_config(config: CompletionConfig, code: &str) -> String {
fn completion_list_with_config(config: CompletionConfig, ra_fixture: &str) -> String {
// filter out all but one builtintype completion for smaller test outputs
let items = get_all_items(config, code);
let items = get_all_items(config, ra_fixture);
let mut bt_seen = false;
let items = items
.into_iter()
Expand Down Expand Up @@ -227,3 +227,26 @@ fn test_no_completions_required() {
cov_mark::check!(no_completion_required);
check_no_completion(r#"fn foo() { for i i$0 }"#);
}

#[test]
fn regression_10042() {
completion_list(
r#"
macro_rules! preset {
($($x:ident)&&*) => {
{
let mut v = Vec::new();
$(
v.push($x.into());
)*
v
}
};
}

fn foo() {
preset!(foo$0);
}
"#,
);
}