Prompt user when switching to a locked workspace in Eclipse by SougandhS · Pull Request #3518 · eclipse-platform/eclipse.platform.ui

SougandhS · 2025-11-08T03:14:21Z

This change prompts the user when attempting to switch to a workspace in Eclipse that is currently locked by another instance, preventing Eclipse from restarting into the locked workspace. Previously, if Eclipse restarted with a locked workspace, the workspace lock prompt would appear, and clicking “OK” would exit the application, requiring the user to reopen Eclipse to select an active workspace. With this update, the user is warned before switching, informed about the lock via a dialog, and prevented from restarting into the locked workspace, improving workflow and avoiding unnecessary restarts.

Before :

before.mp4

After :
(commented out the initial development mode check for this video)

after.mp4

github-actions · 2025-11-08T03:59:01Z

Test Results

852 files ±0 852 suites ±0 56m 17s ⏱️ +7s
7 857 tests ±0 7 614 ✅ ±0 243 💤 ±0 0 ❌ ±0
20 097 runs ±0 19 441 ✅ ±0 656 💤 ±0 0 ❌ ±0

Results for commit 5cc76a7. ± Comparison against base commit ce3b75a.

♻️ This comment has been updated with latest results.

SougandhS · 2025-11-08T04:00:11Z

Hi @iloveeclipse, could you please check this PR when you get some time ?

iloveeclipse

I can check on Monday. The idea itself is good.

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

BeckerWdf · 2025-11-10T07:07:40Z

would it be possible to bring up the exact same dialog (with the same information) in both situations?

SougandhS · 2025-11-10T07:21:33Z

would it be possible to bring up the exact same dialog (with the same information) in both situations?

Sure 👍

SougandhS · 2025-11-10T09:05:04Z

would it be possible to bring up the exact same dialog (with the same information) in both situations?

Updated as suggested

My.Movie.mp4

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

SougandhS · 2025-11-12T15:55:42Z

@iloveeclipse Could u please re-check this ?

iloveeclipse

I believe M3 is the bad time for changing workspace locking code. Take time, test the change also please with the workspace selection dialog that is shown on Eclipse startup, and if everything will work, it could land in the next release.

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

eclipse-platform-bot · 2025-12-02T04:47:59Z

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch

From d198af70fd64dd8a913eec7368a80e87fedef897 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Wed, 18 Mar 2026 09:39:30 +0000
Subject: [PATCH] Version bump(s) for 4.40 stream


diff --git a/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
index cb3e4ac4a2..7c3f352aad 100644
--- a/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.ide.application;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.6.100.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.21.0,4.0.0)",
-- 
2.53.0

Further information are available in Common Build Issues - Missing version increments.

SougandhS · 2025-12-04T09:25:46Z

I believe M3 is the bad time for changing workspace locking code. Take time, test the change also please with the workspace selection dialog that is shown on Eclipse startup, and if everything will work, it could land in the next release.

I have tested the change with a new SDK build and is even working with Eclipse startup case

iloveeclipse · 2026-03-17T16:16:02Z

I've moved messages to the right bundle & rebased on master.

TODO (for me)

Update bundle version requirements for ide and application bundles on latest workbench
Code review
Behavior validation

@SougandhS : would it be OK if I would squash everything to one commit (except bundle version updates)?

iloveeclipse · 2026-03-18T07:32:13Z

would it be OK if I would squash everything to one commit (except bundle version updates)?

We must do that, the API tools sees "touched" code which was reverted and complains about missing version bump.

[ERROR] Failed to execute goal org.eclipse.tycho.extras:tycho-p2-extras-plugin:5.0.3-SNAPSHOT:compare-version-with-baselines (compare-attached-artifacts-with-release) on project org.eclipse.e4.ui.workbench.swt: Only qualifier changed for (org.eclipse.e4.ui.workbench.swt/0.18.0.v20260317-1600). Expected to have bigger x.y.z than what is available in baseline (0.18.0.v20260119-0835) -> [Help 1]

There is no reason to bump that version for not really changed code.

`org.eclipse.ui.ide.application` needs latest API from `org.eclipse.ui.workbench`, `org.eclipse.ui` is the bundle that re-exports it, because `org.eclipse.ui.workbench` has bumped minor version segment, `org.eclipse.ui` must bump minor version segment too. See eclipse-platform#3518

Prompts user on attempting to switch to a workspace that is currently locked by another Eclipse instance. Prompt dialog is now shown informing the user about the lock details and preventing Eclipse from exiting. - Refactored code to use common WorkspaceLock class - Moved related messages to the workbench bundle Also-by: Andrey Loskutov <[email protected]>

