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

Get rid of Visibility.effectiveVisibility member

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-01 11:23:51 +03:00
parent 7d9b7df3b4
commit 2bcd8ee07f
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.kt
+1 -1
View File
@@ -133,7 +133,7 @@ private fun IncrementalResultsConsumer.reportInlineFunction(
val psiFile = (descriptor.source.containingFile as? PsiSourceFile)?.psiFile ?: return
val file = VfsUtilCore.virtualToIoFile(psiFile.virtualFile)
if (effectiveVisibility(descriptor.visibility, descriptor, true).privateApi) return
if (descriptor.visibility.effectiveVisibility(descriptor, true).privateApi) return
val fqName = when (descriptor) {
is PropertyGetterDescriptor -> {
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java
+2 -1
View File
@@ -447,7 +447,8 @@ public final class TranslationUtils {
}
DeclarationDescriptor container = descriptor.getContainingDeclaration();
boolean isPublic = descriptor.getVisibility().effectiveVisibility(descriptor, true).getPublicApi() && !forcePrivate;
EffectiveVisibility effectiveVisibility = EffectiveVisibilityUtilsKt.effectiveVisibility(descriptor.getVisibility(), descriptor, true);
boolean isPublic = effectiveVisibility.getPublicApi() && !forcePrivate;
if (KotlinBuiltIns.isCharOrNullableChar(returnType) && container instanceof ClassDescriptor && isPublic) {
ClassDescriptor containingClass = (ClassDescriptor) container;
FqNameUnsafe containingClassName = DescriptorUtilsKt.getFqNameUnsafe(containingClass);