From 1a2a8dec14ec04ea8eeccae99fd885e7a280e45b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 2 Oct 2018 18:14:33 +0300 Subject: Make siblings an inherent method --- crates/ra_editor/src/extend_selection.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'crates/ra_editor/src/extend_selection.rs') diff --git a/crates/ra_editor/src/extend_selection.rs b/crates/ra_editor/src/extend_selection.rs index 2f8a04b2b..b00a457b9 100644 --- a/crates/ra_editor/src/extend_selection.rs +++ b/crates/ra_editor/src/extend_selection.rs @@ -1,7 +1,7 @@ use ra_syntax::{ - File, TextRange, SyntaxNodeRef, TextUnit, + File, TextRange, SyntaxNodeRef, TextUnit, Direction, SyntaxKind::*, - algo::{find_leaf_at_offset, LeafAtOffset, find_covering_node, Direction, siblings}, + algo::{find_leaf_at_offset, LeafAtOffset, find_covering_node}, }; pub fn extend_selection(file: &File, range: TextRange) -> Option { @@ -71,12 +71,12 @@ fn pick_best<'a>(l: SyntaxNodeRef<'a>, r: SyntaxNodeRef<'a>) -> SyntaxNodeRef<'a } fn extend_comments(node: SyntaxNodeRef) -> Option { - let left = adj_comments(node, Direction::Backward); - let right = adj_comments(node, Direction::Forward); - if left != right { + let prev = adj_comments(node, Direction::Prev); + let next = adj_comments(node, Direction::Next); + if prev != next { Some(TextRange::from_to( - left.range().start(), - right.range().end(), + prev.range().start(), + next.range().end(), )) } else { None @@ -85,7 +85,7 @@ fn extend_comments(node: SyntaxNodeRef) -> Option { fn adj_comments(node: SyntaxNodeRef, dir: Direction) -> SyntaxNodeRef { let mut res = node; - for node in siblings(node, dir) { + for node in node.siblings(dir) { match node.kind() { COMMENT => res = node, WHITESPACE if !node.leaf_text().unwrap().as_str().contains("\n\n") => (), -- cgit v1.2.3