From e5985ad98b2f0b1901ffffad3007166a45f7061f Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Wed, 9 Sep 2020 13:37:43 +0200 Subject: [PATCH] Rename PluginStartupService to PluginStartupApplicationService --- .../configuration/KotlinBuildProcessParametersProvider.kt | 4 ++-- idea/resources-descriptors/META-INF/plugin.xml | 2 +- idea/resources-descriptors/META-INF/plugin.xml.193 | 2 +- idea/resources-descriptors/META-INF/plugin.xml.202 | 2 +- idea/resources-descriptors/META-INF/plugin.xml.as40 | 2 +- idea/resources-descriptors/META-INF/plugin.xml.as41 | 2 +- idea/resources-fir/META-INF/plugin.xml | 2 +- ...tupService.java => PluginStartupApplicationService.java} | 6 +++--- .../configuration/KotlinCompilerConfigurableTab.java | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) rename idea/src/org/jetbrains/kotlin/idea/{PluginStartupService.java => PluginStartupApplicationService.java} (91%) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt index a82bcf99755..59ddbd6974a 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt @@ -9,7 +9,7 @@ import com.intellij.compiler.server.BuildProcessParametersProvider import com.intellij.openapi.project.Project import com.intellij.openapi.util.registry.Registry import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.idea.PluginStartupService +import org.jetbrains.kotlin.idea.PluginStartupApplicationService class KotlinBuildProcessParametersProvider(private val project: Project) : BuildProcessParametersProvider() { override fun getVMArguments(): MutableList { @@ -28,7 +28,7 @@ class KotlinBuildProcessParametersProvider(private val project: Project) : Build if (Registry.`is`("kotlin.jps.instrument.bytecode", false)) { res.add("-Dkotlin.jps.instrument.bytecode=true") } - PluginStartupService.getInstance().aliveFlagPath.let { + PluginStartupApplicationService.getInstance().aliveFlagPath.let { if (!it.isBlank()) { // TODO: consider taking the property name from compiler/daemon/common (check whether dependency will be not too heavy) res.add("-Dkotlin.daemon.client.alive.path=\"$it\"") diff --git a/idea/resources-descriptors/META-INF/plugin.xml b/idea/resources-descriptors/META-INF/plugin.xml index fb3a890b7f0..7fd96ad5765 100644 --- a/idea/resources-descriptors/META-INF/plugin.xml +++ b/idea/resources-descriptors/META-INF/plugin.xml @@ -96,7 +96,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - + diff --git a/idea/resources-descriptors/META-INF/plugin.xml.193 b/idea/resources-descriptors/META-INF/plugin.xml.193 index 07bb9d772e5..20111ffc31f 100644 --- a/idea/resources-descriptors/META-INF/plugin.xml.193 +++ b/idea/resources-descriptors/META-INF/plugin.xml.193 @@ -107,7 +107,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - + diff --git a/idea/resources-descriptors/META-INF/plugin.xml.202 b/idea/resources-descriptors/META-INF/plugin.xml.202 index b5bd281abe2..5c27f8c8763 100644 --- a/idea/resources-descriptors/META-INF/plugin.xml.202 +++ b/idea/resources-descriptors/META-INF/plugin.xml.202 @@ -96,7 +96,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - + diff --git a/idea/resources-descriptors/META-INF/plugin.xml.as40 b/idea/resources-descriptors/META-INF/plugin.xml.as40 index 039d201a5f1..5b34e2eb4dc 100644 --- a/idea/resources-descriptors/META-INF/plugin.xml.as40 +++ b/idea/resources-descriptors/META-INF/plugin.xml.as40 @@ -106,7 +106,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - + diff --git a/idea/resources-descriptors/META-INF/plugin.xml.as41 b/idea/resources-descriptors/META-INF/plugin.xml.as41 index ae9677ffd99..95a1cf31049 100644 --- a/idea/resources-descriptors/META-INF/plugin.xml.as41 +++ b/idea/resources-descriptors/META-INF/plugin.xml.as41 @@ -95,7 +95,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - + diff --git a/idea/resources-fir/META-INF/plugin.xml b/idea/resources-fir/META-INF/plugin.xml index e25d7ad2c15..c62c7bf5f59 100644 --- a/idea/resources-fir/META-INF/plugin.xml +++ b/idea/resources-fir/META-INF/plugin.xml @@ -91,7 +91,7 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu serviceImplementation="org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSessionProvider"/> - + diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupService.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupApplicationService.java similarity index 91% rename from idea/src/org/jetbrains/kotlin/idea/PluginStartupService.java rename to idea/src/org/jetbrains/kotlin/idea/PluginStartupApplicationService.java index f118fd80304..434c5917a6a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupService.java +++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupApplicationService.java @@ -21,10 +21,10 @@ import com.intellij.openapi.application.ApplicationManager; import java.io.File; import java.io.IOException; -public class PluginStartupService { +public class PluginStartupApplicationService { - public static PluginStartupService getInstance() { - return ApplicationManager.getApplication().getService(PluginStartupService.class); + public static PluginStartupApplicationService getInstance() { + return ApplicationManager.getApplication().getService(PluginStartupApplicationService.class); } private String aliveFlagPath; diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java index 85eca5f98e3..c2d8df6a82c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants; import org.jetbrains.kotlin.config.*; -import org.jetbrains.kotlin.idea.PluginStartupService; +import org.jetbrains.kotlin.idea.PluginStartupApplicationService; import org.jetbrains.kotlin.idea.KotlinBundle; import org.jetbrains.kotlin.idea.facet.DescriptionListCellRenderer; import org.jetbrains.kotlin.idea.facet.KotlinFacet; @@ -554,7 +554,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { boolean oldEnableDaemon = compilerWorkspaceSettings.getEnableDaemon(); compilerWorkspaceSettings.setEnableDaemon(keepAliveCheckBox.isSelected()); if (keepAliveCheckBox.isSelected() != oldEnableDaemon) { - PluginStartupService.getInstance().resetAliveFlag(); + PluginStartupApplicationService.getInstance().resetAliveFlag(); } }