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

Take into account SimpleTypeWithEnhancement and subtyping related places

Browse Source 
^KT-47854 Fixed
This commit is contained in:
Victor Petukhov
2021-07-29 12:54:15 +03:00
committed by teamcityserver
parent 6ab632f6ad
commit 3eaa452f9e
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// JSPECIFY_STATE: warn // JSPECIFY_STATE: warn
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
// FILE: J1.java // FILE: J1.java
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
core/descriptors/src/org/jetbrains/kotlin/types/TypeWithEnhancement.kt
+1 -1
View File
@@ -33,7 +33,7 @@ class SimpleTypeWithEnhancement(
) : DelegatingSimpleType(), ) : DelegatingSimpleType(),
TypeWithEnhancement { TypeWithEnhancement {
override val origin: UnwrappedType get() = delegate override val origin get() = delegate
override fun replaceAnnotations(newAnnotations: Annotations): SimpleType = override fun replaceAnnotations(newAnnotations: Annotations): SimpleType =
origin.replaceAnnotations(newAnnotations).wrapEnhancement(enhancement) as SimpleType origin.replaceAnnotations(newAnnotations).wrapEnhancement(enhancement) as SimpleType
core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt
+5 -2
View File
@@ -142,7 +142,7 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy
override fun SimpleTypeMarker.asCapturedType(): CapturedTypeMarker? { override fun SimpleTypeMarker.asCapturedType(): CapturedTypeMarker? {
require(this is SimpleType, this::errorMessage) require(this is SimpleType, this::errorMessage)
return this as? NewCapturedType return if (this is SimpleTypeWithEnhancement) origin.asCapturedType() else this as? NewCapturedType
} }
override fun SimpleTypeMarker.asDefinitelyNotNullType(): DefinitelyNotNullTypeMarker? { override fun SimpleTypeMarker.asDefinitelyNotNullType(): DefinitelyNotNullTypeMarker? {
@@ -326,9 +326,12 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy
require(this is SimpleType, this::errorMessage) require(this is SimpleType, this::errorMessage)
return !isError && return !isError &&
constructor.declarationDescriptor !is TypeAliasDescriptor && constructor.declarationDescriptor !is TypeAliasDescriptor &&
(constructor.declarationDescriptor != null || this is CapturedType || this is NewCapturedType || this is DefinitelyNotNullType || constructor is IntegerLiteralTypeConstructor) (constructor.declarationDescriptor != null || this is CapturedType || this is NewCapturedType || this is DefinitelyNotNullType || constructor is IntegerLiteralTypeConstructor || isSingleClassifierTypeWithEnhancement())
} }
private fun SimpleTypeMarker.isSingleClassifierTypeWithEnhancement() =
this is SimpleTypeWithEnhancement && origin.isSingleClassifierType()
override fun KotlinTypeMarker.contains(predicate: (KotlinTypeMarker) -> Boolean): Boolean { override fun KotlinTypeMarker.contains(predicate: (KotlinTypeMarker) -> Boolean): Boolean {
require(this is KotlinType, this::errorMessage) require(this is KotlinType, this::errorMessage)
return containsInternal(this, predicate) return containsInternal(this, predicate)