Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show diff in "replace with local history" dialog on selection change #1625

Conversation

tobiasmelcher
Copy link
Contributor

The "Replace With" -> "Local History ..." option in the source editor context menu launches a dialog that allows users to revert to a previous version. Initially, this dialog displays a list of all available revisions:

replace_with_local_history

Previously, selecting an entry from the revision list did not trigger any action. Users had to double-click to view the differences.

This pull request enhances the behavior by displaying the differences upon a single click/selection.

@eclipse-platform-bot
Copy link
Contributor

eclipse-platform-bot commented Nov 20, 2024

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

runtime/features/org.eclipse.core.runtime.feature/feature.xml

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 741bcf1cdeaab174f7be98c39dd9dae921d82681 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Wed, 27 Nov 2024 13:10:03 +0000
Subject: [PATCH] Version bump(s) for 4.35 stream


diff --git a/runtime/features/org.eclipse.core.runtime.feature/feature.xml b/runtime/features/org.eclipse.core.runtime.feature/feature.xml
index 7ffa14238f..e21f0b592e 100644
--- a/runtime/features/org.eclipse.core.runtime.feature/feature.xml
+++ b/runtime/features/org.eclipse.core.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.core.runtime.feature"
       label="%featureName"
-      version="1.4.600.qualifier"
+      version="1.4.700.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
-- 
2.47.0

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

Copy link
Contributor

github-actions bot commented Nov 20, 2024

Test Results

 1 755 files  ±0   1 755 suites  ±0   1h 33m 1s ⏱️ + 4m 28s
 4 170 tests ±0   4 147 ✅  - 1   22 💤 ±0  1 ❌ +1 
13 107 runs  ±0  12 942 ✅  - 1  164 💤 ±0  1 ❌ +1 

For more details on these failures, see this check.

Results for commit 15e1afb. ± Comparison against base commit 3776c2f.

♻️ This comment has been updated with latest results.

@tobiasmelcher tobiasmelcher force-pushed the replace_local_history_dialog_single_click branch from da92e2a to 874a1d2 Compare November 20, 2024 12:53
@tobiasmelcher
Copy link
Contributor Author

Issue was detected in an internal UX review. UX experts were asking us why the UI is not updated when an entry in the history list is selected. Question is absolutely valid from my point of view.

@tobiasmelcher tobiasmelcher force-pushed the replace_local_history_dialog_single_click branch from 925d2fd to 1d3f284 Compare November 26, 2024 15:39
@BeckerWdf BeckerWdf added this to the 4.35 M1 milestone Nov 26, 2024
@tobiasmelcher
Copy link
Contributor Author

Following code block is needed to fix layouting issue on macOS. See screencast below:

@Override
public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
	// Avoid using super.run() on macOS as it causes layout issues.
	// The compare viewer controls appear small and do not fill the entire dialog.
	runnable.run(new NullProgressMonitor());
}
layouting_issue.mov

@tobiasmelcher tobiasmelcher force-pushed the replace_local_history_dialog_single_click branch 2 times, most recently from 701bcf2 to 245c371 Compare November 27, 2024 09:28
@tobiasmelcher tobiasmelcher force-pushed the replace_local_history_dialog_single_click branch from 245c371 to 5dbdad0 Compare November 27, 2024 12:40
@tobiasmelcher tobiasmelcher force-pushed the replace_local_history_dialog_single_click branch from 5dbdad0 to a040bc7 Compare November 27, 2024 13:05
@HannesWell HannesWell force-pushed the replace_local_history_dialog_single_click branch from 62559d7 to f093e2a Compare November 28, 2024 22:51
- disallow multi selection in "replace with local history" dialog
- fix layouting issue on MacOS when loading the compare viewers on
selection change
@BeckerWdf
Copy link
Contributor

Failures are unrelated. Merging this.

@BeckerWdf BeckerWdf merged commit e987000 into eclipse-platform:master Dec 3, 2024
11 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants