[kotlin k2] AddReturnExpressionFix: do not suggest a quick fix if there is no right bracket

^KTIJ-29554

GitOrigin-RevId: aa9488718babe674febfeb7cff83ddefc9a60442

plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddReturnExpressionFixFactory.kt

@@ -10,6 +10,7 @@ internal object AddReturnExpressionFixFactory {
 
     val addReturnExpressionFixFactory = KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.NoReturnInFunctionWithBlockBody ->
         val function = (diagnostic.psi as? KtNamedFunction) ?: return@ModCommandBased emptyList()
+        if (function.bodyBlockExpression?.rBrace == null) return@ModCommandBased emptyList()
 
         listOf(
             AddReturnExpressionFix(function)

plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java

@@ -5257,6 +5257,11 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
             runTest("../../../idea/tests/testData/quickfix/addReturnExpression/emptyBody.kt");
         }
 
+        @TestMetadata("noRightBrace.kt")
+        public void testNoRightBrace() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/addReturnExpression/noRightBrace.kt");
+        }
+
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("../../../idea/tests/testData/quickfix/addReturnExpression/simple.kt");

plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java

@@ -1599,6 +1599,11 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest {
             runTest("testData/quickfix/addReturnExpression/emptyBody.kt");
         }
 
+        @TestMetadata("noRightBrace.kt")
+        public void testNoRightBrace() throws Exception {
+            runTest("testData/quickfix/addReturnExpression/noRightBrace.kt");
+        }
+
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("testData/quickfix/addReturnExpression/simple.kt");

plugins/kotlin/idea/tests/testData/quickfix/addReturnExpression/noRightBrace.kt

@@ -0,0 +1,4 @@
+// "Add 'return' expression" "false"
+// ERROR: A 'return' expression required in a function with a block body ('{...}')
+fun test(): Boolean {<caret>
+    val x = 42