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

Refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2020-02-10 11:11:53 +02:00
parent 8008185b77
commit fd7331bbc0
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+7 -11
View File
@@ -170,7 +170,7 @@ class InflowSlicer(
} }
return return
} }
accessedDeclaration.processHierarchyDownwardAndPass() accessedDeclaration.passDeclarationToProcessorWithOverriders()
} }
is MergeInstruction -> createdAt.passInputsToProcessor() is MergeInstruction -> createdAt.passInputsToProcessor()
@@ -193,7 +193,7 @@ class InflowSlicer(
if (resultingDescriptor is FunctionInvokeDescriptor) { if (resultingDescriptor is FunctionInvokeDescriptor) {
(resolvedCall.dispatchReceiver as? ExpressionReceiver)?.expression?.passToProcessorAsValue(parentUsage.lambdaLevel + 1) (resolvedCall.dispatchReceiver as? ExpressionReceiver)?.expression?.passToProcessorAsValue(parentUsage.lambdaLevel + 1)
} else { } else {
resultingDescriptor.originalSource.getPsi()?.processHierarchyDownwardAndPass() resultingDescriptor.originalSource.getPsi()?.passDeclarationToProcessorWithOverriders()
} }
} }
} }
@@ -269,14 +269,10 @@ class InflowSlicer(
private fun PsiElement.passToProcessorAsValue(lambdaLevel: Int = parentUsage.lambdaLevel) = passToProcessor(lambdaLevel, true) private fun PsiElement.passToProcessorAsValue(lambdaLevel: Int = parentUsage.lambdaLevel) = passToProcessor(lambdaLevel, true)
private fun PsiElement.processHierarchyDownwardAndPass() { private fun PsiElement.passDeclarationToProcessorWithOverriders() {
processHierarchyDownward(parentUsage.scope.toSearchScope()) { passToProcessor() } passToProcessor()
} HierarchySearchRequest(this, parentUsage.scope.toSearchScope())
.searchOverriders()
private fun PsiElement.processHierarchyDownward(scope: SearchScope, processor: PsiElement.() -> Unit) { .forEach { it.namedUnwrappedElement?.passToProcessor() }
processor()
HierarchySearchRequest(this, scope).searchOverriders().forEach {
it.namedUnwrappedElement?.processor()
}
} }
} }