From 07c961d99d961bed40df4d530c5b127650f1afc2 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 5 May 2016 11:05:46 +0300 Subject: [PATCH] Moved local method out --- .../kotlin/j2k/ExpressionConverter.kt | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index cb7ffd7c64d..d9c27499774 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -532,20 +532,6 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter { val referenceName = expression.referenceName!! val target = expression.resolve() - fun isNullable(target: PsiVariable): Boolean { - if (typeConverter.variableNullability(target).isNullable(codeConverter.settings)) return true - - if (!converter.inConversionScope(target)) return false - - val canChangeType = when (target) { - is PsiLocalVariable -> codeConverter.canChangeType(target) - is PsiField -> target.hasModifierProperty(PsiModifier.PRIVATE) - else -> return false - } - val shouldDeclareVariableType = converter.shouldDeclareVariableType(target, converter.typeConverter.convertVariableType(target), canChangeType) - return !shouldDeclareVariableType && !converter.settings.specifyFieldTypeByDefault && codeConverter.convertExpression(target.initializer).isNullable - } - val isNullable = target is PsiVariable && isNullable(target) val qualifier = expression.qualifierExpression @@ -590,6 +576,20 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter { result = if (qualifier != null) QualifiedExpression(codeConverter.convertExpression(qualifier), identifier) else identifier } + private fun isNullable(target: PsiVariable): Boolean { + if (typeConverter.variableNullability(target).isNullable(codeConverter.settings)) return true + + if (!converter.inConversionScope(target)) return false + + val canChangeType = when (target) { + is PsiLocalVariable -> codeConverter.canChangeType(target) + is PsiField -> target.hasModifierProperty(PsiModifier.PRIVATE) + else -> return false + } + val shouldDeclareVariableType = converter.shouldDeclareVariableType(target, converter.typeConverter.convertVariableType(target), canChangeType) + return !shouldDeclareVariableType && !converter.settings.specifyFieldTypeByDefault && codeConverter.convertExpression(target.initializer).isNullable + } + override fun visitSuperExpression(expression: PsiSuperExpression) { val psiQualifier = expression.qualifier val qualifier = psiQualifier?.referenceName