From 9f3e829ea6f285b4f79467507369d76180bb6983 Mon Sep 17 00:00:00 2001
From: Maksim Zuev <maksim.zuev@jetbrains.com>
Date: Tue, 10 Dec 2024 15:47:56 +0100
Subject: [PATCH] [debugger] IDEA-363335 Show single icon when a descriptor
 provides it

GitOrigin-RevId: 092bbc60b8f43becf483d2201fec7ae800a63bd8
---
 .../com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java
index 2d39222d8c52..d5530d30d2cf 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java
@@ -142,7 +142,10 @@ public final class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
 
     final Icon valueIcon = valueDescriptor.getValueIcon();
     if (valueIcon != null) {
-      nodeIcon = IconManager.getInstance().createRowIcon(nodeIcon, valueIcon);
+      // Keep watch icon to make clear the source of a node, prefer the provided icon otherwise
+      nodeIcon = nodeIcon == AllIcons.Debugger.Db_watch
+                 ? IconManager.getInstance().createRowIcon(nodeIcon, valueIcon)
+                 : valueIcon;
     }
     return nodeIcon;
   }