Add guards for possible null value in cm.state.vim introduced by code…

…mirror-vim
jupyterlab-contrib · Sep 9, 2024 · 512a64d · 512a64d
1 parent f1ed5a8
commit 512a64d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/codemirrorCommands.ts b/src/codemirrorCommands.ts
@@ -99,6 +99,7 @@ export class VimEditorManager {
         // we override `hasFocus` handler to ensure it is taken into account.
         const cm = getCM(view)!;
         cm.on('vim-mode-change', () => {
+          if (!cm.state.vim) return;
           editor.host.dataset.jpVimModeName = cm.state.vim.mode;
         });
         mirrorEditor.hasFocus = () => {

diff --git a/src/labCommands.ts b/src/labCommands.ts
@@ -180,6 +180,7 @@ export function addNotebookCommands(
               return;
             }
             const vim = cm.state.vim;
+            if (!vim) return;
 
             // Get the current editor state
             if (
-Original file line number
+Diff line change
@@ Expand Up / @@ -180,6 +180,7 @@ export function addNotebookCommands( @@
                   return;
                 }
                 const vim = cm.state.vim;
+                if (!vim) return;
                 // Get the current editor state
                 if (
@@ Expand Down @@