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

Introduce -Xintellij-plugin-root, deprecate CompilerJarLocator

Browse Source
This commit is contained in:
Alexander Udalov
2017-04-07 00:09:00 +03:00
parent ce6676baa8
commit 072f87ddab
7 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
+4 -1
View File
@@ -212,7 +212,10 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
if (arguments.noInline) {
configuration.put(CommonConfigurationKeys.DISABLE_INLINE, true);
}
if (arguments.intellijPluginRoot != null) {
configuration.put(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT, arguments.intellijPluginRoot);
}
@SuppressWarnings("deprecation")
CompilerJarLocator locator = services.get(CompilerJarLocator.class);
if (locator != null) {
configuration.put(CLIConfigurationKeys.COMPILER_JAR_LOCATOR, locator);
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java
+3
View File
@@ -33,6 +33,9 @@ public class CLIConfigurationKeys {
CompilerConfigurationKey.create("is API version explicit");
// Used in Eclipse plugin (see KotlinCLICompiler)
public static final CompilerConfigurationKey<String> INTELLIJ_PLUGIN_ROOT =
CompilerConfigurationKey.create("intellij plugin root");
@SuppressWarnings("deprecation")
public static final CompilerConfigurationKey<CompilerJarLocator> COMPILER_JAR_LOCATOR =
CompilerConfigurationKey.create("compiler jar locator");
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompilerJarLocator.java
+5
View File
@@ -20,6 +20,11 @@ import org.jetbrains.annotations.NotNull;
import java.io.File;
/**
* @deprecated use the -Xintellij-plugin-root command line argument instead
*/
// TODO: drop as soon as Eclipse plugin starts using the new API
@Deprecated
public interface CompilerJarLocator {
@NotNull
File getCompilerJar();
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+4 -2
View File
@@ -435,8 +435,10 @@ class KotlinCoreEnvironment private constructor(
}
private fun registerApplicationExtensionPointsAndExtensionsFrom(configuration: CompilerConfiguration, configFilePath: String) {
val locator = configuration.get(CLIConfigurationKeys.COMPILER_JAR_LOCATOR)
var pluginRoot = if (locator == null) PathUtil.getPathUtilJar() else locator.compilerJar
var pluginRoot =
configuration.get(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT)?.let(::File)
?: configuration.get(CLIConfigurationKeys.COMPILER_JAR_LOCATOR)?.compilerJar
?: PathUtil.getPathUtilJar()
val app = ApplicationManager.getApplication()
val parentFile = pluginRoot.parentFile