From 1e0ae04abae07c782672bbfe0962101d84d98c5d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 10 Feb 2017 15:51:46 +0300 Subject: [PATCH] Minor. Convert if to when --- .../calls/tower/NewResolutionOldInference.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt index 9f875fe713f..81f695e92bb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt @@ -259,15 +259,13 @@ class NewResolutionOldInference( if (resolvedCall.status.possibleTransformToSuccess()) { for (error in status.diagnostics) { - if (error is UnsupportedInnerClassCall) { - resolvedCall.trace.report(Errors.UNSUPPORTED.on(resolvedCall.call.callElement, error.message)) - } - else if (error is NestedClassViaInstanceReference) { - tracing.nestedClassAccessViaInstanceReference(resolvedCall.trace, error.classDescriptor, resolvedCall.explicitReceiverKind) - } - else if (error is ErrorDescriptorDiagnostic) { - // todo - // return@map null + when (error) { + is UnsupportedInnerClassCall -> resolvedCall.trace.report(Errors.UNSUPPORTED.on(resolvedCall.call.callElement, error.message)) + is NestedClassViaInstanceReference -> tracing.nestedClassAccessViaInstanceReference(resolvedCall.trace, error.classDescriptor, resolvedCall.explicitReceiverKind) + is ErrorDescriptorDiagnostic -> { + // todo + // return@map null + } } } }