Fix compiler warnings and some inspections

This commit is contained in:
Alexander Udalov
2020-11-02 09:53:21 +01:00
parent e5d5c20473
commit b3e79d36df
29 changed files with 62 additions and 118 deletions
@@ -85,7 +85,7 @@ class AnnotationTypeQualifierResolver(storageManager: StorageManager, private va
return BUILT_IN_TYPE_QUALIFIER_DEFAULT_ANNOTATIONS[annotationDescriptor.fqName]?.let { qualifierForDefaultingAnnotation ->
val state = resolveDefaultAnnotationState(annotationDescriptor).takeIf { it != ReportLevel.IGNORE } ?: return null
return qualifierForDefaultingAnnotation.copy(
qualifierForDefaultingAnnotation.copy(
nullabilityQualifier = qualifierForDefaultingAnnotation.nullabilityQualifier.copy(isForWarningOnly = state.isWarning)
)
}
@@ -40,6 +40,7 @@ class JavaDescriptorResolver(
if (fqName == null) return null
@Suppress("DEPRECATION")
return packageFragmentProvider.getPackageFragments(fqName.parent()).firstOrNull()?.findClassifierByJavaClass(javaClass)
}
}
@@ -48,7 +48,6 @@ fun PackageFragmentProvider.collectPackageFragmentsOptimizedIfPossible(
) {
when (this) {
is PackageFragmentProviderOptimized -> collectPackageFragments(fqName, packageFragments)
else -> packageFragments.addAll(getPackageFragments(fqName))
else -> packageFragments.addAll(@Suppress("DEPRECATION") getPackageFragments(fqName))
}
}
@@ -47,10 +47,10 @@ open class ClassicTypeCheckerContext(
override val isStubTypeEqualsToAnything: Boolean
get() = stubTypeEqualsToAnything
override fun areEqualTypeConstructors(a: TypeConstructorMarker, b: TypeConstructorMarker): Boolean {
require(a is TypeConstructor, a::errorMessage)
require(b is TypeConstructor, b::errorMessage)
return areEqualTypeConstructors(a, b)
override fun areEqualTypeConstructors(c1: TypeConstructorMarker, c2: TypeConstructorMarker): Boolean {
require(c1 is TypeConstructor, c1::errorMessage)
require(c2 is TypeConstructor, c2::errorMessage)
return areEqualTypeConstructors(c1, c2)
}
open fun areEqualTypeConstructors(a: TypeConstructor, b: TypeConstructor): Boolean = when {
@@ -89,4 +89,4 @@ open class ClassicTypeCheckerContext(
private fun Any.errorMessage(): String {
return "ClassicTypeCheckerContext couldn't handle ${this::class} $this"
}
}