From 5d65e6bc9b297fbf3308e70ea4e2cb9218f2e11f Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 14 Feb 2017 21:00:17 +0300 Subject: [PATCH] Kotlin Facet: Facet migration workaround for the case pre-1.1-beta -> 1.1.rc+ (reset useProjectSettings to false for old configurations) --- .../kotlin/idea/facet/KotlinFacetConfiguration.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetConfiguration.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetConfiguration.kt index a280f2c7058..20f95d604de 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetConfiguration.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetConfiguration.kt @@ -46,6 +46,14 @@ class KotlinFacetConfiguration : FacetConfiguration { else { settings = KotlinFacetSettings() } + + // Migration problem workaround for pre-1.1-beta releases (mainly 1.0.6) -> 1.1-rc+ + // Problematic cases: 1.1-beta/1.1-beta2 -> 1.1-rc+ (useProjectSettings gets reset to false) + // This heuristic detects old enough configurations: + if (element.children.none { it.getAttribute("name").value == "useProjectSettings" } + && settings.compilerInfo.k2jvmCompilerArguments == null) { + settings.useProjectSettings = false + } } @Suppress("OverridingDeprecatedMember")