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

Use IdePlatform instead of IdePlatformKind in 'Kotlin Facet' project structure tab

Browse Source 
Original commit: 2ec1a89fa1
This commit is contained in:
Yan Zhulanow
2018-09-05 19:06:57 +03:00
parent 438c370fec
commit 57c71058b0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatform.kt
+3 -2
View File
@@ -7,14 +7,15 @@ package org.jetbrains.kotlin.platform
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.config.TargetPlatformVersion import org.jetbrains.kotlin.config.TargetPlatformVersion
import org.jetbrains.kotlin.utils.DescriptionAware
abstract class IdePlatform<Kind : IdePlatformKind<Kind>, Arguments : CommonCompilerArguments> { abstract class IdePlatform<Kind : IdePlatformKind<Kind>, Arguments : CommonCompilerArguments> : DescriptionAware {
abstract val kind: Kind abstract val kind: Kind
abstract val version: TargetPlatformVersion abstract val version: TargetPlatformVersion
abstract fun createArguments(init: Arguments.() -> Unit = {}): Arguments abstract fun createArguments(init: Arguments.() -> Unit = {}): Arguments
val description override val description
get() = kind.name + " " + version.description get() = kind.name + " " + version.description
override fun toString() = description override fun toString() = description
jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
+2
View File
@@ -27,6 +27,8 @@ abstract class IdePlatformKind<Kind : IdePlatformKind<Kind>> {
override fun equals(other: Any?): Boolean = javaClass == other?.javaClass override fun equals(other: Any?): Boolean = javaClass == other?.javaClass
override fun hashCode(): Int = javaClass.hashCode() override fun hashCode(): Int = javaClass.hashCode()
override fun toString() = name
companion object { companion object {
// We can't use the ApplicationExtensionDescriptor class directly because it's missing in the JPS process // We can't use the ApplicationExtensionDescriptor class directly because it's missing in the JPS process
private val extension = ApplicationManager.getApplication()?.let { private val extension = ApplicationManager.getApplication()?.let {