Use camel-case in FirFunctionCallOrigin

Also componentCall is operator call
This commit is contained in:
Andrey Zinovyev
2021-05-19 18:25:21 +03:00
committed by TeamCityServer
parent 419aa65381
commit d38effcbbe
17 changed files with 35 additions and 81 deletions
@@ -162,9 +162,7 @@ class FirCallResolver(
}
var reducedCandidates = if (!result.currentApplicability.isSuccess) {
val distinctApplicabilities = bestCandidates.flatMapTo(mutableSetOf()) { candidate ->
candidate.diagnostics.map { it.applicability }
}
val distinctApplicabilities = bestCandidates.mapTo(mutableSetOf()) { it.currentApplicability }
//if all candidates have the same kind on inApplicability - try to choose the most specific one
if (distinctApplicabilities.size == 1 && distinctApplicabilities.single() > CandidateApplicability.INAPPLICABLE) {
chooseMostSpecific()
@@ -272,9 +272,9 @@ internal object CheckCallModifiers : CheckerStage() {
if (callInfo.callSite is FirFunctionCall) {
val functionSymbol = candidate.symbol as? FirNamedFunctionSymbol ?: return
when {
callInfo.callSite.origin == FirFunctionCallOrigin.INFIX && !functionSymbol.fir.isInfix ->
callInfo.callSite.origin == FirFunctionCallOrigin.Infix && !functionSymbol.fir.isInfix ->
sink.reportDiagnostic(InfixCallOfNonInfixFunction(functionSymbol))
callInfo.callSite.origin == FirFunctionCallOrigin.OPERATOR && !functionSymbol.fir.isOperator ->
callInfo.callSite.origin == FirFunctionCallOrigin.Operator && !functionSymbol.fir.isOperator ->
sink.reportDiagnostic(OperatorCallOfNonOperatorFunction(functionSymbol))
callInfo.isImplicitInvoke && !functionSymbol.fir.isOperator ->
sink.reportDiagnostic(OperatorCallOfNonOperatorFunction(functionSymbol))
@@ -51,7 +51,7 @@ private class ConeConditionalEffectToFirVisitor(
return buildFunctionCall {
calleeReference = buildSimpleNamedReference { name = OperatorNameConventions.NOT }
this.explicitReceiver = explicitReceiver
origin = FirFunctionCallOrigin.OPERATOR
origin = FirFunctionCallOrigin.Operator
}
}
@@ -370,7 +370,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
this.name = name
candidateSymbol = null
}
origin = FirFunctionCallOrigin.OPERATOR
origin = FirFunctionCallOrigin.Operator
}
// x.plusAssign(y)
@@ -44,7 +44,7 @@ class FirIntegerOperatorCall @FirImplementationDetail constructor(
extensionReceiver,
argumentList,
calleeReference,
FirFunctionCallOrigin.OPERATOR
FirFunctionCallOrigin.Operator
)
@FirBuilderDsl