Avoid "null" in "Show In" menu when there is no key binding

orionll · akurtakov · commit 09eea87216c5 · 2024-11-26T22:23:45.000+02:00
diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java
@@ -45,6 +45,6 @@ private String getShowInMenuLabel() {
 				? bindingService
 						.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_QUICK_MENU)
 				: ""; //$NON-NLS-1$
-		return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + '\t' + keyBinding;
+		return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + (keyBinding != null ? '\t' + keyBinding : ""); //$NON-NLS-2$
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ private String getShowInMenuLabel() {`
`45`	`45`	`? bindingService`
`46`	`46`	`.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_QUICK_MENU)`
`47`	`47`	`: ""; //$NON-NLS-1$`
`48`		`- return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + '\t' + keyBinding;`
	`48`	`+ return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + (keyBinding != null ? '\t' + keyBinding : ""); //$NON-NLS-2$`
`49`	`49`	`}`
`50`		`-}`
	`50`	`+}`