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

Fix StartupActivities those do not require dumb awareness

Browse Source 
Relates to #KT-35918
This commit is contained in:
Vladimir Dolzhenko
2020-03-25 22:44:28 +01:00
parent 3abf9b4c0f
commit 01c36d19bb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.configuration.ui.notifications.notifyKotlinStyl
import org.jetbrains.kotlin.idea.project.getAndCacheLanguageLevelByDependencies import org.jetbrains.kotlin.idea.project.getAndCacheLanguageLevelByDependencies
import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicInteger
class KotlinConfigurationCheckerStartupActivity : StartupActivity.DumbAware { class KotlinConfigurationCheckerStartupActivity : StartupActivity {
override fun runActivity(project: Project) { override fun runActivity(project: Project) {
NotificationsConfiguration.getNotificationsConfiguration() NotificationsConfiguration.getNotificationsConfiguration()
.register( .register(
idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java
+3 -3
View File
@@ -43,10 +43,10 @@ import org.jetbrains.kotlin.utils.PathUtil;
import static org.jetbrains.kotlin.idea.TestResourceBundleKt.registerAdditionalResourceBundleInTests; 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 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 @Override
public void runActivity(@NotNull Project project) { public void runActivity(@NotNull Project project) {
@@ -115,7 +115,7 @@ public class PluginStartupActivity implements StartupActivity.DumbAware {
private static void registerPathVariable() { private static void registerPathVariable() {
PathMacros macros = PathMacros.getInstance(); PathMacros macros = PathMacros.getInstance();
macros.setMacro(KOTLIN_BUNDLED, PathUtil.getKotlinPathsForIdeaPlugin().getHomePath().getPath()); macros.setMacro(KOTLIN_BUNDLED_PATH_VARIABLE, PathUtil.getKotlinPathsForIdeaPlugin().getHomePath().getPath());
} }
} }