From cbb75d0bcdafdc90f37712a6c03d719742d3ba9f Mon Sep 17 00:00:00 2001
From: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
Date: Wed, 14 Feb 2018 11:11:18 +0100
Subject: [PATCH] Use hardcoded plugin ID when loaded in the main classloader

---
 .../src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
index a54feee6ac3..efc27f8521a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.ide.plugins.PluginManagerCore;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.extensions.PluginId;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,7 +19,7 @@ public class KotlinPluginUtil {
 
     static {
         PluginId pluginId = PluginManagerCore.getPluginByClassName(KotlinPluginUtil.class.getName());
-        if (pluginId == null && ApplicationManager.getApplication().isUnitTestMode()) {
+        if (pluginId == null) {
             pluginId = PluginId.getId("org.jetbrains.kotlin");
         }
         KOTLIN_PLUGIN_ID = pluginId;