fix(vim/#2357): Part 1 - Show pending operator in status bar (#2364)

__Issue:__ As described in #2357 , we weren't showing any context around a pending operator in the status bar - this is really a step backward. __Fix:__ This picks up onivim/libvim#218 so that we get some context around the current pending operator, and we show it in now in the statusbar: ![2020-08-26 12 56 23](https://user-images.githubusercontent.com/13532591/91350541-b02e6880-e79b-11ea-8015-2670a7bf690f.gif) This fixes the operator-pending part of #2357 - we're missing showing the in-progress count of a command, though.
onivim · Aug 26, 2020 · e6a1d19 · e6a1d19
1 parent a89fc69
commit e6a1d19
Show file tree

Hide file tree

Showing 20 changed files with 389 additions and 118 deletions.
diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
diff --git a/bench.esy.lock/opam/charInfo_width.1.1.0/opam b/bench.esy.lock/opam/charInfo_width.1.1.0/opam
diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/esy.lock/opam/charInfo_width.1.1.0/opam b/esy.lock/opam/charInfo_width.1.1.0/opam
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
diff --git a/integrationtest.esy.lock/opam/charInfo_width.1.1.0/opam b/integrationtest.esy.lock/opam/charInfo_width.1.1.0/opam
diff --git a/package.json b/package.json
@@ -241,7 +241,7 @@
     "esy-skia": "*",
     "esy-tree-sitter": "^1.4.1",
     "isolinear": "^3.0.0",
-    "libvim": "8.10869.55",
+    "libvim": "8.10869.56",
     "ocaml": "~4.7.0",
     "reason-native-crash-utils": "onivim/reason-native-crash-utils#38c8f00",
     "reasonFuzz": "*",

diff --git a/src/Core/Mode.re b/src/Core/Mode.re
@@ -11,7 +11,7 @@ type t =
   | Visual({range: VisualRange.t})
   | Select({range: VisualRange.t})
   | Replace
-  | Operator
+  | Operator({pending: Vim.Operator.pending})
   | CommandLine
   // Additional modes
   | TerminalInsert
@@ -37,7 +37,7 @@ let toString =
     | None => "Select"
     }
   | Replace => "Replace"
-  | Operator => "Operator"
+  | Operator({pending}) => Vim.Operator.toString(pending)
   | CommandLine => "Command Line"
   | TerminalInsert => "Terminal Insert"
   | TerminalNormal => "Terminal Normal"