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

Kotlin Facet: Fix language/API version initialization

Browse Source
This commit is contained in:
Alexey Sedunov
2017-09-22 17:22:31 +03:00
parent a005f4804e
commit 0bd267111e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+9 -4
View File
@@ -63,7 +63,8 @@ private fun getDefaultTargetPlatform(module: Module, rootModel: ModuleRootModel?
fun KotlinFacetSettings.initializeIfNeeded( fun KotlinFacetSettings.initializeIfNeeded(
module: Module, module: Module,
rootModel: ModuleRootModel?, rootModel: ModuleRootModel?,
platformKind: TargetPlatformKind<*>? = null // if null, detect by module dependencies platformKind: TargetPlatformKind<*>? = null, // if null, detect by module dependencies
languageVersion: String? = null
) { ) {
val project = module.project val project = module.project
@@ -83,7 +84,7 @@ fun KotlinFacetSettings.initializeIfNeeded(
if (languageLevel == null) { if (languageLevel == null) {
languageLevel = (if (useProjectSettings) LanguageVersion.fromVersionString(commonArguments.languageVersion) else null) languageLevel = (if (useProjectSettings) LanguageVersion.fromVersionString(commonArguments.languageVersion) else null)
?: getDefaultLanguageLevel(module) ?: getDefaultLanguageLevel(module, languageVersion)
} }
if (apiLevel == null) { if (apiLevel == null) {
@@ -209,8 +210,12 @@ fun KotlinFacet.configureFacet(
with(configuration.settings) { with(configuration.settings) {
compilerArguments = null compilerArguments = null
compilerSettings = null compilerSettings = null
initializeIfNeeded(module, modelsProvider.getModifiableRootModel(module), platformKind) initializeIfNeeded(
languageLevel = LanguageVersion.fromFullVersionString(compilerVersion) ?: LanguageVersion.LATEST_STABLE module,
modelsProvider.getModifiableRootModel(module),
platformKind,
compilerVersion
)
// Both apiLevel and languageLevel should be initialized in the lines above // Both apiLevel and languageLevel should be initialized in the lines above
if (apiLevel!! > languageLevel!!) { if (apiLevel!! > languageLevel!!) {
apiLevel = languageLevel apiLevel = languageLevel