Honor expression context when creating Watches

When selecting a field under an object, both the Watch command and Drag
& Drop previously created a non-contextual expression using only the
field name, which caused evaluation failures. This fix ensures that both
Watch and Drag & Drop now generate proper context-aware expressions such
as myobj.myfield instead of just the field name.

Fixes : https://bugs.eclipse.org/bugs/show_bug.cgi?id=321289

Author: SougandhS

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/WatchHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Wind River Systems and others.
+ * Copyright (c) 2008, 2026 Wind River Systems and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,10 +10,12 @@
  *
  * Contributors:
  *     Wind River Systems - initial API and implementation
+ *     IBM Corporation - Improved expression creation
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.actions.expressions;
 
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -33,6 +35,8 @@
 import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter2;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
@@ -49,12 +53,39 @@ public class WatchHandler extends AbstractHandler {
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		if (selection instanceof IStructuredSelection) {
-			Iterator<?> iter = ((IStructuredSelection)selection).iterator();
-			while (iter.hasNext()) {
-				Object element = iter.next();
-				createExpression(element);
+		if (selection instanceof IStructuredSelection structuredSelection) {
+			if (structuredSelection instanceof TreeSelection treeSelection) {
+				for (TreePath path : treeSelection.getPaths()) {
+					List<IVariable> variables = new ArrayList<>();
+					if (path.getSegmentCount() > 1) {
+						for (int e = 0; e < path.getSegmentCount(); e++) {
+							IVariable variable = (IVariable) path.getSegment(e);
+							variables.add(variable);
+						}
+						IWatchExpressionFactoryAdapter2 factory = getFactory2(variables);
+						if (factory != null) {
+							boolean canCreate = factory.canCreateWatchExpression(variables);
+							if (canCreate) {
+								try {
+									String expression = factory.createWatchExpression(variables);
+									createWatchExpression(expression);
+								} catch (CoreException e) {
+									DebugPlugin.log(e);
+									break;
+								}
+							}
+						}
+					} else {
+						Object element = path.getFirstSegment();
+						createExpression(element);
+					}
+				}
+			} else {
+				for (Object element : structuredSelection.toArray()) {
+					createExpression(element);
+				}
 			}
+			showExpressionsView();
 		}
 		return null;
 	}
@@ -96,9 +127,12 @@ private void createExpression(Object element) {
 			DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.WatchAction_0, ActionMessages.WatchAction_1, e); //
 			return;
 		}
+		createWatchExpression(expressionString);
+	}
 
+	private void createWatchExpression(String expressionString) {
 		IWatchExpression expression;
-			expression = DebugPlugin.getDefault().getExpressionManager().newWatchExpression(expressionString);
+		expression = DebugPlugin.getDefault().getExpressionManager().newWatchExpression(expressionString);
 		DebugPlugin.getDefault().getExpressionManager().addExpression(expression);
 		IAdaptable object = DebugUITools.getDebugContext();
 		IDebugElement context = null;
@@ -108,10 +142,8 @@ private void createExpression(Object element) {
 			context = ((ILaunch) object).getDebugTarget();
 		}
 		expression.setExpressionContext(context);
-		showExpressionsView();
 	}
 
-
 	/**
 	 * Returns the factory adapter for the given variable or <code>null</code> if none.
 	 *
@@ -132,6 +164,16 @@ static IWatchExpressionFactoryAdapter2 getFactory2(Object element) {
 		if (element instanceof IAdaptable) {
 			return ((IAdaptable)element).getAdapter(IWatchExpressionFactoryAdapter2.class);
 		}
+		if (element instanceof List<?> ExpressionList) {
+			for (Object obj : ExpressionList) {
+				if (!(obj instanceof IAdaptable)) {
+					return null;
+				}
+			}
+			if (ExpressionList.getFirst() instanceof IVariable variable) {
+				return variable.getAdapter(IWatchExpressionFactoryAdapter2.class);
+			}
+		}
 		return null;
 	}
 

debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -40,6 +40,8 @@
 import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension;
 import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTargetEvent;
@@ -373,19 +375,46 @@ private boolean performExpressionDrop(IStructuredSelection selection) {
 	 */
 	private boolean performVariableOrWatchAdaptableDrop(IStructuredSelection selection) {
 		List<IExpression> expressions = new ArrayList<>(selection.size());
-		for (Iterator<?> itr = selection.iterator(); itr.hasNext();) {
-			Object element = itr.next();
-			String expressionText = createExpressionString(element);
-			if (expressionText != null){
-				IExpression expression = createExpression(expressionText);
-				if (expression != null){
-					expressions.add(expression);
+		IExpression expression;
+		if (selection instanceof ITreeSelection treeSelection) {
+			for (TreePath path : treeSelection.getPaths()) {
+				List<IVariable> variables = new ArrayList<>();
+				expression = null;
+				if (path.getSegmentCount() > 1) {
+					for (int e = 0; e < path.getSegmentCount(); e++) {
+						IVariable variable = (IVariable) path.getSegment(e);
+						variables.add(variable);
+					}
+					IWatchExpressionFactoryAdapter2 factory = getFactory2(variables);
+					if (factory != null) {
+						boolean canCreate = factory.canCreateWatchExpression(variables);
+						if (canCreate) {
+							try {
+								String expressionText = factory.createWatchExpression(variables);
+								expression = createExpression(expressionText);
+								expressions.add(expression);
+							} catch (CoreException e) {
+								DebugPlugin.log(e);
+								break;
+							}
+						}
+					}
 				} else {
-					DebugUIPlugin.log(new Status(IStatus.ERROR,DebugUIPlugin.getUniqueIdentifier(),"Drop failed.  Watch expression could not be created for the text " + expressionText)); //$NON-NLS-1$
+					Object element = path.getFirstSegment();
+					String expressionText = createExpressionString(element);
+					if (expressionText == null) {
+						return false;
+					}
+					expressions.add(createExpression(expressionText));
+				}
+			}
+		} else {
+			for (Object element : selection) {
+				String expressionText = createExpressionString(element);
+				if (expressionText == null) {
 					return false;
 				}
-			} else {
-				return false;
+				expressions.add(createExpression(expressionText));
 			}
 		}
 		if (expressions.size() == selection.size()){
@@ -498,6 +527,16 @@ private IWatchExpressionFactoryAdapter2 getFactory2(Object element) {
 		if (element instanceof IAdaptable) {
 			return ((IAdaptable)element).getAdapter(IWatchExpressionFactoryAdapter2.class);
 		}
+		if (element instanceof List<?> ExpressionList) {
+			for (Object obj : ExpressionList) {
+				if (!(obj instanceof IAdaptable)) {
+					return null;
+				}
+			}
+			if (ExpressionList.getFirst() instanceof IVariable variable) {
+				return variable.getAdapter(IWatchExpressionFactoryAdapter2.class);
+			}
+		}
 		return null;
 	}