From ed5156ee83bce0c7409a20b33a9d553501b2185d Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 28 Jan 2020 14:32:16 +0300 Subject: [PATCH] Wizard: do not show disable/enable checkbox for new project wizard in AS #KT-36195 fixed --- .../ui/KotlinLanguageConfigurationForm.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java index 731412f0c81..c8ac3a6eb2f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java @@ -9,6 +9,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.registry.Registry; import com.intellij.util.ui.AsyncProcessIcon; import org.jetbrains.kotlin.idea.KotlinPluginUtil; +import org.jetbrains.kotlin.idea.PlatformVersion; import org.jetbrains.kotlin.idea.util.VersioningKt; import javax.swing.*; @@ -33,6 +34,8 @@ public class KotlinLanguageConfigurationForm { public KotlinLanguageConfigurationForm() { showVerifierDisabledStatus(); + useNewProjectWizardCheckBox.setVisible(!isAndroidStudio()); + String pluginVersion = KotlinPluginUtil.getPluginVersion(); if (KotlinPluginUtil.isPatched()) { @@ -110,4 +113,10 @@ public class KotlinLanguageConfigurationForm { verifierDisabledText.setText(""); } } + + private static boolean isAndroidStudio() { + PlatformVersion platformVersion = PlatformVersion.Companion.getCurrent(); + if (platformVersion == null) return false; + return platformVersion.getPlatform().equals(PlatformVersion.Platform.ANDROID_STUDIO); + } }