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

[FIR] Only support @ExtensionFunctionType on true functional types

Browse Source 
^KT-59874
This commit is contained in:
Nikolay Lunyak
2023-09-13 15:05:46 +03:00
committed by Space Team
parent 6210da0c98
commit 4b67a504be
5 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt
+4 -1
View File
@@ -73,6 +73,7 @@ fun List<FirAnnotation>.computeTypeAttributes(
session: FirSession,
predefined: List<ConeAttribute<*>> = emptyList(),
containerDeclaration: FirDeclaration? = null,
allowExtensionFunctionType: Boolean = true,
shouldExpandTypeAliases: Boolean
): ConeAttributes {
if (this.isEmpty()) {
@@ -90,7 +91,9 @@ fun List<FirAnnotation>.computeTypeAttributes(
when (classId) {
CompilerConeAttributes.Exact.ANNOTATION_CLASS_ID -> attributes += CompilerConeAttributes.Exact
CompilerConeAttributes.NoInfer.ANNOTATION_CLASS_ID -> attributes += CompilerConeAttributes.NoInfer
CompilerConeAttributes.ExtensionFunctionType.ANNOTATION_CLASS_ID -> attributes += CompilerConeAttributes.ExtensionFunctionType
CompilerConeAttributes.ExtensionFunctionType.ANNOTATION_CLASS_ID -> when {
allowExtensionFunctionType -> attributes += CompilerConeAttributes.ExtensionFunctionType
}
CompilerConeAttributes.ContextFunctionTypeParams.ANNOTATION_CLASS_ID ->
attributes +=
CompilerConeAttributes.ContextFunctionTypeParams(
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
+7 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.resolve.calls.ResolutionDiagnostic
import org.jetbrains.kotlin.fir.resolve.diagnostics.*
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.resolve.transformers.ScopeClassDeclaration
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
import org.jetbrains.kotlin.fir.symbols.impl.*
@@ -260,7 +261,12 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
return symbol.constructType(
resultingArguments,
typeRef.isMarkedNullable,
typeRef.annotations.computeTypeAttributes(session, containerDeclaration = containerDeclaration, shouldExpandTypeAliases = true)
typeRef.annotations.computeTypeAttributes(
session,
containerDeclaration = containerDeclaration,
shouldExpandTypeAliases = true,
allowExtensionFunctionType = (symbol.toLookupTag() as? ConeClassLikeLookupTag)?.isSomeFunctionType(session) == true,
)
).also {
val lookupTag = it.lookupTag
if (lookupTag is ConeClassLikeLookupTagImpl && symbol is FirClassLikeSymbol<*>) {
compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.fir.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
fun foo(a: (String) -> Unit) {
"".<!UNRESOLVED_REFERENCE!>a<!>()
}
interface A : (String) -> Unit {}
typealias AliasedEFT = ExtensionFunctionType
fun foo(a: <!WRONG_EXTENSION_FUNCTION_TYPE!>@AliasedEFT<!> A) {
// @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic.
// Only kotlin.Function{n} type annotated with @Extension should
"".a()
}
compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
fun foo(a: (String) -> Unit) {
"".<!UNRESOLVED_REFERENCE!>a<!>()
}
compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.reversed.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
fun foo(a: (String) -> Unit) {
"".<!UNRESOLVED_REFERENCE!>a<!>()
}
interface A : (String) -> Unit {}
typealias AliasedEFT = ExtensionFunctionType
fun foo(a: <!WRONG_EXTENSION_FUNCTION_TYPE!>@AliasedEFT<!> A) {
// @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic.
// Only kotlin.Function{n} type annotated with @Extension should
"".<!UNRESOLVED_REFERENCE!>a<!>()
}