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/src/diagnostics/fixes.rs | 6 +++--- crates/ide/src/display/navigation_target.rs | 12 ++++++------ crates/ide/src/hover.rs | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'crates/ide/src') diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs index d79f5c170..702e8239d 100644 --- a/crates/ide/src/diagnostics/fixes.rs +++ b/crates/ide/src/diagnostics/fixes.rs @@ -156,20 +156,20 @@ fn missing_record_expr_field_fix( let record_fields = match VariantDef::from(def_id) { VariantDef::Struct(s) => { module = s.module(sema.db); - let source = s.source(sema.db); + let source = s.source_old(sema.db); def_file_id = source.file_id; let fields = source.value.field_list()?; record_field_list(fields)? } VariantDef::Union(u) => { module = u.module(sema.db); - let source = u.source(sema.db); + let source = u.source_old(sema.db); def_file_id = source.file_id; source.value.record_field_list()? } VariantDef::Variant(e) => { module = e.module(sema.db); - let source = e.source(sema.db); + let source = e.source_old(sema.db); def_file_id = source.file_id; let fields = source.value.field_list()?; record_field_list(fields)? 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 D::Ast: ast::NameOwner + ShortLabel, { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - let src = self.source(db); + let src = self.source_old(db); let mut res = NavigationTarget::from_named( db, src.as_ref().map(|it| it as &dyn ast::NameOwner), @@ -314,7 +314,7 @@ impl ToNav for hir::Module { impl ToNav for hir::Impl { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - let src = self.source(db); + let src = self.source_old(db); let derive_attr = self.is_builtin_derive(db); let frange = if let Some(item) = &derive_attr { item.syntax().original_file_range(db) @@ -339,7 +339,7 @@ impl ToNav for hir::Impl { impl ToNav for hir::Field { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - let src = self.source(db); + let src = self.source_old(db); match &src.value { FieldSource::Named(it) => { @@ -365,7 +365,7 @@ impl ToNav for hir::Field { impl ToNav for hir::MacroDef { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - let src = self.source(db); + let src = self.source_old(db); log::debug!("nav target {:#?}", src.value.syntax()); let mut res = NavigationTarget::from_named( db, @@ -448,7 +448,7 @@ impl ToNav for hir::Label { impl ToNav for hir::TypeParam { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - let src = self.source(db); + let src = self.source_old(db); let full_range = match &src.value { Either::Left(it) => it.syntax().text_range(), Either::Right(it) => it.syntax().text_range(), @@ -472,7 +472,7 @@ impl ToNav for hir::TypeParam { impl ToNav for hir::LifetimeParam { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - let src = self.source(db); + let src = self.source_old(db); let full_range = src.value.syntax().text_range(); NavigationTarget { file_id: src.file_id.original_file(db), diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index 98c7bfbe5..90781ea34 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -206,7 +206,7 @@ fn runnable_action( _ => None, }, ModuleDef::Function(it) => { - let src = it.source(sema.db); + let src = it.source_old(sema.db); if src.file_id != file_id.into() { mark::hit!(hover_macro_generated_struct_fn_doc_comment); mark::hit!(hover_macro_generated_struct_fn_doc_attr); @@ -332,11 +332,11 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { if it.is_proc_macro() { return None; } - let label = macro_label(&it.source(db).value); + let label = macro_label(&it.source_old(db).value); from_def_source_labeled(db, it, Some(label), mod_path) } Definition::Field(def) => { - let src = def.source(db).value; + let src = def.source_old(db).value; if let FieldSource::Named(it) = src { from_def_source_labeled(db, def, it.short_label(), mod_path) } else { @@ -385,7 +385,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { D: HasSource + HasAttrs + Copy, A: ShortLabel, { - let short_label = def.source(db).value.short_label(); + let short_label = def.source_old(db).value.short_label(); from_def_source_labeled(db, def, short_label, mod_path) } -- cgit v1.2.3 From ea4708c444509449b86c50b7b1b23f9ff5af4e97 Mon Sep 17 00:00:00 2001 From: Nick Spain Date: Fri, 1 Jan 2021 13:50:50 +1100 Subject: Mark HasSource::source_old as deprecated but allow at all call sites --- crates/ide/src/diagnostics/fixes.rs | 3 +++ crates/ide/src/display/navigation_target.rs | 6 ++++++ crates/ide/src/hover.rs | 4 ++++ 3 files changed, 13 insertions(+) (limited to 'crates/ide/src') diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs index 702e8239d..0b5e0a4c1 100644 --- a/crates/ide/src/diagnostics/fixes.rs +++ b/crates/ide/src/diagnostics/fixes.rs @@ -156,6 +156,7 @@ fn missing_record_expr_field_fix( let record_fields = match VariantDef::from(def_id) { VariantDef::Struct(s) => { module = s.module(sema.db); + #[allow(deprecated)] let source = s.source_old(sema.db); def_file_id = source.file_id; let fields = source.value.field_list()?; @@ -163,12 +164,14 @@ fn missing_record_expr_field_fix( } VariantDef::Union(u) => { module = u.module(sema.db); + #[allow(deprecated)] let source = u.source_old(sema.db); def_file_id = source.file_id; source.value.record_field_list()? } VariantDef::Variant(e) => { module = e.module(sema.db); + #[allow(deprecated)] let source = e.source_old(sema.db); def_file_id = source.file_id; let fields = source.value.field_list()?; diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index de4c0fa12..efa0418ad 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs @@ -285,6 +285,7 @@ where D::Ast: ast::NameOwner + ShortLabel, { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { + #[allow(deprecated)] let src = self.source_old(db); let mut res = NavigationTarget::from_named( db, @@ -314,6 +315,7 @@ impl ToNav for hir::Module { impl ToNav for hir::Impl { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { + #[allow(deprecated)] let src = self.source_old(db); let derive_attr = self.is_builtin_derive(db); let frange = if let Some(item) = &derive_attr { @@ -339,6 +341,7 @@ impl ToNav for hir::Impl { impl ToNav for hir::Field { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { + #[allow(deprecated)] let src = self.source_old(db); match &src.value { @@ -365,6 +368,7 @@ impl ToNav for hir::Field { impl ToNav for hir::MacroDef { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { + #[allow(deprecated)] let src = self.source_old(db); log::debug!("nav target {:#?}", src.value.syntax()); let mut res = NavigationTarget::from_named( @@ -448,6 +452,7 @@ impl ToNav for hir::Label { impl ToNav for hir::TypeParam { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { + #[allow(deprecated)] let src = self.source_old(db); let full_range = match &src.value { Either::Left(it) => it.syntax().text_range(), @@ -472,6 +477,7 @@ impl ToNav for hir::TypeParam { impl ToNav for hir::LifetimeParam { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { + #[allow(deprecated)] let src = self.source_old(db); let full_range = src.value.syntax().text_range(); NavigationTarget { diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index 90781ea34..c192e3ed7 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -206,6 +206,7 @@ fn runnable_action( _ => None, }, ModuleDef::Function(it) => { + #[allow(deprecated)] let src = it.source_old(sema.db); if src.file_id != file_id.into() { mark::hit!(hover_macro_generated_struct_fn_doc_comment); @@ -332,10 +333,12 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { if it.is_proc_macro() { return None; } + #[allow(deprecated)] let label = macro_label(&it.source_old(db).value); from_def_source_labeled(db, it, Some(label), mod_path) } Definition::Field(def) => { + #[allow(deprecated)] let src = def.source_old(db).value; if let FieldSource::Named(it) = src { from_def_source_labeled(db, def, it.short_label(), mod_path) @@ -385,6 +388,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { D: HasSource + HasAttrs + Copy, A: ShortLabel, { + #[allow(deprecated)] let short_label = def.source_old(db).value.short_label(); from_def_source_labeled(db, def, short_label, mod_path) } -- cgit v1.2.3 From 14d0db0759c5b8e1d085ebab03a8b944a8921f2e Mon Sep 17 00:00:00 2001 From: Nick Spain Date: Fri, 1 Jan 2021 14:14:09 +1100 Subject: HasSource::source_old -> HasSource::source for places where proc-macros were special cased In #6901 some special case handling for proc-macros was introduced to prevent panicing as they have no AST. Now the new HasSource::source method is used that returns an option. Generally this was a pretty trivial change, the only thing of much interest is that `hir::MacroDef` now implements `TryToNav` not `ToNav` as this allows us to handle `HasSource::source` now returning an option. --- crates/ide/src/display/navigation_target.rs | 19 +++++-------------- crates/ide/src/hover.rs | 9 +-------- 2 files changed, 6 insertions(+), 22 deletions(-) (limited to 'crates/ide/src') diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index efa0418ad..5dc3f4128 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs @@ -210,15 +210,7 @@ impl ToNav for FileSymbol { impl TryToNav for Definition { fn try_to_nav(&self, db: &RootDatabase) -> Option { match self { - Definition::Macro(it) => { - // FIXME: Currently proc-macro do not have ast-node, - // such that it does not have source - // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913 - if it.is_proc_macro() { - return None; - } - Some(it.to_nav(db)) - } + Definition::Macro(it) => it.try_to_nav(db), Definition::Field(it) => Some(it.to_nav(db)), Definition::ModuleDef(it) => it.try_to_nav(db), Definition::SelfType(it) => Some(it.to_nav(db)), @@ -366,10 +358,9 @@ impl ToNav for hir::Field { } } -impl ToNav for hir::MacroDef { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - #[allow(deprecated)] - let src = self.source_old(db); +impl TryToNav for hir::MacroDef { + fn try_to_nav(&self, db: &RootDatabase) -> Option { + let src = self.source(db)?; log::debug!("nav target {:#?}", src.value.syntax()); let mut res = NavigationTarget::from_named( db, @@ -377,7 +368,7 @@ impl ToNav for hir::MacroDef { SymbolKind::Macro, ); res.docs = self.docs(db); - res + Some(res) } } diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index c192e3ed7..a18dcdd8e 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -327,14 +327,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { let mod_path = definition_mod_path(db, &def); return match def { Definition::Macro(it) => { - // FIXME: Currently proc-macro do not have ast-node, - // such that it does not have source - // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913 - if it.is_proc_macro() { - return None; - } - #[allow(deprecated)] - let label = macro_label(&it.source_old(db).value); + let label = macro_label(&it.source(db)?.value); from_def_source_labeled(db, it, Some(label), mod_path) } Definition::Field(def) => { -- cgit v1.2.3 From c936e4b86fd5de8e9709cd01547a69054cdec91b Mon Sep 17 00:00:00 2001 From: Nick Spain Date: Fri, 1 Jan 2021 15:02:39 +1100 Subject: source_old -> source for cases that can be handled by simple bubbling --- crates/ide/src/diagnostics/fixes.rs | 6 +++--- crates/ide/src/hover.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ide/src') diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs index 0b5e0a4c1..ec0f840e9 100644 --- a/crates/ide/src/diagnostics/fixes.rs +++ b/crates/ide/src/diagnostics/fixes.rs @@ -157,7 +157,7 @@ fn missing_record_expr_field_fix( VariantDef::Struct(s) => { module = s.module(sema.db); #[allow(deprecated)] - let source = s.source_old(sema.db); + let source = s.source(sema.db)?; def_file_id = source.file_id; let fields = source.value.field_list()?; record_field_list(fields)? @@ -165,14 +165,14 @@ fn missing_record_expr_field_fix( VariantDef::Union(u) => { module = u.module(sema.db); #[allow(deprecated)] - let source = u.source_old(sema.db); + let source = u.source(sema.db)?; def_file_id = source.file_id; source.value.record_field_list()? } VariantDef::Variant(e) => { module = e.module(sema.db); #[allow(deprecated)] - let source = e.source_old(sema.db); + let source = e.source(sema.db)?; def_file_id = source.file_id; let fields = source.value.field_list()?; record_field_list(fields)? diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index a18dcdd8e..d2a0cfcd4 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -207,7 +207,7 @@ fn runnable_action( }, ModuleDef::Function(it) => { #[allow(deprecated)] - let src = it.source_old(sema.db); + let src = it.source(sema.db)?; if src.file_id != file_id.into() { mark::hit!(hover_macro_generated_struct_fn_doc_comment); mark::hit!(hover_macro_generated_struct_fn_doc_attr); @@ -332,7 +332,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { } Definition::Field(def) => { #[allow(deprecated)] - let src = def.source_old(db).value; + let src = def.source(db)?.value; if let FieldSource::Named(it) = src { from_def_source_labeled(db, def, it.short_label(), mod_path) } else { @@ -382,7 +382,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option { A: ShortLabel, { #[allow(deprecated)] - let short_label = def.source_old(db).value.short_label(); + let short_label = def.source(db)?.value.short_label(); from_def_source_labeled(db, def, short_label, mod_path) } -- cgit v1.2.3 From 3f1b3df65bee923e5de0652ea4b676530da29127 Mon Sep 17 00:00:00 2001 From: Nick Spain Date: Fri, 1 Jan 2021 17:13:15 +1100 Subject: Move impls of ToNav that use source() to TryToNav --- crates/ide/src/call_hierarchy.rs | 8 +-- crates/ide/src/display/navigation_target.rs | 105 +++++++++++++--------------- crates/ide/src/goto_implementation.rs | 6 +- crates/ide/src/goto_type_definition.rs | 4 +- crates/ide/src/hover.rs | 10 +-- 5 files changed, 64 insertions(+), 69 deletions(-) (limited to 'crates/ide/src') diff --git a/crates/ide/src/call_hierarchy.rs b/crates/ide/src/call_hierarchy.rs index 60e0cd4ad..3c2d39f5d 100644 --- a/crates/ide/src/call_hierarchy.rs +++ b/crates/ide/src/call_hierarchy.rs @@ -8,7 +8,7 @@ use ide_db::RootDatabase; use syntax::{ast, match_ast, AstNode, TextRange}; use crate::{ - display::ToNav, goto_definition, references, FilePosition, NavigationTarget, RangeInfo, + display::TryToNav, goto_definition, references, FilePosition, NavigationTarget, RangeInfo, }; #[derive(Debug, Clone)] @@ -61,7 +61,7 @@ pub(crate) fn incoming_calls(db: &RootDatabase, position: FilePosition) -> Optio match node { ast::Fn(it) => { let def = sema.to_def(&it)?; - Some(def.to_nav(sema.db)) + def.try_to_nav(sema.db) }, _ => None, } @@ -99,7 +99,7 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio match callable.kind() { hir::CallableKind::Function(it) => { let fn_def: hir::Function = it.into(); - let nav = fn_def.to_nav(db); + let nav = fn_def.try_to_nav(db)?; Some(nav) } _ => None, @@ -107,7 +107,7 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio } FnCallNode::MethodCallExpr(expr) => { let function = sema.resolve_method_call(&expr)?; - Some(function.to_nav(db)) + function.try_to_nav(db) } } { Some((func_target, name_ref.syntax().text_range())) diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index 5dc3f4128..1fb26c226 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs @@ -211,12 +211,12 @@ impl TryToNav for Definition { fn try_to_nav(&self, db: &RootDatabase) -> Option { match self { Definition::Macro(it) => it.try_to_nav(db), - Definition::Field(it) => Some(it.to_nav(db)), + Definition::Field(it) => it.try_to_nav(db), Definition::ModuleDef(it) => it.try_to_nav(db), - Definition::SelfType(it) => Some(it.to_nav(db)), + Definition::SelfType(it) => it.try_to_nav(db), Definition::Local(it) => Some(it.to_nav(db)), - Definition::TypeParam(it) => Some(it.to_nav(db)), - Definition::LifetimeParam(it) => Some(it.to_nav(db)), + Definition::TypeParam(it) => it.try_to_nav(db), + Definition::LifetimeParam(it) => it.try_to_nav(db), Definition::Label(it) => Some(it.to_nav(db)), Definition::ConstParam(it) => Some(it.to_nav(db)), } @@ -225,18 +225,17 @@ impl TryToNav for Definition { impl TryToNav for hir::ModuleDef { fn try_to_nav(&self, db: &RootDatabase) -> Option { - let res = match self { - hir::ModuleDef::Module(it) => it.to_nav(db), - hir::ModuleDef::Function(it) => it.to_nav(db), - hir::ModuleDef::Adt(it) => it.to_nav(db), - hir::ModuleDef::Variant(it) => it.to_nav(db), - hir::ModuleDef::Const(it) => it.to_nav(db), - hir::ModuleDef::Static(it) => it.to_nav(db), - hir::ModuleDef::Trait(it) => it.to_nav(db), - hir::ModuleDef::TypeAlias(it) => it.to_nav(db), - hir::ModuleDef::BuiltinType(_) => return None, - }; - Some(res) + match self { + hir::ModuleDef::Module(it) => Some(it.to_nav(db)), + hir::ModuleDef::Function(it) => it.try_to_nav(db), + hir::ModuleDef::Adt(it) => it.try_to_nav(db), + hir::ModuleDef::Variant(it) => it.try_to_nav(db), + hir::ModuleDef::Const(it) => it.try_to_nav(db), + hir::ModuleDef::Static(it) => it.try_to_nav(db), + hir::ModuleDef::Trait(it) => it.try_to_nav(db), + hir::ModuleDef::TypeAlias(it) => it.try_to_nav(db), + hir::ModuleDef::BuiltinType(_) => None, + } } } @@ -271,14 +270,13 @@ impl ToNavFromAst for hir::Trait { const KIND: SymbolKind = SymbolKind::Trait; } -impl ToNav for D +impl TryToNav for D where D: HasSource + ToNavFromAst + Copy + HasAttrs, D::Ast: ast::NameOwner + ShortLabel, { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - #[allow(deprecated)] - let src = self.source_old(db); + fn try_to_nav(&self, db: &RootDatabase) -> Option { + let src = self.source(db)?; let mut res = NavigationTarget::from_named( db, src.as_ref().map(|it| it as &dyn ast::NameOwner), @@ -286,7 +284,7 @@ where ); res.docs = self.docs(db); res.description = src.value.short_label(); - res + Some(res) } } @@ -305,10 +303,9 @@ impl ToNav for hir::Module { } } -impl ToNav for hir::Impl { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - #[allow(deprecated)] - let src = self.source_old(db); +impl TryToNav for hir::Impl { + fn try_to_nav(&self, db: &RootDatabase) -> Option { + let src = self.source(db)?; let derive_attr = self.is_builtin_derive(db); let frange = if let Some(item) = &derive_attr { item.syntax().original_file_range(db) @@ -321,22 +318,21 @@ impl ToNav for hir::Impl { src.value.self_ty().map(|ty| src.with_value(ty.syntax()).original_file_range(db).range) }; - NavigationTarget::from_syntax( + Some(NavigationTarget::from_syntax( frange.file_id, "impl".into(), focus_range, frange.range, SymbolKind::Impl, - ) + )) } } -impl ToNav for hir::Field { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - #[allow(deprecated)] - let src = self.source_old(db); +impl TryToNav for hir::Field { + fn try_to_nav(&self, db: &RootDatabase) -> Option { + let src = self.source(db)?; - match &src.value { + let field_source = match &src.value { FieldSource::Named(it) => { let mut res = NavigationTarget::from_named(db, src.with_value(it), SymbolKind::Field); @@ -354,7 +350,8 @@ impl ToNav for hir::Field { SymbolKind::Field, ) } - } + }; + Some(field_source) } } @@ -372,22 +369,22 @@ impl TryToNav for hir::MacroDef { } } -impl ToNav for hir::Adt { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { +impl TryToNav for hir::Adt { + fn try_to_nav(&self, db: &RootDatabase) -> Option { match self { - hir::Adt::Struct(it) => it.to_nav(db), - hir::Adt::Union(it) => it.to_nav(db), - hir::Adt::Enum(it) => it.to_nav(db), + hir::Adt::Struct(it) => it.try_to_nav(db), + hir::Adt::Union(it) => it.try_to_nav(db), + hir::Adt::Enum(it) => it.try_to_nav(db), } } } -impl ToNav for hir::AssocItem { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { +impl TryToNav for hir::AssocItem { + fn try_to_nav(&self, db: &RootDatabase) -> Option { match self { - AssocItem::Function(it) => it.to_nav(db), - AssocItem::Const(it) => it.to_nav(db), - AssocItem::TypeAlias(it) => it.to_nav(db), + AssocItem::Function(it) => it.try_to_nav(db), + AssocItem::Const(it) => it.try_to_nav(db), + AssocItem::TypeAlias(it) => it.try_to_nav(db), } } } @@ -441,10 +438,9 @@ impl ToNav for hir::Label { } } -impl ToNav for hir::TypeParam { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - #[allow(deprecated)] - let src = self.source_old(db); +impl TryToNav for hir::TypeParam { + fn try_to_nav(&self, db: &RootDatabase) -> Option { + let src = self.source(db)?; let full_range = match &src.value { Either::Left(it) => it.syntax().text_range(), Either::Right(it) => it.syntax().text_range(), @@ -453,7 +449,7 @@ impl ToNav for hir::TypeParam { Either::Left(_) => None, Either::Right(it) => it.name().map(|it| it.syntax().text_range()), }; - NavigationTarget { + Some(NavigationTarget { file_id: src.file_id.original_file(db), name: self.name(db).to_string().into(), kind: Some(SymbolKind::TypeParam), @@ -462,16 +458,15 @@ impl ToNav for hir::TypeParam { container_name: None, description: None, docs: None, - } + }) } } -impl ToNav for hir::LifetimeParam { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - #[allow(deprecated)] - let src = self.source_old(db); +impl TryToNav for hir::LifetimeParam { + fn try_to_nav(&self, db: &RootDatabase) -> Option { + let src = self.source(db)?; let full_range = src.value.syntax().text_range(); - NavigationTarget { + Some(NavigationTarget { file_id: src.file_id.original_file(db), name: self.name(db).to_string().into(), kind: Some(SymbolKind::LifetimeParam), @@ -480,7 +475,7 @@ impl ToNav for hir::LifetimeParam { container_name: None, description: None, docs: None, - } + }) } } diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs index 6eac39639..da9378a97 100644 --- a/crates/ide/src/goto_implementation.rs +++ b/crates/ide/src/goto_implementation.rs @@ -2,7 +2,7 @@ use hir::{Crate, Impl, Semantics}; use ide_db::RootDatabase; use syntax::{algo::find_node_at_offset, ast, AstNode}; -use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo}; +use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo}; // Feature: Go to Implementation // @@ -55,7 +55,7 @@ fn impls_for_def( impls .into_iter() .filter(|impl_def| ty.is_equal_for_find_impls(&impl_def.target_ty(sema.db))) - .map(|imp| imp.to_nav(sema.db)) + .filter_map(|imp| imp.try_to_nav(sema.db)) .collect(), ) } @@ -69,7 +69,7 @@ fn impls_for_trait( let impls = Impl::for_trait(sema.db, krate, tr); - Some(impls.into_iter().map(|imp| imp.to_nav(sema.db)).collect()) + Some(impls.into_iter().filter_map(|imp| imp.try_to_nav(sema.db)).collect()) } #[cfg(test)] diff --git a/crates/ide/src/goto_type_definition.rs b/crates/ide/src/goto_type_definition.rs index aba6bf5dc..7e84e06be 100644 --- a/crates/ide/src/goto_type_definition.rs +++ b/crates/ide/src/goto_type_definition.rs @@ -1,7 +1,7 @@ use ide_db::RootDatabase; use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T}; -use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo}; +use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo}; // Feature: Go to Type Definition // @@ -37,7 +37,7 @@ pub(crate) fn goto_type_definition( let adt_def = ty.autoderef(db).filter_map(|ty| ty.as_adt()).last()?; - let nav = adt_def.to_nav(db); + let nav = adt_def.try_to_nav(db)?; Some(RangeInfo::new(node.text_range(), vec![nav])) } diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index d2a0cfcd4..2737c900f 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -13,7 +13,7 @@ use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, use test_utils::mark; use crate::{ - display::{macro_label, ShortLabel, ToNav, TryToNav}, + display::{macro_label, ShortLabel, TryToNav}, doc_links::{remove_links, rewrite_links}, markdown_remove::remove_markdown, markup::Markup, @@ -183,10 +183,10 @@ fn show_implementations_action(db: &RootDatabase, def: Definition) -> Option match it { - ModuleDef::Adt(Adt::Struct(it)) => Some(to_action(it.to_nav(db))), - ModuleDef::Adt(Adt::Union(it)) => Some(to_action(it.to_nav(db))), - ModuleDef::Adt(Adt::Enum(it)) => Some(to_action(it.to_nav(db))), - ModuleDef::Trait(it) => Some(to_action(it.to_nav(db))), + ModuleDef::Adt(Adt::Struct(it)) => Some(to_action(it.try_to_nav(db)?)), + ModuleDef::Adt(Adt::Union(it)) => Some(to_action(it.try_to_nav(db)?)), + ModuleDef::Adt(Adt::Enum(it)) => Some(to_action(it.try_to_nav(db)?)), + ModuleDef::Trait(it) => Some(to_action(it.try_to_nav(db)?)), _ => None, }, _ => None, -- cgit v1.2.3 From 40cd6cdf67dcfad89a80ff3a662bec2dfd983d67 Mon Sep 17 00:00:00 2001 From: Nick Spain Date: Sat, 2 Jan 2021 22:11:25 +1100 Subject: Fix ConstParam HasSource impl and implement TryToNav not Nav --- crates/ide/src/display/navigation_target.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ide/src') diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index 1fb26c226..e24c78301 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs @@ -218,7 +218,7 @@ impl TryToNav for Definition { Definition::TypeParam(it) => it.try_to_nav(db), Definition::LifetimeParam(it) => it.try_to_nav(db), Definition::Label(it) => Some(it.to_nav(db)), - Definition::ConstParam(it) => Some(it.to_nav(db)), + Definition::ConstParam(it) => it.try_to_nav(db), } } } @@ -479,11 +479,11 @@ impl TryToNav for hir::LifetimeParam { } } -impl ToNav for hir::ConstParam { - fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { - let src = self.source(db); +impl TryToNav for hir::ConstParam { + fn try_to_nav(&self, db: &RootDatabase) -> Option { + let src = self.source(db)?; let full_range = src.value.syntax().text_range(); - NavigationTarget { + Some(NavigationTarget { file_id: src.file_id.original_file(db), name: self.name(db).to_string().into(), kind: Some(SymbolKind::ConstParam), @@ -492,7 +492,7 @@ impl ToNav for hir::ConstParam { container_name: None, description: None, docs: None, - } + }) } } -- cgit v1.2.3