From 14ec4c7accc3b24d7ddef3df3bf60ee1a0917b0f Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 29 Nov 2016 05:52:23 +0300 Subject: [PATCH] Minor: refactor expression in signatureEnhancement for better debugging --- .../load/java/typeEnhancement/signatureEnhancement.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt index e3a22a43600..53b2356b171 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt @@ -47,10 +47,10 @@ private fun D.enhanceSignature(): D { val predefinedEnhancementInfo = - if (this is JavaMethodDescriptor) - PREDEFINED_FUNCTION_ENHANCEMENT_INFO_BY_SIGNATURE[ - SignatureBuildingComponents.signature(this.containingDeclaration as ClassDescriptor, this.computeJvmDescriptor())] - else null + (this as? JavaMethodDescriptor) + ?.run { SignatureBuildingComponents.signature(this.containingDeclaration as ClassDescriptor, this.computeJvmDescriptor()) } + ?.let { signature -> PREDEFINED_FUNCTION_ENHANCEMENT_INFO_BY_SIGNATURE[signature] } + predefinedEnhancementInfo?.let { assert(it.parametersInfo.size == valueParameters.size) {