Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #16078 - Veykril:fix-view-ir, r=Veykril
fix: Fix view mir, hir and eval function not working when cursor is inside macros
I broke the view ones completely by inverting the macro check by accident a few days ago but we don't talk about that.
| -rw-r--r-- | crates/ide/src/interpret_function.rs | 14 | ||||
| -rw-r--r-- | crates/ide/src/view_hir.rs | 2 | ||||
| -rw-r--r-- | crates/ide/src/view_mir.rs | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/crates/ide/src/interpret_function.rs b/crates/ide/src/interpret_function.rs index d06ffd5357..2169749048 100644 --- a/crates/ide/src/interpret_function.rs +++ b/crates/ide/src/interpret_function.rs @@ -1,10 +1,10 @@ use hir::Semantics; -use ide_db::base_db::SourceDatabaseExt; -use ide_db::RootDatabase; -use ide_db::{base_db::FilePosition, LineIndexDatabase}; +use ide_db::{ + base_db::{FilePosition, SourceDatabaseExt}, + LineIndexDatabase, RootDatabase, +}; use std::{fmt::Write, time::Instant}; -use syntax::TextRange; -use syntax::{algo::find_node_at_offset, ast, AstNode}; +use syntax::{algo::ancestors_at_offset, ast, AstNode, TextRange}; // Feature: Interpret Function // @@ -28,7 +28,9 @@ fn find_and_interpret(db: &RootDatabase, position: FilePosition) -> Option<Strin let sema = Semantics::new(db); let source_file = sema.parse(position.file_id); - let item = find_node_at_offset::<ast::Item>(source_file.syntax(), position.offset)?; + let item = ancestors_at_offset(source_file.syntax(), position.offset) + .filter(|it| !ast::MacroCall::can_cast(it.kind())) + .find_map(ast::Item::cast)?; let def = match item { ast::Item::Fn(it) => sema.to_def(&it)?, _ => return None, diff --git a/crates/ide/src/view_hir.rs b/crates/ide/src/view_hir.rs index 738b370a06..9abe54cd39 100644 --- a/crates/ide/src/view_hir.rs +++ b/crates/ide/src/view_hir.rs @@ -20,7 +20,7 @@ fn body_hir(db: &RootDatabase, position: FilePosition) -> Option<String> { let source_file = sema.parse(position.file_id); let item = ancestors_at_offset(source_file.syntax(), position.offset) - .filter(|it| ast::MacroCall::can_cast(it.kind())) + .filter(|it| !ast::MacroCall::can_cast(it.kind())) .find_map(ast::Item::cast)?; let def: DefWithBody = match item { ast::Item::Fn(it) => sema.to_def(&it)?.into(), diff --git a/crates/ide/src/view_mir.rs b/crates/ide/src/view_mir.rs index 52ed420669..08d810c134 100644 --- a/crates/ide/src/view_mir.rs +++ b/crates/ide/src/view_mir.rs @@ -19,7 +19,7 @@ fn body_mir(db: &RootDatabase, position: FilePosition) -> Option<String> { let source_file = sema.parse(position.file_id); let item = ancestors_at_offset(source_file.syntax(), position.offset) - .filter(|it| ast::MacroCall::can_cast(it.kind())) + .filter(|it| !ast::MacroCall::can_cast(it.kind())) .find_map(ast::Item::cast)?; let def: DefWithBody = match item { ast::Item::Fn(it) => sema.to_def(&it)?.into(), |