aboutsummaryrefslogtreecommitdiff
path: root/crates/ide
diff options
context:
space:
mode:
authorEdwin Cheng <[email protected]>2020-12-18 02:26:17 +0000
committerEdwin Cheng <[email protected]>2020-12-18 02:26:17 +0000
commit60a3785ac27d7361617977bd53e11f2859e97c7c (patch)
treeb79241db7008f95204b42e45a41dcbc4d07bda99 /crates/ide
parentc1c36acb025880c742c65f436a61fd87fc627eb0 (diff)
Temp fixes panic caused by no ast for proc-macro
Diffstat (limited to 'crates/ide')
-rw-r--r--crates/ide/src/display/navigation_target.rs10
-rw-r--r--crates/ide/src/hover.rs6
2 files changed, 15 insertions, 1 deletions
diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs
index 234f80a3a..73fc73619 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/display/navigation_target.rs
@@ -176,7 +176,15 @@ impl ToNav for FileSymbol {
176impl TryToNav for Definition { 176impl TryToNav for Definition {
177 fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { 177 fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
178 match self { 178 match self {
179 Definition::Macro(it) => Some(it.to_nav(db)), 179 Definition::Macro(it) => {
180 // FIXME: Currently proc-macro do not have ast-node,
181 // such that it does not have source
182 // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
183 if it.is_proc_macro() {
184 return None;
185 }
186 Some(it.to_nav(db))
187 }
180 Definition::Field(it) => Some(it.to_nav(db)), 188 Definition::Field(it) => Some(it.to_nav(db)),
181 Definition::ModuleDef(it) => it.try_to_nav(db), 189 Definition::ModuleDef(it) => it.try_to_nav(db),
182 Definition::SelfType(it) => Some(it.to_nav(db)), 190 Definition::SelfType(it) => Some(it.to_nav(db)),
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index ab017d2ad..c03dd74e4 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -324,6 +324,12 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
324 let mod_path = definition_mod_path(db, &def); 324 let mod_path = definition_mod_path(db, &def);
325 return match def { 325 return match def {
326 Definition::Macro(it) => { 326 Definition::Macro(it) => {
327 // FIXME: Currently proc-macro do not have ast-node,
328 // such that it does not have source
329 // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
330 if it.is_proc_macro() {
331 return None;
332 }
327 let label = macro_label(&it.source(db).value); 333 let label = macro_label(&it.source(db).value);
328 from_def_source_labeled(db, it, Some(label), mod_path) 334 from_def_source_labeled(db, it, Some(label), mod_path)
329 } 335 }