diff --git a/idea/testData/configuration/projectWithFacetWithRuntime11WithLanguageLevel10/projectFile.ipr b/idea/testData/configuration/projectWithFacetWithRuntime11WithLanguageLevel10/projectFile.ipr index a1407e2c8cd..5b3c8931f3d 100644 --- a/idea/testData/configuration/projectWithFacetWithRuntime11WithLanguageLevel10/projectFile.ipr +++ b/idea/testData/configuration/projectWithFacetWithRuntime11WithLanguageLevel10/projectFile.ipr @@ -31,7 +31,7 @@ - + diff --git a/idea/testData/configuration/projectWithoutFacetWithRuntime11WithoutLanguageLevel/projectFile.ipr b/idea/testData/configuration/projectWithoutFacetWithRuntime11WithoutLanguageLevel/projectFile.ipr index a1407e2c8cd..5b3c8931f3d 100644 --- a/idea/testData/configuration/projectWithoutFacetWithRuntime11WithoutLanguageLevel/projectFile.ipr +++ b/idea/testData/configuration/projectWithoutFacetWithRuntime11WithoutLanguageLevel/projectFile.ipr @@ -31,7 +31,7 @@ - + diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java index 4d07d0c5852..56c25f129ed 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java @@ -166,23 +166,23 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { } public void testProjectWithoutFacetWithRuntime106WithoutLanguageLevel() { - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testProjectWithoutFacetWithRuntime11WithoutLanguageLevel() { - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_1, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_1, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testProjectWithoutFacetWithRuntime11WithLanguageLevel10() { - assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testProjectWithFacetWithRuntime11WithLanguageLevel10() { - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testJsLibraryVersion11() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.181 b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.181 index eeb2aa07ab2..c3d2a5b34b9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.181 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java.181 @@ -166,23 +166,23 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { } public void testProjectWithoutFacetWithRuntime106WithoutLanguageLevel() { - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testProjectWithoutFacetWithRuntime11WithoutLanguageLevel() { - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_1, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_1, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testProjectWithoutFacetWithRuntime11WithLanguageLevel10() { - assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testProjectWithFacetWithRuntime11WithLanguageLevel10() { - assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); } public void testJsLibraryVersion11() {