diff --git a/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties b/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties index 8e37fe9e710..f2e8aaddbe2 100644 --- a/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties +++ b/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties @@ -89,3 +89,5 @@ function.arguments=arguments:\u0020 function.receiver.0=receiver: {0} kotlin.built.in.declarations=Kotlin built-in declarations kotlin.javascript.meta.file=Kotlin JavaScript meta file + +framework.name.kotlin.sdk=Kotlin SDK diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt similarity index 89% rename from idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt index 91b9a9ffd85..ed03a482fd1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -12,10 +12,10 @@ import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil import com.intellij.util.Consumer import org.jdom.Element -import org.jetbrains.kotlin.idea.KotlinBundle +import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.idea.KotlinIcons +import org.jetbrains.kotlin.idea.KotlinIdeaAnalysisBundle import org.jetbrains.kotlin.idea.util.application.runWriteAction -import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion import org.jetbrains.kotlin.utils.PathUtil import javax.swing.JComponent @@ -51,7 +51,7 @@ class KotlinSdkType : SdkType("KotlinSDK") { } } - override fun getPresentableName() = KotlinBundle.message("framework.name.kotlin.sdk") + override fun getPresentableName() = KotlinIdeaAnalysisBundle.message("framework.name.kotlin.sdk") override fun getIcon() = KotlinIcons.SMALL_LOGO @@ -63,7 +63,7 @@ class KotlinSdkType : SdkType("KotlinSDK") { override fun sdkHasValidPath(sdk: Sdk) = true - override fun getVersionString(sdk: Sdk) = bundledRuntimeVersion() + override fun getVersionString(sdk: Sdk): String = KotlinCompilerVersion.VERSION override fun supportsCustomCreateUI() = true diff --git a/idea/resources-en/messages/KotlinBundle.properties b/idea/resources-en/messages/KotlinBundle.properties index 2c44c4921b0..071bfa724b2 100644 --- a/idea/resources-en/messages/KotlinBundle.properties +++ b/idea/resources-en/messages/KotlinBundle.properties @@ -488,8 +488,6 @@ formatter.title.use.continuation.indent=Use continuation indent formatter.title.when.parentheses='when' parentheses formatter.title.when.statements='when' statements -framework.name.kotlin.sdk=Kotlin SDK - hierarchy.text.anonymous=[anonymous] hierarchy.text.in=\ in {0}