mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-27 05:23:24 +00:00
fix: make custom expr prefix completions to understand refs
This commit is contained in:
parent
ebce5e923c
commit
98125b9f95
1 changed files with 25 additions and 4 deletions
|
@ -69,10 +69,6 @@ pub(crate) fn complete_postfix(
|
|||
}
|
||||
}
|
||||
|
||||
if !ctx.config.snippets.is_empty() {
|
||||
add_custom_postfix_completions(acc, ctx, &postfix_snippet, &receiver_text);
|
||||
}
|
||||
|
||||
let try_enum = TryEnum::from_ty(&ctx.sema, &receiver_ty.strip_references());
|
||||
if let Some(try_enum) = &try_enum {
|
||||
match try_enum {
|
||||
|
@ -140,6 +136,10 @@ pub(crate) fn complete_postfix(
|
|||
None => return,
|
||||
};
|
||||
|
||||
if !ctx.config.snippets.is_empty() {
|
||||
add_custom_postfix_completions(acc, ctx, &postfix_snippet, &receiver_text);
|
||||
}
|
||||
|
||||
match try_enum {
|
||||
Some(try_enum) => match try_enum {
|
||||
TryEnum::Result => {
|
||||
|
@ -613,4 +613,25 @@ fn main() {
|
|||
r#"fn main() { log::error!("{}", 2+2) }"#,
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn postfix_custom_snippets_completion_for_references() {
|
||||
check_edit_with_config(
|
||||
CompletionConfig {
|
||||
snippets: vec![Snippet::new(
|
||||
&[],
|
||||
&["ok".into()],
|
||||
&["Ok(${receiver})".into()],
|
||||
"",
|
||||
&[],
|
||||
crate::SnippetScope::Expr,
|
||||
)
|
||||
.unwrap()],
|
||||
..TEST_CONFIG
|
||||
},
|
||||
"ok",
|
||||
r#"fn main() { &&42.$0 }"#,
|
||||
r#"fn main() { Ok(&&42) }"#,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue