From f41688d960ef89c29c4a51c872b8406fb8f81a85 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Sun, 20 Jun 2021 23:37:11 +0900
Subject: Merge `x` and `X`

---
 book/src/keymap.md         |  5 ++---
 helix-term/src/commands.rs | 15 ---------------
 helix-term/src/keymap.rs   |  4 +---
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 267f4378..1e159f81 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -69,9 +69,8 @@
 | `;`      | Collapse selection onto a single cursor                           |
 | `Alt-;`  | Flip selection cursor and anchor                                  |
 | `%`      | Select entire file                                                |
-| `x`      | Select current line                                               |
-| `X`      | Extend to next line                                               |
-| `[`      | Expand selection to parent syntax node TODO: pick a key           |
+| `x`      | Select current line, if already selected, extend to next line     |
+| ``       | Expand selection to parent syntax node TODO: pick a key           |
 | `J`      | join lines inside selection                                       |
 | `K`      | keep selections matching the regex TODO: overlapped by hover help |
 | `Space`  | keep only the primary selection TODO: overlapped by space mode    |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8c290979..8b6e2d88 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -888,21 +888,6 @@ fn search_selection(cx: &mut Context) {
 
 //
 
-fn select_line(cx: &mut Context) {
-    let count = cx.count();
-    let (view, doc) = current!(cx.editor);
-
-    let pos = doc.selection(view.id).primary();
-    let text = doc.text();
-
-    let line = text.char_to_line(pos.head);
-    let start = text.line_to_char(line);
-    let end = text
-        .line_to_char(std::cmp::min(doc.text().len_lines(), line + count))
-        .saturating_sub(1);
-
-    doc.set_selection(view.id, Selection::single(start, end));
-}
 fn extend_line(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 8ea9b387..46d495c3 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -196,9 +196,7 @@ impl Default for Keymaps {
             key!(';') => Command::collapse_selection,
             alt!(';') => Command::flip_selections,
             key!('%') => Command::select_all,
-            key!('x') => Command::select_line,
-            key!('X') => Command::extend_line,
-            // or select mode X?
+            key!('x') => Command::extend_line,
             // extend_to_whole_line, crop_to_whole_line
 
 
-- 
cgit v1.2.3-70-g09d2