Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #10372

Browse source 
10372: minor: Cleanup descend_into_macros_impl r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-09-27 16:45:40 +00:00 committed by GitHub
commit f22eea9053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
crates/hir/src/semantics.rs
View file

@ -544,38 +544,54 @@ impl<'db> SemanticsImpl<'db> {
let sa = self.analyze(&parent); let sa = self.analyze(&parent);
let mut queue = vec![InFile::new(sa.file_id, token)]; let mut queue = vec![InFile::new(sa.file_id, token)];
let mut cache = self.expansion_info_cache.borrow_mut(); let mut cache = self.expansion_info_cache.borrow_mut();
let mut process_expansion_for_token =
|queue: &mut Vec<_>, file_id, item, token: InFile<&_>| {
let mapped_tokens = cache
.entry(file_id)
.or_insert_with(|| file_id.expansion_info(self.db.upcast()))
.as_ref()?
.map_token_down(self.db.upcast(), item, token)?;
let len = queue.len();
// requeue the tokens we got from mapping our current token down
queue.extend(mapped_tokens.inspect(|token| {
if let Some(parent) = token.value.parent() {
self.cache(find_root(&parent), token.file_id);
}
}));
// if the length changed we have found a mapping for the token
(queue.len() != len).then(|| ())
};
// Remap the next token in the queue into a macro call its in, if it is not being remapped // Remap the next token in the queue into a macro call its in, if it is not being remapped
// either due to not being in a macro-call or because its unused push it into the result vec, // either due to not being in a macro-call or because its unused push it into the result vec,
// otherwise push the remapped tokens back into the queue as they can potentially be remapped again. // otherwise push the remapped tokens back into the queue as they can potentially be remapped again.
while let Some(token) = queue.pop() { while let Some(token) = queue.pop() {
self.db.unwind_if_cancelled(); self.db.unwind_if_cancelled();
let was_not_remapped = (|| { let was_not_remapped = (|| {
if let Some((call_id, item)) = token // are we inside an attribute macro call
.value let containing_attribute_macro_call = self.with_ctx(|ctx| {
.ancestors() token
.filter_map(ast::Item::cast) .value
.filter_map(|item| { .ancestors()
self.with_ctx(|ctx| ctx.item_to_macro_call(token.with_value(item.clone()))) .filter_map(ast::Item::cast)
.zip(Some(item)) .filter_map(|item| {
}) Some((ctx.item_to_macro_call(token.with_value(item.clone()))?, item))
.last() })
{ .last()
});
if let Some((call_id, item)) = containing_attribute_macro_call {
let file_id = call_id.as_file(); let file_id = call_id.as_file();
let tokens = cache return process_expansion_for_token(
.entry(file_id) &mut queue,
.or_insert_with(|| file_id.expansion_info(self.db.upcast())) file_id,
.as_ref()? Some(item),
.map_token_down(self.db.upcast(), Some(item), token.as_ref())?; token.as_ref(),
);
let len = queue.len();
queue.extend(tokens.inspect(|token| {
if let Some(parent) = token.value.parent() {
self.cache(find_root(&parent), token.file_id);
}
}));
return (queue.len() != len).then(|| ());
} }
// or are we inside a function-like macro call
if let Some(macro_call) = token.value.ancestors().find_map(ast::MacroCall::cast) { if let Some(macro_call) = token.value.ancestors().find_map(ast::MacroCall::cast) {
let tt = macro_call.token_tree()?; let tt = macro_call.token_tree()?;
let l_delim = match tt.left_delimiter_token() { let l_delim = match tt.left_delimiter_token() {
@ -589,21 +605,12 @@ impl<'db> SemanticsImpl<'db> {
if !TextRange::new(l_delim, r_delim).contains_range(token.value.text_range()) { if !TextRange::new(l_delim, r_delim).contains_range(token.value.text_range()) {
return None; return None;
} }
let file_id = sa.expand(self.db, token.with_value(&macro_call))?;
let tokens = cache
.entry(file_id)
.or_insert_with(|| file_id.expansion_info(self.db.upcast()))
.as_ref()?
.map_token_down(self.db.upcast(), None, token.as_ref())?;
let len = queue.len(); let file_id = sa.expand(self.db, token.with_value(&macro_call))?;
queue.extend(tokens.inspect(|token| { return process_expansion_for_token(&mut queue, file_id, None, token.as_ref());
if let Some(parent) = token.value.parent() {
self.cache(find_root(&parent), token.file_id);
}
}));
return (queue.len() != len).then(|| ());
} }
// outside of a macro invocation so this is a "final" token
None None
})() })()
.is_none(); .is_none();