Dynamically load configuration type

plugin/build.gradle

@@ -4,10 +4,6 @@ apply plugin: "kotlin"
 
 def isAndroidStudio = findProperty("as") != null
 
-if (isAndroidStudio) {
-    version = "$version-as"
-}
-
 intellij {
     pluginName = 'spek-idea-plugin'
     updateSinceUntilBuild = false
@@ -23,14 +19,6 @@ intellij {
     }
 }
 
-patchPluginXml {
-    if (isAndroidStudio) {
-        pluginXmlFiles = ['src/pluginDescriptor/android/plugin.xml']
-    } else {
-        pluginXmlFiles = ['src/pluginDescriptor/jvm/plugin.xml']
-    }
-}
-
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     compileOnly "org.jetbrains.kotlin:kotlin-runtime:$kotlinVersion"

plugin/src/main/kotlin/org/jetbrains/spek/idea/DynamicConfigurationType.kt

@@ -0,0 +1,31 @@
+package org.jetbrains.spek.idea
+
+import com.intellij.execution.configurations.ConfigurationFactory
+import com.intellij.execution.configurations.ConfigurationType
+import javax.swing.Icon
+
+class DynamicConfigurationType: ConfigurationType {
+    val manager by lazy { SpekPluginManager() }
+    val extensionFactory by lazy { manager.extensionFactory }
+    val type by lazy { extensionFactory.createConfigurationType() }
+
+    override fun getIcon(): Icon {
+        return type.icon
+    }
+
+    override fun getConfigurationTypeDescription(): String {
+        return type.configurationTypeDescription
+    }
+
+    override fun getId(): String {
+        return type.id
+    }
+
+    override fun getDisplayName(): String {
+        return type.displayName
+    }
+
+    override fun getConfigurationFactories(): Array<ConfigurationFactory> {
+        return type.configurationFactories
+    }
+}

plugin/src/main/kotlin/org/jetbrains/spek/idea/ExtensionFactory.kt

@@ -0,0 +1,7 @@
+package org.jetbrains.spek.idea
+
+import com.intellij.execution.configurations.ConfigurationType
+
+interface ExtensionFactory {
+    fun createConfigurationType(): ConfigurationType
+}

plugin/src/main/kotlin/org/jetbrains/spek/idea/PluginOverride.kt

@@ -0,0 +1,11 @@
+package org.jetbrains.spek.idea
+
+import com.intellij.openapi.extensions.ExtensionPointName
+
+interface PluginOverride {
+    fun createExtensionFactory(): ExtensionFactory
+
+    companion object {
+        val PLUGIN_OVERRIDE_EP = ExtensionPointName.create<PluginOverride>("org.jetbrains.spek.spek-idea-plugin.pluginOverride")
+    }
+}

plugin/src/main/kotlin/org/jetbrains/spek/idea/SpekRunConfigurationType.kt → plugin/src/main/kotlin/org/jetbrains/spek/idea/SpekConfigurationType.kt

@@ -6,13 +6,13 @@ import com.intellij.icons.AllIcons
 /**
  * @author Ranie Jade Ramiso
  */
