File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed
Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -113,6 +113,7 @@ dependencies {
113113 bundledPlugin(" org.jetbrains.plugins.yaml" )
114114
115115 testFramework(TestFrameworkType .JUnit5 )
116+ testFramework(TestFrameworkType .Platform )
116117 testFramework(TestFrameworkType .Plugin .Java )
117118
118119 pluginVerifier()
Original file line number Diff line number Diff line change @@ -66,6 +66,7 @@ import com.intellij.psi.filters.ElementFilter
6666import com.intellij.psi.util.CachedValue
6767import com.intellij.psi.util.CachedValueProvider
6868import com.intellij.psi.util.CachedValuesManager
69+ import com.intellij.psi.util.ParameterizedCachedValue
6970import com.intellij.psi.util.PsiTreeUtil
7071import com.intellij.psi.util.PsiTypesUtil
7172import com.intellij.psi.util.TypeConversionUtil
@@ -262,9 +263,10 @@ inline fun <T> PsiElement.lockedCached(
262263 val cacheLock = cacheLocks.computeIfAbsent(key) { ReentrantReadWriteLock () }
263264
264265 cacheLock.read {
265- val value = getUserData(key)?.upToDateOrNull
266- if (value != null ) {
267- return value.get()
266+ // The cast seems necessary since 2025.1, ParameterizedCachedValue doesn't extend CachedValue anymore...
267+ @Suppress(" UNCHECKED_CAST" ) val value = getUserData(key as Key <ParameterizedCachedValue <T , Any >>)
268+ if (value?.hasUpToDateValue() == true ) {
269+ return value.getValue(dependencies)
268270 }
269271 }
270272
You can’t perform that action at this time.
0 commit comments