suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

commands: w/b/e need to apply to all selections.

pull/8/head
Blaž Hrastnik 2021-03-04 14:07:35 +09:00
parent dd6db43013
commit 7e4830215e
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
helix-term/src/commands.rs
View File

@ -128,25 +128,40 @@ pub fn move_line_start(cx: &mut Context) {
pub fn move_next_word_start(cx: &mut Context) { pub fn move_next_word_start(cx: &mut Context) {
let count = cx.count; let count = cx.count;
let doc = cx.doc(); let doc = cx.doc();
let pos = State::move_next_word_start(doc.text().slice(..), doc.selection().cursor(), count); let text = doc.text().slice(..);
doc.set_selection(Selection::point(pos)); let selection = doc.selection().transform(|range| {
let pos = State::move_next_word_start(text, range.head, count);
Range::new(pos, pos)
});
doc.set_selection(selection);
} }
pub fn move_prev_word_start(cx: &mut Context) { pub fn move_prev_word_start(cx: &mut Context) {
let count = cx.count; let count = cx.count;
let doc = cx.doc(); let doc = cx.doc();
let pos = State::move_prev_word_start(doc.text().slice(..), doc.selection().cursor(), count); let text = doc.text().slice(..);
doc.set_selection(Selection::point(pos)); let selection = doc.selection().transform(|range| {
let pos = State::move_prev_word_start(text, range.head, count);
Range::new(pos, pos)
});
doc.set_selection(selection);
} }
pub fn move_next_word_end(cx: &mut Context) { pub fn move_next_word_end(cx: &mut Context) {
let count = cx.count; let count = cx.count;
let doc = cx.doc(); let doc = cx.doc();
let pos = State::move_next_word_end(doc.text().slice(..), doc.selection().cursor(), count); let text = doc.text().slice(..);
doc.set_selection(Selection::point(pos)); let selection = doc.selection().transform(|range| {
let pos = State::move_next_word_end(text, range.head, count);
Range::new(pos, pos)
});
doc.set_selection(selection);
} }
pub fn move_file_start(cx: &mut Context) { pub fn move_file_start(cx: &mut Context) {
@ -168,11 +183,11 @@ pub fn move_file_end(cx: &mut Context) {
pub fn extend_next_word_start(cx: &mut Context) { pub fn extend_next_word_start(cx: &mut Context) {
let count = cx.count; let count = cx.count;
let doc = cx.doc(); let doc = cx.doc();
let text = doc.text().slice(..);
let selection = doc.selection().transform(|mut range| { let selection = doc.selection().transform(|mut range| {
let pos = let pos = State::move_next_word_start(text, range.head, count);
State::move_next_word_start(doc.text().slice(..), doc.selection().cursor(), count); Range::new(range.anchor, pos)
range.head = pos;
range
}); });
doc.set_selection(selection); doc.set_selection(selection);
@ -181,11 +196,11 @@ pub fn extend_next_word_start(cx: &mut Context) {
pub fn extend_prev_word_start(cx: &mut Context) { pub fn extend_prev_word_start(cx: &mut Context) {
let count = cx.count; let count = cx.count;
let doc = cx.doc(); let doc = cx.doc();
let text = doc.text().slice(..);
let selection = doc.selection().transform(|mut range| { let selection = doc.selection().transform(|mut range| {
let pos = let pos = State::move_prev_word_start(text, range.head, count);
State::move_prev_word_start(doc.text().slice(..), doc.selection().cursor(), count); Range::new(range.anchor, pos)
range.head = pos;
range
}); });
doc.set_selection(selection); doc.set_selection(selection);
} }
@ -193,10 +208,11 @@ pub fn extend_prev_word_start(cx: &mut Context) {
pub fn extend_next_word_end(cx: &mut Context) { pub fn extend_next_word_end(cx: &mut Context) {
let count = cx.count; let count = cx.count;
let doc = cx.doc(); let doc = cx.doc();
let text = doc.text().slice(..);
let selection = doc.selection().transform(|mut range| { let selection = doc.selection().transform(|mut range| {
let pos = State::move_next_word_end(doc.text().slice(..), doc.selection().cursor(), count); let pos = State::move_next_word_end(text, range.head, count);
range.head = pos; Range::new(range.anchor, pos)
range
}); });
doc.set_selection(selection); doc.set_selection(selection);