Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

Fix vim macros duplicating inserted characters (#8470)

Ashtoncdbe1961d9c4
diff --git a/frontend/src/core/codemirror/keymaps/vim.ts b/frontend/src/core/codemirror/keymaps/vim.ts
index f97d1851de..c373e58e6e 100644
--- a/frontend/src/core/codemirror/keymaps/vim.ts
+++ b/frontend/src/core/codemirror/keymaps/vim.ts
@@ -247,6 +247,27 @@ function applyVimCommands(vimCommands: VimCommand[]) {
}
}
+type VimWithGlobalState = typeof Vim & {
+ getVimGlobalState_?: () => {
+ macroModeState?: {
+ isRecording: boolean;
+ isPlaying: boolean;
+ };
+ };
+};
+
+function isMacroActive() {
+ const getGlobalState = (Vim as VimWithGlobalState).getVimGlobalState_;
+ if (typeof getGlobalState !== "function") {
+ return false;
+ }
+ const macroModeState = getGlobalState()?.macroModeState;
+ if (!macroModeState) {
+ return false;
+ }
+ return Boolean(macroModeState.isRecording || macroModeState.isPlaying);
+}
+
class CodeMirrorVimSync {
private instances = new Set<EditorView>();
private isBroadcasting = false;
@@ -275,10 +296,13 @@ class CodeMirrorVimSync {
return;
}
invariant("mode" in e, 'Expected event to have a "mode" property');
+ const skipBroadcast = isMacroActive();
this.isBroadcasting = true;
// We use onIdle to keep the focused editor snappy
onIdle(() => {
- this.broadcastModeChange(instance, e.mode, e.subMode);
+ if (!skipBroadcast) {
+ this.broadcastModeChange(instance, e.mode, e.subMode);
+ }
this.isBroadcasting = false;
});
});
@@ -338,9 +362,9 @@ class CodeMirrorVimSync {
}
break;
case "insert":
- // Only enter insert mode if we're not already in it
+ // only enter insert mode if we're not already in it
if (!vim.insertMode) {
- Vim.handleKey(cm, "i", "");
+ Vim.handleKey(cm, "i", "mapping");
}
break;
case "visual":