Minor, rename targetPlatformKindKind -> targetPlatformKind

Original commit: d0f31a2bc2
This commit is contained in:
Alexander Udalov
2016-11-10 14:37:29 +03:00
parent 77149c97f1
commit 036f5ae0e0
2 changed files with 4 additions and 20 deletions
@@ -14,22 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.config package org.jetbrains.kotlin.config
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
@@ -69,13 +53,13 @@ object JSPlatform : TargetPlatformKind<NoVersion>(NoVersion, "JavaScript")
data class KotlinVersionInfo( data class KotlinVersionInfo(
var languageLevel: LanguageVersion? = null, var languageLevel: LanguageVersion? = null,
var apiLevel: LanguageVersion? = null, var apiLevel: LanguageVersion? = null,
@get:Transient var targetPlatformKindKind: TargetPlatformKind<*>? = null @get:Transient var targetPlatformKind: TargetPlatformKind<*>? = null
) { ) {
// To be serialized // To be serialized
var targetPlatformName: String var targetPlatformName: String
get() = targetPlatformKindKind?.description ?: "" get() = targetPlatformKind?.description ?: ""
set(value) { set(value) {
targetPlatformKindKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value } targetPlatformKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value }
} }
} }
@@ -78,7 +78,7 @@ class JpsKotlinCompilerSettings : JpsElementBase<JpsKotlinCompilerSettings>() {
fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments { fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments {
val defaultArguments = getSettings(module.project).k2JvmCompilerArguments val defaultArguments = getSettings(module.project).k2JvmCompilerArguments
val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments
val targetPlatform = facetSettings.versionInfo.targetPlatformKindKind as? JVMPlatform ?: return defaultArguments val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? JVMPlatform ?: return defaultArguments
return copyBean(defaultArguments).apply { return copyBean(defaultArguments).apply {
jvmTarget = targetPlatform.version.description jvmTarget = targetPlatform.version.description
} }