Proper selection coloring in JFace Structured Viewers

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface.text
-Bundle-Version: 3.30.0.qualifier
+Bundle-Version: 3.30.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/CompletionProposalDrawSupport.java

@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2025 SAP SE.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     SAP SE - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jface.internal.text;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Scrollable;
+import org.eclipse.swt.widgets.Table;
+
+import org.eclipse.jface.viewers.ColumnViewerSelectionColorListener;
+
+/**
+ * Provides custom drawing support for completion proposals. This class ensures that completion
+ * proposals are always rendered with a focused appearance.
+ *
+ * <p>
+ * This drawing behavior addresses the particular situation where the code completion is triggered
+ * via keyboard shortcut, leaving the editor focused. In such cases, without this custom drawing
+ * support, the completion proposal would appear unfocused, leading to a suboptimal coloring.
+ * </p>
+ */
+public class CompletionProposalDrawSupport implements Listener {
+
+	/**
+	 * Delegate
+	 */
+	private final TableOwnerDrawSupport fTableOwnerDrawSupport;
+
+	private CompletionProposalDrawSupport(Table table) {
+		fTableOwnerDrawSupport= new TableOwnerDrawSupport(table);
+	}
+
+	public static void install(Table table) {
+		CompletionProposalDrawSupport listener= new CompletionProposalDrawSupport(table);
+
+		// Since this listener delegates to TableOwnerDrawSupport right after doing
+		// its own stuff, we need to make sure to listen for all kind of events so
+		// that the delegation happens even after a No-Op.
+		table.addListener(SWT.Dispose, listener);
+		table.addListener(SWT.MeasureItem, listener);
+		table.addListener(SWT.EraseItem, listener);
+		table.addListener(SWT.PaintItem, listener);
+	}
+
+	@Override
+	public void handleEvent(Event event) {
+
+		if (event.widget instanceof Control && event.gc != null) {
+
+			boolean isSelected= (event.detail & SWT.SELECTED) != 0;
+
+			if (event.type == SWT.EraseItem && isSelected) {
+
+				final Color backgroundColor= ColumnViewerSelectionColorListener.getSelectionBackgroundColor(event.display, isSelected);
+				event.gc.setBackground(backgroundColor);
+
+				final int width= (event.widget instanceof Scrollable s) ? s.getClientArea().width : event.width;
+				event.gc.fillRectangle(0, event.y, width, event.height);
+
+				// Prevent native selection drawing
+				event.detail&= ~SWT.SELECTED;
+
+			} else if (event.type == SWT.PaintItem) {
+				final Color foregroundColor= ColumnViewerSelectionColorListener.getSelectionForegroundColor(event.display, isSelected);
+				event.gc.setForeground(foregroundColor);
+			}
+		}
+
+		fTableOwnerDrawSupport.handleEvent(event);
+	}
+}

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java

@@ -27,7 +27,9 @@
 
 
 /**
- * Adds owner draw support for tables.
+ * Adds owner draw support for tables.<br/>
+ * <br/>
+ * It has been replaced by {@link CompletionProposalDrawSupport} in 2026-06.
  *
  * @since 3.4
  */
@@ -40,14 +42,6 @@ public class TableOwnerDrawSupport implements Listener {
 
 	private int fDeltaOfLastMeasure;
 
-	public static void install(Table table) {
-		TableOwnerDrawSupport listener= new TableOwnerDrawSupport(table);
-		table.addListener(SWT.Dispose, listener);
-		table.addListener(SWT.MeasureItem, listener);
-		table.addListener(SWT.EraseItem, listener);
-		table.addListener(SWT.PaintItem, listener);
-	}
-
 	/**
 	 * Stores the styled ranges in the given table item.
 	 *
@@ -70,7 +64,7 @@ private static StyleRange[] getStyledRanges(TableItem item, int column) {
 		return (StyleRange[])item.getData(STYLED_RANGES_KEY + column);
 	}
 
-	private TableOwnerDrawSupport(Table table) {
+	TableOwnerDrawSupport(Table table) {
 		int orientation= table.getStyle() & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
 		fSharedLayout= new TextLayout(table.getDisplay());
 		fSharedLayout.setOrientation(orientation);

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java

@@ -39,6 +39,7 @@
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
 
+import org.eclipse.jface.internal.text.CompletionProposalDrawSupport;
 import org.eclipse.jface.internal.text.TableOwnerDrawSupport;
 import org.eclipse.jface.preference.JFacePreferences;
 import org.eclipse.jface.resource.ColorRegistry;
@@ -274,7 +275,7 @@ private void createProposalSelector() {
 
 		fIsColoredLabelsSupportEnabled= fContentAssistant.isColoredLabelsSupportEnabled();
 		if (fIsColoredLabelsSupportEnabled) {
-			TableOwnerDrawSupport.install(fProposalTable);
+			CompletionProposalDrawSupport.install(fProposalTable);
 		}
 
 		fProposalTable.setLocation(0, 0);

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java

@@ -77,6 +77,7 @@
 import org.eclipse.jface.bindings.keys.KeySequence;
 import org.eclipse.jface.bindings.keys.SWTKeySupport;
 import org.eclipse.jface.contentassist.IContentAssistSubjectControl;
+import org.eclipse.jface.internal.text.CompletionProposalDrawSupport;
 import org.eclipse.jface.internal.text.InformationControlReplacer;
 import org.eclipse.jface.internal.text.TableOwnerDrawSupport;
 import org.eclipse.jface.preference.JFacePreferences;
@@ -628,7 +629,7 @@ void createProposalSelector() {
 
 		fIsColoredLabelsSupportEnabled= fContentAssistant.isColoredLabelsSupportEnabled();
 		if (fIsColoredLabelsSupportEnabled) {
-			TableOwnerDrawSupport.install(fProposalTable);
+			CompletionProposalDrawSupport.install(fProposalTable);
 		}
 
 		fProposalTable.setLocation(0, 0);

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.39.0.qualifier
+Bundle-Version: 3.40.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jface,