obsidian-plugin/esm7_obsidian-vimrc-support
1
0
Fork 0
mirror of https://github.com/esm7/obsidian-vimrc-support.git synced 2026-07-22 05:00:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: fix error if chord display is off, and subscribe CodeMirror keydown event

Browse source
This commit is contained in:
jiyee 2023-01-15 22:08:04 +08:00 committed by shengxuanwei
parent 5e108b9da5
commit d930d2233e
1 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
main.ts
View file

@ -139,27 +139,27 @@ export default class VimrcPlugin extends Plugin {
}
async updateVimEvents() {
let view = this.getActiveView();
if (view) {
const cmEditor = this.getCodeMirror(view);
let view = this.getActiveView();
if (view) {
const cmEditor = this.getCodeMirror(view);
// See https://codemirror.net/doc/manual.html#vimapi_events for events.
this.isInsertMode = false;
this.currentVimStatus = vimStatus.normal;
if (this.settings.displayVimMode)
this.vimStatusBar?.setText(this.currentVimStatus);
// See https://codemirror.net/doc/manual.html#vimapi_events for events.
this.isInsertMode = false;
this.currentVimStatus = vimStatus.normal;
if (this.settings.displayVimMode)
this.vimStatusBar?.setText(this.currentVimStatus);
cmEditor.off('vim-mode-change', this.logVimModeChange);
cmEditor.on('vim-mode-change', this.logVimModeChange);
cmEditor.off('vim-mode-change', this.logVimModeChange);
cmEditor.on('vim-mode-change', this.logVimModeChange);
this.currentKeyChord = [];
cmEditor.off('vim-keypress', this.onVimKeypress);
cmEditor.on('vim-keypress', this.onVimKeypress);
cmEditor.off('vim-command-done', this.onVimCommandDone);
cmEditor.on('vim-command-done', this.onVimCommandDone);
cmEditor.off('keydown', this.onKeydown);
cmEditor.on('keydown', this.onKeydown);
}
this.currentKeyChord = [];
cmEditor.off('vim-keypress', this.onVimKeypress);
cmEditor.on('vim-keypress', this.onVimKeypress);
cmEditor.off('vim-command-done', this.onVimCommandDone);
cmEditor.on('vim-command-done', this.onVimCommandDone);
CodeMirror.off(cmEditor.getInputField(), 'keydown', this.onKeydown);
CodeMirror.on(cmEditor.getInputField(), 'keydown', this.onKeydown);
}
}
async onload() {
@ -259,8 +259,8 @@ export default class VimrcPlugin extends Plugin {
if (cmEditor) {
cmEditor.off('vim-mode-change', this.logVimModeChange);
cmEditor.on('vim-mode-change', this.logVimModeChange);
cmEditor.off('keydown', this.onKeydown);
cmEditor.on('keydown', this.onKeydown);
CodeMirror.off(cmEditor.getInputField(), 'keydown', this.onKeydown);
CodeMirror.on(cmEditor.getInputField(), 'keydown', this.onKeydown);
}
}
}
@ -572,11 +572,11 @@ export default class VimrcPlugin extends Plugin {
if (tempS != "") {
tempS += "-";
}
this.vimChordStatusBar.setText(tempS);
this.vimChordStatusBar?.setText(tempS);
}
onVimCommandDone = async (reason: any) => {
this.vimChordStatusBar.setText("");
this.vimChordStatusBar?.setText("");
this.currentKeyChord = [];
}
@ -587,12 +587,18 @@ export default class VimrcPlugin extends Plugin {
}
}
onKeydown = (instance: CodeMirror.Editor, ev: KeyboardEvent) => {
onKeydown = (ev: KeyboardEvent) => {
if (this.settings.fixedNormalModeLayout) {
const keyMap = this.settings.capturedKeyboardMap;
if (!this.isInsertMode && !ev.shiftKey &&
ev.code in keyMap && ev.key != keyMap[ev.code]) {
this.codeMirrorVimObject.handleKey(instance, keyMap[ev.code], 'mapping');
let view = this.getActiveView();
if (view) {
const cmEditor = this.getCodeMirror(view);
if (cmEditor) {
this.codeMirrorVimObject.handleKey(cmEditor, keyMap[ev.code], 'mapping');
}
}
ev.preventDefault();
return false;
}