From dbfe3370aad9c3bf6c2df96cca5dddc381bfe448 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 1 Feb 2017 12:36:57 +0300 Subject: [PATCH] Kotlin Facet: Ignore invalid platform-specific compiler arguments --- idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index 0baabdc6605..1084f3ca490 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -205,14 +205,14 @@ fun parseCompilerArgumentsToFacet(arguments: List, kotlinFacet: KotlinFa when (versionInfo.targetPlatformKind) { is TargetPlatformKind.Jvm -> { - val jvmTarget = K2JVMCompilerArguments().apply { parseArguments(argumentArray, this) }.jvmTarget + val jvmTarget = K2JVMCompilerArguments().apply { parseArguments(argumentArray, this, ignoreInvalidArguments = true) }.jvmTarget if (jvmTarget != null) { versionInfo.targetPlatformKind = TargetPlatformKind.Jvm.JVM_PLATFORMS.firstOrNull { VersionComparatorUtil.compare(it.version.description, jvmTarget) >= 0 } ?: TargetPlatformKind.Jvm.JVM_PLATFORMS.last() } } - is TargetPlatformKind.JavaScript -> parseArguments(argumentArray, compilerInfo.k2jsCompilerArguments!!) + is TargetPlatformKind.JavaScript -> parseArguments(argumentArray, compilerInfo.k2jsCompilerArguments!!, ignoreInvalidArguments = true) else -> {} }