Consider location of expression when determining field accessibility

A protected field is not accessible unless we are referencing it from within a
class which extends its owner. Therefore, we may use a synthetic property with
the same name as long as we do not have access to the field.

1 files changed, 16 insertions, 0 deletions

diff --git a/src/test/kotlin/com/replaymod/gradle/remap/mapper/kotlin/TestKotlinSyntheticProperties.kt b/src/test/kotlin/com/replaymod/gradle/remap/mapper/kotlin/TestKotlinSyntheticProperties.kt
index 20b65b9..65459f2 100644
--- a/src/test/kotlin/com/replaymod/gradle/remap/mapper/kotlin/TestKotlinSyntheticProperties.kt
+++ b/src/test/kotlin/com/replaymod/gradle/remap/mapper/kotlin/TestKotlinSyntheticProperties.kt
@@ -103,9 +103,15 @@ class TestKotlinSyntheticProperties {
         TestData.remapKt("""
             import a.pkg.A
             val v = A().getConflictingFieldWithoutConflict()
+            class C : A() {
+                val v = getProtectedFieldWithoutConflict()
+            }
         """.trimIndent()) shouldBe """
             import b.pkg.B
             val v = B().getConflictingField()
+            class C : B() {
+                val v = getProtectedField()
+            }
         """.trimIndent()
     }
 
@@ -114,9 +120,11 @@ class TestKotlinSyntheticProperties {
         TestData.remapKt("""
             import a.pkg.A
             val v = A().getA()
+            val v = A().getProtectedFieldWithoutConflict()
         """.trimIndent()) shouldBe """
             import b.pkg.B
             val v = B().b
+            val v = B().protectedField
         """.trimIndent()
     }
 
@@ -125,9 +133,15 @@ class TestKotlinSyntheticProperties {
         TestData.remapKt("""
             import a.pkg.A
             val v = A().conflictingFieldWithoutConflict
+            class C : A() {
+                val v = protectedFieldWithoutConflict
+            }
         """.trimIndent()) shouldBe """
             import b.pkg.B
             val v = B().getConflictingField()
+            class C : B() {
+                val v = getProtectedField()
+            }
         """.trimIndent()
     }
 
@@ -136,9 +150,11 @@ class TestKotlinSyntheticProperties {
         TestData.remapKt("""
             import a.pkg.A
             val v = A().a
+            val v = A().protectedFieldWithoutConflict
         """.trimIndent()) shouldBe """
             import b.pkg.B
             val v = B().b
+            val v = B().protectedField
         """.trimIndent()
     }