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

Minor refactoring: convert to expression body

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-09-19 11:45:38 +03:00
parent 909b9b6463
commit 1e5fb91d7d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyIntention.kt
+4 -3
View File
@@ -37,6 +37,7 @@ class ConvertToExpressionBodyIntention(
KtDeclarationWithBody::class.java, "Convert to expression body" KtDeclarationWithBody::class.java, "Convert to expression body"
) { ) {
override fun isApplicableTo(element: KtDeclarationWithBody): Boolean { override fun isApplicableTo(element: KtDeclarationWithBody): Boolean {
if (element is KtConstructor<*>) return false
val value = calcValue(element) ?: return false val value = calcValue(element) ?: return false
return !value.anyDescendantOfType<KtReturnExpression>( return !value.anyDescendantOfType<KtReturnExpression>(
canGoInside = { it !is KtFunctionLiteral && it !is KtNamedFunction && it !is KtPropertyAccessor } canGoInside = { it !is KtFunctionLiteral && it !is KtNamedFunction && it !is KtPropertyAccessor }
@@ -100,13 +101,13 @@ class ConvertToExpressionBodyIntention(
private fun calcValue(declaration: KtDeclarationWithBody): KtExpression? { private fun calcValue(declaration: KtDeclarationWithBody): KtExpression? {
val body = declaration.blockExpression() ?: return null val body = declaration.blockExpression() ?: return null
return calcValue(body, emptyAllowed = declaration !is KtConstructor<*> && convertEmptyToUnit) return calcValue(body)
} }
private fun calcValue(body: KtBlockExpression, emptyAllowed: Boolean = true): KtExpression? { private fun calcValue(body: KtBlockExpression): KtExpression? {
val bodyStatements = body.statements val bodyStatements = body.statements
if (bodyStatements.isEmpty()) { if (bodyStatements.isEmpty()) {
return if (emptyAllowed) KtPsiFactory(body).createExpression("Unit") else null return if (convertEmptyToUnit) KtPsiFactory(body).createExpression("Unit") else null
} }
val statement = bodyStatements.singleOrNull() ?: return null val statement = bodyStatements.singleOrNull() ?: return null
when (statement) { when (statement) {