language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Infer result of struct literals, and recurse into their child expressions

Browse source
This commit is contained in:
Florian Diebold 2018-12-24 21:00:14 +01:00
parent 4ff1618520
commit 6fcd38cc81
6 changed files with 143 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ra_hir/src/adt.rs
View file

@ -1,3 +1,5 @@
use std::sync::Arc;
use ra_syntax::{SmolStr, ast::{self, NameOwner}};
use crate::{
@ -15,6 +17,14 @@ impl Struct {
Struct { def_id }
}
pub fn def_id(&self) -> DefId {
self.def_id
}
pub fn struct_data(&self, db: &impl HirDatabase) -> Cancelable<Arc<StructData>> {
Ok(db.struct_data(self.def_id)?)
}
pub fn name(&self, db: &impl HirDatabase) -> Cancelable<SmolStr> {
Ok(db.struct_data(self.def_id)?.name.clone())
}
@ -23,7 +33,7 @@ impl Struct {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct StructData {
name: SmolStr,
variant_data: VariantData,
variant_data: Arc<VariantData>,
}
impl StructData {
@ -33,8 +43,17 @@ impl StructData {
.map(|n| n.text())
.unwrap_or(SmolStr::new("[error]"));
let variant_data = VariantData::Unit; // TODO implement this
let variant_data = Arc::new(variant_data);
StructData { name, variant_data }
}
pub fn name(&self) -> &SmolStr {
&self.name
}
pub fn variant_data(&self) -> &Arc<VariantData> {
&self.variant_data
}
}
pub struct Enum {
@ -46,6 +65,10 @@ impl Enum {
Enum { def_id }
}
pub fn def_id(&self) -> DefId {
self.def_id
}
pub fn name(&self, db: &impl HirDatabase) -> Cancelable<SmolStr> {
Ok(db.enum_data(self.def_id)?.name.clone())
}
@ -54,7 +77,7 @@ impl Enum {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct EnumData {
name: SmolStr,
variants: Vec<(SmolStr, VariantData)>,
variants: Vec<(SmolStr, Arc<VariantData>)>,
}
impl EnumData {