From 42343aeaeb710fb4da0f3ef8458e41b774d960e1 Mon Sep 17 00:00:00 2001
From: Maksim Zuev <maksim.zuev@jetbrains.com>
Date: Thu, 26 Jun 2025 14:17:44 +0200
Subject: [PATCH] [rd debugger] IJPL-193791 Read last request id before
 collecting state

GitOrigin-RevId: b1c287ca038cdfb22be120b5c248b41465000a65
---
 .../src/com/intellij/xdebugger/impl/rpc/XBreakpointDto.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XBreakpointDto.kt b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XBreakpointDto.kt
index 8aa229449035..c90688fc09b5 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XBreakpointDto.kt
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/rpc/XBreakpointDto.kt
@@ -5,7 +5,6 @@ import com.intellij.ide.ui.icons.IconId
 import com.intellij.ide.ui.icons.rpcId
 import com.intellij.ide.vfs.VirtualFileId
 import com.intellij.ide.vfs.rpcId
-import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.readAction
 import com.intellij.openapi.util.NlsSafe
 import com.intellij.openapi.util.TextRange
@@ -153,9 +152,10 @@ private suspend fun XBreakpointBase<*, *, *>.getDtoState(currentSession: XDebugS
   val breakpoint = this
   return withContext(Dispatchers.Default) {
     val manager = XDebuggerManager.getInstance(project).breakpointManager as XBreakpointManagerImpl
+    val completedRequestId = manager.requestCounter.getRequestId()
     XBreakpointDtoState(
       displayText = XBreakpointUtil.getShortText(breakpoint),
-      sourcePosition = readAction { sourcePosition?.toRpc () },
+      sourcePosition = readAction { sourcePosition?.toRpc() },
       isDefault = manager.isDefaultBreakpoint(breakpoint),
       logExpressionObject = logExpressionObject?.toRpc(),
       conditionExpression = conditionExpression?.toRpc(),
@@ -177,7 +177,7 @@ private suspend fun XBreakpointBase<*, *, *>.getDtoState(currentSession: XDebugS
       currentSessionCustomPresentation = currentSession?.getBreakpointPresentation(breakpoint)?.toRpc(),
       customPresentation = breakpoint.customizedPresentation?.toRpc(),
       lineBreakpointInfo = readAction { (breakpoint as? XLineBreakpointImpl<*>)?.getInfo() },
-      requestId = manager.requestCounter.getRequestId()
+      requestId = completedRequestId,
     )
   }
 }