Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch to absolute offsets for extend comment word

Browse source
This commit is contained in:
Aleksey Kladov 2018-10-09 16:16:51 +03:00
parent 91f99920bd
commit 5d1dae83a1
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,17 +43,17 @@ pub(crate) fn extend(root: SyntaxNodeRef, range: TextRange) -> Option<TextRange>
} }
fn extend_single_word_in_comment(leaf: SyntaxNodeRef, offset: TextUnit) -> Option<TextRange> { fn extend_single_word_in_comment(leaf: SyntaxNodeRef, offset: TextUnit) -> Option<TextRange> {
let text : &str = leaf.leaf_text()?; let text: &str = leaf.leaf_text()?;
let cursor_position: u32 = (offset - leaf.range().start()).into(); let cursor_position: u32 = (offset - leaf.range().start()).into();
let (before, after) = text.split_at(cursor_position as usize); let (before, after) = text.split_at(cursor_position as usize);
let start_idx = before.rfind(char::is_whitespace)? as u32; let start_idx = before.rfind(char::is_whitespace)? as u32;
let end_idx = after.find(char::is_whitespace)? as u32; let end_idx = after.find(char::is_whitespace)? as u32;
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)) Some(TextRange::from_to(from, to) + leaf.range().start())
} }
fn extend_ws(root: SyntaxNodeRef, ws: SyntaxNodeRef, offset: TextUnit) -> TextRange { fn extend_ws(root: SyntaxNodeRef, ws: SyntaxNodeRef, offset: TextUnit) -> TextRange {
@ -219,5 +219,14 @@ fn main() { foo+<|>bar;}
r#"// foo bar b<|>az quxx"#, r#"// foo bar b<|>az quxx"#,
&["baz", "// foo bar baz quxx"] &["baz", "// foo bar baz quxx"]
); );
do_check(r#"
impl S {
fn foo() {
// hel<|>lo world
}
}
"#,
&["hello", "// hello world"]
);
} }
} }