Honor 'Always run in background' in IProgressService.run() #4202

Fixes #4202

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: fedejeanne

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/progress/ProgressManager.java

@@ -1075,22 +1075,28 @@ public void showInDialog(Shell shell, Job job) {
 	@Override
 	public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable)
 			throws InvocationTargetException, InterruptedException {
+		if (shouldRunInBackground()) {
+			// The "Always run in background" preference must suppress the modal
+			// progress dialog for every fork/cancelable combination, not just the
+			// backward compatible (fork==false || cancelable==false) path below.
+			final ProgressMonitorJobsDialog dialog = new ProgressMonitorJobsDialog(
+					ProgressManagerUtil.getDefaultParent());
+			dialog.setOpenOnRun(false);
+			dialog.run(fork, cancelable, runnable);
+			return;
+		}
+
 		if (!fork || !cancelable) {
 			// Backward compatible code.
 			final ProgressMonitorJobsDialog dialog = new ProgressMonitorJobsDialog(
 					ProgressManagerUtil.getDefaultParent());
-			if (shouldRunInBackground()) {
-				dialog.setOpenOnRun(false);
+			Job showDialogJob = scheduleProgressMonitorJob(dialog);
+			try {
 				dialog.run(fork, cancelable, runnable);
-			} else {
-				Job showDialogJob = scheduleProgressMonitorJob(dialog);
-				try {
-					dialog.run(fork, cancelable, runnable);
-				} finally {
-					// In case the dialog hasn't popped up yet, cancel it so it doesn't pop up after
-					// the operation finishes or unwinds with an exception.
-					showDialogJob.cancel();
-				}
+			} finally {
+				// In case the dialog hasn't popped up yet, cancel it so it doesn't pop up after
+				// the operation finishes or unwinds with an exception.
+				showDialogJob.cancel();
 			}
 			return;
 		}

examples/org.eclipse.ui.examples.job/src/org/eclipse/ui/examples/jobs/views/ProgressServiceView.java

@@ -44,7 +44,11 @@ public class ProgressServiceView extends ViewPart {
 
 	private static final int SLEEP_STEP_MS = 100;
 
-	private final ExecutorService nonUiExecutor = Executors.newSingleThreadExecutor();
+	private final ExecutorService nonUiExecutor = Executors.newSingleThreadExecutor(r -> {
+		Thread t = new Thread(r, "ProgressServiceView-nonUI"); //$NON-NLS-1$
+		t.setDaemon(true);
+		return t;
+	});
 
 	private Button backgroundPrefField;
 	private IPropertyChangeListener prefListener;
@@ -88,7 +92,14 @@ private void createPreferenceGroup(Composite parent) {
 
 		prefListener = event -> {
 			if (IPreferenceConstants.RUN_IN_BACKGROUND.equals(event.getProperty())) {
-				Display.getDefault().asyncExec(() -> {
+				if (backgroundPrefField.isDisposed()) {
+					return;
+				}
+				Display display = backgroundPrefField.getDisplay();
+				if (display.isDisposed()) {
+					return;
+				}
+				display.asyncExec(() -> {
 					if (!backgroundPrefField.isDisposed()) {
 						backgroundPrefField
 								.setSelection(getPreferenceStore().getBoolean(IPreferenceConstants.RUN_IN_BACKGROUND));
@@ -188,25 +199,29 @@ private IRunnableWithProgress createSleepRunnable(long durationMillis, boolean p
 		return monitor -> {
 			int ticks = (int) Math.max(1, durationMillis / SLEEP_STEP_MS);
 			monitor.beginTask("Simulated long-running operation", ticks); //$NON-NLS-1$
-			for (int i = 0; i < ticks; i++) {
-				if (monitor.isCanceled()) {
-					return;
-				}
-				try {
-					Thread.sleep(SLEEP_STEP_MS);
-				} catch (InterruptedException e) {
-					Thread.currentThread().interrupt();
-					return;
-				}
-				if (pumpEvents) {
-					Display display = Display.getCurrent();
-					if (display != null) {
-						while (display.readAndDispatch()) {
-							// drain pending UI events so the heartbeat keeps ticking
+			try {
+				for (int i = 0; i < ticks; i++) {
+					if (monitor.isCanceled()) {
+						return;
+					}
+					try {
+						Thread.sleep(SLEEP_STEP_MS);
+					} catch (InterruptedException e) {
+						Thread.currentThread().interrupt();
+						return;
+					}
+					if (pumpEvents) {
+						Display display = Display.getCurrent();
+						if (display != null) {
+							while (display.readAndDispatch()) {
+								// drain pending UI events so the heartbeat keeps ticking
+							}
 						}
 					}
+					monitor.worked(1);
 				}
-				monitor.worked(1);
+			} finally {
+				monitor.done();
 			}
 		};
 	}