aboutsummaryrefslogtreecommitdiff
path: root/crates/ide/src/display
diff options
context:
space:
mode:
authorNick Spain <[email protected]>2021-01-01 02:05:28 +0000
committerNick Spain <[email protected]>2021-01-02 10:53:51 +0000
commit27cadcd531c017aa7c78c6f7a36f2b7f2ce8a196 (patch)
tree24f43261eeafffc8b98be361c9c2841c2e4861f0 /crates/ide/src/display
parentaa3ce16f2641b7eb562a8eae67738b0ff0c0b7b0 (diff)
HasSource::source -> HasSource::source_old
To start migrating HasSource::source to return an Option.
Diffstat (limited to 'crates/ide/src/display')
-rw-r--r--crates/ide/src/display/navigation_target.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs
index bcde2b6f1..de4c0fa12 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/display/navigation_target.rs
@@ -285,7 +285,7 @@ where
285 D::Ast: ast::NameOwner + ShortLabel, 285 D::Ast: ast::NameOwner + ShortLabel,
286{ 286{
287 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { 287 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
288 let src = self.source(db); 288 let src = self.source_old(db);
289 let mut res = NavigationTarget::from_named( 289 let mut res = NavigationTarget::from_named(
290 db, 290 db,
291 src.as_ref().map(|it| it as &dyn ast::NameOwner), 291 src.as_ref().map(|it| it as &dyn ast::NameOwner),
@@ -314,7 +314,7 @@ impl ToNav for hir::Module {
314 314
315impl ToNav for hir::Impl { 315impl ToNav for hir::Impl {
316 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { 316 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
317 let src = self.source(db); 317 let src = self.source_old(db);
318 let derive_attr = self.is_builtin_derive(db); 318 let derive_attr = self.is_builtin_derive(db);
319 let frange = if let Some(item) = &derive_attr { 319 let frange = if let Some(item) = &derive_attr {
320 item.syntax().original_file_range(db) 320 item.syntax().original_file_range(db)
@@ -339,7 +339,7 @@ impl ToNav for hir::Impl {
339 339
340impl ToNav for hir::Field { 340impl ToNav for hir::Field {
341 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { 341 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
342 let src = self.source(db); 342 let src = self.source_old(db);
343 343
344 match &src.value { 344 match &src.value {
345 FieldSource::Named(it) => { 345 FieldSource::Named(it) => {
@@ -365,7 +365,7 @@ impl ToNav for hir::Field {
365 365
366impl ToNav for hir::MacroDef { 366impl ToNav for hir::MacroDef {
367 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { 367 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
368 let src = self.source(db); 368 let src = self.source_old(db);
369 log::debug!("nav target {:#?}", src.value.syntax()); 369 log::debug!("nav target {:#?}", src.value.syntax());
370 let mut res = NavigationTarget::from_named( 370 let mut res = NavigationTarget::from_named(
371 db, 371 db,
@@ -448,7 +448,7 @@ impl ToNav for hir::Label {
448 448
449impl ToNav for hir::TypeParam { 449impl ToNav for hir::TypeParam {
450 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { 450 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
451 let src = self.source(db); 451 let src = self.source_old(db);
452 let full_range = match &src.value { 452 let full_range = match &src.value {
453 Either::Left(it) => it.syntax().text_range(), 453 Either::Left(it) => it.syntax().text_range(),
454 Either::Right(it) => it.syntax().text_range(), 454 Either::Right(it) => it.syntax().text_range(),
@@ -472,7 +472,7 @@ impl ToNav for hir::TypeParam {
472 472
473impl ToNav for hir::LifetimeParam { 473impl ToNav for hir::LifetimeParam {
474 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { 474 fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
475 let src = self.source(db); 475 let src = self.source_old(db);
476 let full_range = src.value.syntax().text_range(); 476 let full_range = src.value.syntax().text_range();
477 NavigationTarget { 477 NavigationTarget {
478 file_id: src.file_id.original_file(db), 478 file_id: src.file_id.original_file(db),