From 7477cfff49bfec4c248b88c5534b8219ea3cae8c Mon Sep 17 00:00:00 2001
From: Sougandh S <sougandh.s@ibm.com>
Date: Tue, 7 Jul 2026 16:59:32 +0530
Subject: [PATCH] Extend "Compare with Clipboard" feature in Expressions View

Extended the "Compare with Clipboard" feature to support expressions in
addition to variables. The action now handles IJavaVariable and
IExpression
---
 org.eclipse.jdt.debug.ui/plugin.properties    |   7 +-
 org.eclipse.jdt.debug.ui/plugin.xml           |  15 +-
 .../actions/CompareObjectWithClipboard.java   | 134 ++++++++++++++----
 3 files changed, 126 insertions(+), 30 deletions(-)

diff --git a/org.eclipse.jdt.debug.ui/plugin.properties b/org.eclipse.jdt.debug.ui/plugin.properties
index 4e7fca4bc4..a05fd27241 100644
--- a/org.eclipse.jdt.debug.ui/plugin.properties
+++ b/org.eclipse.jdt.debug.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2025 IBM Corporation and others.
+# Copyright (c) 2000, 2026 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -353,4 +353,7 @@ ToggleHitpointAction.label=Toggle Breakpoint with Hit Count
 ToggleHitpointCommand.description=Creates or removes a breakpoint with hit count
 
 CompareVariableClipboard.label=Compare With Clipboard
-CompareVariableClipboard.tooltip=Compare Variable's Value with Clipboard Content
\ No newline at end of file
+CompareVariableClipboard.tooltip=Compare Variable's Value with Clipboard Content
+
+CompareExpressionClipboard.label=Compare With Clipboard
+CompareExpressionClipboard.tooltip=Compare Expressions's Value with Clipboard Content
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/plugin.xml b/org.eclipse.jdt.debug.ui/plugin.xml
index 4643154b7b..668b05985d 100644
--- a/org.eclipse.jdt.debug.ui/plugin.xml
+++ b/org.eclipse.jdt.debug.ui/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!--
-     Copyright (c) 2005, 2025 IBM Corporation and others.
+     Copyright (c) 2005, 2026 IBM Corporation and others.
 
      This program and the accompanying materials
      are made available under the terms of the Eclipse Public License 2.0
@@ -1588,6 +1588,19 @@
             </and>
          </visibility>
       </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.debug.core.model.IExpression"
+            id="org.eclipse.debug.WatchExpressionActions.Compare">
+         <action
+               label="%CompareExpressionClipboard.label"
+               helpContextId="compare_expressions_clipboard_id"
+               class="org.eclipse.jdt.internal.debug.ui.actions.CompareObjectWithClipboard"
+               tooltip="%CompareExpressionClipboard.tooltip"
+               menubarPath="additions"
+               enablesFor="1"
+               id="org.eclipse.debug.ui.watchExpressionActions.CompareWithClipboard">
+         </action>
+      </objectContribution>
       <objectContribution
             id="org.eclipse.jdt.debug.ui.FilteredJavaVariableActions"
             objectClass="org.eclipse.jdt.debug.core.IJavaVariable">
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/CompareObjectWithClipboard.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/CompareObjectWithClipboard.java
index 6bbe7a528e..c84223f2d7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/CompareObjectWithClipboard.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/CompareObjectWithClipboard.java
@@ -26,6 +26,9 @@
 import org.eclipse.compare.structuremergeviewer.DiffNode;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IDebugTarget;
+import org.eclipse.debug.core.model.IExpression;
+import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.core.model.IVariable;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.ui.DebugUITools;
@@ -37,8 +40,10 @@
 import org.eclipse.jdt.internal.debug.core.model.JDINullValue;
 import org.eclipse.jdt.internal.debug.core.model.JDIPrimitiveValue;
 import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame;
