Cleanup: get rid of effective visibility warnings

This commit is contained in:
Mikhail Glukhikh
2015-10-23 16:54:40 +03:00
committed by Mikhail Glukhikh
parent 932542891b
commit f8a70302ac
34 changed files with 60 additions and 56 deletions
@@ -80,7 +80,7 @@ public class LibraryDependenciesCache(private val project: Project) {
return Pair(libraries.toList(), sdks.toList())
}
public fun getLibraryUsageIndex(): LibraryUsageIndex {
private fun getLibraryUsageIndex(): LibraryUsageIndex {
return CachedValuesManager.getManager(project).getCachedValue(project) {
CachedValueProvider.Result(LibraryUsageIndex(), ProjectRootModificationTracker.getInstance(project))
}!!
@@ -52,7 +52,7 @@ import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
fun createSingleImportAction(project: Project,
internal fun createSingleImportAction(project: Project,
editor: Editor,
element: KtElement,
descriptors: Collection<DeclarationDescriptor>): KotlinAddImportAction {
@@ -70,7 +70,7 @@ fun createSingleImportAction(project: Project,
return KotlinAddImportAction(project, editor, element, variants)
}
fun createGroupedImportsAction(project: Project,
internal fun createGroupedImportsAction(project: Project,
editor: Editor,
element: KtElement,
autoImportDescription: String,
@@ -57,7 +57,7 @@ import java.util.*
/**
* Check possibility and perform fix for unresolved references.
*/
abstract class AutoImportFixBase<T: KtExpression>(expression: T, val diagnostics: Collection<Diagnostic>) :
internal abstract class AutoImportFixBase<T: KtExpression>(expression: T, val diagnostics: Collection<Diagnostic>) :
KotlinQuickFixAction<T>(expression), HighPriorityAction, HintAction {
protected constructor(expression: T, diagnostic: Diagnostic? = null) : this(expression, diagnostic.singletonOrEmptyList())
@@ -185,7 +185,7 @@ abstract class AutoImportFixBase<T: KtExpression>(expression: T, val diagnostics
}
}
class AutoImportFix(expression: KtSimpleNameExpression, diagnostic: Diagnostic? = null) :
internal class AutoImportFix(expression: KtSimpleNameExpression, diagnostic: Diagnostic? = null) :
AutoImportFixBase<KtSimpleNameExpression>(expression, diagnostic) {
override fun getCallTypeAndReceiver() = CallTypeAndReceiver.detect(element)
@@ -226,7 +226,7 @@ class AutoImportFix(expression: KtSimpleNameExpression, diagnostic: Diagnostic?
}
}
class MissingInvokeAutoImportFix(expression: KtExpression, diagnostic: Diagnostic) :
internal class MissingInvokeAutoImportFix(expression: KtExpression, diagnostic: Diagnostic) :
AutoImportFixBase<KtExpression>(expression, diagnostic) {
override fun getImportNames() = OperatorNameConventions.INVOKE.singletonList()
@@ -242,7 +242,7 @@ class MissingInvokeAutoImportFix(expression: KtExpression, diagnostic: Diagnosti
}
}
class MissingArrayAccessorAutoImportFix(element: KtArrayAccessExpression, diagnostic: Diagnostic) :
internal class MissingArrayAccessorAutoImportFix(element: KtArrayAccessExpression, diagnostic: Diagnostic) :
AutoImportFixBase<KtArrayAccessExpression>(element, diagnostic) {
override fun getImportNames(): Collection<Name> {
val name = if (diagnostics.first().factory == Errors.NO_GET_METHOD) {
@@ -275,7 +275,7 @@ class MissingArrayAccessorAutoImportFix(element: KtArrayAccessExpression, diagno
}
}
class MissingDelegateAccessorsAutoImportFix(element: KtExpression, diagnostics: Collection<Diagnostic>) :
internal class MissingDelegateAccessorsAutoImportFix(element: KtExpression, diagnostics: Collection<Diagnostic>) :
AutoImportFixBase<KtExpression>(element, diagnostics) {
override fun getImportNames(): Collection<Name> {
return diagnostics.map {
@@ -314,7 +314,7 @@ class MissingDelegateAccessorsAutoImportFix(element: KtExpression, diagnostics:
}
}
class MissingComponentsAutoImportFix(element: KtExpression, diagnostics: Collection<Diagnostic>) :
internal class MissingComponentsAutoImportFix(element: KtExpression, diagnostics: Collection<Diagnostic>) :
AutoImportFixBase<KtExpression>(element, diagnostics) {
override fun getImportNames() = diagnostics.map { Name.identifier(Errors.COMPONENT_FUNCTION_MISSING.cast(it).a.identifier) }
@@ -159,7 +159,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
fun computeTypeCandidates(typeInfo: TypeInfo): List<TypeCandidate> =
typeCandidates.getOrPut(typeInfo) { typeInfo.getPossibleTypes(this).map { TypeCandidate(it) } }
fun computeTypeCandidates(
private fun computeTypeCandidates(
typeInfo: TypeInfo,
substitutions: List<JetTypeSubstitution>,
scope: LexicalScope): List<TypeCandidate> {
@@ -97,7 +97,7 @@ public class MoveKotlinFileHandler : MoveFileHandler() {
return !JavaProjectRootsUtil.isOutsideJavaSourceRoot(element)
}
fun findInternalUsages(file: KtFile, newParent: PsiDirectory): InternalUsagesWrapper {
internal fun findInternalUsages(file: KtFile, newParent: PsiDirectory): InternalUsagesWrapper {
val packageNameInfo = file.getPackageNameInfo(newParent, false)
val usages = packageNameInfo?.let { file.getInternalReferencesToUpdateOnPackageNameChange(it) } ?: emptyList()
return InternalUsagesWrapper(file, usages)
@@ -23,6 +23,7 @@ import com.intellij.psi.PsiComment
import com.intellij.psi.PsiNamedElement
import com.intellij.refactoring.JavaRefactoringSettings
import com.intellij.refactoring.classMembers.AbstractMemberInfoModel
import com.intellij.refactoring.classMembers.MemberInfoModel
import com.intellij.refactoring.memberPullUp.PullUpProcessor
import com.intellij.refactoring.util.DocCommentPolicy
import org.jetbrains.kotlin.asJava.toLightClass
@@ -88,7 +89,8 @@ public class KotlinPullUpDialog(
override fun getSuperClass() = super.getSuperClass()
override fun createMemberInfoModel() = MemberInfoModelImpl()
override fun createMemberInfoModel(): MemberInfoModel<KtNamedDeclaration, KotlinMemberInfo> =
MemberInfoModelImpl()
override fun getPreselection() = mySuperClasses.firstOrNull { !it.isInterfaceClass() } ?: mySuperClasses.firstOrNull()