From 68f7345901e93494fcb384b6a84108704bdb13aa Mon Sep 17 00:00:00 2001
From: Elsa Zacharia <elsa.zacharia@ibm.com>
Date: Thu, 20 Nov 2025 12:13:29 +0530
Subject: [PATCH] Some Colors and Fonts entries already provide user facing
 descriptions via ThemeElementCategory, while others do not. This change uses
 the existing descriptions to display in the description box and adds
 description for ones that doesn't have any entries to ensure the description
 area is not left empty and that available descriptions are consistently
 utilised. This aligns with the standard usage elsewhere in Eclipse preference
 pages.

The main change pertaining to this has been merged in
eclipse.platform.ui via
https://github.com/eclipse-platform/eclipse.platform.ui/pull/3666
and the remaining part is addressed via this change.
---
 debug/org.eclipse.debug.ui/plugin.properties       | 2 ++
 debug/org.eclipse.debug.ui/plugin.xml              | 9 ++++++---
 team/bundles/org.eclipse.compare/plugin.properties | 4 +++-
 team/bundles/org.eclipse.compare/plugin.xml        | 5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debug/org.eclipse.debug.ui/plugin.properties b/debug/org.eclipse.debug.ui/plugin.properties
index 92ee86a205a..605192017de 100644
--- a/debug/org.eclipse.debug.ui/plugin.properties
+++ b/debug/org.eclipse.debug.ui/plugin.properties
@@ -213,6 +213,8 @@ ActionDefinition.toggleStepFilters.description= Toggles enablement of debug step
 ActionDefinition.stepInto.name= Step Into
 ActionDefinition.stepInto.description= Step into
 
+org.eclipse.debug.ui.presentation.description = Colors and fonts used for debug sessions, breakpoints and variables.
+
 ActionDefinition.stepOver.name= Step Over
 ActionDefinition.stepOver.description= Step over
 
diff --git a/debug/org.eclipse.debug.ui/plugin.xml b/debug/org.eclipse.debug.ui/plugin.xml
index 0d4456b7754..70d4d67b5a6 100644
--- a/debug/org.eclipse.debug.ui/plugin.xml
+++ b/debug/org.eclipse.debug.ui/plugin.xml
@@ -2995,9 +2995,12 @@ M4 = Platform-specific fourth key
            perspectiveId="org.eclipse.debug.ui.DebugPerspective"/>
   </extension>
 
-   <extension
-         point="org.eclipse.ui.themes">
-		<themeElementCategory label="%debugPresentation.label" id="org.eclipse.debug.ui.presentation"/>
+	<extension point="org.eclipse.ui.themes">
+		<themeElementCategory id="org.eclipse.debug.ui.presentation" label="%debugPresentation.label">
+			<description>
+				%org.eclipse.debug.ui.presentation.description
+			</description>
+		</themeElementCategory>
       <fontDefinition
             label="%DetailPaneFontDefinition.label"
             defaultsTo="org.eclipse.jface.textfont"
diff --git a/team/bundles/org.eclipse.compare/plugin.properties b/team/bundles/org.eclipse.compare/plugin.properties
index 823ffdd18c0..c39f90e8739 100644
--- a/team/bundles/org.eclipse.compare/plugin.properties
+++ b/team/bundles/org.eclipse.compare/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2025 IBM Corporation and others.
+# Copyright (c) 2000, 2026 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -167,6 +167,8 @@ ComparePreferencePage.colorAndFontLink=See <a>''{0}''</a> preferences for text c
 
 textCompareAppearance.label=Text Compare
 
+org.eclipse.compare.contentmergeviewer.TextMergeViewer=Colors and fonts used in compare editors to indicate differences, conflicts, and changes.
+
 compareIncomingColor.label= Incoming change color
 compareIncomingColor.description= The color used to indicate an incoming change in compare and merge tools.
 compareOutgoingColor.label= Outgoing change color
diff --git a/team/bundles/org.eclipse.compare/plugin.xml b/team/bundles/org.eclipse.compare/plugin.xml
index 5bf22395333..24978d0b081 100644
--- a/team/bundles/org.eclipse.compare/plugin.xml
+++ b/team/bundles/org.eclipse.compare/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!--
-    Copyright (c) 2001, 2019 IBM Corporation and others.
+    Copyright (c) 2001, 2026 IBM Corporation and others.
 
     This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
@@ -30,6 +30,9 @@
       <themeElementCategory
             label="%textCompareAppearance.label"
             id="org.eclipse.compare.contentmergeviewer.TextMergeViewer">
+         <description>
+            %org.eclipse.compare.contentmergeviewer.TextMergeViewer
+         </description>
       </themeElementCategory>
       <colorDefinition
             label="%compareIncomingColor.label"