From e43a45755e7f182628ce90dd90cd2fc75d20dcd3 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 18 Nov 2015 14:27:49 +0300 Subject: [PATCH] Source code fix: no protected in object --- .../idea/findUsages/handlers/KotlinFindUsagesHandler.kt | 6 +++--- .../kotlin/idea/quickfix/KotlinReferenceImporter.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt index 15ae5448a6c..ec8ede44e46 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt @@ -95,10 +95,10 @@ public abstract class KotlinFindUsagesHandler(psiElement: T, companion object { val LOG = Logger.getInstance(KotlinFindUsagesHandler::class.java) - protected fun processUsage(processor: Processor, ref: PsiReference): Boolean = + internal fun processUsage(processor: Processor, ref: PsiReference): Boolean = processor.processIfNotNull { if (ref.element.isValid) KotlinReferenceUsageInfo(ref) else null } - protected fun processUsage(processor: Processor, element: PsiElement): Boolean = + internal fun processUsage(processor: Processor, element: PsiElement): Boolean = processor.processIfNotNull { if (element.isValid) UsageInfo(element) else null } private fun Processor.processIfNotNull(callback: () -> UsageInfo?): Boolean { @@ -106,7 +106,7 @@ public abstract class KotlinFindUsagesHandler(psiElement: T, return if (usageInfo != null) process(usageInfo) else true } - protected fun createReferenceProcessor(usageInfoProcessor: Processor): Processor { + internal fun createReferenceProcessor(usageInfoProcessor: Processor): Processor { val uniqueProcessor = CommonProcessors.UniqueProcessor(usageInfoProcessor) return Processor { KotlinFindUsagesHandler.processUsage(uniqueProcessor, it) } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt index 53585fe7c94..27d5669a61c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt @@ -73,7 +73,7 @@ public class KotlinReferenceImporter : ReferenceImporter { return false } - protected fun hasUnresolvedImportWhichCanImport(file: KtFile, name: String): Boolean { + private fun hasUnresolvedImportWhichCanImport(file: KtFile, name: String): Boolean { return file.importDirectives.any { it.targetDescriptors().isEmpty() && (it.isAllUnder || it.importPath?.importedName?.asString() == name) }