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

Fix KOTLIN_BUNDLED registration

Browse Source 
#KT-39968 Fixed
This commit is contained in:
Vladimir Dolzhenko
2020-07-03 14:46:40 +00:00
parent d1455d0d22
commit 1450cf5f63
8 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources-descriptors/META-INF/plugin.xml
+1
View File
@@ -74,6 +74,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
</extensions>
<extensions defaultExtensionNs="com.intellij">
<applicationInitializedListener implementation="org.jetbrains.kotlin.idea.PluginStartupListener" />
<applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService" />
<postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
idea/resources-descriptors/META-INF/plugin.xml.193
+1
View File
@@ -80,6 +80,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
</extensions>
<extensions defaultExtensionNs="com.intellij">
<applicationInitializedListener implementation="org.jetbrains.kotlin.idea.PluginStartupListener" />
<applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService" />
<postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
idea/resources-descriptors/META-INF/plugin.xml.202
+1
View File
@@ -74,6 +74,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
</extensions>
<extensions defaultExtensionNs="com.intellij">
<applicationInitializedListener implementation="org.jetbrains.kotlin.idea.PluginStartupListener" />
<applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService" />
<postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
idea/resources-descriptors/META-INF/plugin.xml.as40
+1
View File
@@ -79,6 +79,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
</extensions>
<extensions defaultExtensionNs="com.intellij">
<applicationInitializedListener implementation="org.jetbrains.kotlin.idea.PluginStartupListener" />
<applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService" />
<postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
idea/resources-descriptors/META-INF/plugin.xml.as41
+1
View File
@@ -73,6 +73,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
</extensions>
<extensions defaultExtensionNs="com.intellij">
<applicationInitializedListener implementation="org.jetbrains.kotlin.idea.PluginStartupListener" />
<applicationService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService" />
<postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.java
-10
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.idea;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathMacros;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.EditorFactory;
@@ -39,15 +38,12 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTodoSearcher;
import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs;
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm;
import org.jetbrains.kotlin.resolve.konan.diagnostics.ErrorsNative;
import org.jetbrains.kotlin.utils.PathUtil;
import static org.jetbrains.kotlin.idea.TestResourceBundleKt.registerAdditionalResourceBundleInTests;
public class PluginStartupActivity implements StartupActivity {
private static final Logger LOG = Logger.getInstance(PluginStartupActivity.class);
private static final String KOTLIN_BUNDLED_PATH_VARIABLE = "KOTLIN_BUNDLED";
@Override
public void runActivity(@NotNull Project project) {
if (ApplicationManager.getApplication().isUnitTestMode()) {
@@ -56,7 +52,6 @@ public class PluginStartupActivity implements StartupActivity {
StartupCompatKt.runActivity(project);
registerPathVariable();
initializeDiagnostics();
try {
@@ -113,9 +108,4 @@ public class PluginStartupActivity implements StartupActivity {
factory.getClass();
}
private static void registerPathVariable() {
PathMacros macros = PathMacros.getInstance();
macros.setMacro(KOTLIN_BUNDLED_PATH_VARIABLE, PathUtil.getKotlinPathsForIdeaPlugin().getHomePath().getPath());
}
}
idea/src/org/jetbrains/kotlin/idea/PluginStartupListener.kt
+29
View File
@@ -0,0 +1,29 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea
import com.intellij.ide.ApplicationInitializedListener
import com.intellij.openapi.application.PathMacros
import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
import org.jetbrains.kotlin.utils.PathUtil.kotlinPathsForIdeaPlugin
class PluginStartupListener : ApplicationInitializedListener {
override fun componentsInitialized() {
if (isUnitTestMode()) return
registerPathVariable()
}
private fun registerPathVariable() {
val macros = PathMacros.getInstance()
macros.setMacro(KOTLIN_BUNDLED_PATH_VARIABLE, kotlinPathsForIdeaPlugin.homePath.path)
}
companion object {
const val KOTLIN_BUNDLED_PATH_VARIABLE = "KOTLIN_BUNDLED"
}
}
idea/src/org/jetbrains/kotlin/idea/PluginStartupListener.kt.192
+9
View File
@@ -0,0 +1,9 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea
class PluginStartupListener {
}