Fixed CCE in lockedCached and test dependencies

minecraft-dev · Jan 15, 2025 · 99ced62 · 99ced62
1 parent 90a58d3
commit 99ced62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -113,6 +113,7 @@ dependencies {
         bundledPlugin("org.jetbrains.plugins.yaml")
 
         testFramework(TestFrameworkType.JUnit5)
+        testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.Plugin.Java)
 
         pluginVerifier()

diff --git a/src/main/kotlin/util/psi-utils.kt b/src/main/kotlin/util/psi-utils.kt
@@ -66,6 +66,7 @@ import com.intellij.psi.filters.ElementFilter
 import com.intellij.psi.util.CachedValue
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
+import com.intellij.psi.util.ParameterizedCachedValue
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.PsiTypesUtil
 import com.intellij.psi.util.TypeConversionUtil
@@ -262,9 +263,10 @@ inline fun <T> PsiElement.lockedCached(
     val cacheLock = cacheLocks.computeIfAbsent(key) { ReentrantReadWriteLock() }
 
     cacheLock.read {
-        val value = getUserData(key)?.upToDateOrNull
-        if (value != null) {
-            return value.get()
+        // The cast seems necessary since 2025.1, ParameterizedCachedValue doesn't extend CachedValue anymore...
+        @Suppress("UNCHECKED_CAST") val value = getUserData(key as Key<ParameterizedCachedValue<T, Any>>)
+        if (value?.hasUpToDateValue() == true) {
+            return value.getValue(dependencies)
         }
     }