azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Implement TYPE_VARIANCE_CONFLICT, TYPE_VARIANCE_CONFLICT_IN_EXPANDED_TYPE diagnostics, fix tests

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-05-21 17:53:01 +03:00
committed by TeamCityServer
parent ef53f0e0b3
commit cf531dbbe6
36 changed files with 392 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java
+11 -4
View File
@@ -143,6 +143,13 @@ public class TypeCheckingProcedure {
}
}
public static EnrichedProjectionKind getEffectiveProjectionKind(
@NotNull TypeParameterDescriptor typeParameter,
@NotNull TypeProjection typeArgument
) {
return getEffectiveProjectionKind(typeParameter.getVariance(), typeArgument.getProjectionKind());
}
// If class C<out T> then C<T> and C<out T> mean the same
// out * out = out
// out * in = *
@@ -156,11 +163,11 @@ public class TypeCheckingProcedure {
// inv * in = out
// inv * inv = inv
public static EnrichedProjectionKind getEffectiveProjectionKind(
@NotNull TypeParameterDescriptor typeParameter,
@NotNull TypeProjection typeArgument
@NotNull Variance typeParameterVariance,
@NotNull Variance typeArgumentVariance
) {
Variance a = typeParameter.getVariance();
Variance b = typeArgument.getProjectionKind();
Variance a = typeParameterVariance;
Variance b = typeArgumentVariance;
// If they are not both invariant, let's make b not invariant for sure
if (b == INVARIANT) {