Bug 269228 – [Help][Context] HelpView with F1 does not use IContext of IContextProvider

1 files changed, 8 insertions, 4 deletions

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
index 30cf1cc7f..12dd55604 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
@@ -257,7 +257,7 @@ public class ContextHelpPart extends SectionPart implements IHelpPart {
 		savedDescription = helpText;
 	}
 
-	private void updateSearchExpression(boolean explicitContext) {
+	private void updateSearchExpression() {
 		if (lastContext instanceof IContext2) {
 			String title = ((IContext2)lastContext).getTitle();
 			if (title!=null) {
@@ -285,10 +285,14 @@ public class ContextHelpPart extends SectionPart implements IHelpPart {
 		lastProvider = provider;
 		lastContext = context;
 		lastPart = part;
-		if (context==null && provider!=null) {
-			lastContext = provider.getContext(c);
+		if (provider!=null) {
+			// A provider will take precedence over a passed in context
+		    IContext providerContext = provider.getContext(c);
+		    if (providerContext != null) {
+			    lastContext = providerContext;
+		    }
 		}
-		updateSearchExpression(context!=null);
+		updateSearchExpression();
 
 		String helpText;
 		if (lastContext!=null)