K2 resolve: prefer derived class property to base class field

#KT-50082 Fixed

compiler/fir/analysis-tests/testData/resolve/problems/enumEntryFieldShadow.fir.txt

@@ -0,0 +1,28 @@
+FILE: DerivedEnum.kt
+    public final enum class DerivedEnum : R|BaseJava|, R|kotlin/Enum<DerivedEnum>| {
+        private constructor(): R|DerivedEnum| {
+            super<R|kotlin/Enum<DerivedEnum>|>()
+        }
+
+        public final static enum entry x: R|DerivedEnum|
+        public final fun foo(): R|kotlin/Unit| {
+            R|/bar|(R|/DerivedEnum.x|)
+            R|/baz|(<Unresolved name: y>#)
+            R|/baz|(Q|BaseJava|.R|/BaseJava.y|)
+        }
+
+        public final static fun values(): R|kotlin/Array<DerivedEnum>| {
+        }
+
+        public final static fun valueOf(value: R|kotlin/String|): R|DerivedEnum| {
+        }
+
+        public final static val entries: R|kotlin/enums/EnumEntries<DerivedEnum>|
+            public get(): R|kotlin/enums/EnumEntries<DerivedEnum>|
+
+    }
+    public final fun bar(e: R|DerivedEnum|): R|kotlin/Unit| {
+    }
+    public final fun baz(s: R|kotlin/String|): R|kotlin/Unit| {
+        Q|DerivedEnum|.R|/DerivedEnum.x|
+    }

compiler/fir/analysis-tests/testData/resolve/problems/enumEntryFieldShadow.kt

@@ -0,0 +1,24 @@
+// FILE: BaseJava.java
+
+public interface BaseJava {
+    String x = "";
+    String y = "";
+}
+
+// FILE: DerivedEnum.kt
+
+enum class DerivedEnum : BaseJava {
+    x;
+
+    fun foo() {
+        bar(x)
+        baz(<!UNRESOLVED_REFERENCE!>y<!>)
+        baz(BaseJava.y)
+    }
+}
+
+fun bar(e: DerivedEnum) {}
+
+fun baz(s: String) {
+    DerivedEnum.x
+}

compiler/fir/analysis-tests/testData/resolve/propertyVsField/fieldPropertyShadow.fir.txt

@@ -0,0 +1,30 @@
+FILE: KotlinBase.kt
+    public open class KotlinBase : R|kotlin/Any| {
+        public constructor(): R|KotlinBase| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final val abcd: R|kotlin/String| = String(abcd)
+            public get(): R|kotlin/String|
+
+    }
+FILE: KotlinProxy.kt
+    public abstract interface KotlinProxy : R|kotlin/Any| {
+        public open val zyxw: R|kotlin/String|
+            public get(): R|kotlin/String| {
+                ^ String(zyxw)
+            }
+
+    }
+FILE: test.kt
+    public final class Derived : R|Test|, R|KotlinProxy| {
+        public constructor(): R|Derived| {
+            super<R|Test|>()
+        }
+
+        public final fun test(): R|kotlin/Unit| {
+            this@R|/Derived|.R|/Test.abcd|
+            this@R|/Derived|.R|/Test.zyxw|
+        }
+
+    }

compiler/fir/analysis-tests/testData/resolve/propertyVsField/fieldPropertyShadow.kt

@@ -0,0 +1,28 @@
+// FILE: Test.java
+
+public class Test extends KotlinBase {
+    public final String abcd = "ABCD";
+
+    public final String zyxw = "ZYXW";
+}
+
+// FILE: KotlinBase.kt
+
+open class KotlinBase {
+    val abcd = "abcd"
+}
+
+// FILE: KotlinProxy.kt
+
+interface KotlinProxy {
+    val zyxw get() = "zyxw"
+}
+
+// FILE: test.kt
+
+class Derived : Test(), KotlinProxy {
+    fun test() {
+        abcd // field!
+        zyxw // field!
+    }
+}

compiler/fir/analysis-tests/testData/resolve/propertyVsField/propertyAndTwoFields.fir.txt

@@ -0,0 +1,14 @@
+FILE: KotlinBase.kt
+    public open class KotlinBase : R|kotlin/Any| {
+        public constructor(): R|KotlinBase| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final val abcd: R|kotlin/String| = String(abcd)
+            public get(): R|kotlin/String|
+
+    }
+FILE: test.kt
+    public final fun test(d: R|JavaDerived|): R|kotlin/Unit| {
+        R|<local>/d|.R|/JavaDerived.abcd|
+    }

compiler/fir/analysis-tests/testData/resolve/propertyVsField/propertyAndTwoFields.kt

@@ -0,0 +1,23 @@
+// FILE: Test.java
+
+public class Test extends KotlinBase {
+    public final String abcd = "ABCD";
+}
+
+// FILE: KotlinBase.kt
+
+open class KotlinBase {
+    val abcd = "abcd"
+}
+
+// FILE: JavaDerived.java
+
+public class JavaDerived extends Test {
+    public final String abcd = "AaBbCcDd"
+}
+
+// FILE: test.kt
+
+fun test(d: JavaDerived) {
+    d.abcd // JavaDerived
+}

compiler/fir/analysis-tests/testData/resolve/propertyVsField/propertyFieldShadow.fir.txt

@@ -0,0 +1,20 @@
+FILE: test.kt
+    public final class Test2 : R|Test| {
+        public constructor(): R|Test2| {
+            super<R|Test|>()
+        }
+
+        private final val text: R|kotlin/String| = String(BCDE)
+            private get(): R|kotlin/String|
+
+        private final val publicPrivateText: R|kotlin/String| = String(YXWV)
+            private get(): R|kotlin/String|
+
+        public final fun check(): R|kotlin/String| {
+            ^check this@R|/Test2|.R|/Test2.text|
+        }
+
+    }
+    public final fun check(): R|kotlin/String!| {
+        ^check R|/Test2.Test2|().R|/Test.publicPrivateText|
+    }

compiler/fir/analysis-tests/testData/resolve/propertyVsField/propertyFieldShadow.kt

@@ -0,0 +1,20 @@
+// FILE: Test.java
+
+public class Test {
+    protected final String text = "ABCD";
+
+    public final String publicPrivateText = "ZYXW";
+}
+
+// FILE: test.kt
+
+class Test2 : Test() {
+    private val text = "BCDE"
+
+    private val publicPrivateText = "YXWV"
+
+    fun check() = text // Should be resolved to Test2.text, not to Test.text
+}
+
+fun check() = Test2().publicPrivateText // Should be resolved to Test.publicPrivateText (Test2 member is private)
+