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

Remove useless code to determine default visibility

Browse Source
This commit is contained in:
Alexey Belkov
2018-03-09 23:14:18 +03:00
committed by Nikolay Krasko
parent daf6036bc0
commit f3bb952148
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+1 -8
View File
@@ -146,14 +146,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
} }
boolean isLocal = classOrObject != null && KtPsiUtil.isLocal(classOrObject); boolean isLocal = classOrObject != null && KtPsiUtil.isLocal(classOrObject);
Visibility defaultVisibility; this.visibility = isLocal ? Visibilities.LOCAL : resolveVisibilityFromModifiers(modifierList, Visibilities.DEFAULT_VISIBILITY);
if (kind == ClassKind.ENUM_ENTRY || (kind == ClassKind.OBJECT && isCompanionObject)) {
defaultVisibility = Visibilities.PUBLIC;
}
else {
defaultVisibility = Visibilities.DEFAULT_VISIBILITY;
}
this.visibility = isLocal ? Visibilities.LOCAL : resolveVisibilityFromModifiers(modifierList, defaultVisibility);
this.isInner = modifierList != null && modifierList.hasModifier(INNER_KEYWORD) && !isIllegalInner(this); this.isInner = modifierList != null && modifierList.hasModifier(INNER_KEYWORD) && !isIllegalInner(this);
this.isData = modifierList != null && modifierList.hasModifier(KtTokens.DATA_KEYWORD); this.isData = modifierList != null && modifierList.hasModifier(KtTokens.DATA_KEYWORD);
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt
+3 -4
View File
@@ -236,18 +236,17 @@ open class KotlinChangeInfo(
fun getNewSignature(inheritedCallable: KotlinCallableDefinitionUsage<PsiElement>): String { fun getNewSignature(inheritedCallable: KotlinCallableDefinitionUsage<PsiElement>): String {
val buffer = StringBuilder() val buffer = StringBuilder()
val isCustomizedVisibility = newVisibility != Visibilities.DEFAULT_VISIBILITY
val defaultVisibility = if (kind.isConstructor) Visibilities.PUBLIC else Visibilities.DEFAULT_VISIBILITY
if (kind == Kind.PRIMARY_CONSTRUCTOR) { if (kind == Kind.PRIMARY_CONSTRUCTOR) {
buffer.append(name) buffer.append(name)
if (newVisibility != defaultVisibility) { if (isCustomizedVisibility) {
buffer.append(' ').append(newVisibility).append(" constructor ") buffer.append(' ').append(newVisibility).append(" constructor ")
} }
} }
else { else {
if (!DescriptorUtils.isLocal(inheritedCallable.originalCallableDescriptor) && newVisibility != defaultVisibility) { if (!DescriptorUtils.isLocal(inheritedCallable.originalCallableDescriptor) && isCustomizedVisibility) {
buffer.append(newVisibility).append(' ') buffer.append(newVisibility).append(' ')
} }