From fc09534464e04b36e39f9aa8651058aeec7d60c4 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 21 Nov 2019 00:35:44 +0900 Subject: [PATCH] Debugger, minor: move step filters to the 'filter' package --- .../kotlin/idea/debugger/stepping/DebuggerSteppingHelper.java | 2 +- .../idea/debugger/stepping/KotlinSteppingCommandProvider.kt | 3 +++ .../stepping/{ => filter}/KotlinBasicStepMethodFilter.kt | 2 +- .../stepping/{ => filter}/KotlinLambdaMethodFilter.kt | 2 +- .../stepping/{ => filter}/KotlinStepOverInlineFilter.kt | 4 +++- .../stepping/{ => filter}/KotlinSuspendCallStepOverFilter.kt | 2 +- .../stepping/smartStepInto/KotlinSmartStepIntoHandler.kt | 4 ++-- .../debugger/test/KotlinDescriptorTestCaseWithStepping.kt | 2 ++ 8 files changed, 14 insertions(+), 7 deletions(-) rename idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/{ => filter}/KotlinBasicStepMethodFilter.kt (98%) rename idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/{ => filter}/KotlinLambdaMethodFilter.kt (98%) rename idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/{ => filter}/KotlinStepOverInlineFilter.kt (92%) rename idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/{ => filter}/KotlinSuspendCallStepOverFilter.kt (98%) diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/DebuggerSteppingHelper.java b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/DebuggerSteppingHelper.java index 91469eb6e73..c6e0d390bbd 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/DebuggerSteppingHelper.java +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/DebuggerSteppingHelper.java @@ -38,11 +38,11 @@ import one.util.streamex.StreamEx; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.debugger.NoStrataPositionManagerHelperKt; +import org.jetbrains.kotlin.idea.debugger.stepping.filter.KotlinSuspendCallStepOverFilter; import org.jetbrains.kotlin.psi.KtFunctionLiteral; import org.jetbrains.kotlin.psi.KtNamedFunction; import java.util.List; - public class DebuggerSteppingHelper { private static final Logger LOG = Logger.getInstance(DebuggerSteppingHelper.class); diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt index daa4942aa71..aa8fd80e08a 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt @@ -38,6 +38,9 @@ import org.jetbrains.kotlin.idea.debugger.stepping.DexBytecode.RETURN_VOID import org.jetbrains.kotlin.idea.debugger.stepping.DexBytecode.RETURN_WIDE import org.jetbrains.kotlin.idea.core.util.getLineNumber import org.jetbrains.kotlin.idea.core.util.getLineStartOffset +import org.jetbrains.kotlin.idea.debugger.stepping.filter.KotlinStepOverInlineFilter +import org.jetbrains.kotlin.idea.debugger.stepping.filter.KotlinSuspendCallStepOverFilter +import org.jetbrains.kotlin.idea.debugger.stepping.filter.StepOverFilterData import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.psi.* diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinBasicStepMethodFilter.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt similarity index 98% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinBasicStepMethodFilter.kt rename to idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt index 55560831532..c1342c48a84 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinBasicStepMethodFilter.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.debugger.stepping +package org.jetbrains.kotlin.idea.debugger.stepping.filter import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.NamedMethodFilter diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinLambdaMethodFilter.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinLambdaMethodFilter.kt similarity index 98% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinLambdaMethodFilter.kt rename to idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinLambdaMethodFilter.kt index 659ec672961..6cc65d71bcb 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinLambdaMethodFilter.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinLambdaMethodFilter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.debugger.stepping +package org.jetbrains.kotlin.idea.debugger.stepping.filter import com.intellij.debugger.SourcePosition import com.intellij.debugger.engine.BreakpointStepMethodFilter diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinStepOverInlineFilter.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinStepOverInlineFilter.kt similarity index 92% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinStepOverInlineFilter.kt rename to idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinStepOverInlineFilter.kt index 9d0678c614b..436de199623 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinStepOverInlineFilter.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinStepOverInlineFilter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.debugger.stepping +package org.jetbrains.kotlin.idea.debugger.stepping.filter import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.SuspendContextImpl @@ -23,6 +23,8 @@ import com.intellij.util.Range import com.sun.jdi.LocalVariable import com.sun.jdi.Location import org.jetbrains.kotlin.idea.debugger.ktLocationInfo +import org.jetbrains.kotlin.idea.debugger.stepping.KotlinMethodFilter +import org.jetbrains.kotlin.idea.debugger.stepping.getInlineRangeLocalVariables class StepOverFilterData( val lineNumber: Int, diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSuspendCallStepOverFilter.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinSuspendCallStepOverFilter.kt similarity index 98% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSuspendCallStepOverFilter.kt rename to idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinSuspendCallStepOverFilter.kt index 384f3ef28b1..8d9ecb344d8 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSuspendCallStepOverFilter.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinSuspendCallStepOverFilter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.debugger.stepping +package org.jetbrains.kotlin.idea.debugger.stepping.filter import com.intellij.debugger.DebuggerBundle import com.intellij.debugger.DebuggerManagerEx diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/smartStepInto/KotlinSmartStepIntoHandler.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/smartStepInto/KotlinSmartStepIntoHandler.kt index f94b996faf3..99c3eef769e 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/smartStepInto/KotlinSmartStepIntoHandler.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/smartStepInto/KotlinSmartStepIntoHandler.kt @@ -13,8 +13,8 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.util.Range import com.intellij.util.containers.OrderedSet import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils.getTopmostElementAtOffset -import org.jetbrains.kotlin.idea.debugger.stepping.KotlinBasicStepMethodFilter -import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaMethodFilter +import org.jetbrains.kotlin.idea.debugger.stepping.filter.KotlinBasicStepMethodFilter +import org.jetbrains.kotlin.idea.debugger.stepping.filter.KotlinLambdaMethodFilter import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.idea.util.application.runReadAction diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCaseWithStepping.kt b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCaseWithStepping.kt index c4c92f71a9e..b8167e88e36 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCaseWithStepping.kt +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCaseWithStepping.kt @@ -14,6 +14,8 @@ import com.intellij.debugger.impl.PositionUtil import com.intellij.execution.process.ProcessOutputTypes import com.sun.jdi.request.StepRequest import org.jetbrains.kotlin.idea.debugger.stepping.* +import org.jetbrains.kotlin.idea.debugger.stepping.filter.KotlinBasicStepMethodFilter +import org.jetbrains.kotlin.idea.debugger.stepping.filter.KotlinLambdaMethodFilter import org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto.KotlinLambdaSmartStepTarget import org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto.KotlinMethodSmartStepTarget import org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto.KotlinSmartStepIntoHandler