Skip to content

M3 JFace superset: viewport branch + PR #27 + PR #37 (contains #35), gated - #45

Merged
hsoliwal merged 30 commits into
masterfrom
m3/jface-superset-20261023
Oct 23, 2026
Merged

hsoliwal merged 30 commits into
masterfrom
m3/jface-superset-20261023

Conversation

@hsoliwal

@hsoliwal hsoliwal commented Oct 23, 2026 •

Copy link
Copy Markdown
Owner

Superset consolidation 2026-10-23: m3/jface-viewport-20261019 (JFace viewport, Problems view lane model), PR #27 and PR #37 (which contains PR #35) merged on master in that order, every conflict resolved as a superset on master's lineage (PR #43 and its successors).

Decisions the owner should know:

Gate: JDK 25 javac --release 25 over jface m3, workbench m3, the markers package and the m3 tests: 0 errors.

Supersedes #27, #35, #37. Merge is the owner's call. Handover: eclipse.platform.swt m3/viewport-integration-20261016 docs/m3/handover/MULTIPASS_HANDOVER.md.

Receive the qualified Synexia EclipseStructures20261021 eclipse-slot-v2
recipe. Reuse M3JDK21 sparse extents above the validated block threshold,
keep index state synchronized across edits, and preserve marker ordering
and public contracts. Retain a pinned qualification receipt.
Problems view: use M3SparseExtents for marker slot rank and lookup
Coalesce only adjacent single refresh posts for the identical target. Bind timers to their pending batch so older callbacks cannot drain newer work. Preserve ordered updates and explicit direct apply operations, with focused SWT regression and nine-variant coverage.
Bound self-append, retain reentrant delta order, coalesce adjacent scheduled refreshes, and make timer cancellation and disposal deterministic. Preserve logical selection and callback intent across shared viewer operations and Combo clearing.

Correct differential harness layout and tree input preconditions, add regressions, and extend the existing workflow with pinned SWT integration and two-mode M3 validation.

All product, test, and workflow postimages are produced and received through the existing canonical Maven/OpenRewrite selections. Pair with SWT CCombo commit 394bd63c4ba19e5e73bd8dd7c13b5ad3e7d76f3f.
Retain the existing 42 native regressions and add five cases for reselection, disposal, positive restoration, duplicate/empty label clearing, and Verify/failure semantics. Pin SWT af098d7d33a9a66e9ed3cc27fc12abe2300445b8 and update the exact CI inventory from 57 to 62 cases.

Both changes were received through unchanged M3 recipes and the strict receiver. Fresh local qualification passes 47 native tests in each viewer mode, 15 headless tests and 24 within-mode differential traces. The workflow recipe passes all eight SDK checks; hosted Java 25/PDE execution remains separate.
Chronological non-squash merge into the original feature base. Preserve source ancestry and existing code; wider platform acceptance remains separately gated. Do not force/rebase/delete branches.
Preserve full PR history, merge commit only. Do not squash, rebase or force.
…view lane model)

Conflicts resolved as a superset on master's lineage (PR #43 and its
successors #27/#37 continue it): M3ViewerDelta, M3Viewers and M3SlotOrder
keep master's implementation (the branch's M3SlotOrder depends on
com.m3.collections.M3SparseExtents, which platform.ui does not have; the
branch's queue is the older dueNanos/wake variant). Both test sets are
kept (M3ViewerDeltaTest, M3ViewersTest: union). Everything else of the
branch merged clean: M3MarkerLanes search-text lane, M3MarkerDeltas,
docs/m3/markers-view, docs/m3/jdk21 tools. Gate: JDK 25 javac --release 25
over jface m3, workbench m3, the markers package and the m3 tests: 0 errors.
…red viewer delta dispatch, iterative tree lookup)

M3ViewerDelta, M3Viewers and M3ViewersTest conflicts resolved to the
superset head: master (PR #43 and its successors) already carries the
later lineage of this PR's queue (refreshLater flag, fixed deadline);
PR #27's firstPost variant and its removed test are superseded. The rest
of PR #27 merged clean. Gate: 0 errors.
…ewer queue, selection, worker-display safety; contains PR #35)

M3Viewers: PR #37's additive safety kept on master's structure: null checks
on viewer and display, and the owning-display check inside the asyncExec
before enqueue; master's javadoc and refreshLater path kept. ci.yml keeps
master's 62-test inventory (PR #37 pinned 59). Gate: 0 errors.

Copy link
Copy Markdown
Owner Author

Additive CI pin correction (2026-10-23): this PR's .github/workflows/ci.yml now pins hsoliwal/eclipse.platform.swt@026e1515b0ba60588b9152e64e339f137203e966 instead of the CCombo-only pin. That SWT commit has two real merge parents: af098d7d33a9a66e9ed3cc27fc12abe2300445b8 (CCombo) and 483af23f7bb58a06223aad61a79795cc2047d97f (nine Tycho 3.138 metadata corrections). Git compare confirms both heads are ancestors. Against the CCombo parent, exactly nine manifest/POM paths change, +1/-1 each; against the Tycho parent, only CCombo changes (+36/-8). CCombo blob c1bd7ad497721485f3d08783bff5fff02767dc30 is unchanged from its source. Also routes m3/jface-superset-20261023 stacked PRs to focused m3-viewers testing. Latest PR head 3cca5221c08690be2c8a88f83eb7ec5243c92439. No complete SWT/PDE/Tycho/viewer test PASS is claimed; keep #45 unmerged pending executed gates. No protected default branch mutated in this step.

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.

1 participant