[NI] Fix checks for infix/operator conventions

compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt

@@ -373,9 +373,8 @@ internal object EagerResolveOfCallableReferences : ResolutionPart() {
 internal object CheckInfixResolutionPart : ResolutionPart() {
     override fun KotlinResolutionCandidate.process(workIndex: Int) {
         val candidateDescriptor = resolvedCall.candidateDescriptor
-        if (callComponents.statelessCallbacks.isInfixCall(kotlinCall) &&
-            (candidateDescriptor !is FunctionDescriptor || !candidateDescriptor.isInfix)
-        ) {
+        if (candidateDescriptor !is FunctionDescriptor) return
+        if (!candidateDescriptor.isInfix && callComponents.statelessCallbacks.isInfixCall(kotlinCall)) {
             addDiagnostic(InfixCallNoInfixModifier)
         }
     }
@@ -384,9 +383,8 @@ internal object CheckInfixResolutionPart : ResolutionPart() {
 internal object CheckOperatorResolutionPart : ResolutionPart() {
     override fun KotlinResolutionCandidate.process(workIndex: Int) {
         val candidateDescriptor = resolvedCall.candidateDescriptor
-        if (callComponents.statelessCallbacks.isOperatorCall(kotlinCall) &&
-            (candidateDescriptor !is FunctionDescriptor || !candidateDescriptor.isOperator)
-        ) {
+        if (candidateDescriptor !is FunctionDescriptor) return
+        if (!candidateDescriptor.isOperator && callComponents.statelessCallbacks.isOperatorCall(kotlinCall)) {
             addDiagnostic(InvokeConventionCallNoOperatorModifier)
         }
     }

compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/KotlinResolverContext.kt

@@ -196,8 +196,6 @@ class SimpleCandidateFactory(
 enum class KotlinCallKind(vararg resolutionPart: ResolutionPart) {
     VARIABLE(
         CheckVisibility,
-        CheckInfixResolutionPart,
-        CheckOperatorResolutionPart,
         CheckSuperExpressionCallPart,
         NoTypeArguments,
         NoArguments,
@@ -210,6 +208,7 @@ enum class KotlinCallKind(vararg resolutionPart: ResolutionPart) {
         CheckInstantiationOfAbstractClass,
         CheckVisibility,
         CheckInfixResolutionPart,
+        CheckOperatorResolutionPart,
         CheckSuperExpressionCallPart,
         MapTypeArguments,
         MapArguments,