Cleanup: apply "cascade if..." inspection (+ some others)

2017-06-28 15:19:20 +03:00
parent 9c06739594
commit 1d2017b0fc
80 changed files with 1079 additions and 1190 deletions
@@ -222,15 +222,13 @@ object JsExternalChecker : SimpleDeclarationChecker {
    private fun KtDeclarationWithBody.hasValidExternalBody(bindingContext: BindingContext): Boolean {
        if (!hasBody()) return true
        val body = bodyExpression!!
-        return if (!hasBlockBody()) {
-            body.isDefinedExternallyExpression(bindingContext)
-        }
-        else if (body is KtBlockExpression) {
-            val statement = body.statements.singleOrNull() ?: return false
-            statement.isDefinedExternallyExpression(bindingContext)
-        }
-        else {
-            false
+        return when {
+            !hasBlockBody() -> body.isDefinedExternallyExpression(bindingContext)
+            body is KtBlockExpression -> {
+                val statement = body.statements.singleOrNull() ?: return false
+                statement.isDefinedExternallyExpression(bindingContext)
+            }
+            else -> false
        }
    }