Do not report redeclaration when outer class and default object's members clash

Previously we prohibited classes and properties with the same name (now it's unnecessary)
Add test for backends that they support qualified (by default object name) member references inside class body

compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt

@@ -58,24 +58,10 @@ public class DeclarationResolver {
         }
     }
 
-    public fun checkRedeclarationsInInnerClassNames(c: TopDownAnalysisContext) {
+    public fun checkRedeclarations(c: TopDownAnalysisContext) {
         for (classDescriptor in c.getDeclaredClasses().values()) {
-            if (DescriptorUtils.isDefaultObject(classDescriptor)) {
-                // Default objects should be considered during analysing redeclarations in classes
-                continue
-            }
-
-            var allDescriptors = classDescriptor.getScopeForMemberLookup().getOwnDeclaredDescriptors()
-            val defaultObject = classDescriptor.getDefaultObjectDescriptor()
-            if (defaultObject != null) {
-                val descriptorsFromDefaultObject = defaultObject.getScopeForMemberLookup().getOwnDeclaredDescriptors()
-                if (descriptorsFromDefaultObject.isNotEmpty()) {
-                    allDescriptors = allDescriptors + descriptorsFromDefaultObject
-                }
-            }
-
             val descriptorMap = HashMultimap.create<Name, DeclarationDescriptor>()
-            for (desc in allDescriptors) {
+            for (desc in classDescriptor.getScopeForMemberLookup().getOwnDeclaredDescriptors()) {
                 if (desc is ClassDescriptor || desc is PropertyDescriptor) {
                     descriptorMap.put(desc.getName(), desc)
                 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java

@@ -292,7 +292,7 @@ public class LazyTopDownAnalyzer {
         resolveAllHeadersInClasses(c);
 
         declarationResolver.checkRedeclarationsInPackages(topLevelDescriptorProvider, topLevelFqNames);
-        declarationResolver.checkRedeclarationsInInnerClassNames(c);
+        declarationResolver.checkRedeclarations(c);
 
         ResolveUtilPackage.checkTraitRequirements(c.getDeclaredClasses(), trace);
 

compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt

@@ -0,0 +1,18 @@
+class A {
+    private val p: Int
+        get() = 4
+
+    default object B {
+        val p: Int
+            get() = 6
+    }
+
+    fun a() = p + B.p
+}
+
+
+fun box(): String {
+    if (A().a() != 10) return "Fail"
+
+    return "OK"
+}

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt

@@ -1,9 +1,15 @@
-class C {
-    default <!REDECLARATION!>object<!> {
-        val <!REDECLARATION!>Default<!> = this
+class B {
+    default object <!REDECLARATION!>A<!> {
+    }
+
+    val <!REDECLARATION!>A<!> = this
+}
+
+class C {
+    default <!CONFLICTING_JVM_DECLARATIONS!>object A<!> {
+        <!CONFLICTING_JVM_DECLARATIONS!>val A<!> = this
     }
 
-    val <!REDECLARATION!>Default<!> = C
 }
 
 class D {

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt

@@ -1,15 +1,29 @@
 package
 
-internal final class C {
-    public constructor C()
-    internal final val Default: C.Default
+internal final class B {
+    public constructor B()
+    internal final val A: B
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal default object Default {
-        private constructor Default()
-        internal final val Default: C.Default
+    internal default object A {
+        private constructor A()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+internal final class C {
+    public constructor C()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    internal default object A {
+        private constructor A()
+        internal final val A: C.A
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt

@@ -1,11 +1,11 @@
 class A {
-    enum class <!REDECLARATION!>E<!> {
+    enum class E {
         ENTRY
     }
     
     default object {
-        enum class <!REDECLARATION!>E<!> {
+        enum class E {
             ENTRY2
         }
     }
-}
+}

compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.kt

@@ -1,11 +0,0 @@
-enum class E {
-    <!REDECLARATION!>FIRST<!>
-
-    <!REDECLARATION!>SECOND<!>
-
-    default object {
-        class <!REDECLARATION!>FIRST<!>
-
-        val <!REDECLARATION!>SECOND<!> = this
-    }
-}

compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt

@@ -0,0 +1,12 @@
+package kt2247
+
+class B {
+    default object {
+        class Y {
+        }
+    }
+
+    class Y {
+    }
+
+}

compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt

@@ -0,0 +1,11 @@
+enum class E {
+    FIRST
+
+    SECOND
+
+    default object {
+        class FIRST
+
+        val SECOND = this
+    }
+}

compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt

@@ -0,0 +1,6 @@
+class A {
+    default object B {
+        class <!REDECLARATION!>G<!>
+        val <!REDECLARATION!>G<!> = 1
+    }
+}

compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt

@@ -0,0 +1,23 @@
+package
+
+internal final class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    internal default object B {
+        private constructor B()
+        internal final val G: kotlin.Int = 1
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        internal final class G {
+            public constructor G()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}

compiler/testData/diagnostics/tests/redeclarations/kt2247.kt

@@ -1,14 +0,0 @@
-//KT-2247 Report name clashes between inner classes and members of default object
-
-package kt2247
-
-class B {
-    default object {
-        class <!REDECLARATION!>Y<!> {
-        }
-    }
-
-    class <!REDECLARATION!>Y<!> {
-    }
-
-}

compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java

@@ -9195,18 +9195,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("EnumEntriesAndClassObjectMembers.kt")
-            public void testEnumEntriesAndClassObjectMembers() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("kt2247.kt")
-            public void testKt2247() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2247.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("kt2418.kt")
             public void testKt2418() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2418.kt");
@@ -9231,6 +9219,18 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("NoRedeclarationForClassesInDefaultObject.kt")
+            public void testNoRedeclarationForClassesInDefaultObject() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt")
+            public void testNoRedeclarationForEnumEntriesAndDefaultObjectMembers() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("PropertyAndFunInClass.kt")
             public void testPropertyAndFunInClass() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.kt");
@@ -9243,6 +9243,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("RedeclarationInDefaultObject.kt")
+            public void testRedeclarationInDefaultObject() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("RedeclarationInMultiFile.kt")
             public void testRedeclarationInMultiFile() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt");

compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java

@@ -1007,6 +1007,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("defaultObjectSameNamesAsInOuter.kt")
+        public void testDefaultObjectSameNamesAsInOuter() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("delegation2.kt")
         public void testDelegation2() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation2.kt");

idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt

@@ -1,7 +1,21 @@
-class C {
-    default <error>object</error> {
-        val <error>Default</error> = this
+class B {
+    default object <error>A</error> {
     }
 
-    val <error>Default</error> = C
+    val <error>A</error> = this
+}
+
+class C {
+    default <error>object A</error> {
+        <error>val A</error> = this
+    }
+
+}
+
+class D {
+    default <error>object A</error> {
+        <error>val `OBJECT$`</error> = this
+    }
+
+    val `OBJECT$` = D
 }

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassObjectTest.java

@@ -47,4 +47,8 @@ public final class ClassObjectTest extends SingleFileTranslationTest {
     public void testNamedClassObject() throws Exception {
         checkFooBoxIsOk();
     }
+
+    public void testDefaultObjectSameNamesAsInOuter() throws Exception {
+        checkFooBoxIsOk();
+    }
 }

js/js.translator/testData/classObject/cases/defaultObjectSameNamesAsInOuter.kt

@@ -0,0 +1,20 @@
+package foo
+
+class A {
+    private val p: Int
+        get() = 4
+
+    default object B {
+        val p: Int
+            get() = 6
+    }
+
+    fun a() = p + B.p
+}
+
+
+fun box(): String {
+    if (A().a() != 10) return "Fail"
+
+    return "OK"
+}