azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved local method out

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-05-05 11:05:46 +03:00
parent bdd425c1a0
commit 07c961d99d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+14 -14
View File
@@ -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