From 152def62cb635e1e22ab662af04994f184c92c00 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 10 Feb 2020 16:18:29 +0300 Subject: [PATCH] Wizard: get current Kotlin version from compiler #KT-35693 fixed --- .../service/IdeaKotlinVersionProviderService.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt index 215301607cd..670f3e65d75 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.service +import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.idea.KotlinPluginUtil import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult @@ -20,12 +21,10 @@ import java.net.URL import java.util.stream.Collectors class IdeaKotlinVersionProviderService : KotlinVersionProviderService, IdeaWizardService { - override fun getKotlinVersion(): Version { - if (KotlinPluginUtil.isSnapshotVersion()) { - return VersionsDownloader.getLatestEapOrStableKotlinVersion() ?: KotlinVersionProviderServiceImpl.DEFAULT - } - return KotlinPluginUtil.getPluginVersion().let { Version.fromString(it) } - } + override fun getKotlinVersion(): Version = + KotlinCompilerVersion.getVersion()?.let { Version.fromString(it) } + ?: VersionsDownloader.getLatestEapOrStableKotlinVersion() + ?: KotlinVersionProviderServiceImpl.DEFAULT } private object VersionsDownloader {