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

Deprecate PlatformDiagnosticSuppressors::shouldReportUnusedParameter with one parameter

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2023-05-23 15:23:17 +02:00
committed by teamcity
parent dc4aa8c15e
commit 1dc0b054ed
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
+1
View File
@@ -778,6 +778,7 @@ class ControlFlowInformationProviderImpl private constructor(
private fun processUnusedParameter(ctxt: VariableUseContext, element: KtParameter, variableDescriptor: VariableDescriptor) {
val functionDescriptor = variableDescriptor.containingDeclaration as FunctionDescriptor
@Suppress("DEPRECATION")
if (functionDescriptor.isExpect || functionDescriptor.isActual ||
functionDescriptor.isEffectivelyExternal() ||
!diagnosticSuppressor.shouldReportUnusedParameter(variableDescriptor, trace.bindingContext) ||
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PlatformDiagnosticSuppressor.kt
+7 -3
View File
@@ -27,13 +27,13 @@ import org.jetbrains.kotlin.resolve.BindingContext
interface PlatformDiagnosticSuppressor : PlatformSpecificExtension<PlatformDiagnosticSuppressor>{
// Function without binding context is kept for binary compatibility
// Diagnostic should be suppressed if any of two overloads return false
fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean
@Deprecated("Use shouldReportUnusedParameter with bindingContext parameter")
fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean = true
fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean = true
fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean
object Default : PlatformDiagnosticSuppressor {
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean = true
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean = true
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
@@ -44,8 +44,12 @@ class CompositePlatformDiagnosticSuppressor(private val suppressors: List<Platfo
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean =
suppressors.all { it.shouldReportUnusedParameter(parameter, bindingContext) }
@Deprecated("Use shouldReportUnusedParameter with bindingContext parameter")
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean =
suppressors.all { it.shouldReportUnusedParameter(parameter) }
suppressors.all {
@Suppress("DEPRECATION")
it.shouldReportUnusedParameter(parameter)
}
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean =
suppressors.all { it.shouldReportNoBody(descriptor) }