Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 01:38:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor fix

Browse source
This commit is contained in:
Edwin Cheng 2020-01-07 04:35:19 +08:00
parent 4c4416543a
commit 07f4171b18
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ use crate::{db::RootDatabase, FileRange};
use hir::{db::AstDatabase, InFile}; use hir::{db::AstDatabase, InFile};
use itertools::Itertools; use itertools::Itertools;
// FIXME: restore macro support
pub(crate) fn extend_selection(db: &RootDatabase, frange: FileRange) -> TextRange { pub(crate) fn extend_selection(db: &RootDatabase, frange: FileRange) -> TextRange {
let src = db.parse(frange.file_id).tree(); let src = db.parse(frange.file_id).tree();
let root = InFile::new(frange.file_id.into(), src.syntax()); let root = InFile::new(frange.file_id.into(), src.syntax());
@ -93,8 +92,7 @@ fn try_extend_selection(
return Some(node.text_range()); return Some(node.text_range());
} }
// Using shallowest node with same range allows us to traverse siblings. let node = shallowest_node(&node.into()).unwrap();
let node = node.ancestors().take_while(|n| n.text_range() == node.text_range()).last().unwrap();
if node.parent().map(|n| list_kinds.contains(&n.kind())) == Some(true) { if node.parent().map(|n| list_kinds.contains(&n.kind())) == Some(true) {
if let Some(range) = extend_list_item(&node) { if let Some(range) = extend_list_item(&node) {
@ -129,7 +127,7 @@ fn extend_tokens_from_range(
.fold1(|x, y| union_range(x, y))?; .fold1(|x, y| union_range(x, y))?;
let src = db.parse_or_expand(expansion.file_id())?; let src = db.parse_or_expand(expansion.file_id())?;
let parent = shallow_node(&find_covering_element(&src, range))?.parent()?; let parent = shallowest_node(&find_covering_element(&src, range))?.parent()?;
// compute parent mapped token range // compute parent mapped token range
let range = macro_call let range = macro_call
@ -162,7 +160,8 @@ fn union_range(range: TextRange, r: TextRange) -> TextRange {
TextRange::from_to(start, end) TextRange::from_to(start, end)
} }
fn shallow_node(node: &SyntaxElement) -> Option<SyntaxNode> { /// Find the shallowest node with same range, which allows us to traverse siblings.
fn shallowest_node(node: &SyntaxElement) -> Option<SyntaxNode> {
node.ancestors().take_while(|n| n.text_range() == node.text_range()).last() node.ancestors().take_while(|n| n.text_range() == node.text_range()).last()
} }