Suggest assert/return postfix templates only for statements

#KT-14079 Fixed
 #KT-14090 Fixed

idea/src/org/jetbrains/kotlin/idea/codeInsight/postfix/stringBasedPostfixTemplates.kt

@@ -63,7 +63,7 @@ internal object KtAssertPostfixTemplate : ConstantStringBasedPostfixTemplate(
         "assert",
         "assert(expr) { \"\" }",
         "assert(\$expr$) { \"\$END$\" }",
-        createExpressionSelector(statementsOnly = false, predicate = KotlinType::isBoolean)
+        createExpressionSelector(statementsOnly = true, predicate = KotlinType::isBoolean)
 )
 
 internal object KtParenthesizedPostfixTemplate : ConstantStringBasedPostfixTemplate(
@@ -83,7 +83,7 @@ internal object KtReturnPostfixTemplate : ConstantStringBasedPostfixTemplate(
         "return",
         "return expr",
         "return \$expr$\$END$",
-        createExpressionSelector(statementsOnly = false)
+        createExpressionSelector(statementsOnly = true)
 )
 
 internal object KtWhilePostfixTemplate : ConstantStringBasedPostfixTemplate(

idea/testData/codeInsight/postfix/noReturnForNonStatement.kt

@@ -0,0 +1,3 @@
+fun foo(x: Any): Any {
+    val y = x.return<caret>
+}

idea/testData/codeInsight/postfix/noReturnForNonStatement.kt.after

@@ -0,0 +1,3 @@
+fun foo(x: Any): Any {
+    val y = x.return    <caret>
+}

idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/PostfixTemplateProviderTestGenerated.java

@@ -71,6 +71,12 @@ public class PostfixTemplateProviderTestGenerated extends AbstractPostfixTemplat
         doTest(fileName);
     }
 
+    @TestMetadata("noReturnForNonStatement.kt")
+    public void testNoReturnForNonStatement() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/noReturnForNonStatement.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("notBoolean.kt")
     public void testNotBoolean() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/postfix/notBoolean.kt");