Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Aug 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions bench.esy.lock/index.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions bench.esy.lock/opam/charInfo_width.1.1.0/opam

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions esy.lock/index.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions esy.lock/opam/charInfo_width.1.1.0/opam

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions integrationtest.esy.lock/index.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions integrationtest.esy.lock/opam/charInfo_width.1.1.0/opam

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Mode.re
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
Loading