language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use first and last token only

Browse source
This commit is contained in:
Edwin Cheng 2020-01-09 04:03:50 +08:00
parent b30e6a7b56
commit caed836e41
1 changed files with 55 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

87
crates/ra_ide/src/extend_selection.rs
View file

@ -110,48 +110,69 @@ fn extend_tokens_from_range(
macro_call: ast::MacroCall, macro_call: ast::MacroCall,
original_range: TextRange, original_range: TextRange,
) -> Option<TextRange> { ) -> Option<TextRange> {
// compute original mapped token range // Find all non-whitespace tokens under MacroCall
let mut expanded = None; let all_tokens: Vec<_> = macro_call
let range = macro_call
.syntax() .syntax()
.descendants_with_tokens() .descendants_with_tokens()
.filter_map(|n| match n { .filter_map(|n| {
NodeOrToken::Token(token) if token.text_range().is_subrange(&original_range) => { let token = n.as_token()?;
let node = descend_into_macros(db, file_id, token); if token.kind() == WHITESPACE {
match node.file_id { None
it if it == file_id.into() => None, } else {
it if expanded.is_none() || expanded == Some(it) => { Some(token.clone())
expanded = Some(it.into());
Some(node.value.text_range())
} }
_ => None,
}
}
_ => None,
}) })
.fold1(|x, y| union_range(x, y))?; .sorted_by(|a, b| Ord::cmp(&a.text_range().start(), &b.text_range().start()))
.collect();
let expanded = expanded?; // Get all indices which is in original range
let src = db.parse_or_expand(expanded)?; let indices: Vec<_> =
let parent = shallowest_node(&find_covering_element(&src, range))?.parent()?; all_tokens
// compute parent mapped token range .iter()
let range = macro_call .enumerate()
.syntax() .filter_map(|(i, token)| {
.descendants_with_tokens() if token.text_range().is_subrange(&original_range) {
.filter_map(|n| match n { Some(i)
NodeOrToken::Token(token) => {
let node = descend_into_macros(db, file_id, token.clone());
if node.file_id == expanded
&& node.value.text_range().is_subrange(&parent.text_range())
{
Some(token.text_range())
} else { } else {
None None
} }
}
_ => None,
}) })
.fold1(|x, y| union_range(x, y))?; .collect();
// Compute the first and last token index in original_range
let first_idx = *indices.iter().min_by_key(|&&idx| all_tokens[idx].text_range().start())?;
let last_idx = *indices.iter().max_by_key(|&&idx| all_tokens[idx].text_range().end())?;
// compute original mapped token range
let expanded = {
let first_node = descend_into_macros(db, file_id, all_tokens[first_idx].clone());
let first_node = first_node.map(|it| it.text_range());
let last_node = descend_into_macros(db, file_id, all_tokens[last_idx].clone());
if last_node.file_id == file_id.into() || first_node.file_id != last_node.file_id {
return None;
}
first_node.map(|it| union_range(it, last_node.value.text_range()))
};
// Compute parent node range
let src = db.parse_or_expand(expanded.file_id)?;
let parent = shallowest_node(&find_covering_element(&src, expanded.value))?.parent()?;
let validate = |&idx: &usize| {
let token: &SyntaxToken = &all_tokens[idx];
let node = descend_into_macros(db, file_id, token.clone());
node.file_id == expanded.file_id
&& node.value.text_range().is_subrange(&parent.text_range())
};
// Find the first and last text range under expanded parent
let first = (0..=first_idx).rev().take_while(validate).last()?;
let last = (last_idx..all_tokens.len()).take_while(validate).last()?;
let range = union_range(all_tokens[first].text_range(), all_tokens[last].text_range());
if original_range.is_subrange(&range) && original_range != range { if original_range.is_subrange(&range) && original_range != range {
Some(range) Some(range)
} else { } else {