Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 21:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #11089

Browse source 
11089: internal: Render more completions from hir instead of ast r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-12-21 17:29:26 +00:00 committed by GitHub
commit a9793783bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 54 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ide/src/hover/render.rs
View file

@ -420,7 +420,7 @@ where
E: Fn(&D) -> Option<V>,
V: Display,
{
let label = if let Some(value) = (value_extractor)(&def) {
let label = if let Some(value) = value_extractor(&def) {
format!("{} = {}", def.display(db), value)
} else {
def.display(db).to_string()

22
crates/ide_completion/src/completions/qualified_path.rs
View file

@ -287,8 +287,8 @@ fn foo() { let _ = lib::S::$0 }
"#,
expect![[r#"
fn public_method() fn()
ct PUBLIC_CONST pub const PUBLIC_CONST: u32;
ta PublicType pub type PublicType;
ct PUBLIC_CONST pub const PUBLIC_CONST: u32
ta PublicType pub type PublicType = u32
"#]],
);
}
@ -377,12 +377,12 @@ trait Sub: Super {
fn foo<T: Sub>() { T::$0 }
"#,
expect![[r#"
ta SubTy (as Sub) type SubTy;
ta Ty (as Super) type Ty;
ct C2 (as Sub) const C2: ();
ta SubTy (as Sub) type SubTy
ta Ty (as Super) type Ty
ct C2 (as Sub) const C2: ()
fn subfunc() (as Sub) fn()
me submethod(…) (as Sub) fn(&self)
ct CONST (as Super) const CONST: u8;
ct CONST (as Super) const CONST: u8
fn func() (as Super) fn()
me method(…) (as Super) fn(&self)
"#]],
@ -417,12 +417,12 @@ impl<T> Sub for Wrap<T> {
}
"#,
expect![[r#"
ta SubTy (as Sub) type SubTy;
ta Ty (as Super) type Ty;
ct CONST (as Super) const CONST: u8;
ta SubTy (as Sub) type SubTy
ta Ty (as Super) type Ty
ct CONST (as Super) const CONST: u8
fn func() (as Super) fn()
me method(…) (as Super) fn(&self)
ct C2 (as Sub) const C2: ();
ct C2 (as Sub) const C2: ()
fn subfunc() (as Sub) fn()
me submethod(…) (as Sub) fn(&self)
"#]],
@ -653,7 +653,7 @@ impl u8 {
}
"#,
expect![[r#"
ct MAX pub const MAX: Self;
ct MAX pub const MAX: Self
me func(…) fn(self)
"#]],
);

3
crates/ide_completion/src/render/builder_ext.rs
View file

@ -1,6 +1,7 @@
//! Extensions for `Builder` structure required for item rendering.
use itertools::Itertools;
use syntax::SmolStr;
use crate::{context::PathKind, item::Builder, patterns::ImmediateLocation, CompletionContext};
@ -56,7 +57,7 @@ impl Builder {
pub(super) fn add_call_parens(
&mut self,
ctx: &CompletionContext,
name: String,
name: SmolStr,
params: Params,
) -> &mut Builder {
if !self.should_add_parens(ctx) {

6
crates/ide_completion/src/render/const_.rs
View file

@ -1,8 +1,7 @@
//! Renderer for `const` fields.
use hir::{AsAssocItem, HasSource};
use hir::{AsAssocItem, HirDisplay};
use ide_db::SymbolKind;
use syntax::display::const_label;
use crate::{item::CompletionItem, render::RenderContext};
@ -14,8 +13,7 @@ pub(crate) fn render_const(ctx: RenderContext<'_>, const_: hir::Const) -> Option
fn render(ctx: RenderContext<'_>, const_: hir::Const) -> Option<CompletionItem> {
let db = ctx.db();
let name = const_.name(db)?.to_smol_str();
// FIXME: This is parsing files!
let detail = const_label(&const_.source(db)?.value);
let detail = const_.display(db).to_string();
let mut item = CompletionItem::new(SymbolKind::Const, ctx.source_range(), name.clone());
item.set_documentation(ctx.docs(const_))

9
crates/ide_completion/src/render/enum_variant.rs
View file

@ -5,6 +5,7 @@ use std::iter;
use hir::{db::HirDatabase, HasAttrs, HirDisplay, StructKind};
use ide_db::SymbolKind;
use itertools::Itertools;
use syntax::SmolStr;
use crate::{
item::{CompletionItem, ImportEdit},
@ -48,10 +49,10 @@ fn render(
false,
),
};
let qualified_name = qualified_name.to_string();
let short_qualified_name: SmolStr = short_qualified_name.to_string().into();
// FIXME: ModPath::to_smol_str()?
let mut item =
CompletionItem::new(SymbolKind::Variant, ctx.source_range(), qualified_name.to_string());
let mut item = CompletionItem::new(SymbolKind::Variant, ctx.source_range(), qualified_name);
item.set_documentation(variant.docs(db))
.set_deprecated(ctx.is_deprecated(variant))
.detail(detail(db, variant, variant_kind));
@ -60,8 +61,6 @@ fn render(
item.add_import(import_to_add);
}
// FIXME: ModPath::to_smol_str()?
let short_qualified_name = short_qualified_name.to_string();
if variant_kind == hir::StructKind::Tuple {
cov_mark::hit!(inserts_parens_for_tuple_enums);
let params = Params::Anonymous(variant.fields(db).len());

40
crates/ide_completion/src/render/function.rs
View file

@ -52,10 +52,9 @@ fn render(
let name = local_name.unwrap_or_else(|| func.name(db));
let params = params(completion, func, &func_type);
// FIXME: SmolStr?
let call = match &func_type {
FuncType::Method(Some(receiver)) => format!("{}.{}", receiver, &name),
_ => name.to_string(),
FuncType::Method(Some(receiver)) => format!("{}.{}", receiver, &name).into(),
_ => name.to_smol_str(),
};
let mut item = CompletionItem::new(
if func.self_param(db).is_some() {
@ -66,23 +65,6 @@ fn render(
ctx.source_range(),
call.clone(),
);
item.set_documentation(ctx.docs(func))
.set_deprecated(ctx.is_deprecated(func) || ctx.is_deprecated_assoc_item(func))
.detail(detail(db, func))
.add_call_parens(completion, call.clone(), params);
if import_to_add.is_none() {
if let Some(actm) = func.as_assoc_item(db) {
if let Some(trt) = actm.containing_trait_or_trait_impl(db) {
item.trait_name(trt.name(db).to_smol_str());
}
}
}
if let Some(import_to_add) = import_to_add {
item.add_import(import_to_add);
}
item.lookup_by(name.to_smol_str());
let ret_type = func.ret_type(db);
item.set_relevance(CompletionRelevance {
@ -100,6 +82,24 @@ fn render(
}
}
item.set_documentation(ctx.docs(func))
.set_deprecated(ctx.is_deprecated(func) || ctx.is_deprecated_assoc_item(func))
.detail(detail(db, func))
.add_call_parens(completion, call, params);
if import_to_add.is_none() {
if let Some(actm) = func.as_assoc_item(db) {
if let Some(trt) = actm.containing_trait_or_trait_impl(db) {
item.trait_name(trt.name(db).to_smol_str());
}
}
}
if let Some(import_to_add) = import_to_add {
item.add_import(import_to_add);
}
item.lookup_by(name.to_smol_str());
item.build()
}

20
crates/ide_completion/src/render/type_alias.rs
View file

@ -1,8 +1,8 @@
//! Renderer for type aliases.
use hir::{AsAssocItem, HasSource};
use hir::{AsAssocItem, HirDisplay};
use ide_db::SymbolKind;
use syntax::{ast::HasName, display::type_label};
use syntax::SmolStr;
use crate::{item::CompletionItem, render::RenderContext};
@ -29,16 +29,12 @@ fn render(
) -> Option<CompletionItem> {
let db = ctx.db();
// FIXME: This parses the file!
let ast_node = type_alias.source(db)?.value;
let name = ast_node.name().map(|name| {
if with_eq {
format!("{} = ", name.text())
} else {
name.text().to_string()
}
})?;
let detail = type_label(&ast_node);
let name = if with_eq {
SmolStr::from_iter([&*type_alias.name(db).to_smol_str(), " = "])
} else {
type_alias.name(db).to_smol_str()
};
let detail = type_alias.display(db).to_string();
let mut item = CompletionItem::new(SymbolKind::TypeAlias, ctx.source_range(), name.clone());
item.set_documentation(ctx.docs(type_alias))

4
crates/ide_completion/src/tests/expression.rs
View file

@ -546,9 +546,9 @@ fn func() {
ev TupleV(…) (u32)
ev RecordV {field: u32}
ev UnitV ()
ct ASSOC_CONST const ASSOC_CONST: ();
ct ASSOC_CONST const ASSOC_CONST: ()
fn assoc_fn() fn()
ta AssocType type AssocType;
ta AssocType type AssocType = ()
"#]],
);
}

4
crates/ide_completion/src/tests/pattern.rs
View file

@ -294,9 +294,9 @@ fn func() {
ev TupleV(…) (u32)
ev RecordV {field: u32}
ev UnitV ()
ct ASSOC_CONST const ASSOC_CONST: ();
ct ASSOC_CONST const ASSOC_CONST: ()
fn assoc_fn() fn()
ta AssocType type AssocType;
ta AssocType type AssocType = ()
"#]],
);
}

4
crates/ide_completion/src/tests/type_pos.rs
View file

@ -148,7 +148,7 @@ fn foo<'lt, T: Trait2<$0>, const CONST_PARAM: usize>(_: T) {}
kw self
kw super
kw crate
ta Foo = (as Trait2) type Foo;
ta Foo = (as Trait2) type Foo
tp T
cp CONST_PARAM
tt Trait
@ -199,7 +199,7 @@ impl Enum {
fn func(_: Enum::$0) {}
"#,
expect![[r#"
ta AssocType type AssocType;
ta AssocType type AssocType = ()
"#]],
);
}

36
crates/syntax/src/display.rs
View file

@ -50,42 +50,6 @@ pub fn function_declaration(node: &ast::Fn) -> String {
buf
}
pub fn const_label(node: &ast::Const) -> String {
let mut s = String::new();
if let Some(vis) = node.visibility() {
format_to!(s, "{} ", vis);
}
format_to!(s, "const ");
if let Some(name) = node.name() {
format_to!(s, "{}", name);
} else {
format_to!(s, "?");
}
format_to!(s, ": ");
if let Some(ty) = node.ty() {
format_to!(s, "{}", ty);
} else {
format_to!(s, "?");
}
format_to!(s, ";");
s
}
pub fn type_label(node: &ast::TypeAlias) -> String {
let mut s = String::new();
if let Some(vis) = node.visibility() {
format_to!(s, "{} ", vis);
}
format_to!(s, "type ");
if let Some(name) = node.name() {
format_to!(s, "{}", name);
} else {
format_to!(s, "?");
}
format_to!(s, ";");
s
}
pub fn macro_label(node: &ast::Macro) -> String {
let name = node.name();
let mut s = String::new();