[Wasm] Restore binary compatibility of PlatformDiagnosticSuppressor
Keep the original shouldReportUnusedParameter method without BindingContext parameter ^KT-58188 Fixed
This commit is contained in:
committed by
teamcity
parent
e39d9c2c35
commit
dc4aa8c15e
+2
-1
@@ -780,7 +780,8 @@ class ControlFlowInformationProviderImpl private constructor(
|
|||||||
|
|
||||||
if (functionDescriptor.isExpect || functionDescriptor.isActual ||
|
if (functionDescriptor.isExpect || functionDescriptor.isActual ||
|
||||||
functionDescriptor.isEffectivelyExternal() ||
|
functionDescriptor.isEffectivelyExternal() ||
|
||||||
!diagnosticSuppressor.shouldReportUnusedParameter(variableDescriptor, trace.bindingContext)
|
!diagnosticSuppressor.shouldReportUnusedParameter(variableDescriptor, trace.bindingContext) ||
|
||||||
|
!diagnosticSuppressor.shouldReportUnusedParameter(variableDescriptor)
|
||||||
) return
|
) return
|
||||||
|
|
||||||
when (val owner = element.parent.parent) {
|
when (val owner = element.parent.parent) {
|
||||||
|
|||||||
+8
-1
@@ -25,11 +25,15 @@ import org.jetbrains.kotlin.resolve.BindingContext
|
|||||||
|
|
||||||
@DefaultImplementation(PlatformDiagnosticSuppressor.Default::class)
|
@DefaultImplementation(PlatformDiagnosticSuppressor.Default::class)
|
||||||
interface PlatformDiagnosticSuppressor : PlatformSpecificExtension<PlatformDiagnosticSuppressor>{
|
interface PlatformDiagnosticSuppressor : PlatformSpecificExtension<PlatformDiagnosticSuppressor>{
|
||||||
fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean
|
// 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
|
||||||
|
fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean = true
|
||||||
|
|
||||||
fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean
|
fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean
|
||||||
|
|
||||||
object Default : PlatformDiagnosticSuppressor {
|
object Default : PlatformDiagnosticSuppressor {
|
||||||
|
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean = true
|
||||||
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean = true
|
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean = true
|
||||||
|
|
||||||
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
|
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
|
||||||
@@ -40,6 +44,9 @@ class CompositePlatformDiagnosticSuppressor(private val suppressors: List<Platfo
|
|||||||
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean =
|
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean =
|
||||||
suppressors.all { it.shouldReportUnusedParameter(parameter, bindingContext) }
|
suppressors.all { it.shouldReportUnusedParameter(parameter, bindingContext) }
|
||||||
|
|
||||||
|
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean =
|
||||||
|
suppressors.all { it.shouldReportUnusedParameter(parameter) }
|
||||||
|
|
||||||
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean =
|
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean =
|
||||||
suppressors.all { it.shouldReportNoBody(descriptor) }
|
suppressors.all { it.shouldReportNoBody(descriptor) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
|
|||||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.VariableDescriptor
|
import org.jetbrains.kotlin.descriptors.VariableDescriptor
|
||||||
import org.jetbrains.kotlin.name.JsStandardClassIds
|
import org.jetbrains.kotlin.name.JsStandardClassIds
|
||||||
import org.jetbrains.kotlin.resolve.BindingContext
|
|
||||||
import org.jetbrains.kotlin.resolve.checkers.PlatformDiagnosticSuppressor
|
import org.jetbrains.kotlin.resolve.checkers.PlatformDiagnosticSuppressor
|
||||||
|
|
||||||
private val nativeAnnotations = JsStandardClassIds.Annotations.nativeAnnotations.map { it.asSingleFqName() }
|
private val nativeAnnotations = JsStandardClassIds.Annotations.nativeAnnotations.map { it.asSingleFqName() }
|
||||||
@@ -36,8 +35,7 @@ private fun DeclarationDescriptor.isLexicallyInsideJsNative(): Boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
object JsNativeDiagnosticSuppressor : PlatformDiagnosticSuppressor {
|
object JsNativeDiagnosticSuppressor : PlatformDiagnosticSuppressor {
|
||||||
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean =
|
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean = !parameter.isLexicallyInsideJsNative()
|
||||||
!parameter.isLexicallyInsideJsNative()
|
|
||||||
|
|
||||||
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = !descriptor.isLexicallyInsideJsNative()
|
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = !descriptor.isLexicallyInsideJsNative()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,5 +25,8 @@ object WasmDiagnosticSuppressor : PlatformDiagnosticSuppressor {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean =
|
||||||
|
true
|
||||||
|
|
||||||
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
|
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
|
||||||
}
|
}
|
||||||
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.wasm.resolve
|
|||||||
import org.jetbrains.kotlin.container.StorageComponentContainer
|
import org.jetbrains.kotlin.container.StorageComponentContainer
|
||||||
import org.jetbrains.kotlin.container.useImpl
|
import org.jetbrains.kotlin.container.useImpl
|
||||||
import org.jetbrains.kotlin.container.useInstance
|
import org.jetbrains.kotlin.container.useInstance
|
||||||
|
import org.jetbrains.kotlin.js.analyze.JsNativeDiagnosticSuppressor
|
||||||
import org.jetbrains.kotlin.js.naming.NameSuggestion
|
import org.jetbrains.kotlin.js.naming.NameSuggestion
|
||||||
import org.jetbrains.kotlin.js.naming.WasmNameSuggestion
|
import org.jetbrains.kotlin.js.naming.WasmNameSuggestion
|
||||||
import org.jetbrains.kotlin.js.resolve.ExtensionFunctionToExternalIsInlinable
|
import org.jetbrains.kotlin.js.resolve.ExtensionFunctionToExternalIsInlinable
|
||||||
|
|||||||
Reference in New Issue
Block a user