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

Merge #264

Browse source 
264: check for empty range when extending in comment r=matklad a=vemoo

fix for #140 

Co-authored-by: Bernardo <berublan@gmail.com>
This commit is contained in:
bors[bot] 2018-12-08 17:43:15 +00:00
commit 5ad7547ce2
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_editor/src/extend_selection.rs
View file

@ -54,7 +54,12 @@ fn extend_single_word_in_comment(leaf: SyntaxNodeRef, offset: TextUnit) -> Optio
let from: TextUnit = (start_idx + 1).into(); let from: TextUnit = (start_idx + 1).into();
let to: TextUnit = (cursor_position + end_idx).into(); let to: TextUnit = (cursor_position + end_idx).into();
Some(TextRange::from_to(from, to) + leaf.range().start()) let range = TextRange::from_to(from, to);
if range.is_empty() {
None
} else {
Some(range + leaf.range().start())
}
} }
fn extend_ws(root: SyntaxNodeRef, ws: SyntaxNodeRef, offset: TextUnit) -> TextRange { fn extend_ws(root: SyntaxNodeRef, ws: SyntaxNodeRef, offset: TextUnit) -> TextRange {
@ -181,6 +186,20 @@ fn bar(){}
"#, "#,
&["// 1 + 1", "// fn foo() {\n// 1 + 1\n// }"], &["// 1 + 1", "// fn foo() {\n// 1 + 1\n// }"],
); );
do_check(
r#"
// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
// pub enum Direction {
// <|> Next,
// Prev
// }
"#,
&[
"// Next,",
"// #[derive(Debug, Clone, Copy, PartialEq, Eq)]\n// pub enum Direction {\n// Next,\n// Prev\n// }",
],
);
} }
#[test] #[test]