Run the spek under cursor when "Run context configuration" occurs

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

@@ -8,12 +8,15 @@ import com.intellij.openapi.util.Ref
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiElement
+import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.jps.model.java.JavaSourceRootType
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.idea.core.getPackage
+import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtNameReferenceExpression
+import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.spek.tooling.Target
 
 /**
@@ -88,6 +91,14 @@ class SpekRunConfigurationProducer: JavaRunConfigurationProducerBase<SpekRunConf
                     }
                 }
             }
+
+            if (!configurationSet && SpekUtils.isInKotlinFile(element)) {
+                val target = targetForNearestSurroundingSpekBlock(element)
+                if (target != null) {
+                    configuration.target = target
+                    configurationSet = true
+                }
+            }
         }
 
         if (configurationSet) {
@@ -155,6 +166,10 @@ class SpekRunConfigurationProducer: JavaRunConfigurationProducerBase<SpekRunConf
 
                 }
             }
+
+            if (target == null && SpekUtils.isInKotlinFile(element)) {
+                target = targetForNearestSurroundingSpekBlock(element)
+            }
         }
 
         return if (target == null) {
@@ -164,4 +179,27 @@ class SpekRunConfigurationProducer: JavaRunConfigurationProducerBase<SpekRunConf
                 && configuration.configurationModule.module == context.module
         }
     }
+
+    private fun targetForNearestSurroundingSpekBlock(element: PsiElement): Target?
+    {
+        var nearestCallExpression = PsiTreeUtil.getParentOfType(element, KtCallExpression::class.java)
+
+        while (nearestCallExpression != null) {
+            val calleeExpression = nearestCallExpression.calleeExpression!! as KtNameReferenceExpression
+            val resolved = calleeExpression.mainReference.resolve()
+
+            if (resolved is KtNamedFunction && SpekUtils.isGroupOrTest(resolved)) {
+                val spec = SpekUtils.getContainingSpecClass(nearestCallExpression)
+                if (spec != null) {
+                    return Target.Spec(
+                            spec.qualifiedName!!,
+                            SpekUtils.extractPath(nearestCallExpression)
+                    )
+                }
+            }
+            nearestCallExpression = PsiTreeUtil.getParentOfType(nearestCallExpression, KtCallExpression::class.java)
+        }
+
+        return null
+    }
 }

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

@@ -2,6 +2,7 @@ package org.jetbrains.spek.idea
 
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiElement
+import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.PsiUtil
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.toLightClass
@@ -13,6 +14,7 @@ import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtLambdaArgument
 import org.jetbrains.kotlin.psi.KtLambdaExpression
+import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNameReferenceExpression
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtStringTemplateExpression
@@ -80,6 +82,15 @@ object SpekUtils {
         return cls.findAnnotation(fqName) != null
     }
 
+    fun isInKotlinFile(element: PsiElement): Boolean {
+        val file = PsiTreeUtil.getParentOfType(element, KtFile::class.java)
+        return file != null
+    }
+
+    fun isGroupOrTest(function: KtNamedFunction): Boolean {
+        return isGroup(function) || isTest(function)
+    }
+
     fun isGroup(function: KtNamedFunction): Boolean {
         return GROUP_FN.contains(function.name)
     }

tooling/src/main/kotlin/org/jetbrains/spek/tooling/Path.kt

@@ -20,4 +20,30 @@ class Path(@JsonProperty("type") val type: PathType,
 
         fun deserialize(path: String): Path = mapper.readValue(path)
     }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) {
+            return true
+        }
+
+        if (other?.javaClass != javaClass) {
+            return false
+        }
+
+        other as Path
+
+        if (this.type != other.type) {
+            return false
+        }
+
+        if (this.description != other.description) {
+            return false
+        }
+
+        if (this.next != other.next) {
+            return false
+        }
+
+        return true
+    }
 }