Merge branch 'issue2538b' of https://github.com/DaveCarpeneto/eclipse.platform.ui into issue2538b

Author: DaveCarpeneto

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
 	}
 	tools {
 		maven 'apache-maven-latest'
-		jdk 'temurin-jdk17-latest'
+		jdk 'temurin-jdk21-latest'
 	}
 	stages {
 		stage('Build') {

bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/SWTStyleHelpers.java

@@ -756,7 +756,7 @@ public static String getSWTWidgetStyleAsString(int style, String separator) {
 			}
 		} catch (Exception e) {
 		}
-		return swtStyles.length() == 0 ? "" : swtStyles.toString();
+		return swtStyles.length() == 0 ? "" : swtStyles.toString().intern();
 	}
 
 	/**

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/SurroundWithBracketsStrategy.java

@@ -36,9 +36,9 @@ public SurroundWithBracketsStrategy(ISourceViewer sourceViewer) {
 
 	@Override
 	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		if (bracketsMap.containsKey(command.text)) {
+		if (command.text != null && bracketsMap.containsKey(command.text)) {
 			try {
-				ITextSelection selection= (ITextSelection) sourceViewer.getSelectionProvider().getSelection();
+				ITextSelection selection= command.fSelection;
 				if (selection != null && selection.getLength() > 0) {
 					String selectedText= document.get(selection.getOffset(), selection.getLength());
 					String closingBracket= bracketsMap.get(command.text);
@@ -51,12 +51,7 @@ public void customizeDocumentCommand(IDocument document, DocumentCommand command
 					command.shiftsCaret= false;
 
 					// Run this in a UI thread asynchronously to ensure the selection is updated correctly
-					sourceViewer.getTextWidget().getDisplay().asyncExec(new Runnable() {
-						@Override
-						public void run() {
-							sourceViewer.setSelectedRange(command.offset + 1, selectedText.length());
-						}
-					});
+					sourceViewer.getTextWidget().getDisplay().asyncExec(() -> sourceViewer.setSelectedRange(command.offset + 1, selectedText.length()));
 				}
 			} catch (BadLocationException e) {
 				SWT.error(SWT.ERROR_INVALID_ARGUMENT);

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java

@@ -19,7 +19,6 @@
 package org.eclipse.jface.text.source;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
@@ -59,7 +58,6 @@
 import org.eclipse.jface.text.ITextViewerLifecycle;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.SurroundWithBracketsStrategy;
 import org.eclipse.jface.text.TextViewer;
 import org.eclipse.jface.text.codemining.ICodeMiningProvider;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
@@ -546,12 +544,7 @@ public void configure(SourceViewerConfiguration configuration) {
 		String[] types= configuration.getConfiguredContentTypes(this);
 		for (String t : types) {
 
-			IAutoEditStrategy[] autoEditStrategies= configuration.getAutoEditStrategies(this, t);
-			List<IAutoEditStrategy> autoEditStrategiesList= new ArrayList<>(Arrays.asList(autoEditStrategies));
-			autoEditStrategiesList.add(new SurroundWithBracketsStrategy(this));
-			IAutoEditStrategy[] newStrategies= autoEditStrategiesList.toArray(new IAutoEditStrategy[0]);
-
-			doSetAutoEditStrategies(newStrategies, t);
+			doSetAutoEditStrategies(configuration.getAutoEditStrategies(this, t), t);
 			setTextDoubleClickStrategy(configuration.getDoubleClickStrategy(this, t), t);
 
 			int[] stateMasks= configuration.getConfiguredTextHoverStateMasks(this, t);

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java

@@ -30,6 +30,7 @@
 import org.eclipse.jface.text.ITextHover;
 import org.eclipse.jface.text.ITextViewerExtension2;
 import org.eclipse.jface.text.IUndoManager;
+import org.eclipse.jface.text.SurroundWithBracketsStrategy;
 import org.eclipse.jface.text.TextViewerUndoManager;
 import org.eclipse.jface.text.codemining.ICodeMiningProvider;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
@@ -190,7 +191,7 @@ public org.eclipse.jface.text.IAutoIndentStrategy getAutoIndentStrategy(ISourceV
 	 * @since 3.1
 	 */
 	public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) {
-		return new IAutoEditStrategy[] { getAutoIndentStrategy(sourceViewer, contentType) };
+		return new IAutoEditStrategy[] { getAutoIndentStrategy(sourceViewer, contentType), new SurroundWithBracketsStrategy(sourceViewer) };
 	}
 
 	/**

bundles/org.eclipse.jface/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface;singleton:=true
-Bundle-Version: 3.35.200.qualifier
+Bundle-Version: 3.36.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jface,

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2023 IBM Corporation and others.
+ * Copyright (c) 2000, 2024 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -205,25 +205,47 @@ public static ImageDescriptor createFromURLSupplier(boolean useMissingImage, Sup
 	}
 
 	/**
-	 * Convenient method to create an ImageDescriptor from an URI
+	 * Convenient method to create an ImageDescriptor from an URI.
 	 *
-	 * Delegates to ImageDescriptor createFromURL
+	 * Delegates to {@link ImageDescriptor#createFromURL(URL)}. <em>Important</em>
+	 * This method should only be used when it's guaranteed that the given
+	 * {@link URI} is also a valid {@link URL}, in order to avoid the
+	 * {@link MalformedURLException} thrown by {@link URI#toURL()}.
+	 *
+	 * If the URI is {@code null} or not a valid {@link URL}, then an image from
+	 * {@link #getMissingImageDescriptor()} will be returned.
 	 *
 	 * @param uriIconPath The URI of the image file.
 	 * @return a new image descriptor
 	 *
-	 * @since 3.19
+	 * @since 3.36
 	 */
