From a3a50a824b9729f4ab297f8a63cd3bb41e2ff46b Mon Sep 17 00:00:00 2001
From: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Date: Thu, 11 Jun 2026 10:14:00 +0300
Subject: [PATCH 1/2] Trace quick access table disposal

Tracing for fail in QuickAccessDialogTest hints at a disposed table
prior to updating entries in the table. This change adds tracing
for table dispose to validate this.

See: https://github.com/eclipse-platform/eclipse.platform.ui/issues/4009
---
 .../ui/internal/quickaccess/QuickAccessContents.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
index 3886f6a4257..d86ddbd25ec 100644
--- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
+++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.quickaccess;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -836,6 +838,14 @@ public void mouseMove(MouseEvent e) {
 		});
 
 		table.addSelectionListener(SelectionListener.widgetDefaultSelectedAdapter(e -> handleSelection()));
+		if (Policy.DEBUG_QUICK_ACCESS) {
+			table.addDisposeListener(e -> {
+				StringWriter writer = new StringWriter();
+				new Exception("provide stack trace").printStackTrace(new PrintWriter(writer)); //$NON-NLS-1$
+				String stackTrace = writer.toString(); // stack trace as a string
+				trace("Table disposed" + System.lineSeparator() + stackTrace); //$NON-NLS-1$
+			});
+		}
 		return table;
 	}
 

From 23fb09d7ee7dc6cd08c29d30b021704dff3c5f4f Mon Sep 17 00:00:00 2001
From: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Date: Thu, 11 Jun 2026 16:28:33 +0300
Subject: [PATCH 2/2] TEMPORARY, DONT MERGE

---
 .../quickaccess/QuickAccessContents.java      |  4 ++
 .../ui/tests/harness/util/TestRunLogUtil.java | 49 ++++++++++++-------
 .../quickaccess/QuickAccessDialogTest.java    |  5 ++
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
index d86ddbd25ec..d6898eb3249 100644
--- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
+++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
@@ -336,6 +336,10 @@ private void refreshTable(QuickAccessElement perfectMatch, List<QuickAccessEntry
 					item.setData(entry);
 					item.setText(0, entry.provider.getName());
 					item.setText(1, entry.element.getLabel());
+					if (Policy.DEBUG_QUICK_ACCESS) {
+						trace("Adding table row: name=" + entry.provider.getName() + ", label=" //$NON-NLS-1$ //$NON-NLS-2$
+								+ entry.element.getLabel());
+					}
 					if (Util.isWpf()) {
 						item.setImage(1, entry.getImage(entry.element, resourceManager));
 					}
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/TestRunLogUtil.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/TestRunLogUtil.java
index 938c56ffb75..78e14acb8e2 100644
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/TestRunLogUtil.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/TestRunLogUtil.java
@@ -13,6 +13,9 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.harness.util;
 
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
@@ -34,23 +37,7 @@ public final class TestRunLogUtil {
 	 *
 	 * Note: field must be public or JUnit4 will complain.
 	 */
-	public static TestWatcher LOG_TESTRUN = new TestWatcher() {
-		@Override
-		protected void starting(Description description) {
-			System.out.println(formatTestStartMessage(description.getMethodName()));
-		}
-
-		@Override
-		protected void failed(Throwable e, Description description) {
-			System.out.println(description.getMethodName() + " failed:");
-			e.printStackTrace(System.out);
-		}
-
-		@Override
-		protected void finished(Description description) {
-			System.out.println(formatTestFinishedMessage(description.getMethodName()));
-		}
-	};
+	public static TestWatcher LOG_TESTRUN = new LogTestWatcher();
 
 	/**
 	 * Create message used to log start of a test.
@@ -72,6 +59,34 @@ public static String formatTestFinishedMessage(String testName) {
 		return testName + ": tearDown...\n"; //$NON-NLS-1$
 	}
 
+	private static class LogTestWatcher extends TestWatcher implements BeforeEachCallback, AfterEachCallback {
+		@Override
+		protected void starting(Description description) {
+			System.out.println(formatTestStartMessage(description.getMethodName()));
+		}
+
+		@Override
+		protected void failed(Throwable e, Description description) {
+			System.out.println(description.getMethodName() + " failed:");
+			e.printStackTrace(System.out);
+		}
+
+		@Override
+		protected void finished(Description description) {
+			System.out.println(formatTestFinishedMessage(description.getMethodName()));
+		}
+
+		@Override
+		public void beforeEach(ExtensionContext context) throws Exception {
+			System.out.println(formatTestStartMessage(context.getDisplayName()));
+		}
+
+		@Override
+		public void afterEach(ExtensionContext context) throws Exception {
+			System.out.println(formatTestFinishedMessage(context.getDisplayName()));
+		}
+	};
+
 	private TestRunLogUtil() {
 	}
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessDialogTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessDialogTest.java
index c9dd5d7b920..171f99d87d9 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessDialogTest.java	
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessDialogTest.java	
@@ -50,12 +50,14 @@
 import org.eclipse.ui.internal.quickaccess.QuickAccessMessages;
 import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
+import org.eclipse.ui.tests.harness.util.TestRunLogUtil;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 /**
  * Tests the quick access UI
@@ -92,6 +94,9 @@ protected void setInfoText(String text) {
 	private IDialogSettings dialogSettings;
 	private IWorkbenchWindow activeWorkbenchWindow;
 
+	@RegisterExtension
+	public final Object TEST_WATCHER = TestRunLogUtil.LOG_TESTRUN;
+
 	@BeforeAll
 	public static void enableDebugOutputs() {
 		Policy.DEBUG_QUICK_ACCESS = true;