andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

goto line start/end commands extend when in select mode (#739)

Browse Source
This commit is contained in:
Kangwook Lee (이강욱) 2021-09-11 18:31:40 +09:00 committed by GitHub
parent 987d8e6dd6
commit 05c2a72ccb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,8 +410,7 @@ fn extend_line_down(cx: &mut Context) {
move_impl(cx, move_vertically, Direction::Forward, Movement::Extend)
}
fn goto_line_end_impl(cx: &mut Context, movement: Movement) {
let (view, doc) = current!(cx.editor);
fn goto_line_end_impl(view: &mut View, doc: &mut Document, movement: Movement) {
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
@ -427,15 +426,24 @@ fn goto_line_end_impl(cx: &mut Context, movement: Movement) {
}
fn goto_line_end(cx: &mut Context) {
goto_line_end_impl(cx, Movement::Move)
let (view, doc) = current!(cx.editor);
goto_line_end_impl(
view,
doc,
if doc.mode == Mode::Select {
Movement::Extend
} else {
Movement::Move
},
)
}
fn extend_to_line_end(cx: &mut Context) {
goto_line_end_impl(cx, Movement::Extend)
let (view, doc) = current!(cx.editor);
goto_line_end_impl(view, doc, Movement::Extend)
}
fn goto_line_end_newline_impl(cx: &mut Context, movement: Movement) {
let (view, doc) = current!(cx.editor);
fn goto_line_end_newline_impl(view: &mut View, doc: &mut Document, movement: Movement) {
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
@ -448,15 +456,24 @@ fn goto_line_end_newline_impl(cx: &mut Context, movement: Movement) {
}
fn goto_line_end_newline(cx: &mut Context) {
goto_line_end_newline_impl(cx, Movement::Move)
let (view, doc) = current!(cx.editor);
goto_line_end_newline_impl(
view,
doc,
if doc.mode == Mode::Select {
Movement::Extend
} else {
Movement::Move
},
)
}
fn extend_to_line_end_newline(cx: &mut Context) {
goto_line_end_newline_impl(cx, Movement::Extend)
let (view, doc) = current!(cx.editor);
goto_line_end_newline_impl(view, doc, Movement::Extend)
}
fn goto_line_start_impl(cx: &mut Context, movement: Movement) {
let (view, doc) = current!(cx.editor);
fn goto_line_start_impl(view: &mut View, doc: &mut Document, movement: Movement) {
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
@ -470,11 +487,21 @@ fn goto_line_start_impl(cx: &mut Context, movement: Movement) {
}
fn goto_line_start(cx: &mut Context) {
goto_line_start_impl(cx, Movement::Move)
let (view, doc) = current!(cx.editor);
goto_line_start_impl(
view,
doc,
if doc.mode == Mode::Select {
Movement::Extend
} else {
Movement::Move
},
)
}
fn extend_to_line_start(cx: &mut Context) {
goto_line_start_impl(cx, Movement::Extend)
let (view, doc) = current!(cx.editor);
goto_line_start_impl(view, doc, Movement::Extend)
}
fn goto_first_nonwhitespace(cx: &mut Context) {