mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't search for root nodes unnecessarily

Browse Source
This commit is contained in:
Lukas Wirth 2021-11-05 15:52:10 +01:00
parent 8dad1b9228
commit addd93ed9a
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
crates/hir/src/semantics.rs
View File

@ -18,7 +18,7 @@
use syntax::{ use syntax::{
algo::skip_trivia_token, algo::skip_trivia_token,
ast::{self, HasAttrs, HasGenericParams, HasLoopBody}, ast::{self, HasAttrs, HasGenericParams, HasLoopBody},
match_ast, AstNode, Direction, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextSize, match_ast, AstNode, Direction, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextSize,
}; };
use crate::{ use crate::{
@ -556,25 +556,27 @@ fn descend_into_macros_impl(&self, token: SyntaxToken, mut f: impl FnMut(InFile<
None => return, None => return,
}; };
let sa = self.analyze(&parent); let sa = self.analyze(&parent);
let mut stack: SmallVec<[_; 1]> = smallvec![InFile::new(sa.file_id, token)]; let mut stack: SmallVec<[_; 4]> = smallvec![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 mcache = self.macro_call_cache.borrow_mut(); let mut mcache = self.macro_call_cache.borrow_mut();
let mut process_expansion_for_token = let mut process_expansion_for_token =
|stack: &mut SmallVec<_>, file_id, item, token: InFile<&_>| { |stack: &mut SmallVec<_>, macro_file, item, token: InFile<&_>| {
let mapped_tokens = cache let expansion_info = cache
.entry(file_id) .entry(macro_file)
.or_insert_with(|| file_id.expansion_info(self.db.upcast())) .or_insert_with(|| macro_file.expansion_info(self.db.upcast()))
.as_ref()? .as_ref()?;
.map_token_down(self.db.upcast(), item, token)?;
{
let InFile { file_id, value } = expansion_info.expanded();
self.cache(value, file_id);
}
let mapped_tokens = expansion_info.map_token_down(self.db.upcast(), item, token)?;
let len = stack.len(); let len = stack.len();
// requeue the tokens we got from mapping our current token down // requeue the tokens we got from mapping our current token down
stack.extend(mapped_tokens.inspect(|token| { stack.extend(mapped_tokens);
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 // if the length changed we have found a mapping for the token
(stack.len() != len).then(|| ()) (stack.len() != len).then(|| ())
}; };
@ -606,17 +608,15 @@ fn descend_into_macros_impl(&self, token: SyntaxToken, mut f: impl FnMut(InFile<
} }
// or are we inside a function-like macro call // 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(tt) =
let tt = macro_call.token_tree()?; // FIXME replace map.while_some with take_while once stable
let l_delim = match tt.left_delimiter_token() { token.value.ancestors().map(ast::TokenTree::cast).while_some().last()
Some(it) => it.text_range().end(), {
None => tt.syntax().text_range().start(), let macro_call = tt.syntax().parent().and_then(ast::MacroCall::cast)?;
}; if tt.left_delimiter_token().map_or(false, |it| it == token.value) {
let r_delim = match tt.right_delimiter_token() { return None;
Some(it) => it.text_range().start(), }
None => tt.syntax().text_range().end(), if tt.right_delimiter_token().map_or(false, |it| it == token.value) {
};
if !TextRange::new(l_delim, r_delim).contains_range(token.value.text_range()) {
return None; return None;
} }

8
crates/hir_expand/src/lib.rs
View File

@ -18,7 +18,7 @@
use base_db::ProcMacroKind; use base_db::ProcMacroKind;
use either::Either; use either::Either;
pub use mbe::{ExpandError, ExpandResult}; pub use mbe::{ExpandError, ExpandResult, Origin};
use std::{hash::Hash, iter, sync::Arc}; use std::{hash::Hash, iter, sync::Arc};
@ -380,9 +380,11 @@ pub struct ExpansionInfo {
exp_map: Arc<mbe::TokenMap>, exp_map: Arc<mbe::TokenMap>,
} }
pub use mbe::Origin;
impl ExpansionInfo { impl ExpansionInfo {
pub fn expanded(&self) -> InFile<SyntaxNode> {
self.expanded.clone()
}
pub fn call_node(&self) -> Option<InFile<SyntaxNode>> { pub fn call_node(&self) -> Option<InFile<SyntaxNode>> {
Some(self.arg.with_value(self.arg.value.parent()?)) Some(self.arg.with_value(self.arg.value.parent()?))
} }