From 27cadcd531c017aa7c78c6f7a36f2b7f2ce8a196 Mon Sep 17 00:00:00 2001 From: Nick Spain Date: Fri, 1 Jan 2021 13:05:28 +1100 Subject: HasSource::source -> HasSource::source_old To start migrating HasSource::source to return an Option. --- crates/ide_db/src/search.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'crates/ide_db') diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs index ff10f71c3..2df4894a1 100644 --- a/crates/ide_db/src/search.rs +++ b/crates/ide_db/src/search.rs @@ -121,9 +121,9 @@ impl Definition { if let Definition::Local(var) = self { let range = match var.parent(db) { - DefWithBody::Function(f) => f.source(db).value.syntax().text_range(), - DefWithBody::Const(c) => c.source(db).value.syntax().text_range(), - DefWithBody::Static(s) => s.source(db).value.syntax().text_range(), + DefWithBody::Function(f) => f.source_old(db).value.syntax().text_range(), + DefWithBody::Const(c) => c.source_old(db).value.syntax().text_range(), + DefWithBody::Static(s) => s.source_old(db).value.syntax().text_range(), }; let mut res = FxHashMap::default(); res.insert(file_id, Some(range)); @@ -132,17 +132,17 @@ impl Definition { if let Definition::LifetimeParam(param) = self { let range = match param.parent(db) { - hir::GenericDef::Function(it) => it.source(db).value.syntax().text_range(), + hir::GenericDef::Function(it) => it.source_old(db).value.syntax().text_range(), hir::GenericDef::Adt(it) => match it { - hir::Adt::Struct(it) => it.source(db).value.syntax().text_range(), - hir::Adt::Union(it) => it.source(db).value.syntax().text_range(), - hir::Adt::Enum(it) => it.source(db).value.syntax().text_range(), + hir::Adt::Struct(it) => it.source_old(db).value.syntax().text_range(), + hir::Adt::Union(it) => it.source_old(db).value.syntax().text_range(), + hir::Adt::Enum(it) => it.source_old(db).value.syntax().text_range(), }, - hir::GenericDef::Trait(it) => it.source(db).value.syntax().text_range(), - hir::GenericDef::TypeAlias(it) => it.source(db).value.syntax().text_range(), - hir::GenericDef::Impl(it) => it.source(db).value.syntax().text_range(), - hir::GenericDef::Variant(it) => it.source(db).value.syntax().text_range(), - hir::GenericDef::Const(it) => it.source(db).value.syntax().text_range(), + hir::GenericDef::Trait(it) => it.source_old(db).value.syntax().text_range(), + hir::GenericDef::TypeAlias(it) => it.source_old(db).value.syntax().text_range(), + hir::GenericDef::Impl(it) => it.source_old(db).value.syntax().text_range(), + hir::GenericDef::Variant(it) => it.source_old(db).value.syntax().text_range(), + hir::GenericDef::Const(it) => it.source_old(db).value.syntax().text_range(), }; let mut res = FxHashMap::default(); res.insert(file_id, Some(range)); -- cgit v1.2.3