azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1516 from JetBrains/always_fallback_to_hardcoded_plugin_id

Browse Source 
Use hardcoded plugin ID when loaded in the main classloader
This commit is contained in:
Alexander Podkhalyuzin
2018-02-15 17:03:29 +03:00
committed by GitHub
parent 8bfbbe456f cbb75d0bcd
commit 898b31cb83
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
+1 -2
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea;
import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.plugins.PluginManager;
import com.intellij.ide.plugins.PluginManagerCore; import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.extensions.PluginId;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -20,7 +19,7 @@ public class KotlinPluginUtil {
static { static {
PluginId pluginId = PluginManagerCore.getPluginByClassName(KotlinPluginUtil.class.getName()); PluginId pluginId = PluginManagerCore.getPluginByClassName(KotlinPluginUtil.class.getName());
if (pluginId == null && ApplicationManager.getApplication().isUnitTestMode()) { if (pluginId == null) {
pluginId = PluginId.getId("org.jetbrains.kotlin"); pluginId = PluginId.getId("org.jetbrains.kotlin");
} }
KOTLIN_PLUGIN_ID = pluginId; KOTLIN_PLUGIN_ID = pluginId;