commit 092df5d435ff7283b997af1922b991ed4ac44b48
author Alexander Kurtakov <akurtako@redhat.com> Fri Apr 29 14:57:27 2022 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Fri Apr 29 14:57:27 2022 -0400
tree 45698c60f0a71feb3c4c1a4df0fd7566f0459f03
parent 6c06a017fc7ce2eb07b7951a1c82f1d6bda6e8a6
parent fa84637d95df72f0c7283b560170859cfd097762

Merge "Bug 509194 - Invalid menu extension contributions"

core/plugins/org.eclipse.dltk.ui/plugin.xml

diff --git a/core/plugins/org.eclipse.dltk.ui/plugin.xml b/core/plugins/org.eclipse.dltk.ui/plugin.xml
index b8baf85..4488e85 100644
--- a/core/plugins/org.eclipse.dltk.ui/plugin.xml
+++ b/core/plugins/org.eclipse.dltk.ui/plugin.xml
@@ -781,6 +781,43 @@
             <separator name="scriptGroup"/>
             </menu>
 		</menuContribution>
+		<menuContribution
+		    locationURI="menu:org.eclipse.dltk.ui.refactoring.menu?before=reorgGroup">
+            <command
+                  commandId="org.eclipse.dltk.ui.edit.text.script.move.element"
+                  label="%Refactoring.moveAction.label"
+                  style="push">
+               <visibleWhen>
+                  <with
+                        variable="activeContexts">
+                     <iterate
+                           ifEmpty="false"
+                           operator="or">
+                        <equals
+                              value="org.eclipse.dltk.ui.ScriptCodingActionSet">
+                        </equals>
+                     </iterate>
+                  </with>
+               </visibleWhen>
+            </command>
+            <command
+                  commandId="org.eclipse.dltk.ui.edit.text.script.rename.element"
+                  label="%Refactoring.renameAction.label"
+                  style="push">
+               <visibleWhen>
+                  <with
+                        variable="activeContexts">
+                     <iterate
+                           ifEmpty="false"
+                           operator="or">
+                        <equals
+                              value="org.eclipse.dltk.ui.ScriptCodingActionSet">
+                        </equals>
+                     </iterate>
+                  </with>
+               </visibleWhen>
+            </command>
+		</menuContribution>
 	</extension>
 
  <extension
@@ -790,20 +827,6 @@
             description="%ScriptCodingActionSet.description"
             visible="false"
             id="org.eclipse.dltk.ui.ScriptCodingActionSet">
-       <action
-               definitionId="org.eclipse.dltk.ui.edit.text.script.move.element"
-               label="%Refactoring.moveAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.dltk.ui.refactoring.menu/reorgGroup"
-               id="org.eclipse.dltk.ui.actions.Move">
-       </action>
-       <action
-               definitionId="org.eclipse.dltk.ui.edit.text.script.rename.element"
-               label="%Refactoring.renameAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.dltk.ui.refactoring.menu/reorgGroup"
-               id="org.eclipse.dltk.ui.actions.Rename">
-       </action>
       </actionSet>
  </extension>
    <extension