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

Code refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2020-04-11 13:18:15 +03:00
parent 6928700320
commit 5040d37e2f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/slicer/CallSliceProducer.kt
+5
View File
@@ -16,6 +16,11 @@ import org.jetbrains.kotlin.psi.psiUtil.isAncestor
object CallSliceProducer : SliceProducer { object CallSliceProducer : SliceProducer {
override fun produce(usage: UsageInfo, behaviour: KotlinSliceUsage.SpecialBehaviour?, parent: SliceUsage): Collection<SliceUsage>? { override fun produce(usage: UsageInfo, behaviour: KotlinSliceUsage.SpecialBehaviour?, parent: SliceUsage): Collection<SliceUsage>? {
if ((parent as? KotlinSliceUsage)?.behaviour is LambdaCallsBehaviour) {
// UsageInfo produced by LambdaCallsBehaviour has full call-element and does not require any processing
return null
}
when (val refElement = usage.element) { when (val refElement = usage.element) {
null -> { null -> {
val element = (usage.reference as? LightMemberReference)?.element ?: return emptyList() val element = (usage.reference as? LightMemberReference)?.element ?: return emptyList()
idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+2 -2
View File
@@ -190,8 +190,8 @@ class InflowSlicer(
val anonymousFunction = accessedDescriptor.containingDeclaration as? AnonymousFunctionDescriptor val anonymousFunction = accessedDescriptor.containingDeclaration as? AnonymousFunctionDescriptor
if (anonymousFunction != null && accessedDescriptor.name.asString() == "it") { if (anonymousFunction != null && accessedDescriptor.name.asString() == "it") {
val functionLiteral = anonymousFunction.source.getPsi() as KtFunctionLiteral val functionLiteral = anonymousFunction.source.getPsi() as KtFunctionLiteral
val sliceTransformer = ArgumentSliceProducer(anonymousFunction.valueParameters.first()) val parameterDescriptor = anonymousFunction.valueParameters.first()
processCalls(functionLiteral, false, sliceTransformer) processCalls(functionLiteral, false, ArgumentSliceProducer(parameterDescriptor))
} }
} else { } else {
accessedDeclaration.passDeclarationToProcessorWithOverriders() accessedDeclaration.passDeclarationToProcessorWithOverriders()
idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
+1 -6
View File
@@ -148,12 +148,7 @@ class OutflowSlicer(
} }
private fun processFunction(function: KtFunction) { private fun processFunction(function: KtFunction) {
//TODO: CallSliceProducer in all cases processCalls(function, includeOverriders = false, CallSliceProducer)
if (function is KtConstructor<*> || function is KtNamedFunction && function.name != null) {
processCalls(function, includeOverriders = false, sliceProducer = CallSliceProducer)
} else {
processCalls(function, false, SliceProducer.Trivial)
}
} }
private fun processExtensionReceiver(declaration: KtCallableDeclaration, declarationWithBody: KtDeclarationWithBody) { private fun processExtensionReceiver(declaration: KtCallableDeclaration, declarationWithBody: KtDeclarationWithBody) {