From 7e27ae2fb3ecd5e7b594e95ae9075114cb671249 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Tue, 26 Jun 2018 14:18:41 +0300
Subject: [PATCH] EA-66082 - NPE: UndoManagerImpl.onCommandStarted

---
 .../openapi/command/impl/UndoManagerImpl.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
index 6f6389978bbc..0dacdbc9e5d2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
@@ -111,6 +111,15 @@ public class UndoManagerImpl extends UndoManager implements Disposable {
   }
 
   private void runStartupActivity() {
+    myUndoProviders = myProject == null
+                      ? Extensions.getExtensions(UndoProvider.EP_NAME)
+                      : Extensions.getExtensions(UndoProvider.PROJECT_EP_NAME, myProject);
+    for (UndoProvider undoProvider : myUndoProviders) {
+      if (undoProvider instanceof Disposable) {
+        Disposer.register(this, (Disposable)undoProvider);
+      }
+    }
+
     myEditorProvider = new FocusBasedCurrentEditorProvider();
     myCommandProcessor.addCommandListener(new CommandListener() {
       private boolean myStarted;
@@ -147,15 +156,6 @@ public class UndoManagerImpl extends UndoManager implements Disposable {
     }, this);
 
     Disposer.register(this, new DocumentUndoProvider(myProject));
-
-    myUndoProviders = myProject == null
-                      ? Extensions.getExtensions(UndoProvider.EP_NAME)
-                      : Extensions.getExtensions(UndoProvider.PROJECT_EP_NAME, myProject);
-    for (UndoProvider undoProvider : myUndoProviders) {
-      if (undoProvider instanceof Disposable) {
-        Disposer.register(this, (Disposable)undoProvider);
-      }
-    }
   }
 
   public boolean isActive() {