Merge pull request #248 from yaohui-wyh/master

Check if project is disposed when editorDeinit
JetBrains · Sep 8, 2020 · 67c5601 · 67c5601
2 parents e92c0d5 + 61a7070
commit 67c5601
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/com/maddyhome/idea/vim/group/EditorGroup.java b/src/com/maddyhome/idea/vim/group/EditorGroup.java
@@ -73,7 +73,7 @@ private void initLineNumbers(final @NotNull Editor editor) {
   }
 
   private void deinitLineNumbers(@NotNull Editor editor, boolean isReleasing) {
-    if (!supportsVimLineNumbers(editor) || !UserDataManager.getVimEditorGroup(editor)) {
+    if (isProjectDisposed(editor) || !supportsVimLineNumbers(editor) || !UserDataManager.getVimEditorGroup(editor)) {
       return;
     }
 
@@ -97,6 +97,10 @@ private static boolean supportsVimLineNumbers(final @NotNull Editor editor) {
     return EditorHelper.isFileEditor(editor) && !EditorHelper.isDiffEditor(editor);
   }
 
+  private static boolean isProjectDisposed(final @NotNull Editor editor) {
+    return editor.getProject() == null || editor.getProject().isDisposed();
+  }
+
   private static void updateLineNumbers(final @NotNull Editor editor) {
     final boolean relativeNumber = OptionsManager.INSTANCE.getRelativenumber().isSet();
     final boolean number = OptionsManager.INSTANCE.getNumber().isSet();