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

J2K breaks code if applied to a java class with static field which is accessed from another java class

Browse Source 
#KT-11587 Fixed
This commit is contained in:
Natalia Ukhorskaya
2016-03-24 14:36:46 +03:00
parent c7ae9981cb
commit 79bac598bf
16 changed files with 97 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.java
Vendored
+1
View File
@@ -6,6 +6,7 @@ class ClassWithStatics {
public static void staticMethod(int p) {}
public static final int staticField = 1;
public static int staticNonFinalField = 1;
protected static int ourValue = 0;
j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt
Vendored
+1
View File
@@ -10,6 +10,7 @@ internal open class ClassWithStatics {
}
val staticField = 1
var staticNonFinalField = 1
var value = 0
}
j2k/testData/multiFile/ToCompanionObject/external/JavaFile.java
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class C {
void foo(ClassWithStatics c) {
ClassWithStatics.staticMethod(ClassWithStatics.staticField);
c.instanceMethod();
ClassWithStatics.staticField += 2;
ClassWithStatics.staticNonFinalField += 2;
}
void methodReferences() {
j2k/testData/multiFile/ToCompanionObject/external/JavaFile.java.expected
Vendored
+4 -4
View File
@@ -2,9 +2,9 @@ package test;
class C {
void foo(ClassWithStatics c) {
ClassWithStatics.Companion.staticMethod(ClassWithStatics.staticField);
ClassWithStatics.Companion.staticMethod(ClassWithStatics.Companion.getStaticField());
c.instanceMethod();
ClassWithStatics.staticField += 2;
ClassWithStatics.Companion.setStaticNonFinalField(ClassWithStatics.Companion.getStaticNonFinalField() + 2);
}
void methodReferences() {
@@ -15,7 +15,7 @@ class C {
class D extends ClassWithStatics {
void foo() {
Companion.staticMethod(staticField);
value *= 2;
Companion.staticMethod(Companion.getStaticField());
Companion.setValue(Companion.getValue() * 2);
}
}