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

FIR: fix FirOldFrontendDiagnosticsTestGenerated.testVariableInvoke test

Browse Source
This commit is contained in:
Ilya Kirillov
2021-03-12 17:22:02 +01:00
parent c37f8ba708
commit d7da17d8e6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
+4 -3
View File
@@ -373,7 +373,7 @@ val FirFunction<*>.asForbiddenNamedArgumentsTarget: ForbiddenNamedArgumentsTarge
return ForbiddenNamedArgumentsTarget.EXPECTED_CLASS_MEMBER return ForbiddenNamedArgumentsTarget.EXPECTED_CLASS_MEMBER
} }
return when (origin) { return when (origin) {
FirDeclarationOrigin.Source, FirDeclarationOrigin.Library, FirDeclarationOrigin.BuiltIns -> null FirDeclarationOrigin.Source, FirDeclarationOrigin.Library -> null
FirDeclarationOrigin.Delegated -> delegatedWrapperData?.wrapped?.asForbiddenNamedArgumentsTarget FirDeclarationOrigin.Delegated -> delegatedWrapperData?.wrapped?.asForbiddenNamedArgumentsTarget
FirDeclarationOrigin.ImportedFromObject -> importedFromObjectData?.original?.asForbiddenNamedArgumentsTarget FirDeclarationOrigin.ImportedFromObject -> importedFromObjectData?.original?.asForbiddenNamedArgumentsTarget
// For intersection overrides, the logic in // For intersection overrides, the logic in
@@ -385,14 +385,15 @@ val FirFunction<*>.asForbiddenNamedArgumentsTarget: ForbiddenNamedArgumentsTarge
FirDeclarationOrigin.Java, FirDeclarationOrigin.Enhancement -> ForbiddenNamedArgumentsTarget.NON_KOTLIN_FUNCTION FirDeclarationOrigin.Java, FirDeclarationOrigin.Enhancement -> ForbiddenNamedArgumentsTarget.NON_KOTLIN_FUNCTION
FirDeclarationOrigin.SamConstructor -> null FirDeclarationOrigin.SamConstructor -> null
FirDeclarationOrigin.SubstitutionOverride -> originalForSubstitutionOverrideAttr?.asForbiddenNamedArgumentsTarget FirDeclarationOrigin.SubstitutionOverride -> originalForSubstitutionOverrideAttr?.asForbiddenNamedArgumentsTarget
// referenced function of a Kotlin function type is synthetic // referenced function of a Kotlin function type
FirDeclarationOrigin.Synthetic -> { FirDeclarationOrigin.BuiltIns -> {
if (dispatchReceiverClassOrNull()?.isBuiltinFunctionalType() == true) { if (dispatchReceiverClassOrNull()?.isBuiltinFunctionalType() == true) {
ForbiddenNamedArgumentsTarget.INVOKE_ON_FUNCTION_TYPE ForbiddenNamedArgumentsTarget.INVOKE_ON_FUNCTION_TYPE
} else { } else {
null null
} }
} }
FirDeclarationOrigin.Synthetic -> null
is FirDeclarationOrigin.Plugin -> null // TODO: figure out what to do with plugin generated functions is FirDeclarationOrigin.Plugin -> null // TODO: figure out what to do with plugin generated functions
} }
} }