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

Code cleanup: KotlinSafeDeleteProcessor

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-07-21 15:30:34 +03:00
parent d05a525d8d
commit 6ee94dae6f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+9 -10
View File
@@ -43,7 +43,6 @@ import org.jetbrains.kotlin.idea.refactoring.checkSuperMethods
import org.jetbrains.kotlin.idea.refactoring.formatClass import org.jetbrains.kotlin.idea.refactoring.formatClass
import org.jetbrains.kotlin.idea.refactoring.formatFunction import org.jetbrains.kotlin.idea.refactoring.formatFunction
import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.KtReference
import org.jetbrains.kotlin.idea.search.usagesSearch.buildProcessDelegationCallConstructorUsagesTask
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
@@ -68,9 +67,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
deleteSet.any { element -> JavaSafeDeleteProcessor.isInside(it, element.unwrapped) } deleteSet.any { element -> JavaSafeDeleteProcessor.isInside(it, element.unwrapped) }
} }
fun getSearchInfo(element: PsiElement): NonCodeUsageSearchInfo { fun getSearchInfo(element: PsiElement) = NonCodeUsageSearchInfo(getIgnoranceCondition(), element)
return NonCodeUsageSearchInfo(getIgnoranceCondition(), element)
}
fun findUsagesByJavaProcessor(element: PsiElement, forceReferencedElementUnwrapping: Boolean): NonCodeUsageSearchInfo? { fun findUsagesByJavaProcessor(element: PsiElement, forceReferencedElementUnwrapping: Boolean): NonCodeUsageSearchInfo? {
val javaUsages = ArrayList<UsageInfo>() val javaUsages = ArrayList<UsageInfo>()
@@ -89,7 +86,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
is SafeDeleteOverrideAnnotation -> is SafeDeleteOverrideAnnotation ->
usageInfo.smartPointer.element?.let { usageElement -> usageInfo.smartPointer.element?.let { usageElement ->
if (usageElement.toLightMethods().all { method -> method.findSuperMethods().size == 0 }) { if (usageElement.toLightMethods().all { method -> method.findSuperMethods().isEmpty() }) {
KotlinSafeDeleteOverrideAnnotation(usageElement, usageInfo.referencedElement) KotlinSafeDeleteOverrideAnnotation(usageElement, usageInfo.referencedElement)
} }
else null else null
@@ -214,11 +211,13 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
} }
} }
is PsiMethod -> is PsiMethod -> {
findUsagesByJavaProcessor(element, false) findUsagesByJavaProcessor(element, false)
}
is PsiClass -> is PsiClass -> {
findUsagesByJavaProcessor(element, false) findUsagesByJavaProcessor(element, false)
}
is KtProperty -> { is KtProperty -> {
if (element.isLocal) { if (element.isLocal) {
@@ -255,13 +254,13 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
val bindingContext = (element as KtElement).analyze() val bindingContext = (element as KtElement).analyze()
val declarationDescriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element) val declarationDescriptor =
if (declarationDescriptor !is CallableMemberDescriptor) return null bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, element] as? CallableMemberDescriptor ?: return null
return declarationDescriptor.overriddenDescriptors return declarationDescriptor.overriddenDescriptors
.asSequence() .asSequence()
.filter { overridenDescriptor -> overridenDescriptor.modality == Modality.ABSTRACT } .filter { overridenDescriptor -> overridenDescriptor.modality == Modality.ABSTRACT }
.mapTo(ArrayList<String>()) { overridenDescriptor -> .mapTo(ArrayList()) { overridenDescriptor ->
KotlinBundle.message( KotlinBundle.message(
"x.implements.y", "x.implements.y",
formatFunction(declarationDescriptor, true), formatFunction(declarationDescriptor, true),