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

Use text_range::extend_to

Browse source
This commit is contained in:
Edwin Cheng 2020-02-27 10:06:48 +08:00
parent 05388b4ea4
commit 61fd6c6270
4 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,7 +161,7 @@ fn extend_tokens_from_range(
.take_while(validate)
.last()?;
let range = union_range(first.text_range(), last.text_range());
let range = first.text_range().extend_to(&last.text_range());
if original_range.is_subrange(&range) && original_range != range {
Some(range)
} else {
@ -169,12 +169,6 @@ fn extend_tokens_from_range(
}
}
fn union_range(range: TextRange, r: TextRange) -> TextRange {
let start = range.start().min(r.start());
let end = range.end().max(r.end());
TextRange::from_to(start, end)
}
/// Find the shallowest node with same range, which allows us to traverse siblings.
fn shallowest_node(node: &SyntaxNode) -> SyntaxNode {
node.ancestors().take_while(|n| n.text_range() == node.text_range()).last().unwrap()