Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #20937 from A4-Tacks/duplicate-raw-const
Fix duplicate `const` complete after `raw`
| -rw-r--r-- | crates/ide-completion/src/completions/expr.rs | 5 | ||||
| -rw-r--r-- | crates/ide-completion/src/tests/expression.rs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crates/ide-completion/src/completions/expr.rs b/crates/ide-completion/src/completions/expr.rs index 6bdf873426..77734c5d6f 100644 --- a/crates/ide-completion/src/completions/expr.rs +++ b/crates/ide-completion/src/completions/expr.rs @@ -352,7 +352,10 @@ pub(crate) fn complete_expr_path( if !in_block_expr { add_keyword("unsafe", "unsafe {\n $0\n}"); - add_keyword("const", "const {\n $0\n}"); + if !wants_const_token { + // Avoid having two `const` items in `&raw $0` + add_keyword("const", "const {\n $0\n}"); + } } add_keyword("match", "match $1 {\n $0\n}"); add_keyword("while", "while $1 {\n $0\n}"); diff --git a/crates/ide-completion/src/tests/expression.rs b/crates/ide-completion/src/tests/expression.rs index 034bc24f6c..78f003dd21 100644 --- a/crates/ide-completion/src/tests/expression.rs +++ b/crates/ide-completion/src/tests/expression.rs @@ -628,7 +628,6 @@ fn completes_after_ref_expr() { fn main() fn() bt u32 u32 kw const - kw const kw crate:: kw false kw for |