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

More cleanup: lift return / assignment out

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-07-07 13:57:36 +03:00
parent 9269de721e
commit dfe2c16bc7
116 changed files with 472 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/types/JeDeclaredType.kt
+3 -3
View File
@@ -78,10 +78,10 @@ class JeDeclaredType(
val args = mutableListOf<TypeMirror>()
for (typeParameter in psiClass.typeParameters) {
val substitutedParameter = substitutor.substitute(typeParameter)
if (substitutedParameter != null)
args += substitutedParameter.toJeType(psiManager)
args += if (substitutedParameter != null)
substitutedParameter.toJeType(psiManager)
else
args += JeTypeVariableType(typeParameter.getTypeWithTypeParameters(), typeParameter)
JeTypeVariableType(typeParameter.getTypeWithTypeParameters(), typeParameter)
}
args
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt
+3 -3
View File
@@ -168,9 +168,9 @@ open class KotlinUSimpleReferenceExpression(
val assignment = expression.getAssignmentByLHS()
if (assignment != null) {
when (assignment.operationToken) {
KtTokens.EQ -> return ReferenceAccess.WRITE
else -> return ReferenceAccess.READ_WRITE
return when (assignment.operationToken) {
KtTokens.EQ -> ReferenceAccess.WRITE
else -> ReferenceAccess.READ_WRITE
}
}