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

Don't show Kotlin in "Add framework support" for Maven/Gradle modules

Browse Source 
#KT-16392 Fixed
This commit is contained in:
Dmitry Jemerov
2017-04-06 19:26:55 +02:00
parent f1e96709a8
commit da9af682d9
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt
+8
View File
@@ -25,7 +25,9 @@ import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleType import com.intellij.openapi.module.ModuleType
import com.intellij.openapi.roots.ModifiableModelsProvider import com.intellij.openapi.roots.ModifiableModelsProvider
import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.ui.configuration.FacetsProvider
import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription
import org.jetbrains.kotlin.idea.KotlinPluginUtil
import javax.swing.JComponent import javax.swing.JComponent
class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() { class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
@@ -68,4 +70,10 @@ class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
} }
override fun isEnabledForModuleType(moduleType: ModuleType<*>): Boolean = moduleType is JavaModuleType 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)
}
} }
idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
+8
View File
@@ -25,7 +25,9 @@ import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleType import com.intellij.openapi.module.ModuleType
import com.intellij.openapi.roots.ModifiableModelsProvider import com.intellij.openapi.roots.ModifiableModelsProvider
import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.ui.configuration.FacetsProvider
import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription
import org.jetbrains.kotlin.idea.KotlinPluginUtil
import javax.swing.JComponent import javax.swing.JComponent
internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() { internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
@@ -68,4 +70,10 @@ internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider()
} }
override fun isEnabledForModuleType(moduleType: ModuleType<*>): Boolean = moduleType is JavaModuleType 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)
}
} }