Debugger: Move 'smart step into' classes to the 'smartStepInto' package
This commit is contained in:
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.debugger.stepping
|
package org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto
|
||||||
|
|
||||||
import com.intellij.debugger.actions.SmartStepTarget
|
import com.intellij.debugger.actions.SmartStepTarget
|
||||||
import com.intellij.util.Range
|
import com.intellij.util.Range
|
||||||
+6
-1
@@ -1,4 +1,9 @@
|
|||||||
package org.jetbrains.kotlin.idea.debugger.stepping
|
/*
|
||||||
|
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto
|
||||||
|
|
||||||
import com.intellij.debugger.actions.SmartStepTarget
|
import com.intellij.debugger.actions.SmartStepTarget
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
-2
@@ -15,8 +15,6 @@ import com.intellij.util.containers.OrderedSet
|
|||||||
import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils.getTopmostElementAtOffset
|
import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils.getTopmostElementAtOffset
|
||||||
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinBasicStepMethodFilter
|
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinBasicStepMethodFilter
|
||||||
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaMethodFilter
|
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaMethodFilter
|
||||||
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaSmartStepTarget
|
|
||||||
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinMethodSmartStepTarget
|
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
|
import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
|
||||||
|
|
||||||
+7
-3
@@ -19,8 +19,6 @@ import org.jetbrains.kotlin.descriptors.*
|
|||||||
import org.jetbrains.kotlin.idea.caches.resolve.analyze
|
import org.jetbrains.kotlin.idea.caches.resolve.analyze
|
||||||
import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
|
import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
|
||||||
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
|
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
|
||||||
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaSmartStepTarget
|
|
||||||
import org.jetbrains.kotlin.idea.debugger.stepping.KotlinMethodSmartStepTarget
|
|
||||||
import org.jetbrains.kotlin.idea.project.platform
|
import org.jetbrains.kotlin.idea.project.platform
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
import org.jetbrains.kotlin.load.java.isFromJava
|
import org.jetbrains.kotlin.load.java.isFromJava
|
||||||
@@ -68,7 +66,13 @@ class SmartStepTargetVisitor(
|
|||||||
val label = KotlinLambdaSmartStepTarget.calcLabel(resultingDescriptor, param.name)
|
val label = KotlinLambdaSmartStepTarget.calcLabel(resultingDescriptor, param.name)
|
||||||
val isInline = InlineUtil.isInline(resultingDescriptor)
|
val isInline = InlineUtil.isInline(resultingDescriptor)
|
||||||
val isSuspend = param.type.isSuspendFunctionType
|
val isSuspend = param.type.isSuspendFunctionType
|
||||||
val target = KotlinLambdaSmartStepTarget(label, function, lines, isInline, isSuspend)
|
val target = KotlinLambdaSmartStepTarget(
|
||||||
|
label,
|
||||||
|
function,
|
||||||
|
lines,
|
||||||
|
isInline,
|
||||||
|
isSuspend
|
||||||
|
)
|
||||||
append(target)
|
append(target)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -14,6 +14,8 @@ import com.intellij.debugger.impl.PositionUtil
|
|||||||
import com.intellij.execution.process.ProcessOutputTypes
|
import com.intellij.execution.process.ProcessOutputTypes
|
||||||
import com.sun.jdi.request.StepRequest
|
import com.sun.jdi.request.StepRequest
|
||||||
import org.jetbrains.kotlin.idea.debugger.stepping.*
|
import org.jetbrains.kotlin.idea.debugger.stepping.*
|
||||||
|
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
|
import org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto.KotlinSmartStepIntoHandler
|
||||||
import org.jetbrains.kotlin.idea.debugger.test.util.SteppingInstruction
|
import org.jetbrains.kotlin.idea.debugger.test.util.SteppingInstruction
|
||||||
import org.jetbrains.kotlin.idea.debugger.test.util.SteppingInstructionKind
|
import org.jetbrains.kotlin.idea.debugger.test.util.SteppingInstructionKind
|
||||||
|
|||||||
Reference in New Issue
Block a user