2e0803c · helix · git.iko.soy

git.iko.soy/helix

Implement 'remove_primary_selection' as Alt-,

This allows removing search matches from the selection Fixes #713

commit2e0803c8d9ec0028c0d018be251c7c2b781247b3 authorBlaž Hrastnik <blaz@mxxn.io> dateWed 22 Sep 2021, 00:51 (5 years ago) parent75dba1f

3 files changed+27

compare with master

unifiedsplit

helix-core/src/selection.rs+9 helix-term/src/commands.rs+17 helix-term/src/keymap.rs+1

helix-core/src/selection.rs+9

@@ -360,6 +360,15 @@ impl Selection {

360360 self.normalize()

361361 }

362362

363+ /// Adds a new range to the selection and makes it the primary range.

364+ pub fn remove(mut self, index: usize) -> Self {

365+ self.ranges.remove(index);

366+ if index < self.primary_index || self.primary_index == self.ranges.len() {

367+ self.primary_index -= 1;

368+ }

369+ self

370+ }

371+

363372 /// Map selections over a set of changes. Useful for adjusting the selection position after

364373 /// applying changes to a document.

365374 pub fn map(self, changes: &ChangeSet) -> Self {

helix-term/src/commands.rs+17

@@ -290,6 +290,7 @@ impl Command {

290290 join_selections, "Join lines inside selection",

291291 keep_selections, "Keep selections matching regex",

292292 keep_primary_selection, "Keep primary selection",

293+ remove_primary_selection, "Remove primary selection",

293294 completion, "Invoke completion popup",

294295 hover, "Show docs for item under cursor",

295296 toggle_comments, "Comment/uncomment selections",

@@ -4016,11 +4017,27 @@ fn keep_selections(cx: &mut Context) {

40164017

40174018fn keep_primary_selection(cx: &mut Context) {

40184019 let (view, doc) = current!(cx.editor);

4020+ // TODO: handle count

40194021

40204022 let range = doc.selection(view.id).primary();

40214023 doc.set_selection(view.id, Selection::single(range.anchor, range.head));

40224024}

40234025

4026+fn remove_primary_selection(cx: &mut Context) {

4027+ let (view, doc) = current!(cx.editor);

4028+ // TODO: handle count

4029+

4030+ let selection = doc.selection(view.id);

4031+ if selection.len() == 1 {

4032+ cx.editor.set_error("no selections remaining".to_owned());

4033+ return;

4034+ }

4035+ let index = selection.primary_index();

4036+ let selection = selection.clone().remove(index);

4037+

4038+ doc.set_selection(view.id, selection);

4039+}

4040+

40244041fn completion(cx: &mut Context) {

40254042 // trigger on trigger char, or if user calls it

40264043 // (or on word char typing??)

helix-term/src/keymap.rs+1

@@ -499,6 +499,7 @@ impl Default for Keymaps {

499499 // TODO: and another method for inverse

500500

501501 "," => keep_primary_selection,

502+ "A-," => remove_primary_selection,

502503

503504 // "q" => record_macro,

504505 // "Q" => replay_macro,