From da9af682d92d862808aa651790beeea58f6253e5 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 6 Apr 2017 19:26:55 +0200 Subject: [PATCH] Don't show Kotlin in "Add framework support" for Maven/Gradle modules #KT-16392 Fixed --- .../kotlin/idea/framework/JSFrameworkSupportProvider.kt | 8 ++++++++ .../kotlin/idea/framework/JavaFrameworkSupportProvider.kt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt index 45b87c6d85a..7d425250abb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt @@ -25,7 +25,9 @@ import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleType import com.intellij.openapi.roots.ModifiableModelsProvider import com.intellij.openapi.roots.ModifiableRootModel +import com.intellij.openapi.roots.ui.configuration.FacetsProvider import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription +import org.jetbrains.kotlin.idea.KotlinPluginUtil import javax.swing.JComponent class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() { @@ -68,4 +70,10 @@ class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() { } override fun isEnabledForModuleType(moduleType: ModuleType<*>): Boolean = moduleType is JavaModuleType + + override fun canAddSupport(module: Module, facetsProvider: FacetsProvider): Boolean { + return super.canAddSupport(module, facetsProvider) && + !KotlinPluginUtil.isMavenModule(module) && + !KotlinPluginUtil.isGradleModule(module) + } } diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt index f78884616b5..a9cfcb7d571 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt @@ -25,7 +25,9 @@ import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleType import com.intellij.openapi.roots.ModifiableModelsProvider import com.intellij.openapi.roots.ModifiableRootModel +import com.intellij.openapi.roots.ui.configuration.FacetsProvider import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription +import org.jetbrains.kotlin.idea.KotlinPluginUtil import javax.swing.JComponent internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() { @@ -68,4 +70,10 @@ internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() } override fun isEnabledForModuleType(moduleType: ModuleType<*>): Boolean = moduleType is JavaModuleType + + override fun canAddSupport(module: Module, facetsProvider: FacetsProvider): Boolean { + return super.canAddSupport(module, facetsProvider) && + !KotlinPluginUtil.isMavenModule(module) && + !KotlinPluginUtil.isGradleModule(module) + } }