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

Change format of -X arguments to require value after '='

Browse Source 
Report a warning when an argument is passed in the old form (with the
whitespace)

 #KT-17264 Fixed
This commit is contained in:
Alexander Udalov
2017-04-05 16:42:43 +03:00
parent 78c0111c6e
commit f4b6db4dc0
22 changed files with 100 additions and 73 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 -6
View File
@@ -1395,8 +1395,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
<apiVersion>1.0</apiVersion>
<args>
<arg>-java-parameters</arg>
<arg>-Xdump-declarations-to</arg>
<arg>dumpDir</arg>
<arg>-Xdump-declarations-to=dumpDir</arg>
</args>
</configuration>
</plugin>
@@ -1447,8 +1446,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
<configuration>
<jvmTarget>1.8</jvmTarget>
<args>
<arg>-Xdump-declarations-to</arg>
<arg>dumpDir2</arg>
<arg>-Xdump-declarations-to=dumpDir2</arg>
</args>
</configuration>
</plugin>
@@ -1574,7 +1572,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
Assert.assertEquals("1.0", apiLevel!!.description)
Assert.assertEquals("1.8", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals(
listOf("-jdk-home", "temp", "-Xdump-declarations-to", "dumpDir2"),
listOf("-jdk-home", "temp", "-Xdump-declarations-to=dumpDir2"),
compilerSettings!!.additionalArgumentsAsList
)
}
@@ -1585,7 +1583,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
Assert.assertEquals("1.0", apiLevel!!.description)
Assert.assertEquals("1.8", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals(
listOf("-jdk-home", "temp2", "-java-parameters", "-Xdump-declarations-to", "dumpDir"),
listOf("-jdk-home", "temp2", "-java-parameters", "-Xdump-declarations-to=dumpDir"),
compilerSettings!!.additionalArgumentsAsList
)
}
idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+8 -8
View File
@@ -61,13 +61,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
compileKotlin {
kotlinOptions.jvmTarget = "1.7"
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.6"
kotlinOptions.apiVersion = "1.0"
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
}
""")
importProject()
@@ -77,7 +77,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.1", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to tmp -Xsingle-module",
Assert.assertEquals("-Xdump-declarations-to=tmp -Xsingle-module",
compilerSettings!!.additionalArguments)
}
with (testFacetSettings) {
@@ -85,7 +85,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.0", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to tmpTest",
Assert.assertEquals("-Xdump-declarations-to=tmpTest",
compilerSettings!!.additionalArguments)
}
}
@@ -130,13 +130,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
compileMyMainKotlin {
kotlinOptions.jvmTarget = "1.7"
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
}
compileMyTestKotlin {
kotlinOptions.jvmTarget = "1.6"
kotlinOptions.apiVersion = "1.0"
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
}
""")
importProject()
@@ -146,7 +146,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.1", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to tmp -Xsingle-module",
Assert.assertEquals("-Xdump-declarations-to=tmp -Xsingle-module",
compilerSettings!!.additionalArguments)
}
with (facetSettings("project_myTest")) {
@@ -154,7 +154,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.0", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to tmpTest",
Assert.assertEquals("-Xdump-declarations-to=tmpTest",
compilerSettings!!.additionalArguments)
}
}