diff options
| author | Florian Diebold <[email protected]> | 2019-08-30 19:16:28 +0100 |
|---|---|---|
| committer | Florian Diebold <[email protected]> | 2019-09-02 13:56:38 +0100 |
| commit | f92177cfb5088809892455262841e24cf1ecf5b6 (patch) | |
| tree | 789f733506520663e6cb5f99eec7d56c1a443831 /crates/ra_hir/src/code_model.rs | |
| parent | a7858bb7bf0a784d56b2b9ef97785a4fa78f7853 (diff) | |
Add an expr_source method analogous to the source methods in the code model
... and use that instead of exposing the source map.
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
| -rw-r--r-- | crates/ra_hir/src/code_model.rs | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 0f9ff97f1..f7efc1b66 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
| @@ -510,18 +510,6 @@ pub enum DefWithBody { | |||
| 510 | impl_froms!(DefWithBody: Function, Const, Static); | 510 | impl_froms!(DefWithBody: Function, Const, Static); |
| 511 | 511 | ||
| 512 | impl DefWithBody { | 512 | impl DefWithBody { |
| 513 | pub fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult> { | ||
| 514 | db.infer(self) | ||
| 515 | } | ||
| 516 | |||
| 517 | pub fn body(self, db: &impl HirDatabase) -> Arc<Body> { | ||
| 518 | db.body_hir(self) | ||
| 519 | } | ||
| 520 | |||
| 521 | pub fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> { | ||
| 522 | db.body_with_source_map(self).1 | ||
| 523 | } | ||
| 524 | |||
| 525 | /// Builds a resolver for code inside this item. | 513 | /// Builds a resolver for code inside this item. |
| 526 | pub(crate) fn resolver(self, db: &impl HirDatabase) -> Resolver { | 514 | pub(crate) fn resolver(self, db: &impl HirDatabase) -> Resolver { |
| 527 | match self { | 515 | match self { |
| @@ -532,6 +520,43 @@ impl DefWithBody { | |||
| 532 | } | 520 | } |
| 533 | } | 521 | } |
| 534 | 522 | ||
| 523 | pub trait HasBody: Copy { | ||
| 524 | fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult>; | ||
| 525 | fn body(self, db: &impl HirDatabase) -> Arc<Body>; | ||
| 526 | fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap>; | ||
| 527 | } | ||
| 528 | |||
| 529 | impl<T> HasBody for T | ||
| 530 | where | ||
| 531 | T: Into<DefWithBody> + Copy + HasSource, | ||
| 532 | { | ||
| 533 | fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult> { | ||
| 534 | db.infer(self.into()) | ||
| 535 | } | ||
| 536 | |||
| 537 | fn body(self, db: &impl HirDatabase) -> Arc<Body> { | ||
| 538 | db.body_hir(self.into()) | ||
| 539 | } | ||
| 540 | |||
| 541 | fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> { | ||
| 542 | db.body_with_source_map(self.into()).1 | ||
| 543 | } | ||
| 544 | } | ||
| 545 | |||
| 546 | impl HasBody for DefWithBody { | ||
| 547 | fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult> { | ||
| 548 | db.infer(self) | ||
| 549 | } | ||
| 550 | |||
| 551 | fn body(self, db: &impl HirDatabase) -> Arc<Body> { | ||
| 552 | db.body_hir(self) | ||
| 553 | } | ||
| 554 | |||
| 555 | fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> { | ||
| 556 | db.body_with_source_map(self).1 | ||
| 557 | } | ||
| 558 | } | ||
| 559 | |||
| 535 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 560 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
| 536 | pub struct Function { | 561 | pub struct Function { |
| 537 | pub(crate) id: FunctionId, | 562 | pub(crate) id: FunctionId, |
| @@ -617,7 +642,7 @@ impl Function { | |||
| 617 | self.data(db).name.clone() | 642 | self.data(db).name.clone() |
| 618 | } | 643 | } |
| 619 | 644 | ||
| 620 | pub fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> { | 645 | pub(crate) fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> { |
| 621 | db.body_with_source_map(self.into()).1 | 646 | db.body_with_source_map(self.into()).1 |
| 622 | } | 647 | } |
| 623 | 648 | ||