From e93ea0ab70b2e487ef55e5886ccac9dd93bce84b Mon Sep 17 00:00:00 2001
From: Marco Stornelli <marco.stornelli@gmail.com>
Date: Sat, 30 Mar 2019 08:45:57 +0100
Subject: [PATCH] Bug 468206 - Fix color for search matching

We used color keys not saved in the preferences and without any UI
widget. The user wasn't able to change them.

Change-Id: I48bc4e411d2bc016501613b7dbfb0e7f95532099
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
---
 core/org.eclipse.cdt.ui/plugin.properties |  3 +++
 core/org.eclipse.cdt.ui/plugin.xml        | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index b73f5c4128f..457ea7d8050 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -263,6 +263,8 @@ ParentNameSorter.label= &Parent Name
 ParentNameSorter.tooltip= Sort the view by C Element Parent Name
 PathNameSorter.label= P&ath
 PathNameSorter.tooltip= Sort the view by Resource Path
+CSearch.color.match_highlight= Match background highlight
+CSearch.color.match_write_highlight= Write match background highlight
 
 # Action sets
 CSearchActionSet.label= C/C++ Search
@@ -608,6 +610,7 @@ preferenceKeywords.templates=editor templates snippet macros
 preferenceKeywords.folding=editor folding section comment header function method statement preprocessor
 preferenceKeywords.markoccurrences=editor occurrence mark highlight
 preferenceKeywords.smarttyping=editor typing type close comment tabs indentation indent imports wrap escape semicolons braces brackets parenthesis parentheses strings literals paste pasting tabulator automatically
+preferenceKeywords.colored_labels=search colors highlight matching
 
 
 historyAction.label = History...
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index b1129604480..5f6a8f0e287 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -627,14 +627,16 @@
       </colorDefinition>
       <colorDefinition
             id="org.eclipse.cdt.ui.ColoredLabels.match_highlight"
-            isEditable="false"
-            label="%Dummy.label"
+            categoryId="org.eclipse.cdt.ui.presentation"
+            isEditable="true"
+            label="%CSearch.color.match_highlight"
             value="206, 204, 247">
       </colorDefinition>
       <colorDefinition
             id="org.eclipse.cdt.ui.ColoredLabels.writeaccess_highlight"
-            isEditable="false"
-            label="%Dummy.label"
+            categoryId="org.eclipse.cdt.ui.presentation"
+            isEditable="true"
+            label="%CSearch.color.match_write_highlight"
             value="240, 216, 168">
       </colorDefinition>
       <colorDefinition
@@ -1386,7 +1388,15 @@
       <keyword
             label="%preferenceKeywords.indexer"
             id="org.eclipse.cdt.ui.indexer"/>
-   </extension>  
+      <keyword
+            label="%preferenceKeywords.colored_labels"
+            id="org.eclipse.cdt.ui.ColoredLabels.match_highlight">
+      </keyword>
+      <keyword
+            label="%preferenceKeywords.colored_labels"
+            id="org.eclipse.cdt.ui.ColoredLabels.writeaccess_highlight">
+      </keyword>
+   </extension>
 
    <extension
          point="org.eclipse.ui.menus">