From cd13648906f58f93b4228158b9a126e6b8492027 Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Thu, 14 Feb 2019 10:34:40 +0900
Subject: [PATCH] Object literal can be converted to lambda: report if "return"
 is only one and is in the last statement

#KT-29763 Fixed
---
 .../ObjectLiteralToLambdaIntention.kt          |  4 +++-
 .../inspectionData/expected.xml                | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
index 597e3abe338..e4cdb5d1b44 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
@@ -51,7 +51,9 @@ import org.jetbrains.kotlin.types.KotlinType
 class ObjectLiteralToLambdaInspection : IntentionBasedInspection<KtObjectLiteralExpression>(ObjectLiteralToLambdaIntention::class) {
     override fun problemHighlightType(element: KtObjectLiteralExpression): ProblemHighlightType {
         val (_, baseType, singleFunction) = extractData(element) ?: return super.problemHighlightType(element)
-        if (singleFunction.bodyExpression?.anyDescendantOfType<KtReturnExpression> { true } == true) return ProblemHighlightType.INFORMATION
+        val bodyBlock = singleFunction.bodyBlockExpression
+        val lastStatement = bodyBlock?.statements?.lastOrNull()
+        if (bodyBlock?.anyDescendantOfType<KtReturnExpression> { it != lastStatement } == true) return ProblemHighlightType.INFORMATION
 
         val valueArgument = element.parent as? KtValueArgument
         val call = valueArgument?.getStrictParentOfType<KtCallExpression>()
diff --git a/idea/testData/intentions/objectLiteralToLambda/inspectionData/expected.xml b/idea/testData/intentions/objectLiteralToLambda/inspectionData/expected.xml
index 479e451a371..748c5002ceb 100644
--- a/idea/testData/intentions/objectLiteralToLambda/inspectionData/expected.xml
+++ b/idea/testData/intentions/objectLiteralToLambda/inspectionData/expected.xml
@@ -1,4 +1,22 @@
 <problems>
+    <problem>
+        <file>StatementAndReturn.kt</file>
+        <line>8</line>
+        <module>light_idea_test_case</module>
+        <entry_point TYPE="file" FQNAME="StatementAndReturn.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert object literal to lambda</problem_class>
+        <description>Convert to lambda</description>
+    </problem>
+
+    <problem>
+        <file>SingleReturn.kt</file>
+        <line>8</line>
+        <module>light_idea_test_case</module>
+        <entry_point TYPE="file" FQNAME="SingleReturn.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert object literal to lambda</problem_class>
+        <description>Convert to lambda</description>
+    </problem>
+
     <problem>
         <file>Simple.kt</file>
         <line>6</line>