Bug 217279 - [launch] Allow ILaunchShortcut2 to provide resource mapping

2 files changed, 4 insertions, 3 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java
index b40f8eda1..73498a43f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextRunner.java
@@ -112,8 +112,10 @@ public final class ContextRunner {
 			LaunchConfigurationManager lcm = DebugUIPlugin.getDefault().getLaunchConfigurationManager();
 			String mode = group.getMode();
 			List shortcuts = fLRM.getShortcutsForSelection(selection, mode);
-			if(resource == null) {
-				resource = fLRM.getLaunchableResource(shortcuts, selection);
+		// allow the shortcut to translate/provide the resource for the launch
+			IResource overrideResource = fLRM.getLaunchableResource(shortcuts, selection);
+			if(overrideResource != null) {
+				resource = overrideResource;
 			}
 			shortcuts = fLRM.pruneShortcuts(shortcuts, resource, mode);
 		//see if the context is a shared configuration
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
index 03966fa17..4ae0bd3fc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
@@ -461,7 +461,6 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
 	public List getParticipatingLaunchConfigurations(IStructuredSelection selection, IResource resource, List shortcuts, String mode) {
 		List configs = new ArrayList();
 		boolean useDefault = false;
-		//IStructuredSelection ss = SelectedResourceManager.getDefault().getCurrentSelection();
 		if(selection != null) {
 			Object o = selection.getFirstElement();
 			LaunchShortcutExtension ext = null;