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

[FIR] Support of ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS diagnostic

Browse Source 
^KT-56522 Fixed
This commit is contained in:
Ivan Kochurkin
2023-02-11 22:10:02 +01:00
committed by Space Team
parent f1fef62f76
commit c418a7a7bf
7 changed files with 51 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirActualDeclarationChecker.kt
+45 -30
View File
@@ -22,38 +22,53 @@ object FirActualDeclarationChecker : FirBasicDeclarationChecker() {
if (declaration !is FirMemberDeclaration || !declaration.isActual) return
if (declaration is FirCallableDeclaration) {
val actualFunctionSymbol = declaration.symbol
val expectFunctionSymbol = actualFunctionSymbol.getSingleCompatibleExpectForActualOrNull() as? FirCallableSymbol ?: return
if (declaration is FirFunction) {
checkActualFunctionWithDefaultArguments(declaration, reporter, context)
}
checkReturnTypes(declaration, context, reporter)
}
}
val expectTypeParameters = expectFunctionSymbol.getContainingClassSymbol(expectFunctionSymbol.moduleData.session)
?.typeParameterSymbols.orEmpty()
val actualClassTypeParameters = actualFunctionSymbol.getContainingClassSymbol(context.session)?.typeParameterSymbols.orEmpty()
val parentSubstitutor =
createExpectActualTypeParameterSubstitutor(expectTypeParameters, actualClassTypeParameters, context.session)
val substitutor = createExpectActualTypeParameterSubstitutor(
expectFunctionSymbol.typeParameterSymbols,
actualFunctionSymbol.typeParameterSymbols,
context.session,
parentSubstitutor
)
if (!areCompatibleExpectActualTypes(
substitutor.substituteOrSelf(expectFunctionSymbol.resolvedReturnType.type),
actualFunctionSymbol.resolvedReturnType.type,
expectFunctionSymbol.moduleData.session,
context.session
)
) {
@Suppress("UNCHECKED_CAST")
reporter.reportOn(
declaration.source,
FirErrors.ACTUAL_WITHOUT_EXPECT,
actualFunctionSymbol,
actualFunctionSymbol.expectForActual as Map<ExpectActualCompatibility.Incompatible<FirBasedSymbol<*>>, Collection<FirBasedSymbol<*>>>,
context
)
private fun checkActualFunctionWithDefaultArguments(function: FirFunction, reporter: DiagnosticReporter, context: CheckerContext) {
for (valueParameter in function.valueParameters) {
if (valueParameter.defaultValue != null) {
reporter.reportOn(valueParameter.source, FirErrors.ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS, context)
}
}
}
private fun checkReturnTypes(callableDeclaration: FirCallableDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
val actualFunctionSymbol = callableDeclaration.symbol
val expectFunctionSymbol = actualFunctionSymbol.getSingleCompatibleExpectForActualOrNull() as? FirCallableSymbol ?: return
val expectTypeParameters = expectFunctionSymbol.getContainingClassSymbol(expectFunctionSymbol.moduleData.session)
?.typeParameterSymbols.orEmpty()
val actualClassTypeParameters = actualFunctionSymbol.getContainingClassSymbol(context.session)?.typeParameterSymbols.orEmpty()
val parentSubstitutor =
createExpectActualTypeParameterSubstitutor(expectTypeParameters, actualClassTypeParameters, context.session)
val substitutor = createExpectActualTypeParameterSubstitutor(
expectFunctionSymbol.typeParameterSymbols,
actualFunctionSymbol.typeParameterSymbols,
context.session,
parentSubstitutor
)
if (!areCompatibleExpectActualTypes(
substitutor.substituteOrSelf(expectFunctionSymbol.resolvedReturnType.type),
actualFunctionSymbol.resolvedReturnType.type,
expectFunctionSymbol.moduleData.session,
context.session
)
) {
@Suppress("UNCHECKED_CAST")
reporter.reportOn(
callableDeclaration.source,
FirErrors.ACTUAL_WITHOUT_EXPECT,
actualFunctionSymbol,
actualFunctionSymbol.expectForActual as Map<ExpectActualCompatibility.Incompatible<FirBasedSymbol<*>>, Collection<FirBasedSymbol<*>>>,
context
)
}
}
}
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.fir.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
// MODULE: m1-common
// FILE: common.kt
expect class Ok(x: Int, y: String = "")
expect class FailX(x: Int, y: String = "")
expect class FailY(x: Int, y: String = "")
fun test() {
Ok(42)
Ok(42, "OK")
}
// MODULE: m2-jvm()()(m1-common)
// FILE: jvm.kt
actual class Ok actual constructor(x: Int, y: String)
actual class FailX actual constructor(x: Int = 0, y: String)
actual class FailY actual constructor(x: Int, y: String = "")
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// MODULE: m1-common
// FILE: common.kt
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.fir.kt
Vendored
-40
View File
@@ -1,40 +0,0 @@
// MODULE: m1-common
// FILE: common.kt
expect fun ok(x: Int, y: String = "")
expect fun failX(x: Int, y: String = "")
expect fun failY(x: Int, y: String = "")
expect open class Foo {
fun ok(x: Int, y: String = "")
fun failX(x: Int, y: String = "")
fun failY(x: Int, y: String = "")
}
fun test(foo: Foo) {
ok(42)
ok(42, "OK")
foo.ok(42)
foo.ok(42, "OK")
}
// MODULE: m2-jvm()()(m1-common)
// FILE: jvm.kt
actual fun ok(x: Int, y: String) {}
actual fun failX(x: Int = 0, y: String) {}
actual fun failY(x: Int, y: String = "") {}
actual open class Foo {
actual fun ok(x: Int, y: String) {}
actual fun failX(x: Int = 0, y: String) {}
actual fun failY(x: Int, y: String = "") {}
}
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// MODULE: m1-common
// FILE: common.kt
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.fir.kt
Vendored
+3 -3
View File
@@ -29,8 +29,8 @@ fun test(foo: Foo, bar: Bar) {
actual class Bar : Foo {
actual override fun ok(x: Int, y: String) {}
actual override fun failX(x: Int = 0, y: String) {}
actual override fun failY(x: Int, y: String = "") {}
actual override fun failX(<!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>x: Int = 0<!>, y: String) {}
actual override fun failY(x: Int, <!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>y: String = ""<!>) {}
}
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.kt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ fun test(foo: Foo, bar: Bar) {
actual class Bar : Foo {
actual override fun ok(x: Int, y: String) {}
actual override fun failX(<!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>x: Int = <!DEFAULT_VALUE_NOT_ALLOWED_IN_OVERRIDE!>0<!><!>, y: String) {}
actual override fun failY(x: Int, <!ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS!>y: String = <!DEFAULT_VALUE_NOT_ALLOWED_IN_OVERRIDE!>""<!><!>) {}