mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #94

Browse Source 
94: Extend comments by single word first r=matklad a=kjeremy

Fixes #88

Co-authored-by: Jeremy A. Kolb <jkolb@ara.com>
This commit is contained in:
bors[bot] 2018-10-04 14:25:53 +00:00
commit 81bf190f7a
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/ra_editor/src/extend_selection.rs
View File

@ -16,12 +16,18 @@ pub(crate) fn extend(root: SyntaxNodeRef, range: TextRange) -> Option<TextRange>
if leaves.clone().all(|it| it.kind() == WHITESPACE) { if leaves.clone().all(|it| it.kind() == WHITESPACE) {
return Some(extend_ws(root, leaves.next()?, offset)); return Some(extend_ws(root, leaves.next()?, offset));
} }
let leaf = match leaves { let leaf_range = match leaves {
LeafAtOffset::None => return None, LeafAtOffset::None => return None,
LeafAtOffset::Single(l) => l, LeafAtOffset::Single(l) => {
LeafAtOffset::Between(l, r) => pick_best(l, r), if l.kind() == COMMENT {
extend_single_word_in_comment(l, offset).unwrap_or_else(||l.range())
} else {
l.range()
}
},
LeafAtOffset::Between(l, r) => pick_best(l, r).range(),
}; };
return Some(leaf.range()); return Some(leaf_range);
}; };
let node = find_covering_node(root, range); let node = find_covering_node(root, range);
if node.kind() == COMMENT && range == node.range() { if node.kind() == COMMENT && range == node.range() {
@ -36,6 +42,20 @@ pub(crate) fn extend(root: SyntaxNodeRef, range: TextRange) -> Option<TextRange>
} }
} }
fn extend_single_word_in_comment(leaf: SyntaxNodeRef, offset: TextUnit) -> Option<TextRange> {
let text : &str = leaf.leaf_text()?;
let cursor_position: u32 = (offset - leaf.range().start()).into();
let (before, after) = text.split_at(cursor_position as usize);
let start_idx = before.rfind(char::is_whitespace)? as u32;
let end_idx = after.find(char::is_whitespace)? as u32;
let from : TextUnit = (start_idx + 1).into();
let to : TextUnit = (cursor_position + end_idx).into();
Some(TextRange::from_to(from, to))
}
fn extend_ws(root: SyntaxNodeRef, ws: SyntaxNodeRef, offset: TextUnit) -> TextRange { fn extend_ws(root: SyntaxNodeRef, ws: SyntaxNodeRef, offset: TextUnit) -> TextRange {
let ws_text = ws.leaf_text().unwrap(); let ws_text = ws.leaf_text().unwrap();
let suffix = TextRange::from_to(offset, ws.range().end()) - ws.range().start(); let suffix = TextRange::from_to(offset, ws.range().end()) - ws.range().start();
@ -176,4 +196,12 @@ fn main() { foo+<|>bar;}
&["'a", "<'a>"] &["'a", "<'a>"]
); );
} }
#[test]
fn test_extend_selection_select_first_word() {
do_check(
r#"// foo bar b<|>az quxx"#,
&["baz", "// foo bar baz quxx"]
);
}
} }