[gnome-builder] vim: add new movements and count to c mode

[Sébastien Lafargue <slafargue src gnome org>]

commit 670330b97bfe77dae98513b6ffd0c007e39df55e
Author: Sebastien Lafargue <slafargue gnome org>
Date:   Sun Oct 23 22:09:39 2016 +0200

    vim: add new movements and count to c mode
    
    add 'hjkl' movements
    add cursor (up, down, left, right) movements
    add count
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773392

 data/keybindings/vim.css |  105 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 105 insertions(+), 0 deletions(-)
---
diff --git a/data/keybindings/vim.css b/data/keybindings/vim.css
index 484eb02..f3945fa 100644
--- a/data/keybindings/vim.css
+++ b/data/keybindings/vim.css
@@ -573,6 +573,44 @@
 
 @binding-set builder-vim-source-view-normal-c
 {
+  bind "1" { "append-to-count" (1)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "2" { "append-to-count" (2)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "3" { "append-to-count" (3)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "4" { "append-to-count" (4)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "5" { "append-to-count" (5)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "6" { "append-to-count" (6)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "7" { "append-to-count" (7)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "8" { "append-to-count" (8)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "9" { "append-to-count" (9)
+             "set-mode" ("vim-c-with-count", transient) };
+
+  bind "KP_1" { "append-to-count" (1)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_2" { "append-to-count" (2)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_3" { "append-to-count" (3)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_4" { "append-to-count" (4)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_5" { "append-to-count" (5)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_6" { "append-to-count" (6)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_7" { "append-to-count" (7)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_8" { "append-to-count" (8)
+                "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_9" { "append-to-count" (9)
+                "set-mode" ("vim-c-with-count", transient) };
+
   bind "i" { "set-mode" ("vim-normal-c-i", transient) };
 
   bind "a" { "set-mode" ("vim-normal-c-a", transient) };
@@ -588,6 +626,55 @@
              "copy-clipboard" ()
              "delete-selection" () };
 
+  bind "l" { "begin-macro" ()
+             "movement" (next-char, 1, 1, 1)
+             "copy-clipboard" ()
+             "delete-selection" ()
+             "set-mode" ("vim-insert", permanent) };
+  bind "h" { "begin-macro" ()
+             "movement" (previous-char, 1, 1, 1)
+             "copy-clipboard" ()
+             "delete-selection" ()
+             "set-mode" ("vim-insert", permanent) };
+  bind "k" { "begin-macro" ()
+             "movement" (last-char, 0, 0, 0)
+             "movement" (previous-line, 1, 0, 1)
+             "movement" (first-char, 1, 1, 0)
+             "copy-clipboard" ()
+             "delete-selection" ()
+             "set-mode" ("vim-insert", permanent) };
+  bind "j" { "begin-macro" ()
+             "movement" (first-char, 0, 1, 0)
+             "movement" (next-line, 1, 0, 1)
+             "movement" (last-char, 1, 0, 0)
+             "copy-clipboard" ()
+             "delete-selection" ()
+             "set-mode" ("vim-insert", permanent) };
+  bind "Right" { "begin-macro" ()
+                 "movement" (next-char, 1, 1, 1)
+                 "copy-clipboard" ()
+                 "delete-selection" ()
+                 "set-mode" ("vim-insert", permanent) };
+  bind "Left" { "begin-macro" ()
+                "movement" (previous-char, 1, 1, 1)
+                "copy-clipboard" ()
+                "delete-selection" ()
+                "set-mode" ("vim-insert", permanent) };
+  bind "Up" { "begin-macro" ()
+              "movement" (last-char, 0, 0, 0)
+              "movement" (previous-line, 1, 0, 1)
+              "movement" (first-char, 1, 1, 0)
+              "copy-clipboard" ()
+              "delete-selection" ()
+              "set-mode" ("vim-insert", permanent) };
+  bind "Down" { "begin-macro" ()
+                "movement" (first-char, 0, 1, 0)
+                "movement" (next-line, 1, 0, 1)
+                "movement" (last-char, 1, 0, 0)
+                "copy-clipboard" ()
+                "delete-selection" ()
+                "set-mode" ("vim-insert", permanent) };
+
   bind "0" { "begin-macro" ()
              "set-mode" ("vim-insert", permanent)
              "movement" (first-char, 1, 0, 0)
@@ -740,6 +827,14 @@
                      "delete-selection" () };
 }
 
+@binding-set builder-vim-source-view-c-with-count
+{
+  bind "0" { "append-to-count" (0)
+             "set-mode" ("vim-c-with-count", transient) };
+  bind "KP_0" { "append-to-count" (0)
+                "set-mode" ("vim-c-with-count", transient) };
+}
+
 @binding-set builder-vim-source-view-normal-c-i
 {
   /* cip */
@@ -2420,6 +2515,16 @@ idesourceviewmode.vim-normal-c {
                      builder-vim-source-view-normal-c;
 }
 
+idesourceviewmode.vim-c-with-count {
+  -IdeSourceViewMode-suppress-unbound: true;
+  -IdeSourceViewMode-block-cursor: true;
+  -IdeSourceViewMode-default-mode: "vim-normal-c";
+
+  -gtk-key-bindings: builder-vim-source-view,
+                     builder-vim-source-view-c-with-count,
+                     builder-vim-source-view-normal-c;
+}
+
 idesourceviewmode.vim-normal-c-i {
   -IdeSourceViewMode-suppress-unbound: true;
   -IdeSourceViewMode-block-cursor: true;