azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: fix translation of callable reference to property of outer class with private setter

Browse Source
This commit is contained in:
Alexey Andreev
2017-01-24 19:35:11 +03:00
parent d35ddc1017
commit 119bf52adf
7 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt
Vendored
+31
View File
@@ -0,0 +1,31 @@
class A {
var value: String = "fail1"
private set
inner class B {
fun foo(): kotlin.reflect.KMutableProperty0<String> = this@A::value
}
}
class C {
var value: String = "fail2"
private set
fun bar(): kotlin.reflect.KMutableProperty0<String> {
class D {
fun foo(): kotlin.reflect.KMutableProperty0<String> = this@C::value
}
return D().foo()
}
}
fun box(): String {
val a = A()
a.B().foo().set("O")
val c = C()
c.bar().set("K")
return a.value + c.value
}
compiler/testData/codegen/light-analysis/callableReference/property/privateSetOuterClass.txt
Vendored
+30
View File
@@ -0,0 +1,30 @@
@kotlin.Metadata
public final class A {
private @org.jetbrains.annotations.NotNull field value: java.lang.String
inner class A/B
public method <init>(): void
public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String
private final method setValue(p0: java.lang.String): void
}
@kotlin.Metadata
public final class A/B {
synthetic final field this$0: A
inner class A/B
public method <init>(p0: A): void
public final @org.jetbrains.annotations.NotNull method foo(): kotlin.reflect.KMutableProperty0
}
@kotlin.Metadata
public final class C {
private @org.jetbrains.annotations.NotNull field value: java.lang.String
public method <init>(): void
public final @org.jetbrains.annotations.NotNull method bar(): kotlin.reflect.KMutableProperty0
public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String
private final method setValue(p0: java.lang.String): void
}
@kotlin.Metadata
public final class PrivateSetOuterClassKt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
}
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+6
View File
@@ -2176,6 +2176,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
doTest(fileName);
}
@TestMetadata("privateSetOuterClass.kt")
public void testPrivateSetOuterClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt");
doTest(fileName);
}
@TestMetadata("privateSetterInsideClass.kt")
public void testPrivateSetterInsideClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+6
View File
@@ -2176,6 +2176,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("privateSetOuterClass.kt")
public void testPrivateSetOuterClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt");
doTest(fileName);
}
@TestMetadata("privateSetterInsideClass.kt")
public void testPrivateSetterInsideClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeCodegenTestGenerated.java
+6
View File
@@ -2176,6 +2176,12 @@ public class LightAnalysisModeCodegenTestGenerated extends AbstractLightAnalysis
doTest(fileName);
}
@TestMetadata("privateSetOuterClass.kt")
public void testPrivateSetOuterClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt");
doTest(fileName);
}
@TestMetadata("privateSetterInsideClass.kt")
public void testPrivateSetterInsideClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+6
View File
@@ -2561,6 +2561,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
doTest(fileName);
}
@TestMetadata("privateSetOuterClass.kt")
public void testPrivateSetOuterClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt");
doTest(fileName);
}
@TestMetadata("privateSetterInsideClass.kt")
public void testPrivateSetterInsideClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/callableReference/property/privateSetterInsideClass.kt");
js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt
+4 -1
View File
@@ -142,7 +142,10 @@ object CallableReferenceTranslator {
val setter = descriptor.setter ?: return false
if (setter.visibility != Visibilities.PRIVATE) return true
val classDescriptor = context.classDescriptor ?: return false
return classDescriptor == descriptor.containingDeclaration
val outerClasses = generateSequence<DeclarationDescriptor>(classDescriptor) { it.containingDeclaration }
.filterIsInstance<ClassDescriptor>()
return descriptor.containingDeclaration in outerClasses
}
private fun translateForPropertyAccessor(