itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal: Make ascend_call_token iterative instead of recursive

Browse Source
This commit is contained in:
Lukas Wirth 2022-02-11 22:12:16 +01:00
parent 1dee488a68
commit 1c77f36311
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -710,14 +710,14 @@ fn ascend_call_token(
expansion: &ExpansionInfo, expansion: &ExpansionInfo,
token: InFile<SyntaxToken>, token: InFile<SyntaxToken>,
) -> Option<InFile<SyntaxToken>> { ) -> Option<InFile<SyntaxToken>> {
let (mapped, origin) = expansion.map_token_up(db, token.as_ref())?; let mut mapping = expansion.map_token_up(db, token.as_ref())?;
if origin != Origin::Call { while let (mapped, Origin::Call) = mapping {
return None; match mapped.file_id.expansion_info(db) {
Some(info) => mapping = info.map_token_up(db, mapped.as_ref())?,
None => return Some(mapped),
}
} }
if let Some(info) = mapped.file_id.expansion_info(db) { None
return ascend_call_token(db, &info, mapped);
}
Some(mapped)
} }
impl InFile<SyntaxToken> { impl InFile<SyntaxToken> {