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
idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+6 -6
View File
@@ -246,11 +246,11 @@ object KotlinOutputParserHelper {
try {
val severityConst: Any = severityObjectMap[severity] ?: return null
if (isNewAndroidPlugin) {
return createNewMessage(severityConst, text.trim(), file, lineNumber, columnIndex, offset)
return if (isNewAndroidPlugin) {
createNewMessage(severityConst, text.trim(), file, lineNumber, columnIndex, offset)
}
else {
return createOldMessage(severityConst, text.trim(), file, lineNumber, columnIndex)
createOldMessage(severityConst, text.trim(), file, lineNumber, columnIndex)
}
}
catch(e: Throwable) {
@@ -294,11 +294,11 @@ object KotlinOutputParserHelper {
lineNumber: Int?,
columnIndex: Int?
): Any? {
if (file == null || lineNumber == null || columnIndex == null) {
return simpleMessageConstructor.newInstance(severityConst, text)
return if (file == null || lineNumber == null || columnIndex == null) {
simpleMessageConstructor.newInstance(severityConst, text)
}
else {
return complexMessageConstructor.newInstance(
complexMessageConstructor.newInstance(
severityConst,
text, file,
lineNumber, columnIndex)
idea/idea-android/src/org/jetbrains/kotlin/android/ParcelableUtil.kt
+3 -3
View File
@@ -375,12 +375,12 @@ private fun KtClass.createSecondaryConstructor(factory: KtPsiFactory): KtConstru
val constructor = factory.createSecondaryConstructor(constructorText)
val lastProperty = declarations.findLast { it is KtProperty }
if (lastProperty != null) {
return addDeclarationAfter(constructor, lastProperty).apply { addNewLineBeforeDeclaration() }
return if (lastProperty != null) {
addDeclarationAfter(constructor, lastProperty).apply { addNewLineBeforeDeclaration() }
}
else {
val firstFunction = declarations.find { it is KtFunction }
return addDeclarationBefore(constructor, firstFunction).apply { addNewLineBeforeDeclaration() }
addDeclarationBefore(constructor, firstFunction).apply { addNewLineBeforeDeclaration() }
}
}