From b6bb171b67184705569a6ed4adef5ec86d6b68b9 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Tue, 6 Jun 2017 17:33:40 +0300 Subject: [PATCH] [NI] Extension function wins member if it's infix call Fixes 'infixFunctionOverBuiltinMember' --- .../kotlin/resolve/calls/model/KotlinResolverContext.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/KotlinResolverContext.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/KotlinResolverContext.kt index fb0fb090346..035cb5c26ec 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/KotlinResolverContext.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/KotlinResolverContext.kt @@ -94,6 +94,7 @@ enum class KotlinCallKind(vararg resolutionPart: ResolutionPart) { FUNCTION( CheckInstantiationOfAbstractClass, CheckVisibility, + CheckInfixResolutionPart, MapTypeArguments, MapArguments, CreateDescriptorWithFreshTypeVariables,