From e8a89059dc09bcc5fadd5b69571ac2d360c6c3db Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 15 Jul 2019 23:24:53 +0300
Subject: [PATCH] restore hacky logic around BaseToolManager, thanks to clion
 devs

GitOrigin-RevId: b9138b47227dc1e440ef3bd3e51f95c7896f8c19
---
 .../lang-impl/src/com/intellij/tools/BaseToolManager.java | 8 +++++---
 .../lang-impl/src/com/intellij/tools/ToolManager.java     | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java b/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java
index a232e8a0d95a..b68847635a93 100644
--- a/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java
+++ b/platform/lang-impl/src/com/intellij/tools/BaseToolManager.java
@@ -34,9 +34,11 @@ public abstract class BaseToolManager<T extends Tool> {
   @Nullable private final ActionManagerEx myActionManager;
   private final SchemeManager<ToolsGroup<T>> mySchemeManager;
 
-  public BaseToolManager(@NotNull SchemeManagerFactory factory, @NotNull String schemePath, @NotNull String presentableName) {
-    myActionManager = ActionManagerEx.getInstanceEx();
-
+  public BaseToolManager(@Nullable ActionManagerEx ex,
+                         @NotNull SchemeManagerFactory factory,
+                         @NotNull String schemePath,
+                         @NotNull String presentableName) {
+    myActionManager = ex;
     //noinspection AbstractMethodCallInConstructor
     mySchemeManager = factory.create(schemePath, createProcessor(), presentableName);
     mySchemeManager.loadSchemes();
diff --git a/platform/lang-impl/src/com/intellij/tools/ToolManager.java b/platform/lang-impl/src/com/intellij/tools/ToolManager.java
index cddc1b8a4d2b..b9f115a9d3f5 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolManager.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolManager.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.tools;
 
+import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.SchemeManagerFactory;
 import com.intellij.openapi.options.SchemeProcessor;
@@ -22,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class ToolManager extends BaseToolManager<Tool> {
   public ToolManager(@NotNull SchemeManagerFactory factory) {
-    super(factory, "tools", ToolsBundle.message("tools.settings"));
+    super(ActionManagerEx.getInstanceEx(), factory, "tools", ToolsBundle.message("tools.settings"));
   }
 
   @Override