-	public ImageDescriptor imageDescriptorFromURI(URI uriIconPath) {
+	public static ImageDescriptor createFromURI(URI uriIconPath) {
 		try {
-			return ImageDescriptor.createFromURL(new URL(uriIconPath.toString()));
-		} catch (MalformedURLException | NullPointerException e) {
+			return ImageDescriptor.createFromURL(uriIconPath != null ? uriIconPath.toURL() : null);
+		} catch (MalformedURLException e) {
 			// return the missing image placeholder to indicate
 			// the incorrect call without interfering with the user flow
 			return getMissingImageDescriptor();
 		}
 	}
 
+	/**
+	 * Convenient method to create an ImageDescriptor from an URI
+	 *
+	 * Delegates to ImageDescriptor createFromURL
+	 *
+	 * @param uriIconPath The URI of the image file.
+	 * @return a new image descriptor
+	 *
+	 * @since 3.19
+	 * @deprecated Use {@link #createFromURI(URI)} instead.
+	 */
+	@Deprecated(since = "3.36", forRemoval = true)
+	public ImageDescriptor imageDescriptorFromURI(URI uriIconPath) {
+		return createFromURI(uriIconPath);
+	}
+
 	@Override
 	public Object createResource(Device device) throws DeviceResourceException {
 		Image result = createImage(false, device);

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java

@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ltk.internal.ui.refactoring;
 
+import java.lang.reflect.InvocationTargetException;
 import java.text.Collator;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -29,6 +30,8 @@
 import org.eclipse.swt.accessibility.AccessibleEvent;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
@@ -43,31 +46,45 @@
 import org.eclipse.swt.widgets.ToolItem;
 
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuCreator;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.wizard.IWizardContainer;
 
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.PageBook;
+import org.eclipse.ui.services.IServiceLocator;
 
+import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.CompareUI;
+import org.eclipse.compare.ICompareContainer;
+import org.eclipse.compare.ICompareNavigator;
+import org.eclipse.compare.structuremergeviewer.ICompareInput;
+import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;
 
 import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.CompositeChange;
@@ -461,7 +478,7 @@ public void getName(AccessibleEvent e) {
 		fTreeViewer.setContentProvider(createTreeContentProvider());
 		fTreeViewer.setLabelProvider(createTreeLabelProvider());
 		fTreeViewer.setComparator(createTreeComparator());
-		fTreeViewer.addSelectionChangedListener(createSelectionChangedListener());
+		fTreeViewer.addSelectionChangedListener(createSelectionChangedListener(fTreeViewer));
 		fTreeViewer.addCheckStateListener(createCheckStateListener());
 		fTreeViewerPane.setContent(fTreeViewer.getControl());
 		fTreeViewer.getControl().getAccessible().addAccessibleListener(new AccessibleAdapter() {
@@ -596,14 +613,47 @@ private boolean isChild(PreviewNode element, PreviewNode child) {
 		};
 	}
 
-	private ISelectionChangedListener createSelectionChangedListener() {
+	private ISelectionChangedListener createSelectionChangedListener(ChangeElementTreeViewer treeViewer) {
+		Runnable[] runOnMouseUp=new Runnable[] {null};
+		boolean[] mouseDownPressed = new boolean[] {false};
+		treeViewer.getTree().addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				mouseDownPressed[0] = false;
+				if (runOnMouseUp[0] != null) {
+					runOnMouseUp[0].run();
+					runOnMouseUp[0] = null;
+				}
+			}
+
+			@Override
+			public void mouseDown(MouseEvent e) {
+				mouseDownPressed[0] = true;
+			}
+
+			@Override
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
 		return event -> {
 			IStructuredSelection sel= (IStructuredSelection) event.getSelection();
 			if (sel.size() == 1) {
 				PreviewNode newSelection= (PreviewNode)sel.getFirstElement();
 				if (newSelection != fCurrentSelection) {
 					fCurrentSelection= newSelection;
-					showPreview(newSelection);
+					Runnable r = new Runnable() {
+
+						@Override
+						public void run() {
+							showPreview(newSelection);
+						}
+					};
+					if (mouseDownPressed[0]) {
+						runOnMouseUp[0] = r;
+					}else {
+						r.run();
+					}
 				}
 			} else {
 				showPreview(null);
@@ -622,6 +672,13 @@ private void showPreview(PreviewNode element) {
 					if (descriptor != null) {
 						newViewer= descriptor.createViewer();
 						newViewer.createControl(fPreviewContainer);
+						IWizardContainer container = getContainer();
+						if (container != null) {
+							if (newViewer.getControl() instanceof IAdaptable adaptable) {
+								CompareConfiguration config = adaptable.getAdapter(CompareConfiguration.class);
+								config.setContainer(new WizardCompareContainer(container));
+							}
+						}
 					} else {
 						newViewer= fNullPreviewer;
 					}
@@ -761,4 +818,70 @@ private void setHideDerived(boolean hide) {
 	public Change getChange() {
 		return fChange;
 	}
+
+	private static final class WizardCompareContainer implements ICompareContainer {
+
+		private IRunnableContext context;
+
+		public WizardCompareContainer(IRunnableContext context) {
+			this.context=context;
+		}
+
+		@Override
+		public void setStatusMessage(String message) {
+		}
+
+		@Override
+		public void addCompareInputChangeListener(ICompareInput input,
+				ICompareInputChangeListener listener) {
+			input.addCompareInputChangeListener(listener);
+		}
+
+		@Override
+		public void removeCompareInputChangeListener(ICompareInput input,
+				ICompareInputChangeListener listener) {
+			input.removeCompareInputChangeListener(listener);
+		}
+
+		@Override
+		public void registerContextMenu(MenuManager menu,
+				ISelectionProvider selectionProvider) {
+		}
+
+		@Override
+		public IServiceLocator getServiceLocator() {
+			return null;
+		}
+
+		@Override
+		public IActionBars getActionBars() {
+			return null;
+		}
+
+		@Override
+		public void run(boolean fork, boolean cancelable,
+				IRunnableWithProgress runnable)
+				throws InvocationTargetException, InterruptedException {
+			context.run(fork, cancelable, runnable);
+		}
+
+		@Override
+		public ICompareNavigator getNavigator() {
+			return null;
+		}
+
+		@Override
+		public synchronized void runAsynchronously(IRunnableWithProgress runnable) {
+			try {
+				context.run(true, false, runnable);
+			} catch (InvocationTargetException | InterruptedException e) {
+				RefactoringUIPlugin.log(e);
+			}
+		}
+
+		@Override
+		public IWorkbenchPart getWorkbenchPart() {
+			return null;
+		}
+	}
 }

bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangePreviewViewer.java

@@ -118,6 +118,14 @@ public void setText(String text) {
 				current.dispose();
 			}
 		}
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T getAdapter(Class<T> adapter) {
+			if (CompareConfiguration.class.equals(adapter)) {
+				return (T) fCompareConfiguration;
+			}
+			return super.getAdapter(adapter);
+		}
 	}
 
 	private static class CompareElement implements ITypedElement, IEncodedStreamContentAccessor, IResourceProvider {