[eclipse-platform#2968] Fix wrong key binding displayed in MenuItem

Consider the Binding context when there is more than one Binding
for a ParametrizedCommand. The deeper/specialized context will be
preferred.

fixes eclipse-platform#2968

Author: Gesa HENTSCHKE

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java

@@ -24,7 +24,9 @@
 import java.util.Map;
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.core.commands.contexts.Context;
+import org.eclipse.core.commands.contexts.ContextManager;
 import org.eclipse.e4.core.services.contributions.IContributionFactory;
+import org.eclipse.e4.ui.bindings.internal.ContextSet.CComp;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.jface.bindings.Binding;
 import org.eclipse.jface.bindings.Trigger;
@@ -56,6 +58,7 @@ private static int compareSchemes(String[] activeSchemeIds, final String schemeI
 
 	static class BindingComparator implements Comparator<Binding> {
 		private String[] activeSchemeIds;
+		private ContextManager contextManager;
 
 		public void setActiveSchemes(String[] activeSchemeIds) {
 			this.activeSchemeIds = activeSchemeIds;
@@ -65,13 +68,30 @@ public String[] getActiveSchemes() {
 			return this.activeSchemeIds;
 		}
 
+		public void setContextManager(ContextManager contextManager) {
+			this.contextManager = contextManager;
+		}
+
 		@Override
 		public int compare(Binding o1, Binding o2) {
 			int rc = compareSchemes(activeSchemeIds, o1.getSchemeId(), o2.getSchemeId());
 			if (rc != 0) {
 				return rc;
 			}
 
+			/*
+			 * Check to see which has the deeper context. The deeper context is the one that
+			 * is preferred.
+			 */
+			if (contextManager != null) {
+				CComp cComp = new ContextSet.CComp(contextManager);
+				int contextDepth = cComp.compare(contextManager.getContext(o2.getContextId()),
+						contextManager.getContext(o1.getContextId())); // deeper is better
+				if (contextDepth != 0) {
+					return contextDepth;
+				}
+			}
+
 			/*
 			 * Check to see which has the least number of triggers in the trigger sequence.
 			 */

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTableManager.java

@@ -21,6 +21,7 @@
 import java.util.ListIterator;
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.core.commands.contexts.Context;
+import org.eclipse.core.commands.contexts.ContextManager;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.jface.bindings.Binding;
 import org.eclipse.jface.bindings.TriggerSequence;
@@ -34,6 +35,9 @@ public class BindingTableManager {
 	@Inject
 	private IEclipseContext eclipseContext;
 
+	@Inject
+	private ContextManager contextManager;
+
 	private ContextSet definedTables = ContextSet.EMPTY;
 
 	private String[] activeSchemeIds;
@@ -235,6 +239,7 @@ public Collection<Binding> getPartialMatches(ContextSet contextSet, TriggerSeque
 	public void setActiveSchemes(String[] activeSchemeIds) {
 		this.activeSchemeIds = activeSchemeIds;
 		BindingTable.BEST_SEQUENCE.setActiveSchemes(activeSchemeIds);
+		BindingTable.BEST_SEQUENCE.setContextManager(contextManager);
 	}
 
 	/*