1 files changed, 74 insertions, 23 deletions

diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index 098c7f40b..d4244f70c 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use relative_path::RelativePathBuf;
 use ra_db::{CrateId, Cancelable, FileId};
-use ra_syntax::{ast, TreeArc, SyntaxNode, AstNode};
+use ra_syntax::{ast, TreeArc, SyntaxNode};
 
 use crate::{
     Name, DefId, Path, PerNs, ScopesWithSyntaxMapping, Ty, HirFileId,
@@ -12,6 +12,7 @@ use crate::{
     expr::BodySyntaxMapping,
     ty::InferenceResult,
     adt::VariantData,
+    code_model_impl::def_id_to_ast,
 };
 
 /// hir::Crate describes a single crate. It's the main interface with which
@@ -40,12 +41,17 @@ impl Crate {
     }
 }
 
+#[derive(Debug)]
 pub enum Def {
     Module(Module),
     Struct(Struct),
     Enum(Enum),
     EnumVariant(EnumVariant),
     Function(Function),
+    Const(Const),
+    Static(Static),
+    Trait(Trait),
+    Type(Type),
     Item,
 }
 
@@ -186,13 +192,7 @@ impl Struct {
         &self,
         db: &impl HirDatabase,
     ) -> Cancelable<(HirFileId, TreeArc<ast::StructDef>)> {
-        let (file_id, syntax) = self.def_id.source(db);
-        Ok((
-            file_id,
-            ast::StructDef::cast(&syntax)
-                .expect("struct def should point to StructDef node")
-                .to_owned(),
-        ))
+        Ok(def_id_to_ast(db, self.def_id))
     }
 }
 
@@ -219,13 +219,7 @@ impl Enum {
     }
 
     pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::EnumDef>)> {
-        let (file_id, syntax) = self.def_id.source(db);
-        Ok((
-            file_id,
-            ast::EnumDef::cast(&syntax)
-                .expect("enum def should point to EnumDef node")
-                .to_owned(),
-        ))
+        Ok(def_id_to_ast(db, self.def_id))
     }
 }
 
@@ -259,13 +253,7 @@ impl EnumVariant {
         &self,
         db: &impl HirDatabase,
     ) -> Cancelable<(HirFileId, TreeArc<ast::EnumVariant>)> {
-        let (file_id, syntax) = self.def_id.source(db);
-        Ok((
-            file_id,
-            ast::EnumVariant::cast(&syntax)
-                .expect("variant def should point to EnumVariant node")
-                .to_owned(),
-        ))
+        Ok(def_id_to_ast(db, self.def_id))
     }
 }
 
@@ -304,7 +292,7 @@ impl Function {
     }
 
     pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::FnDef>)> {
-        Ok(self.source_impl(db))
+        Ok(def_id_to_ast(db, self.def_id))
     }
 
     pub fn body_syntax_mapping(&self, db: &impl HirDatabase) -> Cancelable<Arc<BodySyntaxMapping>> {
@@ -328,3 +316,66 @@ impl Function {
         db.infer(self.def_id)
     }
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Const {
+    pub(crate) def_id: DefId,
+}
+
+impl Const {
+    pub(crate) fn new(def_id: DefId) -> Const {
+        Const { def_id }
+    }
+
+    pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::ConstDef>)> {
+        Ok(def_id_to_ast(db, self.def_id))
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Static {
+    pub(crate) def_id: DefId,
+}
+
+impl Static {
+    pub(crate) fn new(def_id: DefId) -> Static {
+        Static { def_id }
+    }
+
+    pub fn source(
+        &self,
+        db: &impl HirDatabase,
+    ) -> Cancelable<(HirFileId, TreeArc<ast::StaticDef>)> {
+        Ok(def_id_to_ast(db, self.def_id))
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Trait {
+    pub(crate) def_id: DefId,
+}
+
+impl Trait {
+    pub(crate) fn new(def_id: DefId) -> Trait {
+        Trait { def_id }
+    }
+
+    pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::TraitDef>)> {
+        Ok(def_id_to_ast(db, self.def_id))
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Type {
+    pub(crate) def_id: DefId,
+}
+
+impl Type {
+    pub(crate) fn new(def_id: DefId) -> Type {
+        Type { def_id }
+    }
+
+    pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::TypeDef>)> {
+        Ok(def_id_to_ast(db, self.def_id))
+    }
+}