[gtksourceview/wip/chergert/vim] do text objects for delete

[Christian Hergert <chergert src gnome org>]

commit ebfa614c56f2de40fc95d643122f155597c4cf35
Author: Christian Hergert <chergert redhat com>
Date:   Fri Nov 5 00:23:40 2021 -0700

    do text objects for delete

 gtksourceview/vim/gtk-source-vim-normal.c | 70 +++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 4 deletions(-)
---
diff --git a/gtksourceview/vim/gtk-source-vim-normal.c b/gtksourceview/vim/gtk-source-vim-normal.c
index 6747aec7..df9b3edb 100644
--- a/gtksourceview/vim/gtk-source-vim-normal.c
+++ b/gtksourceview/vim/gtk-source-vim-normal.c
@@ -767,6 +767,7 @@ key_handler_c_with_modifier (GtkSourceVimNormal *self,
        {
                gtk_source_vim_normal_begin_insert_text_object (self, text_object);
                gtk_source_vim_normal_clear (self);
+               g_object_unref (text_object);
                return TRUE;
        }
 
@@ -807,6 +808,70 @@ key_handler_c (GtkSourceVimNormal *self,
        }
 }
 
+static gboolean
+key_handler_d_with_modifier (GtkSourceVimNormal *self,
+                             guint               keyval,
+                             guint               keycode,
+                             GdkModifierType     mods,
+                             const char         *string)
+{
+       GtkSourceVimState *text_object;
+
+       g_assert (GTK_SOURCE_IS_VIM_NORMAL (self));
+
+       text_object = get_text_object (keyval, self->change_modifier);
+
+       if (text_object != NULL)
+       {
+               GtkSourceVimState *command = gtk_source_vim_command_new (":delete");
+               gtk_source_vim_command_set_text_object (GTK_SOURCE_VIM_COMMAND (command),
+                                                       GTK_SOURCE_VIM_TEXT_OBJECT (text_object));
+               gtk_source_vim_normal_clear (self);
+               gtk_source_vim_state_push (GTK_SOURCE_VIM_STATE (self), command);
+               gtk_source_vim_state_pop (command);
+               g_object_unref (text_object);
+               return TRUE;
+       }
+
+       return gtk_source_vim_normal_bail (self);
+}
+
+static gboolean
+key_handler_d (GtkSourceVimNormal *self,
+               guint               keyval,
+               guint               keycode,
+               GdkModifierType     mods,
+               const char         *string)
+{
+       GtkSourceVimState *current;
+
+       g_assert (GTK_SOURCE_IS_VIM_NORMAL (self));
+
+       switch (keyval)
+       {
+               case GDK_KEY_i:
+                       self->change_modifier = CHANGE_INNER;
+                       self->handler = key_handler_d_with_modifier;
+                       return TRUE;
+
+               case GDK_KEY_a:
+                       self->change_modifier = CHANGE_A;
+                       self->handler = key_handler_d_with_modifier;
+                       return TRUE;
+
+               default:
+               {
+                       gtk_source_vim_normal_begin_command (self,
+                                                            NULL,
+                                                            gtk_source_vim_motion_new_none (),
+                                                            ":delete", GDK_KEY_d);
+                       current = gtk_source_vim_state_get_current (GTK_SOURCE_VIM_STATE (self));
+                       gtk_source_vim_state_synthesize (current, keyval, mods);
+                       return TRUE;
+               }
+       }
+}
+
 static gboolean
 key_handler_shift (GtkSourceVimNormal *self,
                    guint               keyval,
@@ -1103,10 +1168,7 @@ key_handler_initial (GtkSourceVimNormal *self,
                                return TRUE;
 
                        case GDK_KEY_d:
-                               gtk_source_vim_normal_begin_command (self,
-                                                                    NULL,
-                                                                    gtk_source_vim_motion_new_none (),
-                                                                    ":delete", GDK_KEY_d);
+                               self->handler = key_handler_d;
                                return TRUE;
 
                        case GDK_KEY_c: