refactor: migrate Xtend to Java - com.avaloq.tools.ddk.xtext.generator (parser group)#1429
Open
joaodinissf wants to merge 2 commits into
Open
Conversation
…r (parser group) Migrate parser group (6 files) to hand-written Java; ANTLR StringConcatenation templates byte-verified vs xtend-gen; local gate green. Split of com.avaloq.tools.ddk.xtext.generator: per-module Xtend infra cleanup deferred until both parser+builder PRs merge. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
joaodinissf
added a commit
to joaodinissf/dsl-devkit
that referenced
this pull request
Jun 17, 2026
…r (builder group) Migrates 12 generator fragment/support classes from Xtend to Java: BundleVersionStripperFragment, DefaultFragmentWithOverride, builder/BuilderIntegrationFragment2, builder/LspBuilderIntegrationFragment2, builder/StandaloneBuilderIntegrationFragment2, formatting/FormatterFragment2, languageconstants/LanguageConstantsFragment2, model/project/ProjectConfig, modelinference/ModelInferenceFragment2, resourceFactory/ResourceFactoryFragment2, ui/compare/CompareFragment2, and ui/contentAssist/AnnotationAwareContentAssistFragment2. Xtend rich-string templates were rewritten as explicit StringConcatenation/string building, implicit getters/extension methods made explicit, and null-safe operators expanded to guarded Java. Behaviour is preserved; only language form changes. This is the builder half of the com.avaloq.tools.ddk.xtext.generator split (parser half tracked in dsldevkit#1429); per-module Xtend infrastructure cleanup is deferred until both halves merge. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
rubenporras
requested changes
Jun 18, 2026
rubenporras
left a comment
rubenporras
left a comment
Member
There was a problem hiding this comment.
Note: I have seen that Claude constantly forgets that he should try to use multi-line strings for readability. I use to interject it as steering once the skill has been kicked in, and that has worked fine so far.
|
|
||
| protected CharSequence compileLexerMembers(final Grammar it, final AntlrOptions options) { | ||
| final StringConcatenation builder = new StringConcatenation(); | ||
| builder.append("@members {"); |
Member
There was a problem hiding this comment.
this is clearly a multi line string.
| protected CharSequence compileLexer(final Grammar it, final AntlrOptions options) { | ||
| final StringConcatenation builder = new StringConcatenation(); | ||
| builder.append(codeConfig.getFileHeader()); | ||
| builder.newLineIfNotEmpty(); |
Member
There was a problem hiding this comment.
I think a builder is justified for this case, but it would be better to remove the usage of org.eclipse.xtend2.lib.StringConcatenation, do you agree?
|
|
||
| @Override | ||
| protected String compileParserImports(final Grammar it, final AntlrOptions options) { | ||
| final StringConcatenation builder = new StringConcatenation(); |
Member
There was a problem hiding this comment.
this is clearly a multi line string.
|
|
||
| protected CharSequence compileParserSetTokenStreamMethod() { | ||
| final StringConcatenation builder = new StringConcatenation(); | ||
| builder.append("/**"); |
Member
There was a problem hiding this comment.
this is clearly a multi line string, and so on, I did not continue the review.
Address review feedback (dsldevkit#1429): convert the static and single-statement interpolated grammar-fragment templates to Java text blocks with .formatted() - compileLexerMembers, compileParserImports, compileParserMemberDeclarations, compileParserSetTokenStreamMethod, compileRuleCatch. Builders that compose sub-results via newLineIfNotEmpty (compileLexer), use the two-argument append(value, indent) re-indentation, or contain FOR/IF control flow are left as StringConcatenation, per the skill's "StringBuilder for control flow only" rule - so the org.eclipse.xtend2.lib.StringConcatenation import stays. Separate commit on top of the migration; output proven byte-identical to the prior code for every converted method (verified against the real StringConcatenation runtime). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
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
2 participants
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.
Migrates the parser group of
com.avaloq.tools.ddk.xtext.generator(parser/antlr+parser/common, 6 files) from Xtend to hand-written Java:AbstractAnnotationAwareAntlrGrammarGenerator,AnnotationAwareAntlrContentAssistGrammarGenerator,AnnotationAwareAntlrGrammarGenerator,AnnotationAwareXtextAntlrGeneratorFragment2,GrammarRuleAnnotations,PredicatesNaming.Notes
StringConcatenationcode-generation templates were byte-verified against thextend-genground truth.clean verify checkstyle:check pmd:check pmd:cpd-check spotbugs:check(0 violations).xtext.generator; the per-module Xtend build infra (xtend-gen wiring, MANIFEST, build.properties/.classpath/.project) is intentionally left untouched — it will be cleaned once both the parser and the builder PRs merge (12 sibling.xtendremain).Blind adversarial review verdict: SHIP (only 2 invented-Javadoc nits).