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

[FE 1.0] Resolve private constructors of sealed classes same as for regular classes

Browse Source 
^KT-44866
^KT-49729
This commit is contained in:
Dmitriy Novozhilov
2021-11-16 16:57:51 +03:00
parent e2d68fd239
commit 93378b1a04
31 changed files with 294 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaDescriptorVisibilities.java
+19 -4
View File
@@ -33,7 +33,12 @@ public class JavaDescriptorVisibilities {
@NotNull
public static final DescriptorVisibility PACKAGE_VISIBILITY = new DelegatedDescriptorVisibility(JavaVisibilities.PackageVisibility.INSTANCE) {
@Override
public boolean isVisible(@Nullable ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
public boolean isVisible(
@Nullable ReceiverValue receiver,
@NotNull DeclarationDescriptorWithVisibility what,
@NotNull DeclarationDescriptor from,
boolean useSpecialRulesForPrivateSealedConstructors
) {
return areInSamePackage(what, from);
}
};
@@ -41,7 +46,12 @@ public class JavaDescriptorVisibilities {
@NotNull
public static final DescriptorVisibility PROTECTED_STATIC_VISIBILITY = new DelegatedDescriptorVisibility(JavaVisibilities.ProtectedStaticVisibility.INSTANCE) {
@Override
public boolean isVisible(@Nullable ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
public boolean isVisible(
@Nullable ReceiverValue receiver,
@NotNull DeclarationDescriptorWithVisibility what,
@NotNull DeclarationDescriptor from,
boolean useSpecialRulesForPrivateSealedConstructors
) {
return isVisibleForProtectedAndPackage(receiver, what, from);
}
};
@@ -49,7 +59,12 @@ public class JavaDescriptorVisibilities {
@NotNull
public static final DescriptorVisibility PROTECTED_AND_PACKAGE = new DelegatedDescriptorVisibility(JavaVisibilities.ProtectedAndPackage.INSTANCE) {
@Override
public boolean isVisible(@Nullable ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
public boolean isVisible(
@Nullable ReceiverValue receiver,
@NotNull DeclarationDescriptorWithVisibility what,
@NotNull DeclarationDescriptor from,
boolean useSpecialRulesForPrivateSealedConstructors
) {
return isVisibleForProtectedAndPackage(receiver, what, from);
}
};
@@ -63,7 +78,7 @@ public class JavaDescriptorVisibilities {
return true;
}
return DescriptorVisibilities.PROTECTED.isVisible(receiver, what, from);
return DescriptorVisibilities.PROTECTED.isVisible(receiver, what, from, false);
}
private static boolean areInSamePackage(@NotNull DeclarationDescriptor first, @NotNull DeclarationDescriptor second) {