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

Source code fix: no protected in object

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-11-18 14:27:49 +03:00
parent 3d75ebb859
commit e43a45755e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
+3 -3
View File
@@ -95,10 +95,10 @@ public abstract class KotlinFindUsagesHandler<T : PsiElement>(psiElement: T,
companion object { companion object {
val LOG = Logger.getInstance(KotlinFindUsagesHandler::class.java) val LOG = Logger.getInstance(KotlinFindUsagesHandler::class.java)
protected fun processUsage(processor: Processor<UsageInfo>, ref: PsiReference): Boolean = internal fun processUsage(processor: Processor<UsageInfo>, ref: PsiReference): Boolean =
processor.processIfNotNull { if (ref.element.isValid) KotlinReferenceUsageInfo(ref) else null } processor.processIfNotNull { if (ref.element.isValid) KotlinReferenceUsageInfo(ref) else null }
protected fun processUsage(processor: Processor<UsageInfo>, element: PsiElement): Boolean = internal fun processUsage(processor: Processor<UsageInfo>, element: PsiElement): Boolean =
processor.processIfNotNull { if (element.isValid) UsageInfo(element) else null } processor.processIfNotNull { if (element.isValid) UsageInfo(element) else null }
private fun Processor<UsageInfo>.processIfNotNull(callback: () -> UsageInfo?): Boolean { private fun Processor<UsageInfo>.processIfNotNull(callback: () -> UsageInfo?): Boolean {
@@ -106,7 +106,7 @@ public abstract class KotlinFindUsagesHandler<T : PsiElement>(psiElement: T,
return if (usageInfo != null) process(usageInfo) else true return if (usageInfo != null) process(usageInfo) else true
} }
protected fun createReferenceProcessor(usageInfoProcessor: Processor<UsageInfo>): Processor<PsiReference> { internal fun createReferenceProcessor(usageInfoProcessor: Processor<UsageInfo>): Processor<PsiReference> {
val uniqueProcessor = CommonProcessors.UniqueProcessor(usageInfoProcessor) val uniqueProcessor = CommonProcessors.UniqueProcessor(usageInfoProcessor)
return Processor { KotlinFindUsagesHandler.processUsage(uniqueProcessor, it) } return Processor { KotlinFindUsagesHandler.processUsage(uniqueProcessor, it) }
idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt
+1 -1
View File
@@ -73,7 +73,7 @@ public class KotlinReferenceImporter : ReferenceImporter {
return false return false
} }
protected fun hasUnresolvedImportWhichCanImport(file: KtFile, name: String): Boolean { private fun hasUnresolvedImportWhichCanImport(file: KtFile, name: String): Boolean {
return file.importDirectives.any { return file.importDirectives.any {
it.targetDescriptors().isEmpty() && (it.isAllUnder || it.importPath?.importedName?.asString() == name) it.targetDescriptors().isEmpty() && (it.isAllUnder || it.importPath?.importedName?.asString() == name)
} }