From 24e98121d81b75bafcd9c6005548776c00de8401 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 7 Mar 2020 15:27:03 +0100 Subject: Try to complete within macros --- crates/ra_hir_expand/src/db.rs | 53 ++++++++++++++++++++++++++++++++++------- crates/ra_hir_expand/src/lib.rs | 9 ++++++- 2 files changed, 53 insertions(+), 9 deletions(-) (limited to 'crates/ra_hir_expand') diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index f3a84cacc..a7aa60fc9 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -129,16 +129,43 @@ pub(crate) fn macro_arg( pub(crate) fn macro_expand( db: &dyn AstDatabase, id: MacroCallId, +) -> Result, String> { + macro_expand_with_arg(db, id, None) +} + +// TODO hack +pub fn expander( + db: &dyn AstDatabase, + id: MacroCallId, +) -> Option> { + let lazy_id = match id { + MacroCallId::LazyMacro(id) => id, + MacroCallId::EagerMacro(_id) => { + // TODO + unimplemented!() + } + }; + + let loc = db.lookup_intern_macro(lazy_id); + let macro_rules = db.macro_def(loc.def)?; + Some(macro_rules) +} + +pub(crate) fn macro_expand_with_arg( + db: &dyn AstDatabase, + id: MacroCallId, + arg: Option>, ) -> Result, String> { let lazy_id = match id { MacroCallId::LazyMacro(id) => id, MacroCallId::EagerMacro(id) => { + // TODO return Ok(db.lookup_intern_eager_expansion(id).subtree); } }; let loc = db.lookup_intern_macro(lazy_id); - let macro_arg = db.macro_arg(id).ok_or("Fail to args in to tt::TokenTree")?; + let macro_arg = arg.or_else(|| db.macro_arg(id)).ok_or("Fail to args in to tt::TokenTree")?; let macro_rules = db.macro_def(loc.def).ok_or("Fail to find macro definition")?; let tt = macro_rules.0.expand(db, lazy_id, ¯o_arg.0).map_err(|err| format!("{:?}", err))?; @@ -162,12 +189,24 @@ pub(crate) fn parse_or_expand(db: &dyn AstDatabase, file_id: HirFileId) -> Optio pub(crate) fn parse_macro( db: &dyn AstDatabase, macro_file: MacroFile, +) -> Option<(Parse, Arc)> { + parse_macro_with_arg(db, macro_file, None) +} + +pub fn parse_macro_with_arg( + db: &dyn AstDatabase, + macro_file: MacroFile, + arg: Option>, ) -> Option<(Parse, Arc)> { let _p = profile("parse_macro_query"); let macro_call_id = macro_file.macro_call_id; - let tt = db - .macro_expand(macro_call_id) + let expansion = if let Some(arg) = arg { + macro_expand_with_arg(db, macro_call_id, Some(arg)) + } else { + db.macro_expand(macro_call_id) + }; + let tt = expansion .map_err(|err| { // Note: // The final goal we would like to make all parse_macro success, @@ -185,15 +224,13 @@ pub(crate) fn parse_macro( .collect::>() .join("\n"); - log::warn!( + eprintln!( "fail on macro_parse: (reason: {} macro_call: {:#}) parents: {}", - err, - node.value, - parents + err, node.value, parents ); } _ => { - log::warn!("fail on macro_parse: (reason: {})", err); + eprintln!("fail on macro_parse: (reason: {})", err); } } }) diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 3fce73e8a..92f3902dd 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -157,6 +157,13 @@ impl HirFileId { } } } + + pub fn macro_file(self) -> Option { + match self.0 { + HirFileIdRepr::FileId(_) => None, + HirFileIdRepr::MacroFile(m) => Some(m), + } + } } #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] @@ -296,7 +303,7 @@ pub struct ExpansionInfo { exp_map: Arc, } -pub use mbe::Origin; +pub use mbe::{syntax_node_to_token_tree, Origin}; use ra_parser::FragmentKind; impl ExpansionInfo { -- cgit v1.2.3 From f617455d10084da30a13cc49ffdd6b86c6049ba1 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 7 Mar 2020 19:58:18 +0100 Subject: Remove TODOs --- crates/ra_hir_expand/src/db.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'crates/ra_hir_expand') diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index a7aa60fc9..f5c8bc22f 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -133,7 +133,6 @@ pub(crate) fn macro_expand( macro_expand_with_arg(db, id, None) } -// TODO hack pub fn expander( db: &dyn AstDatabase, id: MacroCallId, @@ -141,8 +140,7 @@ pub fn expander( let lazy_id = match id { MacroCallId::LazyMacro(id) => id, MacroCallId::EagerMacro(_id) => { - // TODO - unimplemented!() + return None; } }; @@ -159,8 +157,11 @@ pub(crate) fn macro_expand_with_arg( let lazy_id = match id { MacroCallId::LazyMacro(id) => id, MacroCallId::EagerMacro(id) => { - // TODO - return Ok(db.lookup_intern_eager_expansion(id).subtree); + if arg.is_some() { + return Err("hypothetical macro expansion not implemented for eager macro".to_owned()); + } else { + return Ok(db.lookup_intern_eager_expansion(id).subtree); + } } }; -- cgit v1.2.3 From afdf08e964345ac4a884a5630772611ba81f6969 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 8 Mar 2020 11:02:14 +0100 Subject: Move hypothetical expansion to hir_expand --- crates/ra_hir_expand/src/db.rs | 43 ++++++++++++++++++++++++++++++++--------- crates/ra_hir_expand/src/lib.rs | 9 +-------- 2 files changed, 35 insertions(+), 17 deletions(-) (limited to 'crates/ra_hir_expand') diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index f5c8bc22f..29dde3d80 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -72,6 +72,30 @@ pub trait AstDatabase: SourceDatabase { fn intern_eager_expansion(&self, eager: EagerCallLoc) -> EagerMacroId; } +/// This expands the given macro call, but with different arguments. This is +/// used for completion, where we want to see what 'would happen' if we insert a +/// token. The `token_to_map` mapped down into the expansion, with the mapped +/// token returned. +pub fn expand_hypothetical( + db: &impl AstDatabase, + actual_macro_call: MacroCallId, + hypothetical_args: &ra_syntax::ast::TokenTree, + token_to_map: ra_syntax::SyntaxToken, +) -> Option<(SyntaxNode, ra_syntax::SyntaxToken)> { + let macro_file = MacroFile { macro_call_id: actual_macro_call }; + let (tt, tmap_1) = mbe::syntax_node_to_token_tree(hypothetical_args.syntax()).unwrap(); + let range = + token_to_map.text_range().checked_sub(hypothetical_args.syntax().text_range().start())?; + let token_id = tmap_1.token_by_range(range)?; + let macro_def = expander(db, actual_macro_call)?; + let (node, tmap_2) = + parse_macro_with_arg(db, macro_file, Some(std::sync::Arc::new((tt, tmap_1))))?; + let token_id = macro_def.0.map_id_down(token_id); + let range = tmap_2.range_by_token(token_id)?.by_kind(token_to_map.kind())?; + let token = ra_syntax::algo::find_covering_element(&node.syntax_node(), range).into_token()?; + Some((node.syntax_node(), token)) +} + pub(crate) fn ast_id_map(db: &dyn AstDatabase, file_id: HirFileId) -> Arc { let map = db.parse_or_expand(file_id).map_or_else(AstIdMap::default, |it| AstIdMap::from_source(&it)); @@ -133,10 +157,7 @@ pub(crate) fn macro_expand( macro_expand_with_arg(db, id, None) } -pub fn expander( - db: &dyn AstDatabase, - id: MacroCallId, -) -> Option> { +fn expander(db: &dyn AstDatabase, id: MacroCallId) -> Option> { let lazy_id = match id { MacroCallId::LazyMacro(id) => id, MacroCallId::EagerMacro(_id) => { @@ -149,7 +170,7 @@ pub fn expander( Some(macro_rules) } -pub(crate) fn macro_expand_with_arg( +fn macro_expand_with_arg( db: &dyn AstDatabase, id: MacroCallId, arg: Option>, @@ -158,7 +179,9 @@ pub(crate) fn macro_expand_with_arg( MacroCallId::LazyMacro(id) => id, MacroCallId::EagerMacro(id) => { if arg.is_some() { - return Err("hypothetical macro expansion not implemented for eager macro".to_owned()); + return Err( + "hypothetical macro expansion not implemented for eager macro".to_owned() + ); } else { return Ok(db.lookup_intern_eager_expansion(id).subtree); } @@ -225,13 +248,15 @@ pub fn parse_macro_with_arg( .collect::>() .join("\n"); - eprintln!( + log::warn!( "fail on macro_parse: (reason: {} macro_call: {:#}) parents: {}", - err, node.value, parents + err, + node.value, + parents ); } _ => { - eprintln!("fail on macro_parse: (reason: {})", err); + log::warn!("fail on macro_parse: (reason: {})", err); } } }) diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 92f3902dd..3fce73e8a 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -157,13 +157,6 @@ impl HirFileId { } } } - - pub fn macro_file(self) -> Option { - match self.0 { - HirFileIdRepr::FileId(_) => None, - HirFileIdRepr::MacroFile(m) => Some(m), - } - } } #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] @@ -303,7 +296,7 @@ pub struct ExpansionInfo { exp_map: Arc, } -pub use mbe::{syntax_node_to_token_tree, Origin}; +pub use mbe::Origin; use ra_parser::FragmentKind; impl ExpansionInfo { -- cgit v1.2.3