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 86e35ed101ae..e387fd36bc3b 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 @@ -11,9 +11,9 @@ 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.platform.debugger.impl.rpc.XValueId import com.intellij.platform.project.ProjectId import com.intellij.platform.project.findProject -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.sun.jdi.ReferenceType import kotlinx.coroutines.Dispatchers diff --git a/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerManagerApi.kt b/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerManagerApi.kt index 3435a9ee9aaf..fd1e52e85b33 100644 --- a/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerManagerApi.kt +++ b/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerManagerApi.kt @@ -8,7 +8,7 @@ import com.intellij.debugger.impl.DebuggerSession import com.intellij.java.debugger.impl.shared.rpc.JavaDebuggerManagerApi import com.intellij.java.debugger.impl.shared.rpc.JavaDebuggerSessionDto import com.intellij.java.debugger.impl.shared.rpc.JavaSessionState -import com.intellij.xdebugger.impl.rpc.XDebugSessionId +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.xdebugger.impl.rpc.models.findValue import fleet.rpc.core.toRpc import kotlinx.coroutines.flow.map diff --git a/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerSessionApi.kt b/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerSessionApi.kt index 69258cedc075..d69dd114b20b 100644 --- a/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerSessionApi.kt +++ b/java/debugger/backend/src/com/intellij/java/debugger/impl/backend/BackendJavaDebuggerSessionApi.kt @@ -9,12 +9,12 @@ import com.intellij.ide.ui.icons.rpcId import com.intellij.java.debugger.impl.shared.engine.NodeRendererId import com.intellij.java.debugger.impl.shared.rpc.* import com.intellij.openapi.application.EDT +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId +import com.intellij.platform.debugger.impl.rpc.XExecutionStackId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.platform.debugger.impl.rpc.toRpc import com.intellij.unscramble.CompoundDumpItem import com.intellij.unscramble.DumpItem -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XExecutionStackId -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.models.findValue import fleet.util.channels.use diff --git a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/SharedJavaDebuggerManager.kt b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/SharedJavaDebuggerManager.kt index 80626a1c1716..3c33b2ef0ee7 100644 --- a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/SharedJavaDebuggerManager.kt +++ b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/SharedJavaDebuggerManager.kt @@ -5,11 +5,11 @@ import com.intellij.java.debugger.impl.shared.rpc.JavaDebuggerManagerApi 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.XDebugSessionId import com.intellij.platform.util.coroutines.childScope import com.intellij.xdebugger.impl.XDebuggerManagerProxyListener import com.intellij.xdebugger.impl.frame.XDebugManagerProxy import com.intellij.xdebugger.impl.frame.XDebugSessionProxy -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest diff --git a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewAsGroup.kt b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewAsGroup.kt index 2bdf43f4cf0a..12918bda993c 100644 --- a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewAsGroup.kt +++ b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewAsGroup.kt @@ -10,12 +10,12 @@ import com.intellij.openapi.actionSystem.* import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecification import com.intellij.openapi.project.DumbAware import com.intellij.openapi.project.Project +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.platform.debugger.impl.shared.FrontendDescriptorStateManager import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.frame.XValuePlace import com.intellij.xdebugger.impl.frame.XDebugManagerProxy import com.intellij.xdebugger.impl.frame.XDebugSessionProxy -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.ui.DebuggerUIUtil import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl diff --git a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerLuxActionsApi.kt b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerLuxActionsApi.kt index ecc501b14d45..9701bc36826b 100644 --- a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerLuxActionsApi.kt +++ b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerLuxActionsApi.kt @@ -1,9 +1,9 @@ // 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.java.debugger.impl.shared.rpc +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.platform.project.ProjectId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XValueId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.remoteApiDescriptor diff --git a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerManagerApi.kt b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerManagerApi.kt index 153c8af778c6..258ef58d9f00 100644 --- a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerManagerApi.kt +++ b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/rpc/JavaDebuggerManagerApi.kt @@ -1,8 +1,8 @@ // 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.java.debugger.impl.shared.rpc +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.core.RpcFlow 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 008591e8fec7..0c31a65cc01e 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 @@ -6,10 +6,10 @@ import com.intellij.ide.ui.icons.IconId import com.intellij.java.debugger.impl.shared.engine.NodeRendererId import com.intellij.openapi.util.NlsSafe import com.intellij.platform.debugger.impl.rpc.SerializableSimpleTextAttributes +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId +import com.intellij.platform.debugger.impl.rpc.XExecutionStackId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XExecutionStackId -import com.intellij.xdebugger.impl.rpc.XValueId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.core.ReceiveChannelSerializer 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 b7d9828094ad..071835b1c8a6 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 @@ -16,8 +16,6 @@ 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.XBreakpointId -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import com.intellij.xdebugger.impl.rpc.models.findValue internal class BackendXBreakpointApi : XBreakpointApi { 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 04a0ac032908..3e5ed4f32544 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 @@ -14,7 +14,6 @@ import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.editor.Document import com.intellij.openapi.extensions.ExtensionPointAdapter -import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.progress.blockingContextToIndicator import com.intellij.openapi.project.Project @@ -34,8 +33,6 @@ import com.intellij.xdebugger.breakpoints.XBreakpointType import com.intellij.xdebugger.breakpoints.XLineBreakpointType import com.intellij.xdebugger.impl.XDebuggerUtilImpl import com.intellij.xdebugger.impl.breakpoints.* -import com.intellij.xdebugger.impl.rpc.XBreakpointId -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import com.intellij.xdebugger.impl.rpc.models.findValue import com.intellij.xdebugger.impl.rpc.sourcePosition import fleet.rpc.core.toRpc diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebugSessionTabApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebugSessionTabApi.kt index ab380dc39a0c..069c3d4d4333 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebugSessionTabApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebugSessionTabApi.kt @@ -2,6 +2,8 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.openapi.application.EDT +import com.intellij.platform.debugger.impl.rpc.XDebugSessionDataId +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.debugger.impl.rpc.XDebuggerSessionAdditionalTabEvent import com.intellij.xdebugger.impl.findValue import com.intellij.xdebugger.impl.rpc.* 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 0a5edc8b0eb4..1eaad9936fbf 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 @@ -17,7 +17,6 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.evaluate.XEvaluationOrigin 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.models.* import com.intellij.xdebugger.impl.rpc.sourcePosition import com.intellij.xdebugger.impl.ui.tree.nodes.XEvaluationCallbackWithOrigin 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 53ebf0d3eaa7..a25cc16ee598 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 @@ -20,7 +20,6 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.XDebuggerManagerImpl import com.intellij.xdebugger.impl.XDebuggerUtilImpl.reshowInlayRunToCursor import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import com.intellij.xdebugger.impl.rpc.models.findValue import com.intellij.xdebugger.impl.rpc.toRpc import com.intellij.xdebugger.impl.settings.XDebuggerSettingManagerImpl diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerNavigationApi.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerNavigationApi.kt index 87060c656877..b8e785a989d7 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerNavigationApi.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/BackendXDebuggerNavigationApi.kt @@ -4,10 +4,10 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.openapi.application.EDT import com.intellij.platform.debugger.impl.rpc.TimeoutSafeResult import com.intellij.platform.debugger.impl.rpc.XDebuggerNavigationApi +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.XSourcePosition import com.intellij.xdebugger.frame.XNavigatable import com.intellij.xdebugger.frame.XValue -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers 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 0a9c3f2e4bd5..e103952485f6 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,13 +2,13 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.ide.ui.colors.color +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.debugger.impl.rpc.XDebuggerValueMarkupApi +import com.intellij.platform.debugger.impl.rpc.XValueId 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.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.models.BackendXValueModelsManager import com.intellij.xdebugger.impl.rpc.models.findValue 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 4c3b36e1ba65..6e7622f50978 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 @@ -4,7 +4,6 @@ package com.intellij.platform.debugger.impl.backend import com.intellij.openapi.util.NlsContexts import com.intellij.platform.debugger.impl.rpc.* import com.intellij.xdebugger.frame.XValueModifier -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import kotlinx.coroutines.CompletableDeferred 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 5030710d183f..45d74168fd25 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 @@ -6,6 +6,7 @@ import com.intellij.openapi.project.Project 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.XBreakpointId import com.intellij.platform.debugger.impl.rpc.XDependentBreakpointManagerApi import com.intellij.platform.project.ProjectId import com.intellij.platform.project.findProject @@ -15,7 +16,6 @@ import com.intellij.xdebugger.impl.XDebuggerManagerImpl import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase import com.intellij.xdebugger.impl.breakpoints.XDependentBreakpointListener import com.intellij.xdebugger.impl.breakpoints.XDependentBreakpointManager -import com.intellij.xdebugger.impl.rpc.XBreakpointId import com.intellij.xdebugger.impl.rpc.models.findValue import fleet.rpc.core.toRpc import kotlinx.coroutines.Dispatchers 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 16a056af4c3c..4a3d4eae6e6c 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 @@ -7,9 +7,6 @@ import com.intellij.openapi.util.NlsContexts 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 -import com.intellij.xdebugger.impl.rpc.XExecutionStackId -import com.intellij.xdebugger.impl.rpc.XStackFrameId import com.intellij.xdebugger.impl.rpc.models.findValue import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel 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 b5403261d7ac..b91a66587d18 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 @@ -13,8 +13,6 @@ 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.XValueGroupId -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.models.findValue import com.intellij.xdebugger.impl.rpc.models.getOrStoreGlobally diff --git a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/XBreakpointDtoUtils.kt b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/XBreakpointDtoUtils.kt index 982816be1d06..9641fbdb4f4a 100644 --- a/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/XBreakpointDtoUtils.kt +++ b/platform/xdebugger-impl/backend/src/com/intellij/platform/debugger/impl/backend/XBreakpointDtoUtils.kt @@ -11,7 +11,6 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.XDebuggerManagerImpl import com.intellij.xdebugger.impl.breakpoints.* import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy.Monolith.Companion.getEditorsProvider -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import com.intellij.xdebugger.impl.rpc.toRpc import fleet.rpc.core.toRpc import kotlinx.coroutines.Dispatchers diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointManager.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointManager.kt index cfe09ecc7933..dfcedb039591 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointManager.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointManager.kt @@ -19,7 +19,6 @@ import com.intellij.xdebugger.SplitDebuggerMode import com.intellij.xdebugger.impl.XLineBreakpointInstallationInfo import com.intellij.xdebugger.impl.breakpoints.* import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem -import com.intellij.xdebugger.impl.rpc.XBreakpointId import fleet.rpc.client.RpcClientException import kotlinx.coroutines.* import kotlinx.coroutines.channels.BufferOverflow 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 b41ed4ad95d7..3907da47866c 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 @@ -18,7 +18,6 @@ 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.XBreakpointId import com.intellij.xdebugger.impl.rpc.sourcePosition import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt index 121be327f3ce..f6c9eadd5012 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXBreakpointTypesManager.kt @@ -6,10 +6,10 @@ import com.intellij.openapi.components.service import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.rpc.XBreakpointTypeApi import com.intellij.platform.debugger.impl.rpc.XBreakpointTypeDto +import com.intellij.platform.debugger.impl.rpc.XBreakpointTypeId import com.intellij.platform.project.projectId import com.intellij.xdebugger.impl.breakpoints.XBreakpointTypeProxy import com.intellij.xdebugger.impl.breakpoints.XLineBreakpointTypeProxy -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import fleet.multiplatform.shims.ConcurrentHashMap import fleet.rpc.client.durable import kotlinx.coroutines.CompletableDeferred 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 0b9f8bbc6ad4..93df0274792f 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 @@ -6,6 +6,8 @@ import com.intellij.frontend.FrontendType import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.frontend.evaluate.quick.FrontendXValue import com.intellij.platform.debugger.impl.frontend.frame.FrontendXExecutionStack +import com.intellij.platform.debugger.impl.rpc.XExecutionStackId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.SplitDebuggerMode import com.intellij.xdebugger.frame.XExecutionStack import com.intellij.xdebugger.frame.XValue @@ -13,8 +15,6 @@ import com.intellij.xdebugger.impl.XDebuggerExecutionPointManager import com.intellij.xdebugger.impl.breakpoints.XBreakpointManagerProxy import com.intellij.xdebugger.impl.frame.XDebugManagerProxy import com.intellij.xdebugger.impl.frame.XDebugSessionProxy -import com.intellij.xdebugger.impl.rpc.XExecutionStackId -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.util.XDebugMonolithUtils import com.intellij.xdebugger.impl.withTemporaryXValueId import kotlinx.coroutines.flow.Flow diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerManager.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerManager.kt index bea9da0d9ee2..54d5d35024a9 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerManager.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/FrontendXDebuggerManager.kt @@ -22,7 +22,6 @@ import com.intellij.util.asDisposable import com.intellij.xdebugger.SplitDebuggerMode import com.intellij.xdebugger.impl.XDebuggerManagerProxyListener import com.intellij.xdebugger.impl.frame.XDebugSessionProxy -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import fleet.rpc.client.durable import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers 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 10fa9bb8b0f3..78c9a83ae0e8 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 @@ -4,11 +4,11 @@ package com.intellij.platform.debugger.impl.frontend import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.rpc.XBreakpointDependencyDto import com.intellij.platform.debugger.impl.rpc.XBreakpointDependencyEvent +import com.intellij.platform.debugger.impl.rpc.XBreakpointId 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 import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.launch 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 5fbef6835200..e8da068dbb81 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 @@ -15,7 +15,6 @@ import com.intellij.xdebugger.evaluation.ExpressionInfo 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 com.intellij.xdebugger.impl.ui.tree.nodes.XEvaluationCallbackWithOrigin import kotlinx.coroutines.CoroutineScope diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXFullValueEvaluator.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXFullValueEvaluator.kt index be9e0061d32a..f594e636061e 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXFullValueEvaluator.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/evaluate/quick/FrontendXFullValueEvaluator.kt @@ -6,8 +6,8 @@ import com.intellij.openapi.application.EDT import com.intellij.platform.debugger.impl.rpc.XFullValueEvaluatorDto import com.intellij.platform.debugger.impl.rpc.XFullValueEvaluatorResult import com.intellij.platform.debugger.impl.rpc.XValueApi +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.frame.XFullValueEvaluator -import com.intellij.xdebugger.impl.rpc.XValueId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendDropFrameHandler.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendDropFrameHandler.kt index 8072907cd9bf..dcf854678889 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendDropFrameHandler.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendDropFrameHandler.kt @@ -1,11 +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.platform.debugger.impl.frontend.frame +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.debugger.impl.rpc.XExecutionStackApi import com.intellij.util.ThreeState import com.intellij.xdebugger.frame.XDropFrameHandler import com.intellij.xdebugger.frame.XStackFrame -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXExecutionStack.kt b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXExecutionStack.kt index 74d9c6189eef..1889690694de 100644 --- a/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXExecutionStack.kt +++ b/platform/xdebugger-impl/frontend/src/com/intellij/platform/debugger/impl/frontend/frame/FrontendXExecutionStack.kt @@ -6,11 +6,11 @@ import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.frontend.storage.getOrCreateStackFrame import com.intellij.platform.debugger.impl.rpc.XExecutionStackApi import com.intellij.platform.debugger.impl.rpc.XExecutionStackDto +import com.intellij.platform.debugger.impl.rpc.XExecutionStackId import com.intellij.platform.debugger.impl.rpc.XStackFramesEvent import com.intellij.xdebugger.frame.XDescriptor import com.intellij.xdebugger.frame.XExecutionStack import com.intellij.xdebugger.frame.XStackFrame -import com.intellij.xdebugger.impl.rpc.XExecutionStackId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.future.asCompletableFuture import kotlinx.coroutines.launch 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 e10816ae30f4..023347bea0b1 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,7 +17,6 @@ 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.XStackFrameId import com.intellij.xdebugger.impl.rpc.sourcePosition import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose 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 37565b39e097..134c1cf27585 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,7 @@ 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.xdebugger.impl.rpc.XStackFrameId +import com.intellij.platform.debugger.impl.rpc.XStackFrameId import fleet.multiplatform.shims.ConcurrentHashMap import kotlinx.coroutines.CoroutineScope import kotlin.coroutines.AbstractCoroutineContextElement diff --git a/platform/xdebugger-impl/rpc/BUILD.bazel b/platform/xdebugger-impl/rpc/BUILD.bazel index ab71dc11ef07..a0d5910796da 100644 --- a/platform/xdebugger-impl/rpc/BUILD.bazel +++ b/platform/xdebugger-impl/rpc/BUILD.bazel @@ -19,7 +19,6 @@ jvm_library( "//platform/xdebugger-api:debugger", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", - "//platform/xdebugger-impl/shared", "//platform/project/shared:project", "//platform/platform-impl:ide-impl", "//platform/platform-impl/rpc", diff --git a/platform/xdebugger-impl/rpc/api-dump.txt b/platform/xdebugger-impl/rpc/api-dump.txt index e69de29bb2d1..77f39be1f86b 100644 --- a/platform/xdebugger-impl/rpc/api-dump.txt +++ b/platform/xdebugger-impl/rpc/api-dump.txt @@ -0,0 +1,11 @@ +e:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType +- java.lang.Enum +- sf:Companion:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType$Companion +- sf:MOUSE_ALT_OVER_HINT:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType +- sf:MOUSE_CLICK_HINT:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType +- sf:MOUSE_OVER_HINT:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType +- s:getEntries():kotlin.enums.EnumEntries +- s:valueOf(java.lang.String):com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType +- s:values():com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType[] +f:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType$Companion +- f:serializer():kotlinx.serialization.KSerializer 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 87054f94bb52..9ab06ccac436 100644 --- a/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml +++ b/platform/xdebugger-impl/rpc/intellij.platform.debugger.impl.rpc.iml @@ -38,7 +38,6 @@ - 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 474322d94010..04de7034415c 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 @@ -10,8 +10,6 @@ import com.intellij.platform.project.ProjectId import com.intellij.platform.rpc.RemoteApiProviderService 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 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/XBreakpointDto.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointDto.kt index 6845d384e5d0..847e08db4616 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointDto.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointDto.kt @@ -1,13 +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.platform.debugger.impl.rpc -import com.intellij.ide.ui.icons.IconId import com.intellij.ide.rpc.util.TextRangeId +import com.intellij.ide.ui.icons.IconId import com.intellij.ide.vfs.VirtualFileId import com.intellij.openapi.util.NlsSafe import com.intellij.xdebugger.breakpoints.SuspendPolicy -import com.intellij.xdebugger.impl.rpc.XBreakpointId -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import fleet.rpc.core.RpcFlow import kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XBreakpointId.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointId.kt similarity index 88% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XBreakpointId.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointId.kt index 7054b2af9ba4..382878c0c575 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XBreakpointId.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointId.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.platform.rpc.Id import com.intellij.platform.rpc.UID diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointTypeApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointTypeApi.kt index 3e1283f6b44e..a188fce47454 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointTypeApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointTypeApi.kt @@ -11,8 +11,6 @@ import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.platform.rpc.UID import com.intellij.xdebugger.breakpoints.SuspendPolicy import com.intellij.xdebugger.breakpoints.XBreakpointType -import com.intellij.xdebugger.impl.rpc.XBreakpointId -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId 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/XBreakpointTypeId.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointTypeId.kt similarity index 85% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XBreakpointTypeId.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointTypeId.kt index 6c8cdefccc88..b169c851bbee 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XBreakpointTypeId.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XBreakpointTypeId.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 kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebugSessionApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebugSessionApi.kt index d1ab9ca212e6..1d350b4c7e3b 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebugSessionApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebugSessionApi.kt @@ -15,7 +15,6 @@ import com.intellij.platform.rpc.UID import com.intellij.xdebugger.evaluation.EvaluationMode import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider import com.intellij.xdebugger.frame.XDescriptor -import com.intellij.xdebugger.impl.rpc.* import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.core.DeferredSerializer diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XDebugSessionId.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebugSessionId.kt similarity index 92% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XDebugSessionId.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebugSessionId.kt index 3b1bdb2b38fa..73f6a781b730 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XDebugSessionId.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebugSessionId.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.platform.rpc.Id import com.intellij.platform.rpc.UID 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 a6fbdeeed9aa..c8163d93306e 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 @@ -8,14 +8,11 @@ import com.intellij.openapi.util.NlsSafe import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.ui.SimpleTextAttributes import com.intellij.xdebugger.evaluation.ExpressionInfo -import com.intellij.xdebugger.impl.evaluate.XEvaluationOrigin import com.intellij.xdebugger.frame.XDebuggerTreeNodeHyperlink import com.intellij.xdebugger.frame.XDescriptor import com.intellij.xdebugger.frame.XPinToTopData +import com.intellij.xdebugger.impl.evaluate.XEvaluationOrigin import com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -import com.intellij.xdebugger.impl.rpc.XStackFrameId -import com.intellij.xdebugger.impl.rpc.XValueGroupId -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/XDebuggerManagerApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerManagerApi.kt index dd18c4b6b36d..d4947b40af82 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerManagerApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerManagerApi.kt @@ -4,8 +4,6 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.openapi.editor.impl.EditorId import com.intellij.platform.project.ProjectId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XBreakpointId -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.core.RpcFlow 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 9e174d1b60c7..248787831477 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 @@ -2,7 +2,6 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XValueId 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/XDebuggerTreeSelectedValueId.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerTreeSelectedValueId.kt index fae63a0298c3..df7dd9f187b7 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerTreeSelectedValueId.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDebuggerTreeSelectedValueId.kt @@ -1,7 +1,6 @@ // 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.platform.debugger.impl.rpc -import com.intellij.xdebugger.impl.rpc.XValueId import kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus 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 b1bc2a955ef2..e887061e3bcc 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 @@ -2,8 +2,6 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XValueId 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 f4d80fe73c15..836b696ee908 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,7 +3,6 @@ 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.XValueId 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/XDependentBreakpointManagerApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDependentBreakpointManagerApi.kt index 537a0a7de041..805599531f77 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDependentBreakpointManagerApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XDependentBreakpointManagerApi.kt @@ -3,7 +3,6 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.platform.project.ProjectId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XBreakpointId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.core.RpcFlow diff --git a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExecutionStackApi.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExecutionStackApi.kt index 0f7837a2e918..f8ae3b3bdb0d 100644 --- a/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExecutionStackApi.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExecutionStackApi.kt @@ -2,9 +2,6 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XExecutionStackId -import com.intellij.xdebugger.impl.rpc.XStackFrameId 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/XExecutionStackId.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExecutionStackId.kt similarity index 90% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XExecutionStackId.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExecutionStackId.kt index 64e467ddbc1a..650d9c9abd09 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XExecutionStackId.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XExecutionStackId.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.platform.rpc.Id import com.intellij.platform.rpc.UID diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XStackFrameId.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XStackFrameId.kt similarity index 91% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XStackFrameId.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XStackFrameId.kt index 3d3fbf179c7e..1ec525cb3381 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XStackFrameId.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XStackFrameId.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.platform.rpc.Id import com.intellij.platform.rpc.UID 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 5a9c9d7a31c6..5ff89461596a 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.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 74a40ad3b79d..d202e1fd0f1d 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,8 +3,6 @@ package com.intellij.platform.debugger.impl.rpc import com.intellij.platform.rpc.RemoteApiProviderService import com.intellij.util.ThreeState -import com.intellij.xdebugger.impl.rpc.XValueGroupId -import com.intellij.xdebugger.impl.rpc.XValueId 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/XValueId.kt b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueId.kt similarity index 92% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueId.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueId.kt index eb65ae9d1f91..40069f7602f7 100644 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/XValueId.kt +++ b/platform/xdebugger-impl/rpc/src/com/intellij/platform/debugger/impl/rpc/XValueId.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.platform.rpc.Id import com.intellij.platform.rpc.UID diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/evaluate/XEvaluationOrigin.kt b/platform/xdebugger-impl/rpc/src/com/intellij/xdebugger/impl/evaluate/XEvaluationOrigin.kt similarity index 100% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/evaluate/XEvaluationOrigin.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/xdebugger/impl/evaluate/XEvaluationOrigin.kt diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueHintType.kt b/platform/xdebugger-impl/rpc/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueHintType.kt similarity index 100% rename from platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueHintType.kt rename to platform/xdebugger-impl/rpc/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueHintType.kt diff --git a/platform/xdebugger-impl/shared/api-dump-unreviewed.txt b/platform/xdebugger-impl/shared/api-dump-unreviewed.txt index 77f39be1f86b..e69de29bb2d1 100644 --- a/platform/xdebugger-impl/shared/api-dump-unreviewed.txt +++ b/platform/xdebugger-impl/shared/api-dump-unreviewed.txt @@ -1,11 +0,0 @@ -e:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -- java.lang.Enum -- sf:Companion:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType$Companion -- sf:MOUSE_ALT_OVER_HINT:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -- sf:MOUSE_CLICK_HINT:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -- sf:MOUSE_OVER_HINT:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -- s:getEntries():kotlin.enums.EnumEntries -- s:valueOf(java.lang.String):com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType -- s:values():com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType[] -f:com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType$Companion -- f:serializer():kotlinx.serialization.KSerializer diff --git a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/package-info.java b/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/package-info.java deleted file mode 100644 index 68876823073d..000000000000 --- a/platform/xdebugger-impl/shared/src/com/intellij/xdebugger/impl/rpc/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -@Internal -package com.intellij.xdebugger.impl.rpc; - -import org.jetbrains.annotations.ApiStatus.Internal; 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 204bb1d6e837..b9a637dbdf7e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/FrontendXLineBreakpointVariant.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/FrontendXLineBreakpointVariant.kt @@ -14,8 +14,6 @@ import com.intellij.xdebugger.XSourcePosition import com.intellij.xdebugger.impl.breakpoints.XLineBreakpointProxy import com.intellij.xdebugger.impl.breakpoints.XLineBreakpointTypeProxy import com.intellij.xdebugger.impl.frame.XDebugManagerProxy -import com.intellij.xdebugger.impl.rpc.XBreakpointId -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import com.intellij.xdebugger.impl.rpc.toRpc import fleet.util.channels.use import kotlinx.coroutines.CoroutineScope diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/MonolithXDebugManagerProxy.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/MonolithXDebugManagerProxy.kt index 8f4bb7df63a9..f97e73a433dc 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/MonolithXDebugManagerProxy.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/MonolithXDebugManagerProxy.kt @@ -5,6 +5,8 @@ import com.intellij.frontend.FrontendApplicationInfo import com.intellij.frontend.FrontendType import com.intellij.idea.AppMode import com.intellij.openapi.project.Project +import com.intellij.platform.debugger.impl.rpc.XExecutionStackId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.SplitDebuggerMode import com.intellij.xdebugger.XDebuggerManager import com.intellij.xdebugger.frame.XExecutionStack @@ -15,8 +17,6 @@ import com.intellij.xdebugger.impl.breakpoints.asProxy import com.intellij.xdebugger.impl.frame.XDebugManagerProxy import com.intellij.xdebugger.impl.frame.XDebugSessionProxy import com.intellij.xdebugger.impl.frame.asProxy -import com.intellij.xdebugger.impl.rpc.XExecutionStackId -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.models.getOrStoreGlobally import kotlinx.coroutines.* 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 0bc071f10919..cb765821e64b 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.kt @@ -41,6 +41,8 @@ import com.intellij.openapi.util.Comparing import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.Ref import com.intellij.openapi.util.ThrowableComputable +import com.intellij.platform.debugger.impl.rpc.XDebugSessionDataId +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.util.coroutines.childScope import com.intellij.psi.search.GlobalSearchScope import com.intellij.ui.AppUIUtil.invokeLaterIfProjectAlive @@ -69,7 +71,10 @@ import com.intellij.xdebugger.impl.frame.* import com.intellij.xdebugger.impl.inline.DebuggerInlayListener import com.intellij.xdebugger.impl.inline.InlineDebugRenderer import com.intellij.xdebugger.impl.mixedmode.XMixedModeCombinedDebugProcess -import com.intellij.xdebugger.impl.rpc.* +import com.intellij.xdebugger.impl.rpc.XDebugSessionPausedInfo +import com.intellij.xdebugger.impl.rpc.XDebuggerSessionTabAbstractInfo +import com.intellij.xdebugger.impl.rpc.XDebuggerSessionTabInfo +import com.intellij.xdebugger.impl.rpc.XDebuggerSessionTabInfoNoInit import com.intellij.xdebugger.impl.rpc.models.storeGlobally import com.intellij.xdebugger.impl.settings.XDebuggerSettingManagerImpl import com.intellij.xdebugger.impl.ui.* diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java index b23378d665c3..016a267d5d85 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ViewBreakpointsAction.java @@ -14,9 +14,9 @@ import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecificat import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; +import com.intellij.platform.debugger.impl.rpc.XBreakpointId; import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil; import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory; -import com.intellij.xdebugger.impl.rpc.XBreakpointId; import org.jetbrains.annotations.NotNull; public class ViewBreakpointsAction extends DumbAwareAction implements ActionRemoteBehaviorSpecification.FrontendOtherwiseBackend { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ShowBreakpointDialogRemoteTopic.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ShowBreakpointDialogRemoteTopic.kt index 808020855594..5b8818f4dc28 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ShowBreakpointDialogRemoteTopic.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ShowBreakpointDialogRemoteTopic.kt @@ -1,8 +1,8 @@ // 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.breakpoints +import com.intellij.platform.debugger.impl.rpc.XBreakpointId import com.intellij.platform.rpc.topics.ProjectRemoteTopic -import com.intellij.xdebugger.impl.rpc.XBreakpointId import kotlinx.serialization.Serializable import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java index 0abdd91110f9..6418910fe215 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java @@ -12,6 +12,7 @@ import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.platform.debugger.impl.rpc.XBreakpointId; import com.intellij.pom.Navigatable; import com.intellij.ui.ColorUtil; import com.intellij.ui.ExperimentalUI; @@ -30,7 +31,6 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl; import com.intellij.xdebugger.impl.XDebuggerUtilImpl; import com.intellij.xdebugger.impl.frame.XDebugManagerProxy; import com.intellij.xdebugger.impl.frame.XDebugSessionProxy; -import com.intellij.xdebugger.impl.rpc.XBreakpointId; import com.intellij.xml.CommonXmlStrings; import com.intellij.xml.util.XmlStringUtil; import kotlin.Unit; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java index d257586945a2..837b727be754 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java @@ -13,13 +13,13 @@ import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.platform.debugger.impl.rpc.XBreakpointId; import com.intellij.pom.Navigatable; import com.intellij.ui.*; import com.intellij.ui.popup.util.DetailView; import com.intellij.util.concurrency.AppExecutorUtil; import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem; import com.intellij.xdebugger.impl.breakpoints.ui.XLightBreakpointPropertiesPanel; -import com.intellij.xdebugger.impl.rpc.XBreakpointId; import com.intellij.xdebugger.ui.DebuggerColors; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerProxy.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerProxy.kt index 40e58cedc6c1..0913a6865857 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerProxy.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerProxy.kt @@ -5,11 +5,11 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.application.WriteAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.vfs.VirtualFile +import com.intellij.platform.debugger.impl.rpc.XBreakpointId import com.intellij.util.ThrowableRunnable import com.intellij.xdebugger.XDebuggerUtil import com.intellij.xdebugger.impl.XLineBreakpointInstallationInfo import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem -import com.intellij.xdebugger.impl.rpc.XBreakpointId import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal 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 999f5518a142..9763d83197fe 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 @@ -5,6 +5,7 @@ import com.intellij.openapi.editor.markup.GutterDraggableObject import com.intellij.openapi.editor.markup.GutterIconRenderer import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe +import com.intellij.platform.debugger.impl.rpc.XBreakpointId import com.intellij.pom.Navigatable import com.intellij.xdebugger.XDebuggerManager import com.intellij.xdebugger.XExpression @@ -15,7 +16,6 @@ import com.intellij.xdebugger.breakpoints.XBreakpointProperties import com.intellij.xdebugger.breakpoints.XBreakpointType import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider import com.intellij.xdebugger.impl.XDebugSessionImpl -import com.intellij.xdebugger.impl.rpc.XBreakpointId import org.jetbrains.annotations.ApiStatus import javax.swing.Icon diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointTypeProxy.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointTypeProxy.kt index 85e98f56cae3..5ba43119a64e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointTypeProxy.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointTypeProxy.kt @@ -3,6 +3,7 @@ package com.intellij.xdebugger.impl.breakpoints import com.intellij.openapi.application.EDT import com.intellij.openapi.project.Project +import com.intellij.platform.debugger.impl.rpc.XBreakpointTypeId import com.intellij.xdebugger.XDebuggerManager import com.intellij.xdebugger.breakpoints.SuspendPolicy import com.intellij.xdebugger.breakpoints.XBreakpoint @@ -10,7 +11,6 @@ import com.intellij.xdebugger.breakpoints.XBreakpointType import com.intellij.xdebugger.breakpoints.XLineBreakpointType import com.intellij.xdebugger.breakpoints.ui.XBreakpointCustomPropertiesPanel import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil.breakpointTypes -import com.intellij.xdebugger.impl.rpc.XBreakpointTypeId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/AddXBreakpointAction.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/AddXBreakpointAction.kt index 4917d796107d..3523c013f2de 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/AddXBreakpointAction.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/AddXBreakpointAction.kt @@ -9,8 +9,8 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.project.DumbAware import com.intellij.openapi.project.Project +import com.intellij.platform.debugger.impl.rpc.XBreakpointId import com.intellij.xdebugger.impl.breakpoints.XBreakpointTypeProxy -import com.intellij.xdebugger.impl.rpc.XBreakpointId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch 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 bebcf683e31e..f4fd4b31efc8 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 @@ -3,13 +3,13 @@ package com.intellij.xdebugger.impl.breakpoints.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; +import com.intellij.platform.debugger.impl.rpc.XBreakpointId; import com.intellij.pom.Navigatable; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.popup.util.ItemWrapper; import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy; -import com.intellij.xdebugger.impl.rpc.XBreakpointId; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.Nullable; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointNoneItem.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointNoneItem.java index 6fe663e71e93..1a9738de6287 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointNoneItem.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointNoneItem.java @@ -3,11 +3,11 @@ package com.intellij.xdebugger.impl.breakpoints.ui; import com.intellij.openapi.project.Project; +import com.intellij.platform.debugger.impl.rpc.XBreakpointId; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.popup.util.DetailView; import com.intellij.xdebugger.XDebuggerBundle; import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy; -import com.intellij.xdebugger.impl.rpc.XBreakpointId; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.Nullable; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java index d58d004c8a67..1ce542bc3aa8 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java @@ -14,6 +14,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.NlsActions; import com.intellij.openapi.util.NlsSafe; +import com.intellij.platform.debugger.impl.rpc.XBreakpointId; import com.intellij.ui.*; import com.intellij.ui.popup.util.DetailController; import com.intellij.ui.popup.util.DetailViewImpl; @@ -35,7 +36,6 @@ import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointItemNode; import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointItemsTreeController; import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointsCheckboxTree; import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointsGroupNode; -import com.intellij.xdebugger.impl.rpc.XBreakpointId; import kotlin.Unit; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogFactory.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogFactory.kt index 4294917be815..f79e8a1848c5 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogFactory.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogFactory.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.project.Project import com.intellij.openapi.ui.popup.Balloon import com.intellij.openapi.util.Disposer +import com.intellij.platform.debugger.impl.rpc.XBreakpointId import com.intellij.platform.rpc.topics.sendToClient import com.intellij.xdebugger.SplitDebuggerMode import com.intellij.xdebugger.breakpoints.XBreakpoint @@ -17,7 +18,6 @@ import com.intellij.xdebugger.impl.breakpoints.ShowBreakpointDialogRequest import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy import com.intellij.xdebugger.impl.frame.XDebugManagerProxy -import com.intellij.xdebugger.impl.rpc.XBreakpointId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogInitialBreakpoint.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogInitialBreakpoint.kt index 0168a5ec3c87..ca739fd1b75f 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogInitialBreakpoint.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialogInitialBreakpoint.kt @@ -1,7 +1,7 @@ // 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.breakpoints.ui -import com.intellij.xdebugger.impl.rpc.XBreakpointId +import com.intellij.platform.debugger.impl.rpc.XBreakpointId import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ShowSessionTabRemoteTopic.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ShowSessionTabRemoteTopic.kt index 216373589883..b45e1d88cfc7 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ShowSessionTabRemoteTopic.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ShowSessionTabRemoteTopic.kt @@ -4,9 +4,9 @@ package com.intellij.xdebugger.impl.frame import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.rpc.ShowFramesRequest import com.intellij.platform.debugger.impl.rpc.ShowSessionTabRequest +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.rpc.topics.ProjectRemoteTopic import com.intellij.platform.rpc.topics.sendToClient -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugManagerProxy.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugManagerProxy.kt index f6661fef7639..69440795a83f 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugManagerProxy.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugManagerProxy.kt @@ -3,13 +3,13 @@ package com.intellij.xdebugger.impl.frame import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId +import com.intellij.platform.debugger.impl.rpc.XExecutionStackId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.frame.XExecutionStack import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.impl.XDebuggerExecutionPointManager import com.intellij.xdebugger.impl.breakpoints.XBreakpointManagerProxy -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XExecutionStackId -import com.intellij.xdebugger.impl.rpc.XValueId import kotlinx.coroutines.flow.Flow import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugSessionProxy.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugSessionProxy.kt index 370bab15335a..d4438a8b9ffa 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugSessionProxy.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugSessionProxy.kt @@ -12,6 +12,7 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup import com.intellij.openapi.application.EDT import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.xdebugger.XDebugSession import com.intellij.xdebugger.XDebugSessionListener import com.intellij.xdebugger.XSourcePosition @@ -27,7 +28,6 @@ import com.intellij.xdebugger.impl.XSteppingSuspendContext import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase import com.intellij.xdebugger.impl.breakpoints.XBreakpointProxy import com.intellij.xdebugger.impl.breakpoints.asProxy -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import com.intellij.xdebugger.impl.ui.XDebugSessionData import com.intellij.xdebugger.impl.ui.XDebugSessionTab import com.intellij.xdebugger.ui.XDebugTabLayouter diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionTabApi.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionTabApi.kt index 055020dfe07a..74be5c41ecbb 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionTabApi.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XDebugSessionTabApi.kt @@ -4,6 +4,8 @@ package com.intellij.xdebugger.impl.rpc import com.intellij.execution.RunContentDescriptorIdImpl import com.intellij.execution.rpc.ExecutionEnvironmentProxyDto import com.intellij.ide.ui.icons.IconId +import com.intellij.platform.debugger.impl.rpc.XDebugSessionDataId +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.debugger.impl.rpc.XDebuggerSessionAdditionalTabEvent import com.intellij.platform.rpc.Id import com.intellij.platform.rpc.RemoteApiProviderService diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueGroupModel.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueGroupModel.kt index fb8dc395a3ff..fd8b20f169b6 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueGroupModel.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/BackendXValueGroupModel.kt @@ -3,12 +3,12 @@ package com.intellij.xdebugger.impl.rpc.models import com.intellij.openapi.components.Service import com.intellij.openapi.components.service +import com.intellij.platform.debugger.impl.rpc.XValueGroupId import com.intellij.platform.kernel.ids.BackendValueIdType import com.intellij.platform.kernel.ids.findValueById import com.intellij.platform.kernel.ids.storeValueGlobally import com.intellij.xdebugger.frame.XValueGroup import com.intellij.xdebugger.impl.XDebugSessionImpl -import com.intellij.xdebugger.impl.rpc.XValueGroupId import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus 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 bc417246bc65..c1e6598c980c 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 @@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project import com.intellij.platform.debugger.impl.rpc.XFullValueEvaluatorDto import com.intellij.platform.debugger.impl.rpc.XFullValueEvaluatorDto.FullValueEvaluatorLinkAttributes import com.intellij.platform.debugger.impl.rpc.XValueDto +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.platform.debugger.impl.rpc.XValueMarkerDto import com.intellij.platform.debugger.impl.rpc.XValueSerializedPresentation import com.intellij.platform.debugger.impl.rpc.XValueTextProviderDto @@ -25,14 +26,12 @@ import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.frame.XValuePlace import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.pinned.items.PinToTopValue -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.ui.XValueTextProvider import com.intellij.xdebugger.impl.ui.tree.ValueMarkup import fleet.rpc.core.RpcFlow import fleet.rpc.core.toRpc import kotlinx.collections.immutable.toImmutableSet import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Deferred import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.* import kotlinx.coroutines.future.asDeferred diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XBreakpointValueId.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XBreakpointValueId.kt index 9c0e448d7b9a..96a481da2653 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XBreakpointValueId.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XBreakpointValueId.kt @@ -1,11 +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.models +import com.intellij.platform.debugger.impl.rpc.XBreakpointId import com.intellij.platform.kernel.ids.BackendValueIdType import com.intellij.platform.kernel.ids.findValueById import com.intellij.platform.kernel.ids.storeValueGlobally import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase -import com.intellij.xdebugger.impl.rpc.XBreakpointId import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XDebugSessionValueIdType.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XDebugSessionValueIdType.kt index 89b8ed05a69d..f0c3bffd690b 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XDebugSessionValueIdType.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XDebugSessionValueIdType.kt @@ -1,12 +1,12 @@ // 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.models +import com.intellij.platform.debugger.impl.rpc.XDebugSessionDataId +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.kernel.ids.BackendValueIdType import com.intellij.platform.kernel.ids.findValueById import com.intellij.platform.kernel.ids.storeValueGlobally import com.intellij.xdebugger.impl.XDebugSessionImpl -import com.intellij.xdebugger.impl.rpc.XDebugSessionDataId -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import com.intellij.xdebugger.impl.ui.XDebugSessionData import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt index f1fbf0084d7c..1eb5ce9fa60e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XExecutionStackModel.kt @@ -3,6 +3,7 @@ package com.intellij.xdebugger.impl.rpc.models import com.intellij.openapi.components.Service import com.intellij.openapi.components.service +import com.intellij.platform.debugger.impl.rpc.XExecutionStackId import com.intellij.platform.kernel.ids.BackendValueIdType import com.intellij.platform.kernel.ids.findValueById import com.intellij.platform.kernel.ids.storeValueGlobally @@ -10,7 +11,6 @@ import com.intellij.util.AwaitCancellationAndInvoke import com.intellij.util.awaitCancellationAndInvoke import com.intellij.xdebugger.frame.XExecutionStack import com.intellij.xdebugger.impl.XDebugSessionImpl -import com.intellij.xdebugger.impl.rpc.XExecutionStackId import fleet.multiplatform.shims.ConcurrentHashMap import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XStackFrameModel.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XStackFrameModel.kt index 71bdb06f04a2..6c701f4180b1 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XStackFrameModel.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/models/XStackFrameModel.kt @@ -3,12 +3,12 @@ package com.intellij.xdebugger.impl.rpc.models import com.intellij.openapi.components.Service import com.intellij.openapi.components.service +import com.intellij.platform.debugger.impl.rpc.XStackFrameId import com.intellij.platform.kernel.ids.BackendValueIdType import com.intellij.platform.kernel.ids.findValueById import com.intellij.platform.kernel.ids.storeValueGlobally import com.intellij.xdebugger.frame.XStackFrame import com.intellij.xdebugger.impl.XDebugSessionImpl -import com.intellij.xdebugger.impl.rpc.XStackFrameId import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceAction.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceAction.kt index 68ca14741216..f6a64ae04521 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceAction.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceAction.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecification import com.intellij.platform.debugger.impl.rpc.XDebuggerNavigationApi -import com.intellij.xdebugger.impl.rpc.XValueId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl private class XJumpToSourceAction : XJumpToSourceActionBase(), ActionRemoteBehaviorSpecification.FrontendOtherwiseBackend { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceActionBase.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceActionBase.kt index c9ac6ee931e0..4c56b78fc4c2 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceActionBase.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToSourceActionBase.kt @@ -5,9 +5,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.application.EDT import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.util.registry.Registry.Companion.`is` +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.evaluate.XDebuggerEvaluationDialog import com.intellij.xdebugger.impl.frame.XDebugManagerProxy -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.ui.DebuggerUIUtil import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl import kotlinx.coroutines.Dispatchers diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToTypeSourceAction.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToTypeSourceAction.kt index b091c7483bd2..199a983bf840 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToTypeSourceAction.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XJumpToTypeSourceAction.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecification import com.intellij.platform.debugger.impl.rpc.XDebuggerNavigationApi -import com.intellij.xdebugger.impl.rpc.XValueId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl private class XJumpToTypeSourceAction : XJumpToSourceActionBase(), ActionRemoteBehaviorSpecification.FrontendOtherwiseBackend { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/util/XDebugMonolithUtils.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/util/XDebugMonolithUtils.kt index ee8f18135eb5..5a4a77389644 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/util/XDebugMonolithUtils.kt +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/util/XDebugMonolithUtils.kt @@ -3,14 +3,14 @@ package com.intellij.xdebugger.impl.util import com.intellij.frontend.FrontendApplicationInfo import com.intellij.frontend.FrontendType +import com.intellij.platform.debugger.impl.rpc.XBreakpointId +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId +import com.intellij.platform.debugger.impl.rpc.XValueId import com.intellij.xdebugger.breakpoints.XBreakpointType import com.intellij.xdebugger.frame.XValue import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil -import com.intellij.xdebugger.impl.rpc.XBreakpointId -import com.intellij.xdebugger.impl.rpc.XDebugSessionId -import com.intellij.xdebugger.impl.rpc.XValueId import com.intellij.xdebugger.impl.rpc.models.BackendXValueModel import com.intellij.xdebugger.impl.rpc.models.findValue import org.jetbrains.annotations.ApiStatus diff --git a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel index 4f0ff0cfebd7..636234efba2d 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel @@ -64,7 +64,7 @@ jvm_library( "//libraries/kotlinx/serialization/json", "//java/java-impl:impl", "//java/debugger/shared", - "//platform/xdebugger-impl/shared", + "//platform/xdebugger-impl/rpc", ] ) ### auto-generated section `build intellij.kotlin.jvm.debugger.coroutines` end \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml b/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml index f2d61ebdf7f5..47728da3297e 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml +++ b/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml @@ -69,6 +69,6 @@ - + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel index d2840909b9d8..8fc2cf19fb25 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel @@ -35,7 +35,7 @@ jvm_library( "//plugins/kotlin/jvm-debugger/coroutines", "//platform/statistics", "//plugins/kotlin/base/facet", - "//platform/xdebugger-impl/shared", + "//platform/xdebugger-impl/rpc", "//platform/editor-ui-api:editor-ui", "//plugins/kotlin/j2k/shared", ] diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel index addcdf8ce3b9..a57cc8de4076 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel @@ -48,7 +48,7 @@ jvm_library( "@lib//:kotlinc-analysis-api", "//plugins/kotlin/jvm-debugger/eval4j", "@lib//:kotlinc-scripting-compiler-plugin", - "//platform/xdebugger-impl/shared", + "//platform/xdebugger-impl/rpc", ] ) ### auto-generated section `build kotlin.jvm-debugger.evaluation.k1` end \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml index c1896f579c28..eef8c7aa54cf 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml @@ -54,6 +54,6 @@ - + \ No newline at end of file diff --git a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml index aa029433d4d9..01a13385e8b6 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml @@ -29,7 +29,7 @@ - + diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel b/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel index 71c539572f5e..04e6d72e397a 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel +++ b/plugins/stream-debugger-core/intellij.debugger.streams.backend/BUILD.bazel @@ -19,12 +19,12 @@ jvm_library( "//platform/kernel/shared:kernel", "//platform/platform-impl/rpc", "//plugins/stream-debugger-core/intellij.debugger.streams.shared:debugger-streams-shared", - "//platform/xdebugger-impl/shared", "@lib//:kotlinx-coroutines-core", "//platform/xdebugger-impl:debugger-impl", "//platform/xdebugger-api:debugger", "//plugins/stream-debugger-core:debugger-streams-core", "//platform/core-api:core", + "//platform/xdebugger-impl/rpc", ] ) ### auto-generated section `build intellij.debugger.streams.backend` end \ No newline at end of file diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml b/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml index ebc5b5521d15..d07c2dfc505f 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml +++ b/plugins/stream-debugger-core/intellij.debugger.streams.backend/intellij.debugger.streams.backend.iml @@ -38,11 +38,11 @@ - + \ No newline at end of file diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.backend/src/com/intellij/debugger/streams/backend/BackendStreamDebuggerApi.kt b/plugins/stream-debugger-core/intellij.debugger.streams.backend/src/com/intellij/debugger/streams/backend/BackendStreamDebuggerApi.kt index 63759fd35a72..1032fb3688c9 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.backend/src/com/intellij/debugger/streams/backend/BackendStreamDebuggerApi.kt +++ b/plugins/stream-debugger-core/intellij.debugger.streams.backend/src/com/intellij/debugger/streams/backend/BackendStreamDebuggerApi.kt @@ -4,10 +4,10 @@ import com.intellij.debugger.streams.core.action.TraceStreamRunner import com.intellij.debugger.streams.shared.ChainStatus import com.intellij.debugger.streams.shared.StreamDebuggerApi import com.intellij.openapi.application.smartReadAction +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.util.asDisposable import com.intellij.xdebugger.XDebugSession import com.intellij.xdebugger.XDebugSessionListener -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import com.intellij.xdebugger.impl.rpc.models.findValue import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.Channel diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.shared/BUILD.bazel b/plugins/stream-debugger-core/intellij.debugger.streams.shared/BUILD.bazel index 1b0085c82e62..d59d2b8f6d51 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.shared/BUILD.bazel +++ b/plugins/stream-debugger-core/intellij.debugger.streams.shared/BUILD.bazel @@ -24,7 +24,7 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/xdebugger-impl:debugger-impl", - "//platform/xdebugger-impl/shared", + "//platform/xdebugger-impl/rpc", ] ) ### auto-generated section `build intellij.debugger.streams.shared` end \ No newline at end of file diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.shared/intellij.debugger.streams.shared.iml b/plugins/stream-debugger-core/intellij.debugger.streams.shared/intellij.debugger.streams.shared.iml index c1e46afbe106..09d0ad0a6773 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.shared/intellij.debugger.streams.shared.iml +++ b/plugins/stream-debugger-core/intellij.debugger.streams.shared/intellij.debugger.streams.shared.iml @@ -43,6 +43,6 @@ - + \ No newline at end of file diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerApi.kt b/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerApi.kt index f27feed69651..5a499c81706f 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerApi.kt +++ b/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerApi.kt @@ -1,7 +1,7 @@ package com.intellij.debugger.streams.shared +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.platform.rpc.RemoteApiProviderService -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import fleet.rpc.RemoteApi import fleet.rpc.Rpc import fleet.rpc.remoteApiDescriptor diff --git a/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerManager.kt b/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerManager.kt index 486edd5c08e0..14d536c5bb8b 100644 --- a/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerManager.kt +++ b/plugins/stream-debugger-core/intellij.debugger.streams.shared/src/com/intellij/debugger/streams/shared/StreamDebuggerManager.kt @@ -4,9 +4,9 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.project.Project import com.intellij.openapi.startup.ProjectActivity +import com.intellij.platform.debugger.impl.rpc.XDebugSessionId import com.intellij.xdebugger.impl.XDebuggerManagerProxyListener import com.intellij.xdebugger.impl.frame.XDebugSessionProxy -import com.intellij.xdebugger.impl.rpc.XDebugSessionId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/python/BUILD.bazel b/python/BUILD.bazel index a5217a9f0eed..794372a5181f 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -356,6 +356,7 @@ jvm_library( "//python/common", "//python/python-process-output:processOutput", "//platform/xdebugger-impl/shared", + "//platform/xdebugger-impl/rpc", ], exports = [ "//python/openapi:community", diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index 1cb0b2c7a959..a185840c7605 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -193,5 +193,6 @@ + \ No newline at end of file