From 1b5b0d2839bfc5eb16f38c46f778274c611329c1 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 10 Feb 2020 11:15:04 +0200 Subject: [PATCH] Minor refactoring --- idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt | 2 +- idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt | 2 +- idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt index 5e43f7d2c52..879abf87cbf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt @@ -86,7 +86,7 @@ class InflowSlicer( } private fun processParameter(parameter: KtParameter, includeOverriders: Boolean) { - if (!parameter.canProcess()) return + if (!canProcessParameter(parameter)) return val function = parameter.ownerFunction ?: return diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt index d7aaeea8932..29a1b7da2cb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt @@ -35,7 +35,7 @@ class OutflowSlicer( } private fun processVariable(variable: KtCallableDeclaration) { - if (variable is KtParameter && !variable.canProcess()) return + if (variable is KtParameter && !canProcessParameter(variable)) return val withDereferences = parentUsage.params.showInstanceDereferences val accessKind = if (withDereferences) AccessKind.READ_OR_WRITE else AccessKind.READ_ONLY diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt index e169c38f802..ce3651a77b6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt @@ -130,7 +130,7 @@ abstract class Slicer( } } - protected fun KtParameter.canProcess() = !isVarArg + protected fun canProcessParameter(parameter: KtParameter) = !parameter.isVarArg protected val DeclarationDescriptorWithSource.originalSource: SourceElement get() {