diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt index d031e1b7d12..555a08c53c5 100644 --- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt @@ -21,8 +21,6 @@ import org.jetbrains.kotlin.idea.debugger.coroutine.data.* import org.jetbrains.kotlin.idea.debugger.safeLineNumber import org.jetbrains.kotlin.idea.debugger.safeLocation import org.jetbrains.kotlin.idea.debugger.safeMethod -import org.jetbrains.kotlin.idea.debugger.safeSignature - class CoroutineBuilder(val suspendContext: XSuspendContext) { private val coroutineStackFrameProvider = CoroutineAsyncStackTraceProvider() @@ -172,7 +170,7 @@ class CoroutineBuilder(val suspendContext: XSuspendContext) { private fun isInvokeSuspendNegativeLineMethodFrame(frame: StackFrameProxyImpl) = frame.safeLocation()?.safeMethod()?.name() == "invokeSuspend" && - frame.safeLocation()?.safeMethod()?.safeSignature() ?: "" == "(Ljava/lang/Object;)Ljava/lang/Object;" && + frame.safeLocation()?.safeMethod()?.signature() == "(Ljava/lang/Object;)Ljava/lang/Object;" && frame.safeLocation()?.safeLineNumber() ?: 0 < 0 } diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineViewDebugSessionListener.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineViewDebugSessionListener.kt index a552bc37411..d8e81999199 100644 --- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineViewDebugSessionListener.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineViewDebugSessionListener.kt @@ -21,7 +21,6 @@ class CoroutineViewDebugSessionListener( val log by logger override fun sessionPaused() { - log.info("XListener: sessionPaused") val suspendContext = session.suspendContext ?: return requestClear() xCoroutineView.alarm.cancel() renew(suspendContext) @@ -29,34 +28,24 @@ class CoroutineViewDebugSessionListener( override fun sessionResumed() { xCoroutineView.saveState() - log.info("XListener: sessionResumed") val suspendContext = session.suspendContext ?: return requestClear() renew(suspendContext) } override fun sessionStopped() { - log.info("XListener: sessionStopped") val suspendContext = session.suspendContext ?: return requestClear() renew(suspendContext) } override fun stackFrameChanged() { xCoroutineView.saveState() - log.info("XListener: stackFrameChanged") -// val suspendContext = session.suspendContext ?: return requestClear() -// log.warn("stackFrameChanged ${session}") -// renew(suspendContext) } override fun beforeSessionResume() { - log.info("XListener: beforeSessionResume") - log.warn("beforeSessionResume ${session}") } override fun settingsChanged() { - log.info("XListener: settingsChanged") val suspendContext = session.suspendContext ?: return requestClear() - log.warn("settingsChanged ${session}") renew(suspendContext) } diff --git a/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/safeUtil.kt b/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/safeUtil.kt index 431d5f5f03c..d7c406a2392 100644 --- a/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/safeUtil.kt +++ b/idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/safeUtil.kt @@ -89,10 +89,6 @@ fun Field.safeType(): Type? { return wrapClassNotLoadedException { type() } } -fun Method.safeSignature() { - wrapIllegalArgumentExceptionException { signature() } -} - private inline fun wrapAbsentInformationException(block: () -> T): T? { return try { block() @@ -105,14 +101,6 @@ private inline fun wrapAbsentInformationException(block: () -> T): T? { } } -private inline fun wrapIllegalArgumentExceptionException(block: () -> T): T? { - return try { - block() - } catch (e: IllegalArgumentException) { - null - } -} - private inline fun wrapClassNotLoadedException(block: () -> T): T? { return try { block()