bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-completion/src/render.rs')
-rw-r--r--crates/ide-completion/src/render.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/crates/ide-completion/src/render.rs b/crates/ide-completion/src/render.rs
index 8f43d388b8..abcff62341 100644
--- a/crates/ide-completion/src/render.rs
+++ b/crates/ide-completion/src/render.rs
@@ -17,7 +17,7 @@ use ide_db::{
imports::import_assets::LocatedImport,
RootDatabase, SnippetCap, SymbolKind,
};
-use syntax::{ast, format_smolstr, AstNode, SmolStr, SyntaxKind, TextRange};
+use syntax::{ast, format_smolstr, AstNode, SmolStr, SyntaxKind, TextRange, ToSmolStr};
use text_edit::TextEdit;
use crate::{
@@ -133,7 +133,8 @@ pub(crate) fn render_field(
let db = ctx.db();
let is_deprecated = ctx.is_deprecated(field);
let name = field.name(db);
- let (name, escaped_name) = (name.unescaped().to_smol_str(), name.to_smol_str());
+ let (name, escaped_name) =
+ (name.unescaped().display(db).to_smolstr(), name.display_no_db().to_smolstr());
let mut item = CompletionItem::new(
SymbolKind::Field,
ctx.source_range(),
@@ -399,10 +400,10 @@ fn render_resolution_path(
let config = completion.config;
let requires_import = import_to_add.is_some();
- let name = local_name.to_smol_str();
+ let name = local_name.display_no_db().to_smolstr();
let mut item = render_resolution_simple_(ctx, &local_name, import_to_add, resolution);
if local_name.is_escaped() {
- item.insert_text(local_name.to_smol_str());
+ item.insert_text(local_name.display_no_db().to_smolstr());
}
// Add `<>` for generic types
let type_path_no_ty_args = matches!(
@@ -484,8 +485,11 @@ fn render_resolution_simple_(
let ctx = ctx.import_to_add(import_to_add);
let kind = res_to_kind(resolution);
- let mut item =
- CompletionItem::new(kind, ctx.source_range(), local_name.unescaped().to_smol_str());
+ let mut item = CompletionItem::new(
+ kind,
+ ctx.source_range(),
+ local_name.unescaped().display(db).to_smolstr(),
+ );
item.set_relevance(ctx.completion_relevance())
.set_documentation(scope_def_docs(db, resolution))
.set_deprecated(scope_def_is_deprecated(&ctx, resolution));