bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/expand_macro.rs')
-rw-r--r--crates/ide/src/expand_macro.rs67
1 files changed, 54 insertions, 13 deletions
diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs
index f8f9378b9e..7c396339c1 100644
--- a/crates/ide/src/expand_macro.rs
+++ b/crates/ide/src/expand_macro.rs
@@ -1,10 +1,10 @@
use hir::db::ExpandDatabase;
-use hir::{ExpandResult, InFile, Semantics};
+use hir::{ExpandResult, InFile, InRealFile, Semantics};
use ide_db::{
FileId, RootDatabase, base_db::Crate, helpers::pick_best_token,
syntax_helpers::prettify_macro_expansion,
};
-use span::{Edition, SpanMap, SyntaxContext, TextRange, TextSize};
+use span::{SpanMap, SyntaxContext, TextRange, TextSize};
use stdx::format_to;
use syntax::{AstNode, NodeOrToken, SyntaxKind, SyntaxNode, T, ast, ted};
@@ -26,8 +26,9 @@ pub struct ExpandedMacro {
// ![Expand Macro Recursively](https://user-images.githubusercontent.com/48062697/113020648-b3973180-917a-11eb-84a9-ecb921293dc5.gif)
pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<ExpandedMacro> {
let sema = Semantics::new(db);
- let file = sema.parse_guess_edition(position.file_id);
- let krate = sema.file_to_module_def(position.file_id)?.krate().into();
+ let file_id = sema.attach_first_edition(position.file_id)?;
+ let file = sema.parse(file_id);
+ let krate = sema.file_to_module_def(file_id.file_id(db))?.krate().into();
let tok = pick_best_token(file.syntax().token_at_offset(position.offset), |kind| match kind {
SyntaxKind::IDENT => 1,
@@ -86,7 +87,10 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
return derive;
}
- let mut anc = tok.parent_ancestors();
+ let mut anc = sema
+ .descend_token_into_include_expansion(InRealFile::new(file_id, tok))
+ .value
+ .parent_ancestors();
let mut span_map = SpanMap::empty();
let mut error = String::new();
let (name, expanded, kind) = loop {
@@ -95,14 +99,7 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
if let Some(item) = ast::Item::cast(node.clone()) {
if let Some(def) = sema.resolve_attr_macro_call(&item) {
break (
- def.name(db)
- .display(
- db,
- sema.attach_first_edition(position.file_id)
- .map(|it| it.edition(db))
- .unwrap_or(Edition::CURRENT),
- )
- .to_string(),
+ def.name(db).display(db, file_id.edition(db)).to_string(),
expand_macro_recur(&sema, &item, &mut error, &mut span_map, TextSize::new(0))?,
SyntaxKind::MACRO_ITEMS,
);
@@ -759,4 +756,48 @@ fn test() {
"<>hi""#]],
);
}
+
+ #[test]
+ fn in_included() {
+ check(
+ r#"
+//- minicore: include
+//- /main.rs crate:main
+include!("./included.rs");
+//- /included.rs
+macro_rules! foo {
+ () => { fn item() {} };
+}
+foo$0!();
+"#,
+ expect![[r#"
+ foo!
+ fn item(){}"#]],
+ );
+ }
+
+ #[test]
+ fn include() {
+ check(
+ r#"
+//- minicore: include
+//- /main.rs crate:main
+include$0!("./included.rs");
+//- /included.rs
+macro_rules! foo {
+ () => { fn item() {} };
+}
+foo();
+"#,
+ expect![[r#"
+ include!
+ macro_rules! foo {
+ () => {
+ fn item(){}
+
+ };
+ }
+ foo();"#]],
+ );
+ }
}