From 309f98997672a9dd1ddd72482d3a3779ccdb0812 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 15 Jul 2019 23:43:31 +0300
Subject: [PATCH] transform tool managers into services

GitOrigin-RevId: db148375e6f70f3fb062c3ce921b63a170739f63
---
 .../lang-impl/src/com/intellij/tools/ToolManager.java     | 8 ++++----
 .../platform-resources/src/META-INF/LangExtensions.xml    | 2 ++
 platform/platform-resources/src/componentSets/Lang.xml    | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/tools/ToolManager.java b/platform/lang-impl/src/com/intellij/tools/ToolManager.java
index b9f115a9d3f5..4295c4b8549d 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolManager.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolManager.java
@@ -16,14 +16,14 @@
 package com.intellij.tools;
 
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
-import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.options.SchemeManagerFactory;
 import com.intellij.openapi.options.SchemeProcessor;
 import org.jetbrains.annotations.NotNull;
 
 public class ToolManager extends BaseToolManager<Tool> {
-  public ToolManager(@NotNull SchemeManagerFactory factory) {
-    super(ActionManagerEx.getInstanceEx(), factory, "tools", ToolsBundle.message("tools.settings"));
+  public ToolManager() {
+    super(ActionManagerEx.getInstanceEx(), SchemeManagerFactory.getInstance(), "tools", ToolsBundle.message("tools.settings"));
   }
 
   @Override
@@ -47,6 +47,6 @@ public class ToolManager extends BaseToolManager<Tool> {
   }
 
   public static ToolManager getInstance() {
-    return ApplicationManager.getApplication().getComponent(ToolManager.class);
+    return ServiceManager.getService(ToolManager.class);
   }
 }
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index d079b6096838..c941a466fb32 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -37,6 +37,8 @@
 
     <applicationService serviceImplementation="com.intellij.refactoring.rename.RenameHandlerRegistry"/>
 
+    <applicationService serviceImplementation="com.intellij.tools.ToolManager"/>
+
     <projectService serviceInterface="com.intellij.ide.fileTemplates.FileTemplateManager"
                     serviceImplementation="com.intellij.ide.fileTemplates.impl.FileTemplateManagerImpl"/>
     <projectService serviceImplementation="com.intellij.ide.fileTemplates.impl.FileTemplateSettings"/>
diff --git a/platform/platform-resources/src/componentSets/Lang.xml b/platform/platform-resources/src/componentSets/Lang.xml
index 5bd5d8a84293..f25500a2c7c0 100644
--- a/platform/platform-resources/src/componentSets/Lang.xml
+++ b/platform/platform-resources/src/componentSets/Lang.xml
@@ -9,10 +9,6 @@
       <implementation-class>com.intellij.psi.stubs.StubIndexImpl</implementation-class>
     </component>
 
-    <component>
-      <implementation-class>com.intellij.tools.ToolManager</implementation-class>
-    </component>
-
     <component>
       <interface-class>com.intellij.psi.stubs.SerializationManager</interface-class>
       <implementation-class>com.intellij.psi.stubs.SerializationManagerImpl</implementation-class>