language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Review Updates

Browse source
This commit is contained in:
Wyatt Herkamp 2024-03-21 13:41:46 -04:00
parent 262e06f1ef
commit c381d0fc64
2 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/hir-def/src/nameres/collector.rs
View file

@ -1232,6 +1232,7 @@ impl DefCollector<'_> {
Some(def) if def.is_attribute() => def, Some(def) if def.is_attribute() => def,
_ => return Resolved::No, _ => return Resolved::No,
}; };
let call_id = let call_id =
attr_macro_as_call_id(self.db, file_ast_id, attr, self.def_map.krate, def); attr_macro_as_call_id(self.db, file_ast_id, attr, self.def_map.krate, def);
if let MacroDefId { if let MacroDefId {
@ -1264,7 +1265,6 @@ impl DefCollector<'_> {
}; };
let ast_id = ast_id.with_value(ast_adt_id); let ast_id = ast_id.with_value(ast_adt_id);
// the call_id for the actual derive macro. This is used so all the derive proc macros can share a token tree
match attr.parse_path_comma_token_tree(self.db.upcast()) { match attr.parse_path_comma_token_tree(self.db.upcast()) {
Some(derive_macros) => { Some(derive_macros) => {
@ -2305,7 +2305,7 @@ impl ModCollector<'_, '_> {
fn collect_macro_call( fn collect_macro_call(
&mut self, &mut self,
&MacroCall { ref path, ast_id, expand_to, ctxt, .. }: &MacroCall, &MacroCall { ref path, ast_id, expand_to, ctxt }: &MacroCall,
container: ItemContainerId, container: ItemContainerId,
) { ) {
let ast_id = AstIdWithPath::new(self.file_id(), ast_id, ModPath::clone(path)); let ast_id = AstIdWithPath::new(self.file_id(), ast_id, ModPath::clone(path));
@ -2444,10 +2444,7 @@ mod tests {
use base_db::SourceDatabase; use base_db::SourceDatabase;
use test_fixture::WithFixture; use test_fixture::WithFixture;
use crate::{ use crate::{nameres::DefMapCrateData, test_db::TestDB};
nameres::{DefMapCrateData, ModuleData, ModuleOrigin},
test_db::TestDB,
};
use super::*; use super::*;

21
crates/hir-expand/src/db.rs
View file

@ -151,7 +151,7 @@ pub fn expand_speculative(
let span_map = RealSpanMap::absolute(FileId::BOGUS); let span_map = RealSpanMap::absolute(FileId::BOGUS);
let span_map = SpanMapRef::RealSpanMap(&span_map); let span_map = SpanMapRef::RealSpanMap(&span_map);
let (_, _, span) = db.macro_arg(actual_macro_call); let (_, _, span) = db.macro_arg_considering_derives(actual_macro_call, &loc.kind);
// Build the subtree and token mapping for the speculative args // Build the subtree and token mapping for the speculative args
let (mut tt, undo_info) = match loc.kind { let (mut tt, undo_info) = match loc.kind {
@ -346,8 +346,6 @@ pub(crate) fn parse_with_map(
} }
} }
/// Imagine the word smart in quotes.
///
/// This resolves the [MacroCallId] to check if it is a derive macro if so get the [macro_arg] for the derive. /// This resolves the [MacroCallId] to check if it is a derive macro if so get the [macro_arg] for the derive.
/// Other wise return the [macro_arg] for the macro_call_id. /// Other wise return the [macro_arg] for the macro_call_id.
/// ///
@ -435,20 +433,9 @@ fn macro_arg(db: &dyn ExpandDatabase, id: MacroCallId) -> MacroArgResult {
} }
return (Arc::new(tt), SyntaxFixupUndoInfo::NONE, span); return (Arc::new(tt), SyntaxFixupUndoInfo::NONE, span);
} }
// MacroCallKind::Derive should not be here. As we are getting the argument for the derive macro // MacroCallKind::Derive should not be here. As we are getting the argument for the derive macro
MacroCallKind::Derive { ast_id, derive_attr_index, .. } => { MacroCallKind::Derive { .. } => {
let node = ast_id.to_ptr(db).to_node(&root); unreachable!("`ExpandDatabase::macro_arg` called with `MacroCallKind::Derive`")
let censor_derive_input = censor_derive_input(derive_attr_index, &node);
let item_node = node.into();
let attr_source = attr_source(derive_attr_index, &item_node);
// FIXME: This is wrong, this should point to the path of the derive attribute`
let span =
map.span_for_range(attr_source.as_ref().and_then(|it| it.path()).map_or_else(
|| item_node.syntax().text_range(),
|it| it.syntax().text_range(),
));
(censor_derive_input, item_node, span)
} }
MacroCallKind::Attr { ast_id, invoc_attr_index, .. } => { MacroCallKind::Attr { ast_id, invoc_attr_index, .. } => {
let node = ast_id.to_ptr(db).to_node(&root); let node = ast_id.to_ptr(db).to_node(&root);
@ -637,7 +624,7 @@ fn proc_macro_span(db: &dyn ExpandDatabase, ast: AstId<ast::Fn>) -> Span {
fn expand_proc_macro(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandResult<Arc<tt::Subtree>> { fn expand_proc_macro(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandResult<Arc<tt::Subtree>> {
let loc = db.lookup_intern_macro_call(id); let loc = db.lookup_intern_macro_call(id);
let (macro_arg, undo_info, span) = db.macro_arg_considering_derives(id, &loc.kind.clone()); let (macro_arg, undo_info, span) = db.macro_arg_considering_derives(id, &loc.kind);
let (expander, ast) = match loc.def.kind { let (expander, ast) = match loc.def.kind {
MacroDefKind::ProcMacro(expander, _, ast) => (expander, ast), MacroDefKind::ProcMacro(expander, _, ast) => (expander, ast),