SougandhS · 2026-03-18T07:56:36Z

@SougandhS : would it be OK if I would squash everything to one commit (except bundle version updates)?

Please go ahead 👍

iloveeclipse

I've fixed version constraints needed, refactored WorkspaceLock and started to look into Workbench code changes needed. Unfortunately be51d14 changes were not consistent, we have to understand how that can be fixed in context of the required changes here.

I will push updated PR now, but I plan to continue looking into Workbench changes needed.

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkspaceLock.java

iloveeclipse · 2026-03-18T09:10:13Z

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

+				return null;
+			}
+		} catch (MalformedURLException e) {
+			return null;


this return null here is wrong, because we simply can't get workspace URL, but have no idea if workspace is locked or not. Probably exception should be propagated.

iloveeclipse · 2026-03-18T09:28:49Z

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

 	 * @param workspacePath the new workspace location
-	 * @return {@link IApplication#EXIT_OK} or {@link IApplication#EXIT_RELAUNCH}
+	 * @return {@link IApplication#EXIT_OK} or {@link IApplication#EXIT_RELAUNCH} or
+	 *         <code>null</code> if workspace is locked


Unfortunately code doesn't match the javadoc, see retrurn null at line 2708 after be51d14.

This all needs careful rework.

TODO: Workbench.setRestartArguments() null handling is wrong ATM because of the be51d14 changes. See eclipse-platform#3518

iloveeclipse reviewed Nov 8, 2025

View reviewed changes

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java Outdated Show resolved Hide resolved

SougandhS force-pushed the PromptOnSwitch branch from 243aaf8 to 279a4ef Compare November 8, 2025 09:08

SougandhS force-pushed the PromptOnSwitch branch from 279a4ef to 954cc49 Compare November 10, 2025 09:05

iloveeclipse requested changes Nov 10, 2025

View reviewed changes

SougandhS force-pushed the PromptOnSwitch branch 3 times, most recently from b3e89f9 to a7c8013 Compare November 11, 2025 00:47

SougandhS requested a review from iloveeclipse November 11, 2025 01:36

SougandhS force-pushed the PromptOnSwitch branch 3 times, most recently from e2ca711 to fc83bc2 Compare November 12, 2025 14:44

iloveeclipse requested changes Nov 12, 2025

View reviewed changes

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java Outdated Show resolved Hide resolved

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java Outdated Show resolved Hide resolved

SougandhS force-pushed the PromptOnSwitch branch from fc83bc2 to 54146c5 Compare December 2, 2025 04:38

SougandhS force-pushed the PromptOnSwitch branch from ed5958e to 51a81db Compare December 4, 2025 09:19

SougandhS requested a review from iloveeclipse December 4, 2025 10:41

SougandhS force-pushed the PromptOnSwitch branch from 51a81db to 41c3dfe Compare December 12, 2025 01:37

iloveeclipse force-pushed the PromptOnSwitch branch from 41c3dfe to aa4ad7a Compare March 17, 2026 16:13

iloveeclipse and others added 2 commits March 18, 2026 08:41

iloveeclipse requested changes Mar 18, 2026

View reviewed changes

Work in progress refactoring

682fb77

TODO: Workbench.setRestartArguments() null handling is wrong ATM because of the be51d14 changes. See eclipse-platform#3518

iloveeclipse force-pushed the PromptOnSwitch branch from ca496e0 to 682fb77 Compare March 18, 2026 09:35

Version bump(s) for 4.40 stream

5cc76a7

Conversation

SougandhS commented Nov 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Nov 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

SougandhS commented Nov 8, 2025

Uh oh!

iloveeclipse left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

BeckerWdf commented Nov 10, 2025

Uh oh!

SougandhS commented Nov 10, 2025

Uh oh!

SougandhS commented Nov 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SougandhS commented Nov 12, 2025

Uh oh!

iloveeclipse left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

eclipse-platform-bot commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SougandhS commented Dec 4, 2025

Uh oh!

iloveeclipse commented Mar 17, 2026

Uh oh!

iloveeclipse commented Mar 18, 2026

Uh oh!

SougandhS commented Mar 18, 2026

Uh oh!

iloveeclipse left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iloveeclipse Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

iloveeclipse Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

SougandhS commented Nov 8, 2025 •

edited

Loading

github-actions bot commented Nov 8, 2025 •

edited

Loading

eclipse-platform-bot commented Dec 2, 2025 •

edited

Loading