commit 2c0d582b95dc66e48afd0c00bd7b2a8c338d6aea
author Carsten Reckord <reckord@yatta.de> Wed Dec 13 20:43:40 2017 +0100
committer Carsten Reckord <reckord@yatta.de> Thu Feb 15 17:43:46 2018 +0100
tree ee727ff702c928b152e200e7317dccd050a5faf2
parent 5f9b6cbb6603918dbda75cd1398a64799f62d49d

528345 - [Generic Editor] Move Toggle Highlight button to "Editor Presentation"

Contribute "Toggle Highlight" button to "Editor Presentation" instead of
a dedicated toolbar section

For some reason, doing that also makes the hidden separator used as a
group marker for the "Presentation" group visible, so make it invisible
again via an additional contribution. And make sure to do that separately,
because although it's always present, it can't be addressed in a menuContribution otherwise for some reason.

Change-Id: Ie5dab5d45ea420e3af81a2b370fc2a40cd2dbb89
Signed-off-by: Carsten Reckord <reckord@yatta.de>

org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF

diff --git a/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF b/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF
index 511fd8f..625eeb9 100644
--- a/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@
  org.eclipse.ui.workbench;bundle-version="3.109.0",
  org.eclipse.jface;bundle-version="3.12.0",
  org.eclipse.ui.ide;bundle-version="3.12.0",
- org.eclipse.core.resources;bundle-version="3.11.0"
+ org.eclipse.core.resources;bundle-version="3.11.0",
+ org.eclipse.core.expressions;bundle-version="3.6.0"
 Export-Package: org.eclipse.ui.internal.genericeditor;x-internal:=true,
  org.eclipse.ui.internal.genericeditor.hover;x-internal:=true,
  org.eclipse.ui.internal.genericeditor.markers;x-internal:=true

org.eclipse.ui.genericeditor/plugin.xml

diff --git a/org.eclipse.ui.genericeditor/plugin.xml b/org.eclipse.ui.genericeditor/plugin.xml
index 9b96663..f2c4b4a 100644
--- a/org.eclipse.ui.genericeditor/plugin.xml
+++ b/org.eclipse.ui.genericeditor/plugin.xml
@@ -86,11 +86,24 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="toolbar:org.eclipse.ui.genericeditor.GenericEditor">
+            locationURI="toolbar:org.eclipse.ui.edit.text.actionSet.presentation?after=additions">
+         <separator
+               name="Presentation"
+               visible="false">
+         </separator>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="toolbar:org.eclipse.ui.edit.text.actionSet.presentation?before=Presentation">
          <command
                commandId="org.eclipse.ui.genericeditor.togglehighlight"
                label="%command.toggle.highlight.label"
                style="toggle">
+            <visibleWhen>
+               <reference
+                     definitionId="org.eclipse.ui.genericeditor.GenericEditor.active">
+               </reference>
+            </visibleWhen>
          </command>
       </menuContribution>
    </extension>
@@ -173,4 +186,16 @@
          </part>
       </actionSetPartAssociation>
    </extension>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="org.eclipse.ui.genericeditor.GenericEditor.active">
+         <with
+               variable="activeEditorId">
+            <equals
+                  value="org.eclipse.ui.genericeditor.GenericEditor">
+            </equals>
+         </with>
+      </definition>
+   </extension>
 </plugin>