diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/konan/KonanPlatform.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/konan/KonanPlatform.kt index f0c10d0adfa..185572e9eb5 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/konan/KonanPlatform.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/konan/KonanPlatform.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.platform.toTargetPlatform abstract class KonanPlatform : SimplePlatform("Native") { override val oldFashionedDescription: String - get() = "Kotlin/Native " + get() = "Native " } @Suppress("DEPRECATION_ERROR") diff --git a/idea/testData/configuration/loadAndSaveOldNativeFacet/module.iml b/idea/testData/configuration/loadAndSaveOldNativeFacet/module.iml new file mode 100644 index 00000000000..13d086cf8b9 --- /dev/null +++ b/idea/testData/configuration/loadAndSaveOldNativeFacet/module.iml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/configuration/loadAndSaveOldNativeFacet/projectFile.ipr b/idea/testData/configuration/loadAndSaveOldNativeFacet/projectFile.ipr new file mode 100644 index 00000000000..a1407e2c8cd --- /dev/null +++ b/idea/testData/configuration/loadAndSaveOldNativeFacet/projectFile.ipr @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/configuration/loadAndSaveOldNativeFacet/src/foo.kt b/idea/testData/configuration/loadAndSaveOldNativeFacet/src/foo.kt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt index b92c0c19e3b..d9161fe8b63 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt @@ -96,6 +96,16 @@ open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinInTempDirTest() Assert.assertEquals(moduleFileContentBefore, moduleFileContentAfter) } + + fun testLoadAndSaveOldNativeFacet() { + val moduleFileContentBefore = String(module.moduleFile!!.contentsToByteArray()) + val application = ApplicationManager.getApplication() as ApplicationImpl + application.isSaveAllowed = true + application.saveAll() + val moduleFileContentAfter = String(module.moduleFile!!.contentsToByteArray()) + Assert.assertEquals(moduleFileContentBefore.replace("platform=\"Native \"", "platform=\"Native \" allPlatforms=\"Native []\""), moduleFileContentAfter) + } + //TODO(auskov): test parsing common target platform with multiple versions of java, add parsing common platforms fun testLoadAndSaveProjectWithV2OldPlatformFacetConfig() { val moduleFileContentBefore = String(module.moduleFile!!.contentsToByteArray())