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

FIR: disregard enhancements for warnings

Browse Source 
Warnings are not implemented yet, so don't produce errors either.
This commit is contained in:
pyos
2021-09-02 12:18:49 +02:00
committed by teamcityserver
parent a475453a01
commit 9bb7a29baa
79 changed files with 325 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt
+3 -2
View File
@@ -113,7 +113,9 @@ private fun ConeKotlinType.enhanceInflexibleType(
val effectiveQualifiers = qualifiers(index)
val enhancedTag = lookupTag.enhanceMutability(effectiveQualifiers, position)
val nullabilityFromQualifiers = effectiveQualifiers.nullability.takeIf { shouldEnhance }
// TODO: implement warnings
val nullabilityFromQualifiers = effectiveQualifiers.nullability
.takeIf { shouldEnhance && !effectiveQualifiers.isNullabilityQualifierForWarning }
val enhancedNullability = when (nullabilityFromQualifiers) {
NullabilityQualifier.NULLABLE -> true
NullabilityQualifier.NOT_NULL -> false
@@ -138,7 +140,6 @@ private fun ConeKotlinType.enhanceInflexibleType(
return null // absolutely no changes
}
// TODO: val nullabilityForWarning = enhancedNullabilityAttribute != null && effectiveQualifiers.isNullabilityQualifierForWarning
val mergedArguments = Array(typeArguments.size) { enhancedArguments[it] ?: typeArguments[it] }
val mergedAttributes = if (shouldAddAttribute) attributes + CompilerConeAttributes.EnhancedNullability else attributes
val enhancedType = enhancedTag.constructType(mergedArguments, enhancedNullability, mergedAttributes)