+import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.TextTransfer;
@@ -53,34 +58,33 @@ public void run(IAction action) {
 		if (selection == null) {
 			return;
 		}
+
+		Object clpbrd = getClipboard();
+		if (clpbrd == null) {
+			MessageDialog.openWarning(DebugUIPlugin.getShell(), "Comparison Failed", "Invalid clipboard content"); //$NON-NLS-1$ //$NON-NLS-2$
+			return;
+		}
+
 		if (selection.getFirstElement() instanceof IJavaVariable variable) {
 			try {
-				Object clpbrd = getClipboard();
-				if (clpbrd != null) {
-					String cb = clpbrd.toString();
-					String variableName = variable.getName();
-					if (variable.getValue() instanceof IJavaObject javaObject && !(javaObject instanceof JDINullValue)) {
-						if (javaObject.getJavaType() instanceof IJavaArrayType) {
-							StringBuilder arrBuilder = new StringBuilder("["); //$NON-NLS-1$
-							for (IVariable variableTemp : variable.getValue().getVariables()) {
-								arrBuilder.append(variableTemp.getValue() + ", "); //$NON-NLS-1$
-							}
-							arrBuilder.delete(arrBuilder.length() - 2, arrBuilder.length());
-							arrBuilder.append("]"); //$NON-NLS-1$
-							compareVariable(arrBuilder.toString(), variableName, cb);
-							return;
-						}
-						JDIStackFrame frame = (JDIStackFrame) DebugUITools.getDebugContext();
-						IJavaThread thread = (IJavaThread) frame.getThread();
-						IJavaValue stringVal = javaObject.sendMessage("toString", "()Ljava/lang/String;", null, thread, false); //$NON-NLS-1$//$NON-NLS-2$
-						String variableValue = stringVal.getValueString();
-						compareVariable(variableValue, variableName, cb);
-					}
-					if (variable.getValue() instanceof JDIPrimitiveValue javaPrimitive) {
-						compareVariable(javaPrimitive.toString(), variableName, cb);
-					}
-				} else {
-					MessageDialog.openWarning(DebugUIPlugin.getShell(), "Variable Value Comparision", "Invalid clipboard content"); //$NON-NLS-1$ //$NON-NLS-2$
+				handleCompareForValue(variable.getName(), clpbrd.toString(), variable.getValue());
+				return;
+			} catch (DebugException e) {
+				DebugUIPlugin.log(e);
+			}
+		}
+
+		if (selection.getFirstElement() instanceof IExpression expression) {
+			try {
+				String cb = clpbrd.toString();
+				String title = "Selected Expression"; //$NON-NLS-1$
+				if (expression instanceof JavaInspectExpression) {
+					handleCompareForValue(title, cb, expression.getValue());
+					return;
+				}
+				IValue expValue = expression.getValue();
+				if (expValue != null) {
+					compareVariable(expValue.getValueString(), title, cb);
 				}
 			} catch (DebugException e) {
 				DebugUIPlugin.log(e);
@@ -88,6 +92,62 @@ public void run(IAction action) {
 		}
 	}
 
+	/**
+	 * Resolves the string representation of <code>value</code> and opens the compare editor.
+	 *
+	 * @param title
+	 *            label for the left side of the compare editor
+	 * @param clipboard
+	 *            active clipboard content to compare against
+	 * @param value
+	 *            value of the selected variable or expression
+	 * @throws DebugException
+	 *             if evaluating the value or retrieving array elements fails
+	 */
+	private void handleCompareForValue(String title, String clipboard, IValue value) throws DebugException {
+
+		if (value instanceof IJavaObject javaObject && !(javaObject instanceof JDINullValue)) {
+			if (javaObject.getJavaType() instanceof IJavaArrayType) {
+				handleCompareForArrayTypes(title, clipboard, value.getVariables());
+				return;
+			}
+			if (!(DebugUITools.getDebugContext() instanceof JDIStackFrame frame)) {
+				return;
+			}
+			IJavaThread thread = (IJavaThread) frame.getThread();
+			IJavaValue stringVal = javaObject.sendMessage("toString", "()Ljava/lang/String;", null, thread, false); //$NON-NLS-1$//$NON-NLS-2$
+			compareVariable(stringVal.getValueString(), title, clipboard);
+		} else if (value instanceof JDIPrimitiveValue javaPrimitive) {
+			compareVariable(javaPrimitive.getValueString(), title, clipboard);
+		}
+	}
+
+	/**
+	 * Builds a string representation of the given array variables and opens the compare editor.
+	 *
+	 * @param title
+	 *            Label shown on the left side of the compare editor (variable name or expression text)
+	 * @param clipboard
+	 *            Active clipboard content to compare against
+	 * @param variables
+	 *            The array elements as <code>IVariable[]</code>, obtained from the array value
+	 * @throws DebugException
+	 *             if retrieving a variable's value fails
+	 */
+	private void handleCompareForArrayTypes(String title, String clipboard, IVariable[] variables) throws DebugException {
+		if (variables.length == 0) {
+			compareVariable("[]", title, clipboard); //$NON-NLS-1$
+			return;
+		}
+		StringBuilder arrBuilder = new StringBuilder("["); //$NON-NLS-1$
+		for (IVariable variableTemp : variables) {
+			arrBuilder.append(variableTemp.getValue() + ", "); //$NON-NLS-1$
+		}
+		arrBuilder.delete(arrBuilder.length() - 2, arrBuilder.length());
+		arrBuilder.append("]"); //$NON-NLS-1$
+		compareVariable(arrBuilder.toString(), title, clipboard);
+	}
+
 	/**
 	 * Creates comparable objects
 	 *
@@ -136,7 +196,7 @@ public InputStream getContents() {
 		config.setLeftLabel(variableName);
 		config.setRightLabel("Contents in clipboard"); //$NON-NLS-1$
 		config.setLeftEditable(false);
-		config.setLeftEditable(false);
+		config.setRightEditable(false);
 		CompareEditorInput compareInput = new CompareEditorInput(config) {
 			@Override
 			protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
@@ -163,4 +223,24 @@ private Object getClipboard() {
 		}
 	}
 
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		if (selection instanceof IStructuredSelection ss) {
+			if (ss.getFirstElement() instanceof IExpression expression) {
+				if (expression.getValue() == null) {
+					action.setEnabled(false);
+					return;
+				}
+				IDebugTarget target = expression.getDebugTarget();
+				if (target == null) {
+					action.setEnabled(false);
+					return;
+				}
+				if (target.isTerminated() || target.isDisconnected()) {
+					action.setEnabled(false);
+				}
+			}
+		}
+	}
+
 }