From c7115e72336a572d57a9b0e0168cd16c9281b3ed Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 27 Jan 2017 18:16:07 +0100 Subject: [PATCH] Copy language and API version from compiler options to version info --- idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index d122afc314f..65d8b41a023 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -188,7 +188,11 @@ fun parseCompilerArgumentsToFacet(arguments: List, kotlinFacet: KotlinFa val argumentArray = arguments.toTypedArray() with(kotlinFacet.configuration.settings) { // todo: merge common arguments with platform-specific ones in facet settings - parseArguments(argumentArray, compilerInfo.commonCompilerArguments!!, ignoreInvalidArguments = true) + compilerInfo.commonCompilerArguments!!.let { commonCompilerArguments -> + parseArguments(argumentArray, commonCompilerArguments, ignoreInvalidArguments = true) + versionInfo.apiLevel = LanguageVersion.fromVersionString(commonCompilerArguments.apiVersion) + versionInfo.languageLevel = LanguageVersion.fromVersionString(commonCompilerArguments.languageVersion) + } when (versionInfo.targetPlatformKind) { is TargetPlatformKind.Jvm -> {