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

Kotlin Facet: Do not present imported -d/-cp in "Additional arguments"

Browse Source
This commit is contained in:
Alexey Sedunov
2017-03-15 15:24:48 +03:00
parent 88a394e892
commit 0e4c3ec202
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt
+4 -2
View File
@@ -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)
}
}
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+3 -1
View File
@@ -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