add constans Visibilities.DEFAULT_VISIBILITY and JetTokens.DEFAULT_VISIBILITY_KEYWORD

compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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);
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java

@@ -258,6 +258,8 @@ public class Visibilities {
         return null;
     }
 
+    public static final Visibility DEFAULT_VISIBILITY = INTERNAL;
+
     public static boolean isPrivate(@NotNull Visibility visibility) {
         return visibility == PRIVATE || visibility == PRIVATE_TO_THIS;
     }

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt

@@ -413,7 +413,7 @@ internal class DescriptorRendererImpl(
         if (normalizedVisibilities) {
             visibility = visibility.normalize()
         }
-        if (!showInternalKeyword && visibility == Visibilities.INTERNAL) return
+        if (!showInternalKeyword && visibility == Visibilities.DEFAULT_VISIBILITY) return
         builder.append(renderKeyword(visibility.displayName)).append(" ")
     }
 

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java

@@ -386,7 +386,7 @@ public class DescriptorUtils {
             return Visibilities.PRIVATE;
         }
         if (isAnonymousObject(classDescriptor)) {
-            return Visibilities.INTERNAL;
+            return Visibilities.DEFAULT_VISIBILITY;
         }
         assert classKind == ClassKind.CLASS || classKind == ClassKind.INTERFACE || classKind == ClassKind.ANNOTATION_CLASS;
         return Visibilities.PUBLIC;

core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java

@@ -467,7 +467,7 @@ public class OverridingUtil {
     @Nullable
     private static Visibility findMaxVisibility(@NotNull Collection<? extends CallableMemberDescriptor> descriptors) {
         if (descriptors.isEmpty()) {
-            return Visibilities.INTERNAL;
+            return Visibilities.DEFAULT_VISIBILITY;
         }
         Visibility maxVisibility = null;
         for (CallableMemberDescriptor descriptor : descriptors) {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt

@@ -72,7 +72,7 @@ private class MissingDependencyErrorClassDescriptor(
 
     init {
         val emptyConstructor = ConstructorDescriptorImpl.create(this, Annotations.EMPTY, true, SourceElement.NO_SOURCE)
-        emptyConstructor.initialize(listOf(), listOf(), Visibilities.INTERNAL)
+        emptyConstructor.initialize(listOf(), listOf(), Visibilities.DEFAULT_VISIBILITY)
         emptyConstructor.setReturnType(createErrorType("<ERROR RETURN TYPE>"))
         initialize(JetScope.Empty, setOf(emptyConstructor), emptyConstructor)
     }

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt

@@ -188,7 +188,7 @@ public open class JetChangeInfo(
     public fun getNewSignature(inheritedCallable: JetCallableDefinitionUsage<PsiElement>): String {
         val buffer = StringBuilder()
 
-        val defaultVisibility = if (kind.isConstructor) Visibilities.PUBLIC else Visibilities.INTERNAL
+        val defaultVisibility = if (kind.isConstructor) Visibilities.PUBLIC else Visibilities.DEFAULT_VISIBILITY
 
         if (kind == Kind.PRIMARY_CONSTRUCTOR) {
             buffer.append(name)

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java

@@ -97,7 +97,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
                   "",
                   null,
                   "",
-                  Visibilities.INTERNAL,
+                  Visibilities.DEFAULT_VISIBILITY,
                   Collections.<JetParameterInfo>emptyList(),
                   null,
                   method,

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt

@@ -429,7 +429,7 @@ public class JetChangeSignatureDialog(
                                  methodName,
                                  returnType,
                                  returnTypeText,
-                                 visibility ?: Visibilities.INTERNAL,
+                                 visibility ?: Visibilities.DEFAULT_VISIBILITY,
                                  parameters,
                                  parametersModel.getReceiver(),
                                  defaultValueContext)