Merge #2795

2795: Use dummy value for macro file in bulitin macros r=matklad a=edwin0cheng

This PR skip the actual line and column computation for `MacroFile` and return a dummy value instead.

Related to #2794



Co-authored-by: Edwin Cheng <[email protected]>

1 files changed, 10 insertions, 2 deletions

diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index 2c119269c..e9e275670 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -62,8 +62,13 @@ register_builtin! {
 }
 
 fn to_line_number(db: &dyn AstDatabase, file: HirFileId, pos: TextUnit) -> usize {
-    // FIXME: Use expansion info
     let file_id = file.original_file(db);
+
+    // FIXME: if the file is coming from macro, we return a dummy value for now.
+    if file.call_node(db).map(|it| it.file_id != file_id.into()).unwrap_or(true) {
+        return 0;
+    }
+
     let text = db.file_text(file_id);
     let mut line_num = 1;
 
@@ -150,8 +155,11 @@ fn option_env_expand(
 }
 
 fn to_col_number(db: &dyn AstDatabase, file: HirFileId, pos: TextUnit) -> usize {
-    // FIXME: Use expansion info
     let file_id = file.original_file(db);
+    // FIXME: if the file is coming from macro, we return a dummy value for now.
+    if file.call_node(db).map(|it| it.file_id != file_id.into()).unwrap_or(true) {
+        return 0;
+    }
     let text = db.file_text(file_id);
 
     let pos = pos.to_usize();