language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix original_source find order

Browse source
This commit is contained in:
Edwin Cheng 2019-12-15 01:20:07 +08:00
parent 7238037de4
commit 61360fdfec
5 changed files with 109 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

79
crates/ra_ide/src/expand.rs
View file

@ -1,57 +1,62 @@
//! Utilities to work with files, produced by macros.
use std::iter::successors;
use hir::InFile;
use hir::{ExpansionOrigin, InFile};
use ra_db::FileId;
use ra_syntax::{ast, AstNode, SyntaxNode, SyntaxToken, TextRange};
use crate::{db::RootDatabase, FileRange};
pub(crate) fn original_range(db: &RootDatabase, node: InFile<&SyntaxNode>) -> FileRange {
let expansion = match node.file_id.expansion_info(db) {
None => {
return FileRange {
file_id: node.file_id.original_file(db),
range: node.value.text_range(),
}
}
Some(it) => it,
};
#[derive(Debug, PartialEq, Eq)]
pub(crate) enum OriginalRangeKind {
/// Return range if any token is matched
#[allow(dead_code)]
Any,
/// Return range if token is inside macro_call
CallToken,
/// Return whole macro call range if matched
WholeCall,
}
pub(crate) fn original_range_by_kind(
db: &RootDatabase,
node: InFile<&SyntaxNode>,
kind: OriginalRangeKind,
) -> Option<FileRange> {
let expansion = node.file_id.expansion_info(db)?;
// the input node has only one token ?
let single = node.value.first_token()? == node.value.last_token()?;
// FIXME: We should handle recurside macro expansions
let range = match kind {
OriginalRangeKind::WholeCall => expansion.call_node()?.map(|node| node.text_range()),
_ => node.value.descendants().find_map(|it| {
let first = it.first_token()?;
let last = it.last_token()?;
let range = node.value.descendants_with_tokens().find_map(|it| {
match it.as_token() {
// FIXME: Remove this branch after all `tt::TokenTree`s have a proper `TokenId`,
// and return the range of the overall macro expansions if mapping first and last tokens fails.
Some(token) => {
let token = expansion.map_token_up(node.with_value(&token))?;
Some(token.with_value(token.value.text_range()))
if !single && first == last {
return None;
}
None => {
// Try to map first and last tokens of node, and, if success, return the union range of mapped tokens
let n = it.into_node()?;
let first = expansion.map_token_up(node.with_value(&n.first_token()?))?;
let last = expansion.map_token_up(node.with_value(&n.last_token()?))?;
// FIXME: Is is possible ?
if first.file_id != last.file_id {
return None;
}
// Try to map first and last tokens of node, and, if success, return the union range of mapped tokens
let (first, first_origin) = expansion.map_token_up(node.with_value(&first))?;
let (last, last_origin) = expansion.map_token_up(node.with_value(&last))?;
// FIXME: Add union method in TextRange
let range = union_range(first.value.text_range(), last.value.text_range());
Some(first.with_value(range))
if first.file_id != last.file_id
|| first_origin != last_origin
|| (kind == OriginalRangeKind::CallToken && first_origin != ExpansionOrigin::Call)
{
return None;
}
}
});
return match range {
Some(it) => FileRange { file_id: it.file_id.original_file(db), range: it.value },
None => {
FileRange { file_id: node.file_id.original_file(db), range: node.value.text_range() }
}
// FIXME: Add union method in TextRange
Some(first.with_value(union_range(first.value.text_range(), last.value.text_range())))
})?,
};
return Some(FileRange { file_id: range.file_id.original_file(db), range: range.value });
fn union_range(a: TextRange, b: TextRange) -> TextRange {
let start = a.start().min(b.start());
let end = a.end().max(b.end());