Bug 355061 [Commands] [Compatibility] Targeted popup menu contribution

appears in 'File > New' menu

Move the new code to the bottom so that the other conditional
statements are evaluated first to ensure no regressions have
been accidentally introduced.

1 files changed, 6 insertions, 4 deletions

diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
index dede19fc253..b1a86dbe933 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
@@ -177,10 +177,7 @@ public final class ContributionsAnalyzer {
 
 	static boolean isFiltered(MMenu menuModel, MMenuContribution menuContribution,
 			boolean includePopups) {
-		if (!includePopups) {
-			// not including popups, so filter out popup menu contributions
-			return menuContribution.getTags().contains(ContributionsAnalyzer.MC_POPUP);
-		} else if (menuModel.getTags().contains(ContributionsAnalyzer.MC_POPUP)) {
+		if (includePopups || menuModel.getTags().contains(ContributionsAnalyzer.MC_POPUP)) {
 			return !menuContribution.getTags().contains(ContributionsAnalyzer.MC_POPUP)
 					&& menuContribution.getTags().contains(ContributionsAnalyzer.MC_MENU);
 		}
@@ -188,6 +185,11 @@ public final class ContributionsAnalyzer {
 			return !menuContribution.getTags().contains(ContributionsAnalyzer.MC_MENU)
 					&& menuContribution.getTags().contains(ContributionsAnalyzer.MC_POPUP);
 		}
+		if (!includePopups) {
+			// not including popups, so filter out popup menu contributions if the menu is a regular
+			// menu
+			return menuContribution.getTags().contains(ContributionsAnalyzer.MC_POPUP);
+		}
 		return false;
 	}