Correct report of "redundant setter" for override & empty block cases

So #KT-22364 Fixed

idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt

@@ -28,11 +28,9 @@ class RedundantSetterInspection : AbstractKotlinInspection(), CleanupLocalInspec
 private fun KtPropertyAccessor.isRedundantSetter(): Boolean {
     if (!isSetter) return false
     if (annotationEntries.isNotEmpty()) return false
-    if (property.hasModifier(KtTokens.OVERRIDE_KEYWORD)) return false
     if (hasLowerVisibilityThanProperty()) return false
     val expression = bodyExpression ?: return true
     if (expression is KtBlockExpression) {
-        if (expression.statements.isEmpty()) return true
         val statement = expression.statements.takeIf { it.size == 1 }?.firstOrNull() ?: return false
         val parameter = valueParameters.takeIf { it.size == 1 }?.firstOrNull() ?: return false
         val binaryExpression = statement as? KtBinaryExpression ?: return false

idea/testData/inspectionsLocal/redundantSetter/blankBody.kt

@@ -1,3 +1,5 @@
+// PROBLEM: none
+
 class Test {
     var x = 1
         <caret>set(value) {

idea/testData/inspectionsLocal/redundantSetter/onlyReturnFieldBody.kt.after

@@ -1,3 +0,0 @@
-class Test {
-    var x = 1
-}

idea/testData/inspectionsLocal/redundantSetter/overrideBlankBody.kt

@@ -5,5 +5,5 @@ interface A {
 
 class X : A {
     override var myVar: Boolean = false
-        <caret>set(value) {}
+    <caret>set(value) {}
 }

idea/testData/inspectionsLocal/redundantSetter/overrideDefault.kt

@@ -0,0 +1,8 @@
+interface A {
+    var myVar: Boolean
+}
+
+class X : A {
+    override var myVar: Boolean = false
+        <caret>set
+}

idea/testData/inspectionsLocal/redundantSetter/overrideDefault.kt.after

@@ -0,0 +1,7 @@
+interface A {
+    var myVar: Boolean
+}
+
+class X : A {
+    override var myVar: Boolean = false
+}

idea/testData/inspectionsLocal/redundantSetter/overrideNotOnlyFieldSetBody.kt

@@ -0,0 +1,13 @@
+// PROBLEM: none
+interface A {
+    var myVar: Boolean
+}
+
+class X : A {
+    override var myVar: Boolean = false
+        <caret>set(value) {
+        foo()
+        field = value
+    }
+    fun foo() {}
+}

idea/testData/inspectionsLocal/redundantSetter/overrideOnlyFieldSetBody.kt

@@ -0,0 +1,10 @@
+interface A {
+    var myVar: Boolean
+}
+
+class X : A {
+    override var myVar: Boolean = false
+        <caret>set(value) {
+        field = value
+    }
+}

idea/testData/inspectionsLocal/redundantSetter/overrideOnlyFieldSetBody.kt.after

@@ -0,0 +1,7 @@
+interface A {
+    var myVar: Boolean
+}
+
+class X : A {
+    override var myVar: Boolean = false
+}

idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java

@@ -2898,21 +2898,39 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
             doTest(fileName);
         }
 
-        @TestMetadata("notOnlyReturnField.kt")
+        @TestMetadata("notOnlyFieldSetBody.kt")
-        public void testNotOnlyReturnField() throws Exception {
+        public void testNotOnlyFieldSetBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/notOnlyReturnField.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/notOnlyFieldSetBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("onlyReturnFieldBody.kt")
+        @TestMetadata("onlyFieldSetBody.kt")
-        public void testOnlyReturnFieldBody() throws Exception {
+        public void testOnlyFieldSetBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/onlyReturnFieldBody.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/onlyFieldSetBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("override.kt")
+        @TestMetadata("overrideBlankBody.kt")
-        public void testOverride() throws Exception {
+        public void testOverrideBlankBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/override.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/overrideBlankBody.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("overrideDefault.kt")
+        public void testOverrideDefault() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/overrideDefault.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("overrideNotOnlyFieldSetBody.kt")
+        public void testOverrideNotOnlyFieldSetBody() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/overrideNotOnlyFieldSetBody.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("overrideOnlyFieldSetBody.kt")
+        public void testOverrideOnlyFieldSetBody() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantSetter/overrideOnlyFieldSetBody.kt");
             doTest(fileName);
         }