Rename: Do not report shadowing conflict if redeclaration is detected

#KT-13240 Fixed

ChangeLog.md

@@ -266,6 +266,7 @@ Using 'this' as function argument in constructor of non-final class
 - [`KT-13239`](https://youtrack.jetbrains.com/issue/KT-13239) Rename: Warn about function name conflicts
 - [`KT-13174`](https://youtrack.jetbrains.com/issue/KT-13174) Move: Warn about accessibility conflicts due to moving to unrelated module
 - [`KT-13175`](https://youtrack.jetbrains.com/issue/KT-13175) Move: Warn about accessibility conflicts when moving entire file
+- [`KT-13240`](https://youtrack.jetbrains.com/issue/KT-13240) Rename: Do not report shadowing conflict if redeclaration is detected
 
 ##### New features
 

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt

@@ -162,6 +162,7 @@ fun reportShadowing(
         result: MutableList<UsageInfo>
 ) {
     val candidate = DescriptorToSourceUtilsIde.getAnyDeclaration(declaration.project, candidateDescriptor) as? PsiNamedElement ?: return
+    if (declaration.parent == candidate.parent) return
     val message = "${declaration.renderDescription().capitalize()} will be shadowed by ${candidate.renderDescription()}"
     result += BasicUnresolvableCollisionUsageInfo(refElement, elementToBindUsageInfoTo, message)
 }

idea/testData/refactoring/rename/noShadowingConflictForSiblingDeclarations/before/test.kt

@@ -0,0 +1,9 @@
+package test
+
+class /*rename*/SameScopeA { val contentA = 1 }
+class SameScopeB { val contentB = 2 }
+
+fun useClass() {
+    val va = SameScopeA().contentA
+    val vb = SameScopeB().contentB
+}

idea/testData/refactoring/rename/noShadowingConflictForSiblingDeclarations/noShadowingConflictForSiblingDeclarations.test

@@ -0,0 +1,7 @@
+{
+  "type": "MARKED_ELEMENT",
+  "mainFile": "test.kt",
+  "newName": "SameScopeB",
+  "withRuntime": "true",
+  "hint": "Class 'SameScopeB' is already declared in package 'test'"
+}

idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java

@@ -227,6 +227,12 @@ public class RenameTestGenerated extends AbstractRenameTest {
         doTest(fileName);
     }
 
+    @TestMetadata("noShadowingConflictForSiblingDeclarations/noShadowingConflictForSiblingDeclarations.test")
+    public void testNoShadowingConflictForSiblingDeclarations_NoShadowingConflictForSiblingDeclarations() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/noShadowingConflictForSiblingDeclarations/noShadowingConflictForSiblingDeclarations.test");
+        doTest(fileName);
+    }
+
     @TestMetadata("parameterRedeclaration/parameterRedeclaration.test")
     public void testParameterRedeclaration_ParameterRedeclaration() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/parameterRedeclaration/parameterRedeclaration.test");