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

Better code

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-05-05 11:08:46 +03:00
parent 07c961d99d
commit bf9e4a3d84
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+6 -2
View File
@@ -581,13 +581,17 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
if (!converter.inConversionScope(target)) return false if (!converter.inConversionScope(target)) return false
if (converter.settings.specifyFieldTypeByDefault) return false
val canChangeType = when (target) { val canChangeType = when (target) {
is PsiLocalVariable -> codeConverter.canChangeType(target) is PsiLocalVariable -> codeConverter.canChangeType(target)
is PsiField -> target.hasModifierProperty(PsiModifier.PRIVATE) is PsiField -> target.hasModifierProperty(PsiModifier.PRIVATE)
else -> return false else -> return false
} }
val shouldDeclareVariableType = converter.shouldDeclareVariableType(target, converter.typeConverter.convertVariableType(target), canChangeType) if (converter.shouldDeclareVariableType(target, converter.typeConverter.convertVariableType(target), canChangeType)) return false
return !shouldDeclareVariableType && !converter.settings.specifyFieldTypeByDefault && codeConverter.convertExpression(target.initializer).isNullable
// if variable type won't be specified then check nullability of the initializer
return codeConverter.convertExpression(target.initializer).isNullable
} }
override fun visitSuperExpression(expression: PsiSuperExpression) { override fun visitSuperExpression(expression: PsiSuperExpression) {