azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy language and API version from compiler options to version info

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-01-27 18:16:07 +01:00
parent 6ef96017e8
commit c7115e7233
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+5 -1
View File
@@ -188,7 +188,11 @@ fun parseCompilerArgumentsToFacet(arguments: List<String>, 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 -> {