Merge pull request #17 from just-ai/211/dev

Release 211-0.5.2
just-ai · Nov 16, 2021 · 8a0a204 · 8a0a204
2 parents 892b0cb + 37a5d4f
commit 8a0a204
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,11 @@
 pluginGroup = com.justai.jaicf.plugin
 pluginName = Jaicf Plugin
-pluginVersion = 211-0.5.1
+pluginVersion = 211-0.5.2
 
 pluginSinceBuild = 211
 pluginUntilBuild = 211.*
 
-pluginVerifierIdeVersions = 2021.1.1, 2021.1.2, 2021.1.3
+pluginVerifierIdeVersions = 2021.1.3
 
 platformType = IC
 platformVersion = 2021.1.3

diff --git a/src/main/kotlin/com/justai/jaicf/plugin/inspections/NotOverriddenReactionUsageInspection.kt b/src/main/kotlin/com/justai/jaicf/plugin/inspections/NotOverriddenReactionUsageInspection.kt
@@ -117,15 +117,18 @@ private val MemberDescriptor.isOpenOrAbstract: Boolean
 private val MemberDescriptor.isFinal: Boolean
     get() = modality == Modality.FINAL
 
-private fun KotlinType.findOverridingFunction(descriptor: FunctionDescriptor) = (supertypes() + this)
+private fun KotlinType.findOverridingFunction(descriptor: FunctionDescriptor) = (listOf(this) + supertypes())
     .mapNotNull { it.toClassDescriptor }
     .firstOrNull { supertype ->
         supertype.findDeclaredFunction(
             descriptor.name.asString(),
             false
-        ) { it.overriddenDescriptors.contains(descriptor) } != null
+        ) { it.allOverriddenDescriptors.contains(descriptor) } != null
     }
 
+private val FunctionDescriptor.allOverriddenDescriptors: Collection<FunctionDescriptor>
+    get() = overriddenDescriptors.flatMap { it.allOverriddenDescriptors + it }
+
 private fun KtTypeReference.classForRefactor(): KtClass? {
     val bindingContext = analyze(BodyResolveMode.PARTIAL)
     val type = bindingContext[BindingContext.TYPE, this] ?: return null

diff --git a/src/main/kotlin/com/justai/jaicf/plugin/scenarios/linker/ScenarioReferenceResolver.kt b/src/main/kotlin/com/justai/jaicf/plugin/scenarios/linker/ScenarioReferenceResolver.kt
@@ -33,17 +33,17 @@ class ScenarioReferenceResolver(project: Project) : JaicfService(project) {
     private val scenarioService = ScenarioDataService.getInstance(project)
 
     private val resolvedReferences by cached(PsiModificationTracker.MODIFICATION_COUNT) {
-        mutableMapOf<KtReferenceExpression, Scenario?>()
+        mutableMapOf<Pair<KtReferenceExpression, State?>, Scenario?>()
     }
 
     fun resolve(scenarioReference: KtReferenceExpression, boundedState: State? = null): Scenario? {
         if (scenarioReference.isRemoved || !enabled) return null
 
-        resolvedReferences?.get(scenarioReference)?.let { return it }
+        resolvedReferences?.get(scenarioReference to boundedState)?.let { return it }
 
         val body = getScenarioBody(scenarioReference, boundedState) ?: return null
         return resolveScenario(body)?.also {
-            resolvedReferences?.set(scenarioReference, it)
+            resolvedReferences?.set(scenarioReference to boundedState, it)
         }
     }
 
@@ -63,10 +63,14 @@ class ScenarioReferenceResolver(project: Project) : JaicfService(project) {
             }
 
             is KtParameter -> {
+                (resolvedElement.defaultValue as? KtReferenceExpression)?.let {
+                    return getScenarioBody(it)
+                }
+
                 val parameterName = resolvedElement.name ?: return null
-                // TODO Maybe make a better search for value of parameter
                 val argumentExpression =
                     boundedState?.stateExpression?.argumentExpressionOrDefaultValue(parameterName) as? KtReferenceExpression
+
                 return argumentExpression?.let { getScenarioBody(it) }
             }
 
@@ -75,23 +79,25 @@ class ScenarioReferenceResolver(project: Project) : JaicfService(project) {
             }
 
             else -> {
-                if (scenarioReference !is KtCallExpression) return null
+                return (scenarioReference as? KtCallExpression)?.let(::getScenarioBody)
+            }
+        }
+    }
 
-                if (scenarioReference.isStateDeclaration) return scenarioReference
+    private fun getScenarioBody(callExpression: KtCallExpression): KtExpression? {
+        if (callExpression.isStateDeclaration) return callExpression
 
-                return when (val resolved = scenarioReference.referenceExpression()?.resolve()) {
-                    is KtNamedFunction -> (resolved.initializer as? KtCallExpression)?.let {
-                        if (it.isStateDeclaration) it else null
-                    }
+        return when (val resolved = callExpression.referenceExpression()?.resolve()) {
+            is KtNamedFunction -> (resolved.initializer as? KtCallExpression)?.let {
+                if (it.isStateDeclaration) it else null
+            }
 
-                    is KtClass -> resolved.body?.scenarioBody
+            is KtClass -> resolved.body?.scenarioBody
 
-                    is KtPrimaryConstructor ->
-                        scenarioReference.argumentExpressionOrDefaultValue(SCENARIO_MODEL_FIELD_NAME)
+            is KtPrimaryConstructor ->
+                callExpression.argumentExpressionOrDefaultValue(SCENARIO_MODEL_FIELD_NAME)
 
-                    else -> null
-                }
-            }
+            else -> null
         }
     }