refactor(scope): clarify generated method bodies - #1525
Merged
Merged
Conversation
joaodinissf
force-pushed
the
codex/readable-scope-generators
branch
from
September 7, 2026 21:28
862abe0 to
19ba3aa
Compare
rubenporras
previously approved these changes
Sep 8, 2026
joaodinissf
disabled the stack merge
September 8, 2026 07:32
joaodinissf
disabled the stack merge
September 8, 2026 07:36
joaodinissf
force-pushed
the
codex/readable-scope-generators
branch
from
September 8, 2026 07:36
19ba3aa to
f1d5ba9
Compare
rubenporras
previously approved these changes
Sep 8, 2026
joaodinissf
force-pushed
the
codex/readable-scope-generators
branch
from
September 8, 2026 07:53
f1d5ba9 to
62efede
Compare
rubenporras
previously approved these changes
Sep 8, 2026
joaodinissf
disabled the stack merge
September 8, 2026 08:33
Base automatically changed from
migrate/xtend-to-java/scope-step-3
to
master
September 8, 2026 08:34
Use Tycho zip comparison so ZIP metadata differences do not reject unchanged bundle contents. Co-authored-by: Astra <noreply@openai.com>
joaodinissf
force-pushed
the
codex/readable-scope-generators
branch
from
September 8, 2026 08:34
62efede to
22c92b5
Compare
rubenporras
approved these changes
Sep 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The migrated scope generators bury package switches, rule dispatch and lambda bodies in long sequences of small append calls. This refactor gives the emission phases named helpers, shares the reference/type switch scaffolding, and combines static source fragments into readable text blocks. Dynamic multiline fragments retain
StringConcatenationindentation and separator handling.Stacked on #1519, following #1517 and #1518. Merge the parent stack first. The generator refactoring changes
ScopeProviderGenerator.javaandScopeNameProviderGenerator.java; their public method signatures and generated behavior are preserved. The parent POM also selects Tycho's archive-content comparator for the baseline gate, as described below. The remaining Xtend sources and compiler configuration stay in place. #1522 edits the scope inferrer, whose calls to these methods remain compatible.Validation on Java 21:
testBulkApplyingQuickfixUI timeout waiting for the table labelledSelect a fix:(354 tests, zero failures, one error, two skipped). The final tree is therefore not claimed to have a fully green local test run.The differential harness is intentionally outside the repository, as requested. It compiles saved originals alongside the refactored classes and uses the actual StringConcatenation and EMF libraries.
The differential harness covers generated text, indentation, ordering, collaborator traces and explicit exception messages using controlled fixtures. Leaf collaborators are stubbed; JVM-generated helpful NPE diagnostic wording is excluded. These tests support preservation for the exercised cases, rather than proving all possible inputs.
Baseline verification fix:
compare-version-with-baselinesnow uses Tycho'szipcomparator instead of its default whole-file byte comparison. A fresh local build with baseline replacement disabled reproduced the failure on an unchanged bundle: all archive entry contents matched the release, but ZIP timestamps differed. With the content comparator, the full reactorclean verify -DskipTests -Dtycho.baseline.replace=nonepassed, includingxtext.validandtest.core, which failed in CI. A throwaway check against Tycho 5.0.4 confirmed timestamp-only changes are accepted and changed payload bytes are rejected. Version checks remain enabled; no bundle versions were bumped. The full test suite is left to the new CI run.