-abstract class SpekRunConfigurationType(id: String, displayName: String): ConfigurationTypeBase(
+abstract class SpekConfigurationType(id: String, displayName: String): ConfigurationTypeBase(
     id,
     displayName,
     "Run Spek tests",
     AllIcons.RunConfigurations.Junit
 ) {
-    protected abstract fun createConfigurationFactory(type: SpekRunConfigurationType): SpekConfigurationFactory
+    protected abstract fun createConfigurationFactory(type: SpekConfigurationType): SpekConfigurationFactory
 
     init {
         addFactory(createConfigurationFactory(this))

plugin/src/main/kotlin/org/jetbrains/spek/idea/SpekJvmRunConfigurationType.kt

@@ -1,10 +1,10 @@
 package org.jetbrains.spek.idea
 
-class SpekJvmRunConfigurationType: SpekRunConfigurationType(
+class SpekJvmRunConfigurationType: SpekConfigurationType(
     "org.spekframework.spek-jvm",
     "Spek"
 ) {
-    override fun createConfigurationFactory(type: SpekRunConfigurationType): SpekConfigurationFactory {
+    override fun createConfigurationFactory(type: SpekConfigurationType): SpekConfigurationFactory {
         return SpekJvmConfigurationFactory(type)
     }
 }

plugin/src/main/kotlin/org/jetbrains/spek/idea/SpekPluginManager.kt

@@ -0,0 +1,21 @@
+package org.jetbrains.spek.idea
+
+import com.intellij.execution.configurations.ConfigurationType
+import com.intellij.openapi.extensions.Extensions
+
+class SpekPluginManager {
+    val extensionFactory by lazy {
+        val override = Extensions.getExtensions(PluginOverride.PLUGIN_OVERRIDE_EP)
+            .firstOrNull()
+
+        override?.createExtensionFactory() ?: createDefaultExtensionFactory()
+    }
+
+    private fun createDefaultExtensionFactory(): ExtensionFactory {
+        return object: ExtensionFactory {
+            override fun createConfigurationType(): ConfigurationType {
+                return SpekJvmRunConfigurationType()
+            }
+        }
+    }
+}

plugin/src/main/kotlin/org/jetbrains/spek/idea/SpekRunConfigurationProducer.kt

@@ -23,7 +23,7 @@ import org.jetbrains.spek.tooling.Target
  * @author Ranie Jade Ramiso
  */
 class SpekRunConfigurationProducer: JavaRunConfigurationProducerBase<SpekRunConfiguration>(
-    ConfigurationTypeUtil.findConfigurationType(SpekRunConfigurationType::class.java)
+    ConfigurationTypeUtil.findConfigurationType(DynamicConfigurationType::class.java)
 ) {
     override fun setupConfigurationFromContext(configuration: SpekRunConfiguration, context: ConfigurationContext,
                                                sourceElement: Ref<PsiElement>): Boolean {

plugin/src/main/kotlin/org/jetbrains/spek/idea/androidstudio/PluginAndroidOverride.kt

@@ -0,0 +1,15 @@
+package org.jetbrains.spek.idea.androidstudio
+
+import com.intellij.execution.configurations.ConfigurationType
+import org.jetbrains.spek.idea.ExtensionFactory
+import org.jetbrains.spek.idea.PluginOverride
+
+class PluginAndroidOverride: PluginOverride {
+    override fun createExtensionFactory(): ExtensionFactory {
+        return object: ExtensionFactory {
+            override fun createConfigurationType(): ConfigurationType {
+                return SpekAndroidConfigurationType()
+            }
+        }
+    }
+}

plugin/src/main/kotlin/org/jetbrains/spek/idea/androidstudio/SpekAndroidConfigurationType.kt

@@ -1,13 +1,13 @@
 package org.jetbrains.spek.idea.androidstudio
 
 import org.jetbrains.spek.idea.SpekConfigurationFactory
-import org.jetbrains.spek.idea.SpekRunConfigurationType
+import org.jetbrains.spek.idea.SpekConfigurationType
 
-class SpekAndroidConfigurationType: SpekRunConfigurationType(
+class SpekAndroidConfigurationType: SpekConfigurationType(
     "SpecsRunConfiguration", // hardcoded :(
-    "Spek - Android"
+    "Spek"
 ) {
-    override fun createConfigurationFactory(type: SpekRunConfigurationType): SpekConfigurationFactory {
+    override fun createConfigurationFactory(type: SpekConfigurationType): SpekConfigurationFactory {
         return SpekAndroidConfigurationFactory(type)
     }
 }

plugin/src/main/resources/META-INF/android.xml

@@ -0,0 +1,5 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="org.jetbrains.spek.spek-idea-plugin">
+        <pluginOverride implementation="org.jetbrains.spek.idea.androidstudio.PluginAndroidOverride"/>
+    </extensions>
+</idea-plugin>

plugin/src/pluginDescriptor/jvm/plugin.xml → plugin/src/main/resources/META-INF/plugin.xml

@@ -21,14 +21,19 @@
     -->
     <depends>org.jetbrains.kotlin</depends>
     <depends>com.intellij.modules.java</depends>
+    <depends optional="true" config-file="android.xml">com.intellij.modules.androidstudio</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <configurationType implementation="org.jetbrains.spek.idea.SpekJvmRunConfigurationType"/>
+        <configurationType implementation="org.jetbrains.spek.idea.DynamicConfigurationType"/>
         <runConfigurationProducer implementation="org.jetbrains.spek.idea.SpekRunConfigurationProducer"/>
         <implicitUsageProvider implementation="org.jetbrains.spek.idea.SpekImplicitUsageProvider"/>
         <runLineMarkerContributor language="kotlin" implementationClass="org.jetbrains.spek.idea.SpekLineMarkerProvider"/>
     </extensions>
 
+    <extensionPoints>
+        <extensionPoint name="pluginOverride" interface="org.jetbrains.spek.idea.PluginOverride"/>
+    </extensionPoints>
+
     <actions>
         <!-- Add your actions here -->
     </actions>