Skip to content

Commit c6bd2d9

Browse files
Merge pull request #21982 from A4-Tacks/kw-not-snippet
minor: Fix self kw is snippet in type location
2 parents b41a134 + e864158 commit c6bd2d9

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

crates/ide-completion/src/render.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -590,14 +590,17 @@ pub(crate) fn render_type_keyword_snippet(
590590
let mut item =
591591
CompletionItem::new(CompletionItemKind::Keyword, source_range, label, ctx.edition);
592592

593-
let cap = ctx.config.snippet_cap;
594-
if let Some(cap) = cap {
593+
let insert_text = if !snippet.contains('$') {
594+
item.insert_text(snippet);
595+
snippet
596+
} else if let Some(cap) = ctx.config.snippet_cap {
595597
item.insert_snippet(cap, snippet);
596-
}
597-
598-
let insert_text = if cap.is_some() { snippet } else { label }.to_owned();
599-
adds_ret_type_arrow(ctx, path_ctx, &mut item, insert_text);
598+
snippet
599+
} else {
600+
label
601+
};
600602

603+
adds_ret_type_arrow(ctx, path_ctx, &mut item, insert_text.to_owned());
601604
item
602605
}
603606

0 commit comments

Comments
 (0)