diff --git a/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerLuxActionsApi.kt b/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerLuxActionsApi.kt index c46cb5527205..379660afa9c2 100644 --- a/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerLuxActionsApi.kt +++ b/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerLuxActionsApi.kt @@ -6,8 +6,8 @@ import com.intellij.debugger.memory.filtering.ClassInstancesProvider import com.intellij.debugger.memory.ui.InstancesWindow import com.intellij.java.debugger.impl.shared.rpc.JavaDebuggerLuxActionsApi import com.intellij.openapi.application.EDT -import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.XValueId +import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.sun.jdi.ReferenceType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerSessionApi.kt b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerSessionApi.kt index f97d3988d048..d9f3ac58f360 100644 --- a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerSessionApi.kt +++ b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerSessionApi.kt @@ -4,8 +4,8 @@ package com.intellij.java.debugger.impl.shared.rpc import com.intellij.execution.filters.Filter import com.intellij.ide.ui.icons.IconId import com.intellij.openapi.util.NlsSafe -import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.platform.debugger.impl.rpc.SerializableSimpleTextAttributes +import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.xdebugger.impl.rpc.XDebugSessionId import fleet.rpc.RemoteApi import fleet.rpc.Rpc diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointApi.kt index 7d11f3b7c92e..048c7d7838c6 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointApi.kt @@ -6,7 +6,7 @@ import com.intellij.ide.rpc.FrontendDocumentId import com.intellij.ide.rpc.bindToFrontend import com.intellij.openapi.application.EDT import com.intellij.openapi.application.edtWriteAction -import com.intellij.platform.debugger.impl.rpc.XBreakpointApi +import com.intellij.platform.debugger.impl.rpc.* import com.intellij.platform.project.ProjectId import com.intellij.platform.project.findProject import com.intellij.xdebugger.XDebuggerManager @@ -16,7 +16,8 @@ import com.intellij.xdebugger.impl.breakpoints.XBreakpointManagerImpl import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy.Monolith.Companion.getEditorsProvider import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil import com.intellij.xdebugger.impl.breakpoints.XLineBreakpointImpl -import com.intellij.xdebugger.impl.rpc.* +import com.intellij.xdebugger.impl.rpc.XBreakpointId +import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import com.intellij.xdebugger.impl.rpc.models.findValue import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointTypeApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointTypeApi.kt index 5abdd0eb5329..992fe34b01c7 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointTypeApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXBreakpointTypeApi.kt @@ -17,6 +17,7 @@ import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.progress.blockingContextToIndicator import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.rpc.TimeoutSafeResult +import com.intellij.platform.debugger.impl.rpc.sourcePosition import com.intellij.platform.project.ProjectId import com.intellij.platform.project.findProject import com.intellij.platform.project.findProjectOrNull diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerEvaluatorApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerEvaluatorApi.kt index 30a4e0d7015e..bd6797ab910f 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerEvaluatorApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerEvaluatorApi.kt @@ -18,7 +18,7 @@ import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.evaluate.quick.XDebuggerDocumentOffsetEvaluator import com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -import com.intellij.xdebugger.impl.rpc.* +import com.intellij.xdebugger.impl.rpc.XStackFrameId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.models.BackendXValueModelsManager import com.intellij.xdebugger.impl.rpc.models.XStackFrameModel diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerManagerApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerManagerApi.kt index 2be998591253..d101d562a38e 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerManagerApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerManagerApi.kt @@ -5,6 +5,7 @@ import com.intellij.ide.ui.icons.rpcId import com.intellij.openapi.application.EDT import com.intellij.openapi.editor.impl.EditorId import com.intellij.openapi.editor.impl.findEditorOrNull +import com.intellij.platform.debugger.impl.rpc.toRpc import com.intellij.platform.execution.impl.backend.createProcessHandlerDto import com.intellij.platform.project.ProjectId import com.intellij.platform.project.findProject @@ -19,34 +20,15 @@ import com.intellij.xdebugger.impl.XDebuggerUtilImpl.reshowInlayRunToCursor import com.intellij.xdebugger.impl.XSteppingSuspendContext import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase import com.intellij.xdebugger.impl.frame.XDebugSessionProxy.Companion.useFeProxy -import com.intellij.xdebugger.impl.rpc.SuspendData -import com.intellij.xdebugger.impl.rpc.XBreakpointEvent -import com.intellij.xdebugger.impl.rpc.XBreakpointsSetDto -import com.intellij.xdebugger.impl.rpc.XDebugSessionDataDto -import com.intellij.xdebugger.impl.rpc.XDebugSessionDto -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XDebugSessionState -import com.intellij.xdebugger.impl.rpc.XDebugSessionsList -import com.intellij.xdebugger.impl.rpc.XDebuggerEditorsProviderDto -import com.intellij.xdebugger.impl.rpc.XDebuggerManagerApi -import com.intellij.xdebugger.impl.rpc.XDebuggerManagerSessionEvent -import com.intellij.xdebugger.impl.rpc.XDebuggerSessionEvent -import com.intellij.xdebugger.impl.rpc.XExecutionStackDto -import com.intellij.xdebugger.impl.rpc.XSmartStepIntoHandlerDto -import com.intellij.xdebugger.impl.rpc.XSuspendContextDto +import com.intellij.xdebugger.impl.rpc.* import com.intellij.xdebugger.impl.rpc.models.findValue import com.intellij.xdebugger.impl.rpc.models.getOrStoreGlobally -import com.intellij.xdebugger.impl.rpc.toRpc import com.intellij.xdebugger.impl.settings.XDebuggerSettingManagerImpl import fleet.rpc.core.toRpc import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.awaitClose -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.buffer -import kotlinx.coroutines.flow.channelFlow -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.mapLatest +import kotlinx.coroutines.flow.* internal class BackendXDebuggerManagerApi : XDebuggerManagerApi { @OptIn(ExperimentalCoroutinesApi::class) diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueMarkupApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueMarkupApi.kt index 88339e35c2c4..ab664de4d5c9 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueMarkupApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueMarkupApi.kt @@ -2,11 +2,11 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.platform.debugger.impl.rpc.XDebuggerValueMarkupApi +import com.intellij.platform.debugger.impl.rpc.XValueMarkerDto import com.intellij.ui.JBColor import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.frame.XValueMarkers import com.intellij.xdebugger.impl.rpc.XValueId -import com.intellij.xdebugger.impl.rpc.XValueMarkerDto import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.models.BackendXValueModelsManager import com.intellij.xdebugger.impl.ui.tree.ValueMarkup diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueModifierApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueModifierApi.kt index e469c529174b..4c3b36e1ba65 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueModifierApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerValueModifierApi.kt @@ -2,14 +2,10 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.openapi.util.NlsContexts -import com.intellij.platform.debugger.impl.rpc.SetValueResult -import com.intellij.platform.debugger.impl.rpc.TimeoutSafeResult -import com.intellij.platform.debugger.impl.rpc.XDebuggerValueModifierApi +import com.intellij.platform.debugger.impl.rpc.* import com.intellij.xdebugger.frame.XValueModifier -import com.intellij.xdebugger.impl.rpc.XExpressionDto import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel -import com.intellij.xdebugger.impl.rpc.xExpression import kotlinx.coroutines.CompletableDeferred internal class BackendXDebuggerValueModifierApi : XDebuggerValueModifierApi { diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDependentBreakpointManagerApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDependentBreakpointManagerApi.kt index 6387999cb393..5030710d183f 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDependentBreakpointManagerApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDependentBreakpointManagerApi.kt @@ -3,12 +3,12 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.openapi.application.EDT import com.intellij.openapi.project.Project -import com.intellij.platform.project.ProjectId -import com.intellij.platform.project.findProject import com.intellij.platform.debugger.impl.rpc.XBreakpointDependenciesDto import com.intellij.platform.debugger.impl.rpc.XBreakpointDependencyDto import com.intellij.platform.debugger.impl.rpc.XBreakpointDependencyEvent import com.intellij.platform.debugger.impl.rpc.XDependentBreakpointManagerApi +import com.intellij.platform.project.ProjectId +import com.intellij.platform.project.findProject import com.intellij.xdebugger.XDebuggerManager import com.intellij.xdebugger.breakpoints.XBreakpoint import com.intellij.xdebugger.impl.XDebuggerManagerImpl diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXExecutionStackApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXExecutionStackApi.kt index 99fc8800bdd9..07eb4345a3b6 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXExecutionStackApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXExecutionStackApi.kt @@ -4,12 +4,7 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.ide.ui.icons.rpcId import com.intellij.openapi.application.EDT import com.intellij.openapi.util.NlsContexts -import com.intellij.platform.debugger.impl.rpc.XExecutionStackApi -import com.intellij.platform.debugger.impl.rpc.XStackFramePresentation -import com.intellij.platform.debugger.impl.rpc.XStackFramePresentationFragment -import com.intellij.platform.debugger.impl.rpc.XStackFramesEvent -import com.intellij.platform.debugger.impl.rpc.XValueComputeChildrenEvent -import com.intellij.platform.debugger.impl.rpc.toRpc +import com.intellij.platform.debugger.impl.rpc.* import com.intellij.xdebugger.frame.XExecutionStack import com.intellij.xdebugger.frame.XStackFrame import com.intellij.xdebugger.impl.rpc.XDebugSessionId diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXValueApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXValueApi.kt index fddf0e3db7a0..f9845a518dd6 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXValueApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXValueApi.kt @@ -3,10 +3,7 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.ide.ui.icons.rpcId import com.intellij.openapi.util.NlsContexts -import com.intellij.platform.debugger.impl.rpc.XFullValueEvaluatorResult -import com.intellij.platform.debugger.impl.rpc.XInlineDebuggerDataDto -import com.intellij.platform.debugger.impl.rpc.XValueApi -import com.intellij.platform.debugger.impl.rpc.XValueComputeChildrenEvent +import com.intellij.platform.debugger.impl.rpc.* import com.intellij.platform.util.coroutines.childScope import com.intellij.ui.SimpleTextAttributes import com.intellij.xdebugger.Obsolescent @@ -15,7 +12,7 @@ import com.intellij.xdebugger.XSourcePosition import com.intellij.xdebugger.frame.* import com.intellij.xdebugger.frame.XFullValueEvaluator.XFullValueEvaluationCallback import com.intellij.xdebugger.impl.XDebugSessionImpl -import com.intellij.xdebugger.impl.rpc.* +import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import fleet.rpc.core.toRpc import kotlinx.coroutines.* diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointProxy.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointProxy.kt index 8e73f12100b1..62be01864946 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointProxy.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointProxy.kt @@ -10,6 +10,9 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe import com.intellij.platform.debugger.impl.frontend.FrontendBreakpointRequestCounter.Companion.REQUEST_IS_NOT_NEEDED import com.intellij.platform.debugger.impl.rpc.XBreakpointApi +import com.intellij.platform.debugger.impl.rpc.sourcePosition +import com.intellij.platform.debugger.impl.rpc.toRpc +import com.intellij.platform.debugger.impl.rpc.xExpression import com.intellij.platform.util.coroutines.childScope import com.intellij.pom.Navigatable import com.intellij.xdebugger.XExpression @@ -18,7 +21,10 @@ import com.intellij.xdebugger.breakpoints.SuspendPolicy import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider import com.intellij.xdebugger.impl.breakpoints.* import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase.calculateIcon -import com.intellij.xdebugger.impl.rpc.* +import com.intellij.xdebugger.impl.rpc.XBreakpointCustomPresentationDto +import com.intellij.xdebugger.impl.rpc.XBreakpointDto +import com.intellij.xdebugger.impl.rpc.XBreakpointDtoState +import com.intellij.xdebugger.impl.rpc.XBreakpointId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebugManagerProxy.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebugManagerProxy.kt index 4476c56fdfb4..25bf40e85640 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebugManagerProxy.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebugManagerProxy.kt @@ -20,6 +20,7 @@ private class FrontendXDebugManagerProxy : XDebugManagerProxy { return XDebugSessionProxy.useFeProxy() || (frontendType is FrontendType.Remote && frontendType.isGuest()) // CWM case } + override suspend fun withId(value: XValue, session: XDebugSessionProxy, block: suspend (XValueId) -> T): T { val valueId = (value as FrontendXValue).xValueDto.id return block(valueId) diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerEditorsProvider.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerEditorsProvider.kt index eda47f470b1f..3139c49e68e7 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerEditorsProvider.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerEditorsProvider.kt @@ -11,13 +11,13 @@ import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.fileTypes.FileTypeManager import com.intellij.openapi.fileTypes.FileTypes import com.intellij.openapi.project.Project +import com.intellij.platform.debugger.impl.rpc.XExpressionDto +import com.intellij.platform.debugger.impl.rpc.XSourcePositionDto +import com.intellij.platform.debugger.impl.rpc.toRpc import com.intellij.xdebugger.XExpression import com.intellij.xdebugger.XSourcePosition import com.intellij.xdebugger.evaluation.EvaluationMode import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider -import com.intellij.xdebugger.impl.rpc.XExpressionDto -import com.intellij.xdebugger.impl.rpc.XSourcePositionDto -import com.intellij.xdebugger.impl.rpc.toRpc internal class FrontendXDebuggerEditorsProvider( private val fileTypeId: String, diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerSession.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerSession.kt index be3ffa89e235..0a63c29de5d7 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerSession.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerSession.kt @@ -20,7 +20,10 @@ import com.intellij.platform.debugger.impl.frontend.frame.FrontendXStackFrame import com.intellij.platform.debugger.impl.frontend.frame.FrontendXSuspendContext import com.intellij.platform.debugger.impl.frontend.storage.FrontendXStackFramesStorage import com.intellij.platform.debugger.impl.frontend.storage.getOrCreateStackFrame +import com.intellij.platform.debugger.impl.rpc.XSourcePositionDto import com.intellij.platform.debugger.impl.rpc.XValueMarkerId +import com.intellij.platform.debugger.impl.rpc.consoleView +import com.intellij.platform.debugger.impl.rpc.sourcePosition import com.intellij.platform.execution.impl.frontend.createFrontendProcessHandler import com.intellij.platform.execution.impl.frontend.executionEnvironment import com.intellij.platform.util.coroutines.childScope @@ -40,19 +43,7 @@ import com.intellij.xdebugger.impl.XSourceKind import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy import com.intellij.xdebugger.impl.frame.* import com.intellij.xdebugger.impl.inline.DebuggerInlayListener -import com.intellij.xdebugger.impl.rpc.SuspendData -import com.intellij.xdebugger.impl.rpc.XDebugSessionApi -import com.intellij.xdebugger.impl.rpc.XDebugSessionDataDto -import com.intellij.xdebugger.impl.rpc.XDebugSessionDto -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XDebugSessionState -import com.intellij.xdebugger.impl.rpc.XDebuggerSessionEvent -import com.intellij.xdebugger.impl.rpc.XDebuggerSessionTabDto -import com.intellij.xdebugger.impl.rpc.XDebuggerSessionTabInfo -import com.intellij.xdebugger.impl.rpc.XDebuggerSessionTabInfoCallback -import com.intellij.xdebugger.impl.rpc.XSourcePositionDto -import com.intellij.xdebugger.impl.rpc.consoleView -import com.intellij.xdebugger.impl.rpc.sourcePosition +import com.intellij.xdebugger.impl.rpc.* import com.intellij.xdebugger.impl.ui.XDebugSessionData import com.intellij.xdebugger.impl.ui.XDebugSessionTab import com.intellij.xdebugger.ui.XDebugTabLayouter @@ -393,7 +384,7 @@ class FrontendXDebuggerSession private constructor( return false } - override fun getDropFrameHandler(): XDropFrameHandler? = dropFrameHandler + override fun getDropFrameHandler(): XDropFrameHandler = dropFrameHandler override fun getActiveNonLineBreakpoint(): XBreakpointProxy? { return activeNonLineBreakpoint.value diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDependentBreakpointManagerProxy.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDependentBreakpointManagerProxy.kt index 30ead3b84d40..f801cb3d5313 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDependentBreakpointManagerProxy.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDependentBreakpointManagerProxy.kt @@ -2,10 +2,10 @@ package com.intellij.platform.debugger.impl.frontend import com.intellij.openapi.project.Project -import com.intellij.platform.project.projectId import com.intellij.platform.debugger.impl.rpc.XBreakpointDependencyDto import com.intellij.platform.debugger.impl.rpc.XBreakpointDependencyEvent import com.intellij.platform.debugger.impl.rpc.XDependentBreakpointManagerApi +import com.intellij.platform.project.projectId import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy import com.intellij.xdebugger.impl.breakpoints.XDependentBreakpointManagerProxy import com.intellij.xdebugger.impl.rpc.XBreakpointId diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXStackFramesListColorsCache.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXStackFramesListColorsCache.kt index 323e27e8f6b2..ad995b97e0fa 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXStackFramesListColorsCache.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXStackFramesListColorsCache.kt @@ -4,11 +4,11 @@ package com.intellij.platform.debugger.impl.frontend import com.intellij.ide.ui.colors.color import com.intellij.ide.vfs.VirtualFileId import com.intellij.platform.debugger.impl.frontend.frame.FrontendXStackFrame +import com.intellij.platform.debugger.impl.rpc.SerializedColorState import com.intellij.psi.search.scope.NonProjectFilesScope import com.intellij.xdebugger.frame.XStackFrame import com.intellij.xdebugger.impl.frame.XDebuggerFramesList import com.intellij.xdebugger.impl.frame.XStackFramesListColorsCache -import com.intellij.xdebugger.impl.rpc.SerializedColorState import com.intellij.xdebugger.impl.rpc.XDebugSessionApi import kotlinx.coroutines.launch import java.awt.Color @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicInteger internal class FrontendXStackFramesListColorsCache( session: FrontendXDebuggerSession, - framesList: XDebuggerFramesList + framesList: XDebuggerFramesList, ) : XStackFramesListColorsCache(session.project) { private val cs = session.coroutineScope diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXValueMarkers.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXValueMarkers.kt index 364d2aac1dd6..a89646155956 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXValueMarkers.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXValueMarkers.kt @@ -5,11 +5,11 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.frontend.evaluate.quick.FrontendXValue +import com.intellij.platform.debugger.impl.rpc.XDebuggerValueMarkupApi +import com.intellij.platform.debugger.impl.rpc.XValueMarkerDto import com.intellij.ui.JBColor import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.impl.frame.XValueMarkers -import com.intellij.platform.debugger.impl.rpc.XDebuggerValueMarkupApi -import com.intellij.xdebugger.impl.rpc.XValueMarkerDto import com.intellij.xdebugger.impl.ui.tree.ValueMarkup import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async @@ -29,15 +29,15 @@ internal class FrontendXValueMarkers(private val project: Project return true } - override fun markValue(value: XValue, markup: ValueMarkup): Promise? { + override fun markValue(value: XValue, markup: ValueMarkup): Promise { return project.service().markValue(value, markup) } - override fun unmarkValue(value: XValue): Promise? { + override fun unmarkValue(value: XValue): Promise { return project.service().unmarkValue(value) } - override fun getAllMarkers(): Map? { + override fun getAllMarkers(): Map { // TODO[IJPL-160146]: Implement getAllMarkers return mapOf() } @@ -58,7 +58,7 @@ private class FrontendXValueMarkersService(project: Project, private val cs: Cor return valueMarked.asCompletableFuture().asPromise() } - fun unmarkValue(value: XValue): Promise? { + fun unmarkValue(value: XValue): Promise { val valueUnmarked = cs.async { XDebuggerValueMarkupApi.getInstance().unmarkValue((value as FrontendXValue).xValueDto.id) Any() diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXDebuggerEvaluator.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXDebuggerEvaluator.kt index 8b4f080b8d4c..c43b274df864 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXDebuggerEvaluator.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXDebuggerEvaluator.kt @@ -7,10 +7,7 @@ import com.intellij.openapi.diagnostic.ControlFlowException import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.editor.Document import com.intellij.openapi.project.Project -import com.intellij.platform.debugger.impl.rpc.TimeoutSafeResult -import com.intellij.platform.debugger.impl.rpc.XDebuggerEvaluatorApi -import com.intellij.platform.debugger.impl.rpc.XDebuggerEvaluatorDto -import com.intellij.platform.debugger.impl.rpc.XEvaluationResult +import com.intellij.platform.debugger.impl.rpc.* import com.intellij.xdebugger.XDebuggerBundle import com.intellij.xdebugger.XExpression import com.intellij.xdebugger.XSourcePosition @@ -19,7 +16,6 @@ import com.intellij.xdebugger.evaluation.XDebuggerEvaluator import com.intellij.xdebugger.impl.evaluate.quick.XDebuggerDocumentOffsetEvaluator import com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType import com.intellij.xdebugger.impl.rpc.XStackFrameId -import com.intellij.xdebugger.impl.rpc.toRpc import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.future.future @@ -64,8 +60,7 @@ internal open class FrontendXDebuggerEvaluator( protected fun evaluateByRpc(callback: XEvaluationCallback, evaluate: suspend () -> TimeoutSafeResult) { evaluatorScope.launch(Dispatchers.EDT) { try { - val evaluation = evaluate().await() - when (evaluation) { + when (val evaluation = evaluate().await()) { is XEvaluationResult.Evaluated -> callback.evaluated(FrontendXValue.create(project, evaluatorScope, evaluation.valueId, false)) is XEvaluationResult.EvaluationError -> callback.errorOccurred(evaluation.errorMessage) is XEvaluationResult.InvalidExpression -> callback.invalidExpression(evaluation.error) diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValue.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValue.kt index bb3cdc9eeca2..4b950c294ada 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValue.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValue.kt @@ -8,8 +8,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.thisLogger import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe -import com.intellij.platform.debugger.impl.rpc.XValueApi -import com.intellij.platform.debugger.impl.rpc.XValueDto +import com.intellij.platform.debugger.impl.rpc.* import com.intellij.platform.util.coroutines.childScope import com.intellij.util.ConcurrencyUtil import com.intellij.util.ThreeState @@ -17,7 +16,6 @@ import com.intellij.xdebugger.Obsolescent import com.intellij.xdebugger.XExpression import com.intellij.xdebugger.frame.* import com.intellij.xdebugger.frame.presentation.XValuePresentation -import com.intellij.xdebugger.impl.rpc.* import com.intellij.xdebugger.impl.ui.tree.XValueExtendedPresentation import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeEx import kotlinx.coroutines.* diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValueModifier.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValueModifier.kt index e6375420cc67..fb5f9d9b7063 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValueModifier.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXValueModifier.kt @@ -4,13 +4,13 @@ package com.intellij.platform.debugger.impl.frontend.evaluate.quick import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.project.Project -import com.intellij.xdebugger.XExpression -import com.intellij.xdebugger.frame.XValueModifier -import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl import com.intellij.platform.debugger.impl.rpc.SetValueResult import com.intellij.platform.debugger.impl.rpc.XDebuggerValueModifierApi import com.intellij.platform.debugger.impl.rpc.XValueDto -import com.intellij.xdebugger.impl.rpc.toRpc +import com.intellij.platform.debugger.impl.rpc.toRpc +import com.intellij.xdebugger.XExpression +import com.intellij.xdebugger.frame.XValueModifier +import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import java.lang.Deprecated diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXStackFrame.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXStackFrame.kt index 9654a5dd77ea..d287a6354fa6 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXStackFrame.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXStackFrame.kt @@ -17,9 +17,7 @@ import com.intellij.xdebugger.frame.XCompositeNode import com.intellij.xdebugger.frame.XStackFrame import com.intellij.xdebugger.frame.XStackFrameUiPresentationContainer import com.intellij.xdebugger.impl.frame.XDebuggerFramesList -import com.intellij.xdebugger.impl.rpc.XSourcePositionDto import com.intellij.xdebugger.impl.rpc.XStackFrameId -import com.intellij.xdebugger.impl.rpc.sourcePosition import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt index 8bf126198b90..3d5f8244d43a 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/storage/FrontendXStackFramesStorage.kt @@ -4,7 +4,6 @@ package com.intellij.platform.debugger.impl.frontend.storage import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.frontend.frame.FrontendXStackFrame import com.intellij.platform.debugger.impl.rpc.XStackFrameDto -import com.intellij.platform.debugger.impl.rpc.XStackFramePresentation import com.intellij.xdebugger.impl.rpc.XStackFrameId import fleet.multiplatform.shims.ConcurrentHashMap import kotlinx.coroutines.CoroutineScope diff --git a/platform/xdebugger-impl/rpc/BUILD.bazel b/platform/xdebugger-impl/rpc/BUILD.bazel index fab88835958c..478bc8697ade 100644 --- a/platform/xdebugger-impl/rpc/BUILD.bazel +++ b/platform/xdebugger-impl/rpc/BUILD.bazel @@ -25,6 +25,7 @@ jvm_library( "//platform/core-ui", "//platform/execution-impl", "//platform/remote-topics/shared:rpc-topics", + "//platform/core-api:core", ], runtime_deps = [":rpc_resources"] ) diff --git a/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml b/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml index 29ea7b1d84a1..743d8346f76e 100644 --- a/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml +++ b/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml @@ -45,5 +45,6 @@ + \ No newline at end of file diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointApi.kt index a84f9de3c264..720c49b84f62 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointApi.kt @@ -9,8 +9,6 @@ import com.intellij.xdebugger.breakpoints.SuspendPolicy import com.intellij.xdebugger.evaluation.EvaluationMode import com.intellij.xdebugger.impl.rpc.XBreakpointId import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId -import com.intellij.xdebugger.impl.rpc.XExpressionDto -import com.intellij.xdebugger.impl.rpc.XSourcePositionDto import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.remoteApiDescriptor diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XDebuggerConsoleViewData.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerConsoleViewData.kt similarity index 96% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XDebuggerConsoleViewData.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerConsoleViewData.kt index 732e35b40492..42da48339568 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XDebuggerConsoleViewData.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerConsoleViewData.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.xdebugger.impl.rpc +package com.intellij.platform.debugger.impl.rpc import com.intellij.execution.process.ProcessHandler import com.intellij.execution.ui.ConsoleView @@ -11,7 +11,6 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import org.jetbrains.annotations.ApiStatus -// TODO: should be moved to RPC module!! @ApiStatus.Internal @Serializable class XDebuggerConsoleViewData(@Serializable internal val remoteData: RemoteXDebuggerConsoleViewData? = null, @Transient internal val localConsole: ConsoleView? = null) diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerEvaluatorApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerEvaluatorApi.kt index c7158706f680..79909038f9fd 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerEvaluatorApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerEvaluatorApi.kt @@ -11,7 +11,8 @@ import com.intellij.xdebugger.evaluation.ExpressionInfo import com.intellij.xdebugger.frame.XDebuggerTreeNodeHyperlink import com.intellij.xdebugger.frame.XValueDescriptor import com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -import com.intellij.xdebugger.impl.rpc.* +import com.intellij.xdebugger.impl.rpc.XStackFrameId +import com.intellij.xdebugger.impl.rpc.XValueId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.core.DeferredSerializer diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerNavigationApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerNavigationApi.kt index f7831b9ec577..9e174d1b60c7 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerNavigationApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerNavigationApi.kt @@ -6,7 +6,6 @@ import com.intellij.xdebugger.impl.rpc.XValueId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.remoteApiDescriptor -import kotlinx.coroutines.Deferred import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueMarkupApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueMarkupApi.kt index 5f645aabf44c..bf8c52b53455 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueMarkupApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueMarkupApi.kt @@ -3,7 +3,6 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.xdebugger.impl.rpc.XValueId -import com.intellij.xdebugger.impl.rpc.XValueMarkerDto import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.remoteApiDescriptor diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueModifierApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueModifierApi.kt index 52bdf162e19a..f4d80fe73c15 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueModifierApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerValueModifierApi.kt @@ -3,12 +3,10 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.openapi.util.NlsContexts import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XExpressionDto import com.intellij.xdebugger.impl.rpc.XValueId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.remoteApiDescriptor -import kotlinx.coroutines.Deferred import kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XExpressionDto.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExpressionDto.kt similarity index 94% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XExpressionDto.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExpressionDto.kt index a511100ce087..c157ea4fae4d 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XExpressionDto.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExpressionDto.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.xdebugger.impl.rpc +package com.intellij.platform.debugger.impl.rpc import com.intellij.lang.Language import com.intellij.xdebugger.XExpression @@ -8,7 +8,6 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import org.jetbrains.annotations.ApiStatus -// TODO: move to RPC module!! @ApiStatus.Internal @Serializable data class XExpressionDto( diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XFileColorDto.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XFileColorDto.kt similarity index 91% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XFileColorDto.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XFileColorDto.kt index 8ee8f262bd04..4c660c17fd9b 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XFileColorDto.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XFileColorDto.kt @@ -1,12 +1,11 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.xdebugger.impl.rpc +package com.intellij.platform.debugger.impl.rpc import com.intellij.ide.ui.colors.ColorId import com.intellij.ide.vfs.VirtualFileId import kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus -// TODO: should be moved to RPC module!! @ApiStatus.Internal @Serializable data class XFileColorDto( diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XSourcePositionDto.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XSourcePositionDto.kt similarity index 96% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XSourcePositionDto.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XSourcePositionDto.kt index f66785da67d2..d13117b0f190 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XSourcePositionDto.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XSourcePositionDto.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.xdebugger.impl.rpc +package com.intellij.platform.debugger.impl.rpc import com.intellij.ide.vfs.VirtualFileId import com.intellij.ide.vfs.rpcId @@ -13,7 +13,6 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import org.jetbrains.annotations.ApiStatus -// TODO: move to RPC module!! @ApiStatus.Internal @Serializable data class XSourcePositionDto( diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XStackTraceDto.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XStackTraceDto.kt index ca5988ba11cf..5a9c9d7a31c6 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XStackTraceDto.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XStackTraceDto.kt @@ -8,7 +8,6 @@ import com.intellij.ide.ui.icons.IconId import com.intellij.openapi.util.NlsContexts import com.intellij.ui.SimpleTextAttributes import com.intellij.util.ThreeState -import com.intellij.xdebugger.impl.rpc.XSourcePositionDto import com.intellij.xdebugger.impl.rpc.XStackFrameId import kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueApi.kt index d99012b4251b..871178d2461a 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueApi.kt @@ -3,10 +3,7 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.util.ThreeState -import com.intellij.xdebugger.impl.rpc.XExpressionDto -import com.intellij.xdebugger.impl.rpc.XSourcePositionDto import com.intellij.xdebugger.impl.rpc.XValueId -import com.intellij.xdebugger.impl.rpc.XValueSerializedPresentation import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.core.RpcFlow diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueMarkerDto.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueMarkerDto.kt similarity index 85% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueMarkerDto.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueMarkerDto.kt index 19ac80330753..705e674e8949 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueMarkerDto.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueMarkerDto.kt @@ -1,11 +1,10 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.xdebugger.impl.rpc +package com.intellij.platform.debugger.impl.rpc import kotlinx.serialization.Serializable import kotlinx.serialization.Transient import java.awt.Color -// TODO: move to RPC module!! // TODO[IJPL-160146]: Implement implement Color serialization @Serializable data class XValueMarkerDto(val text: String, @Transient val color: Color? = null, val tooltipText: String?) \ No newline at end of file diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueSerializedPresentation.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueSerializedPresentation.kt similarity index 98% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueSerializedPresentation.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueSerializedPresentation.kt index 22a37631d30c..6bf7c1d81f91 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueSerializedPresentation.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueSerializedPresentation.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.xdebugger.impl.rpc +package com.intellij.platform.debugger.impl.rpc import com.intellij.ide.ui.icons.IconId import com.intellij.openapi.editor.colors.TextAttributesKey diff --git a/platform/xdebugger-impl/shared/resources/intellij.platform.debugger.impl.shared.xml b/platform/xdebugger-impl/shared/resources/intellij.platform.debugger.impl.shared.xml index 866712e33b60..39c171575cce 100644 --- a/platform/xdebugger-impl/shared/resources/intellij.platform.debugger.impl.shared.xml +++ b/platform/xdebugger-impl/shared/resources/intellij.platform.debugger.impl.shared.xml @@ -1,6 +1,7 @@ - \ No newline at end of file diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueId.kt b/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueId.kt index 979e598581e7..9a9a363a92b0 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueId.kt +++ b/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueId.kt @@ -2,6 +2,7 @@ package com.intellij.xdebugger.impl.rpc import com.intellij.platform.rpc.Id +import com.intellij.platform.rpc.UID import kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus @@ -10,4 +11,4 @@ import org.jetbrains.annotations.ApiStatus */ @ApiStatus.Internal @Serializable -data class XValueId(override val uid: com.intellij.platform.rpc.UID) : Id \ No newline at end of file +data class XValueId(override val uid: UID) : Id \ No newline at end of file diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/FrontendXLineBreakpointVariant.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/FrontendXLineBreakpointVariant.kt index c4e68003e723..8a42872b38eb 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/FrontendXLineBreakpointVariant.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/FrontendXLineBreakpointVariant.kt @@ -7,6 +7,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.openapi.util.TextRange +import com.intellij.platform.debugger.impl.rpc.toRpc import com.intellij.platform.project.projectId import com.intellij.xdebugger.XSourcePosition import com.intellij.xdebugger.impl.breakpoints.XLineBreakpointProxy diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.kt index c48a42b46388..ff2d20984147 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.kt @@ -144,6 +144,7 @@ class XDebugSessionImpl @JvmOverloads constructor( private val myIcon: Icon? = icon private val myCurrentStackFrameManager = XDebugSessionCurrentStackFrameManager() private val executionStackFlow = MutableStateFlow>(Ref.create(null)) + @get:ApiStatus.Internal val fileColorsComputer: FileColorsComputer = FileColorsComputer(project, coroutineScope) @@ -617,7 +618,7 @@ class XDebugSessionImpl @JvmOverloads constructor( override fun areBreakpointsMuted(): Boolean { return sessionData.isBreakpointsMuted } - + @ApiStatus.Internal fun getBreakpointsMutedFlow(): StateFlow { return sessionData.breakpointsMutedFlow diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerRunToCursorActionHandler.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerRunToCursorActionHandler.kt index fb5bf32f0d3c..06ec2ea95237 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerRunToCursorActionHandler.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerRunToCursorActionHandler.kt @@ -16,12 +16,12 @@ package com.intellij.xdebugger.impl.actions.handlers import com.intellij.openapi.actionSystem.DataContext +import com.intellij.platform.debugger.impl.rpc.toRpc import com.intellij.xdebugger.impl.XDebuggerUtilImpl import com.intellij.xdebugger.impl.actions.XDebuggerProxySuspendedActionHandler import com.intellij.xdebugger.impl.frame.XDebugSessionProxy import com.intellij.xdebugger.impl.performDebuggerActionAsync import com.intellij.xdebugger.impl.rpc.XDebugSessionApi -import com.intellij.xdebugger.impl.rpc.toRpc import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XMarkObjectActionHandler.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XMarkObjectActionHandler.kt index 70b7b55fc298..45a96532cb9f 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XMarkObjectActionHandler.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XMarkObjectActionHandler.kt @@ -6,11 +6,11 @@ import com.intellij.openapi.actionSystem.PlatformCoreDataKeys import com.intellij.openapi.application.EDT import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.rpc.XDebuggerValueMarkupApi +import com.intellij.platform.debugger.impl.rpc.XValueMarkerDto import com.intellij.ui.ComponentUtil import com.intellij.xdebugger.impl.actions.MarkObjectActionHandler import com.intellij.xdebugger.impl.frame.XDebugSessionProxy import com.intellij.xdebugger.impl.frame.XValueMarkers -import com.intellij.xdebugger.impl.rpc.XValueMarkerDto import com.intellij.xdebugger.impl.rpc.withId import com.intellij.xdebugger.impl.ui.DebuggerUIUtil import com.intellij.xdebugger.impl.ui.tree.ValueMarkerPresentationDialog diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointProxy.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointProxy.kt index 0761b1b99057..05a034949639 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointProxy.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointProxy.kt @@ -126,7 +126,7 @@ interface XBreakpointProxy : Comparable { breakpoint.isEnabled = enabled } - override fun getSourcePosition(): XSourcePosition? = breakpoint.getSourcePosition() + override fun getSourcePosition(): XSourcePosition? = breakpoint.sourcePosition override fun getNavigatable(): Navigatable? = breakpoint.getNavigatable() @@ -213,7 +213,7 @@ interface XBreakpointProxy : Comparable { } override fun isDisposed(): Boolean = breakpoint.isDisposed - + override fun updateIcon() { breakpoint.updateIcon() } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointItem.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointItem.java index c1a90f5e3020..bebcf683e31e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointItem.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointItem.java @@ -57,7 +57,7 @@ public abstract class BreakpointItem extends ItemWrapper implements Comparable { @Serializable data class XBreakpointsLineInfo( val availableTypes: List, - val singleBreakpointVariant: Boolean + val singleBreakpointVariant: Boolean, ) @ApiStatus.Internal diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionApi.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionApi.kt index b2217e550cf7..4071752387b2 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionApi.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionApi.kt @@ -10,6 +10,10 @@ import com.intellij.ide.ui.icons.IconId import com.intellij.ide.vfs.VirtualFileId import com.intellij.openapi.util.NlsContexts import com.intellij.openapi.util.NlsSafe +import com.intellij.platform.debugger.impl.rpc.XDebuggerConsoleViewData +import com.intellij.platform.debugger.impl.rpc.XExpressionDto +import com.intellij.platform.debugger.impl.rpc.XFileColorDto +import com.intellij.platform.debugger.impl.rpc.XSourcePositionDto import com.intellij.platform.rpc.Id import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.platform.rpc.UID diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueModel.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueModel.kt index a214997fb1b5..48c64ab3cb0b 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueModel.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueModel.kt @@ -4,6 +4,8 @@ package com.intellij.xdebugger.impl.rpc.models import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.project.Project +import com.intellij.platform.debugger.impl.rpc.XValueMarkerDto +import com.intellij.platform.debugger.impl.rpc.XValueSerializedPresentation import com.intellij.platform.kernel.ids.BackendValueIdType import com.intellij.platform.kernel.ids.deleteValueById import com.intellij.platform.kernel.ids.findValueById @@ -15,8 +17,6 @@ import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.frame.XValuePlace import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.rpc.XValueId -import com.intellij.xdebugger.impl.rpc.XValueMarkerDto -import com.intellij.xdebugger.impl.rpc.XValueSerializedPresentation import com.intellij.xdebugger.impl.ui.tree.ValueMarkup import kotlinx.collections.immutable.toImmutableSet import kotlinx.coroutines.CoroutineScope diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XValuePresentationBridge.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XValuePresentationBridge.kt index 7c3c32a18efd..0b3aa65de30b 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XValuePresentationBridge.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XValuePresentationBridge.kt @@ -6,13 +6,13 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.diagnostic.fileLogger import com.intellij.openapi.editor.colors.TextAttributesKey import com.intellij.openapi.util.NlsSafe +import com.intellij.platform.debugger.impl.rpc.XValueAdvancedPresentationPart +import com.intellij.platform.debugger.impl.rpc.XValueSerializedPresentation import com.intellij.xdebugger.frame.XFullValueEvaluator import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.frame.XValuePlace import com.intellij.xdebugger.frame.presentation.XValuePresentation import com.intellij.xdebugger.frame.presentation.XValuePresentation.XValueTextRenderer -import com.intellij.xdebugger.impl.rpc.XValueAdvancedPresentationPart -import com.intellij.xdebugger.impl.rpc.XValueSerializedPresentation import com.intellij.xdebugger.impl.ui.tree.XValueExtendedPresentation import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeEx import kotlinx.coroutines.*