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

Changed visibility for trait static fields

Browse Source
This commit is contained in:
Michael Bogdanov
2015-10-09 10:24:44 +03:00
parent 8198ac77cb
commit afa281357a
9 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+1 -3
View File
@@ -316,9 +316,7 @@ public class PropertyCodegen {
else if (hasPublicFieldAnnotation && !isDelegate) { else if (hasPublicFieldAnnotation && !isDelegate) {
modifiers |= ACC_PUBLIC; modifiers |= ACC_PUBLIC;
} }
else if (isInterfaceCompanionObject(propertyDescriptor.getContainingDeclaration())) { else {
modifiers |= ACC_PRIVATE;
} else {
modifiers |= getVisibilityForSpecialPropertyBackingField(propertyDescriptor, isDelegate); modifiers |= getVisibilityForSpecialPropertyBackingField(propertyDescriptor, isDelegate);
} }
compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public interface TraitClassObjectField {
static final class Companion { static final class Companion {
@org.jetbrains.annotations.Nullable @org.jetbrains.annotations.Nullable
private static final java.lang.String x = ""; public static final java.lang.String x = "";
private static final java.lang.String y = ""; private static final java.lang.String y = "";
public static final TraitClassObjectField.Companion INSTANCE; public static final TraitClassObjectField.Companion INSTANCE;
compiler/testData/writeFlags/property/classObject/trait/internalVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC, ACC_SYNTHETIC // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_SYNTHETIC
compiler/testData/writeFlags/property/classObject/trait/internalVar.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_STATIC, ACC_SYNTHETIC // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC
compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC // FLAGS: ACC_PROTECTED, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVal.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVar.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_STATIC // FLAGS: ACC_PROTECTED, ACC_STATIC
compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt
Vendored
+1 -1
View File
@@ -11,4 +11,4 @@ interface Test {
// TESTED_OBJECT_KIND: property // TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop // TESTED_OBJECTS: Test$Companion, prop
// FLAGS: ACC_PRIVATE, ACC_STATIC // FLAGS: ACC_PUBLIC, ACC_STATIC