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

add constans Visibilities.DEFAULT_VISIBILITY and JetTokens.DEFAULT_VISIBILITY_KEYWORD

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-03 11:49:22 +03:00
parent e7c9699bfa
commit b8aa5d43bd
13 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java
+2
View File
@@ -163,6 +163,8 @@ public interface JetTokens {
JetModifierKeywordToken COMPANION_KEYWORD = JetModifierKeywordToken.softKeywordModifier("companion");
JetModifierKeywordToken SEALED_KEYWORD = JetModifierKeywordToken.softKeywordModifier("sealed");
JetModifierKeywordToken DEFAULT_VISIBILITY_KEYWORD = INTERNAL_KEYWORD;
JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally");
JetModifierKeywordToken FINAL_KEYWORD = JetModifierKeywordToken.softKeywordModifier("final");
compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java
+1 -1
View File
@@ -48,7 +48,7 @@ abstract class JetDeclarationImpl extends JetExpressionImpl implements JetDeclar
@Override
public void addModifier(@NotNull JetModifierKeywordToken modifier) {
AddRemoveModifierPackage.addModifier(this, modifier, JetTokens.INTERNAL_KEYWORD);
AddRemoveModifierPackage.addModifier(this, modifier, JetTokens.DEFAULT_VISIBILITY_KEYWORD);
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class JetModifierListOwnerStub<T extends StubElement<?>> extends JetEleme
@Override
public void addModifier(@NotNull JetModifierKeywordToken modifier) {
AddRemoveModifierPackage.addModifier(this, modifier, JetTokens.INTERNAL_KEYWORD);
AddRemoveModifierPackage.addModifier(this, modifier, JetTokens.DEFAULT_VISIBILITY_KEYWORD);
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+2 -2
View File
@@ -298,13 +298,13 @@ public class DescriptorResolver {
JetModifierList modifierList = modifierListOwner.getModifierList();
defaultVisibility = modifierList != null && modifierList.hasModifier(OVERRIDE_KEYWORD)
? Visibilities.INHERITED
: Visibilities.INTERNAL;
: Visibilities.DEFAULT_VISIBILITY;
}
else if (containingDescriptor instanceof FunctionDescriptor || containingDescriptor instanceof PropertyDescriptor) {
defaultVisibility = Visibilities.LOCAL;
}
else {
defaultVisibility = Visibilities.INTERNAL;
defaultVisibility = Visibilities.DEFAULT_VISIBILITY;
}
return defaultVisibility;
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
defaultVisibility = Visibilities.PUBLIC;
}
else {
defaultVisibility = Visibilities.INTERNAL;
defaultVisibility = Visibilities.DEFAULT_VISIBILITY;
}
this.visibility = isLocal ? Visibilities.LOCAL : resolveVisibilityFromModifiers(modifierList, defaultVisibility);