From e7af2fd28ed46f02046ea329a8e6707a2e217bd6 Mon Sep 17 00:00:00 2001 From: Julia McClellan Date: Fri, 4 Aug 2023 06:22:54 -0400 Subject: Fix handling of Java contravariance (#3092) --- .../org/jetbrains/dokka/analysis/java/parsers/DokkaPsiParser.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'subprojects/analysis-java-psi/src/main/kotlin') diff --git a/subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/parsers/DokkaPsiParser.kt b/subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/parsers/DokkaPsiParser.kt index 45f44338..a1f9cef0 100644 --- a/subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/parsers/DokkaPsiParser.kt +++ b/subprojects/analysis-java-psi/src/main/kotlin/org/jetbrains/dokka/analysis/java/parsers/DokkaPsiParser.kt @@ -567,8 +567,10 @@ internal class DokkaPsiParser( private fun getVariance(type: PsiWildcardType): Projection = when { + type.isExtends -> Covariance(getBound(type.extendsBound)) + type.isSuper -> Contravariance(getBound(type.superBound)) + // If the type isn't explicitly bounded, it still has an implicit `extends Object` bound type.extendsBound != PsiType.NULL -> Covariance(getBound(type.extendsBound)) - type.superBound != PsiType.NULL -> Contravariance(getBound(type.superBound)) else -> throw IllegalStateException("${type.presentableText} has incorrect bounds") } -- cgit