From 0e4c3ec202ce19844f94b7f14650afd7373155d8 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 15 Mar 2017 15:24:48 +0300 Subject: [PATCH] Kotlin Facet: Do not present imported -d/-cp in "Additional arguments" --- .../jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt | 6 ++++-- idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt index 06c2b172eac..4740f11738e 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt @@ -451,7 +451,8 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { Assert.assertEquals(LanguageFeature.State.ENABLED, coroutineSupport) Assert.assertEquals("JVM 1.8", targetPlatformKind!!.description) Assert.assertEquals("1.8", (compilerArguments as K2JVMCompilerArguments).jvmTarget) - Assert.assertEquals("-cp foobar.jar -jdk-home JDK_HOME -Xmulti-platform", + Assert.assertEquals("foobar.jar", (compilerArguments as K2JVMCompilerArguments).classpath) + Assert.assertEquals("-jdk-home JDK_HOME -Xmulti-platform", compilerSettings!!.additionalArguments) } } @@ -591,7 +592,8 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { Assert.assertEquals(LanguageFeature.State.ENABLED, coroutineSupport) Assert.assertEquals("JVM 1.8", targetPlatformKind!!.description) Assert.assertEquals("1.8", (compilerArguments as K2JVMCompilerArguments).jvmTarget) - Assert.assertEquals("-cp foobar.jar -jdk-home JDK_HOME -Xmulti-platform", + Assert.assertEquals("foobar.jar", (compilerArguments as K2JVMCompilerArguments).classpath) + Assert.assertEquals("-jdk-home JDK_HOME -Xmulti-platform", compilerSettings!!.additionalArguments) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index 7f23e9617c2..9166242434b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -143,7 +143,9 @@ private val commonUIHiddenFields = listOf("pluginClasspaths", "pluginOptions") private val commonPrimaryFields = commonUIExposedFields + commonUIHiddenFields -private val jvmSpecificUIExposedFields = listOf("jvmTarget") +private val jvmSpecificUIExposedFields = listOf("jvmTarget", + "destination", + "classpath") val jvmUIExposedFields = commonUIExposedFields + jvmSpecificUIExposedFields private val jvmPrimaryFields = commonPrimaryFields + jvmSpecificUIExposedFields