From 01c36d19bb4619114d960b7ce7d9adad852ee1fe Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Wed, 25 Mar 2020 22:44:28 +0100
Subject: [PATCH] Fix StartupActivities those do not require dumb awareness

Relates to #KT-35918
---
 .../configuration/ui/KotlinConfigurationCheckerService.kt   | 2 +-
 .../org/jetbrains/kotlin/idea/PluginStartupActivity.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt
index 7c636c2b6c4..e58dc4bfac1 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.configuration.ui.notifications.notifyKotlinStyl
 import org.jetbrains.kotlin.idea.project.getAndCacheLanguageLevelByDependencies
 import java.util.concurrent.atomic.AtomicInteger
 
-class KotlinConfigurationCheckerStartupActivity : StartupActivity.DumbAware {
+class KotlinConfigurationCheckerStartupActivity : StartupActivity {
     override fun runActivity(project: Project) {
         NotificationsConfiguration.getNotificationsConfiguration()
             .register(
diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java
index 954a15d9961..56a4fa4c3ef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java
+++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java
@@ -43,10 +43,10 @@ import org.jetbrains.kotlin.utils.PathUtil;
 
 import static org.jetbrains.kotlin.idea.TestResourceBundleKt.registerAdditionalResourceBundleInTests;
 
-public class PluginStartupActivity implements StartupActivity.DumbAware {
+public class PluginStartupActivity implements StartupActivity {
     private static final Logger LOG = Logger.getInstance(PluginStartupActivity.class);
 
-    private static final String KOTLIN_BUNDLED = "KOTLIN_BUNDLED";
+    private static final String KOTLIN_BUNDLED_PATH_VARIABLE = "KOTLIN_BUNDLED";
 
     @Override
     public void runActivity(@NotNull Project project) {
@@ -115,7 +115,7 @@ public class PluginStartupActivity implements StartupActivity.DumbAware {
 
     private static void registerPathVariable() {
         PathMacros macros = PathMacros.getInstance();
-        macros.setMacro(KOTLIN_BUNDLED, PathUtil.getKotlinPathsForIdeaPlugin().getHomePath().getPath());
+        macros.setMacro(KOTLIN_BUNDLED_PATH_VARIABLE, PathUtil.getKotlinPathsForIdeaPlugin().getHomePath().getPath());
     }
 
 }