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

Consider Activity Filtering when running in E3 compatibility mode #2768

Merged

Conversation

laeubi
Copy link
Contributor

@laeubi laeubi commented Jan 31, 2025

Currently contributions by E4 are not filtered using the E3 activity mechanism as it is a pure E3 concept.

To improve integration and interaction of E4 and E3 when using the compatibility layer this now installs a WorkbenchContributionFactory into the application context that additionally takes activity filtering of the E3 workbench into account.

See

Requires:

Copy link
Contributor

github-actions bot commented Jan 31, 2025

Test Results

 1 821 files  ±0   1 821 suites  ±0   1h 30m 24s ⏱️ - 5m 14s
 7 719 tests ±0   7 490 ✅ +1  228 💤 ±0  1 ❌  - 1 
24 318 runs  ±0  23 568 ✅ +1  749 💤 ±0  1 ❌  - 1 

For more details on these failures, see this check.

Results for commit c2a8a4c. ± Comparison against base commit 8c2be45.

♻️ This comment has been updated with latest results.

@laeubi laeubi force-pushed the consider_activity_filterings branch from 92276ec to 1b4b00b Compare January 31, 2025 08:47
@laeubi laeubi requested a review from iloveeclipse January 31, 2025 08:47
@laeubi laeubi force-pushed the consider_activity_filterings branch from 1b4b00b to 2ac26c2 Compare January 31, 2025 08:48
@iloveeclipse
Copy link
Member

Please also bump dependencies required here:

diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF
index 2bef9ec..cb4ef94 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF
@@ -9,3 +9,3 @@
 Require-Bundle: org.eclipse.e4.ui.workbench;bundle-version="0.9.0",
- org.eclipse.e4.core.services;bundle-version="0.9.0",
+ org.eclipse.e4.core.services;bundle-version="2.5.100",
  org.eclipse.e4.core.contexts;bundle-version="1.0.0",
diff --git a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
index 2e8dd48..4401f18 100644
--- a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
@@ -102,3 +102,3 @@
  org.eclipse.core.databinding.observable;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.e4.core.services;bundle-version="2.2.0",
+ org.eclipse.e4.core.services;bundle-version="2.5.100",
  org.eclipse.e4.core.contexts;bundle-version="1.0.0",

@laeubi laeubi force-pushed the consider_activity_filterings branch from 2ac26c2 to 0a4af9b Compare January 31, 2025 10:12
@laeubi
Copy link
Contributor Author

laeubi commented Jan 31, 2025

Lower versions updated

@laeubi
Copy link
Contributor Author

laeubi commented Jan 31, 2025

I merged the other PR but we will need to wait for the next Ibuild until this one can succeed.

@iloveeclipse iloveeclipse force-pushed the consider_activity_filterings branch from 0a4af9b to accf339 Compare February 1, 2025 20:05
@iloveeclipse
Copy link
Member

I haven't looked into details, but there are many e4 test fails caused by the change:
https://ci.eclipse.org/platform/job/eclipse.platform.ui/job/PR-2768/5/testReport/

@laeubi
Copy link
Contributor Author

laeubi commented Feb 2, 2025

I will take a look

Currently contributions by E4 are not filtered using the E3 activity
mechanism as it is a pure E3 concept.

To improve integration and interaction of E4 and E3 when using the
compatibility layer this now installs a WorkbenchContributionFactory
into the application context that additionally takes activity filtering
of the E3 workbench into account.

See eclipse-platform#2217
@laeubi laeubi force-pushed the consider_activity_filterings branch from accf339 to c2a8a4c Compare February 2, 2025 13:29
@laeubi
Copy link
Contributor Author

laeubi commented Feb 2, 2025

The problem was that handled items have no contributor (to support these one must possibly lookup the command/handler and then check if that contribution is active but I will ignore this for now).

@laeubi
Copy link
Contributor Author

laeubi commented Feb 2, 2025

Looks good now!

@iloveeclipse iloveeclipse merged commit 5fa25b1 into eclipse-platform:master Feb 2, 2025
15 of 17 checks passed
@iloveeclipse
Copy link
Member

Many thanks!

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.

2 participants