[gnome-builder/wip/vim] vim: preserve selection on `k` command.

[Christian Hergert <chergert src gnome org>]

commit 7d2dd3c9920ab84499497861d455ca2b58bb121e
Author: Christian Hergert <christian hergert me>
Date:   Tue Sep 30 14:19:23 2014 -0700

    vim: preserve selection on `k` command.

 src/editor/gb-editor-vim.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/src/editor/gb-editor-vim.c b/src/editor/gb-editor-vim.c
index c9a75cd..a7388a8 100644
--- a/src/editor/gb-editor-vim.c
+++ b/src/editor/gb-editor-vim.c
@@ -502,6 +502,8 @@ gb_editor_vim_move_up (GbEditorVim *vim)
   GtkTextBuffer *buffer;
   GtkTextMark *insert;
   GtkTextIter iter;
+  GtkTextIter selection;
+  gboolean has_selection;
   guint line;
   guint offset;
 
@@ -510,18 +512,13 @@ gb_editor_vim_move_up (GbEditorVim *vim)
   priv = vim->priv;
 
   buffer = gtk_text_view_get_buffer (priv->text_view);
-  insert = gtk_text_buffer_get_insert (buffer);
-  gtk_text_buffer_get_iter_at_mark (buffer, &iter, insert);
+  has_selection = gb_editor_vim_get_selection_bounds (vim, &iter, &selection);
   line = gtk_text_iter_get_line (&iter);
   offset = vim->priv->target_line_offset;
 
   if (line == 0)
     return;
 
-  /*
-   * TODO: handle there being a selection.
-   */
-
   gtk_text_buffer_get_iter_at_line (buffer, &iter, line - 1);
   if ((line - 1) == gtk_text_iter_get_line (&iter))
     {
@@ -529,9 +526,18 @@ gb_editor_vim_move_up (GbEditorVim *vim)
         if (!gtk_text_iter_ends_line (&iter))
           if (!gtk_text_iter_forward_char (&iter))
             break;
-      gtk_text_buffer_select_range (buffer, &iter, &iter);
+
+      if (has_selection)
+        {
+          if (gtk_text_iter_equal (&iter, &selection))
+            gtk_text_iter_backward_char (&iter);
+          gb_editor_vim_select_range (vim, &iter, &selection);
+        }
+      else
+        gtk_text_buffer_select_range (buffer, &iter, &iter);
     }
 
+  insert = gtk_text_buffer_get_insert (buffer);
   gtk_text_view_scroll_mark_onscreen (vim->priv->text_view, insert);
 }
 
@@ -1090,9 +1096,9 @@ gb_editor_vim_clear_selection (GbEditorVim *vim)
   GtkTextBuffer *buffer;
   GtkTextMark *insert;
   GtkTextIter iter;
-  
+
   g_assert (GB_IS_EDITOR_VIM (vim));
-  
+
   buffer = gtk_text_view_get_buffer (vim->priv->text_view);
   insert = gtk_text_buffer_get_insert (buffer);
   gtk_text_buffer_get_iter_at_mark (buffer, &iter, insert);