Introduce HasSource trait

2 files changed, 27 insertions, 1 deletions

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 63fdca55e..765850488 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -31,6 +31,11 @@ impl<T> From<(HirFileId, T)> for Source<T> {
     }
 }
 
+pub trait HasSource {
+    type Ast;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<Self::Ast>;
+}
+
 /// hir::Crate describes a single crate. It's the main interface with which
 /// a crate's dependencies interact. Mostly, it should be just a proxy for the
 /// root module.
@@ -364,6 +369,13 @@ pub struct Struct {
     pub(crate) id: StructId,
 }
 
+impl HasSource for Struct {
+    type Ast = TreeArc<ast::StructDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::StructDef>> {
+        self.id.source(db).into()
+    }
+}
+
 impl Struct {
     pub fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::StructDef>> {
         self.id.source(db).into()
@@ -422,6 +434,13 @@ pub struct Union {
     pub(crate) id: StructId,
 }
 
+impl HasSource for Union {
+    type Ast = TreeArc<ast::StructDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::StructDef>> {
+        self.id.source(db).into()
+    }
+}
+
 impl Union {
     pub fn source(
         self,
@@ -455,6 +474,13 @@ pub struct Enum {
     pub(crate) id: EnumId,
 }
 
+impl HasSource for Enum {
+    type Ast = TreeArc<ast::EnumDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::EnumDef>> {
+        self.id.source(db).into()
+    }
+}
+
 impl Enum {
     pub fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::EnumDef>> {
         self.id.source(db).into()
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 90e3f1275..02f5f7f40 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -81,5 +81,5 @@ pub use self::code_model::{
     StructField, FieldSource,
     Static, Const, ConstSignature,
     Trait, TypeAlias, MacroDef, Container,
-    BuiltinType, Source,
+    BuiltinType, Source, HasSource,
 };