Skip to content

style: drop Xtend-compiler boilerplate in migrated check.core files #1491

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.

Sign up for GitHub

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

Merged
joaodinissf merged 2 commits into from
Aug 17, 2026
Merged

style: drop Xtend-compiler boilerplate in migrated check.core files #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c66a56
style(check): drop Xtend-compiler boilerplate across migrated check.c…
joaodinissf Aug 14, 2026
ecf695f
style(check): simplify the issue-map builder-head emission
joaodinissf Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 49 additions & 51 deletions ...valoq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/formatting2/CheckFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@
package com.avaloq.tools.ddk.check.formatting2;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.Keyword;
import org.eclipse.xtext.common.types.JvmFormalParameter;
import org.eclipse.xtext.common.types.JvmGenericArrayTypeReference;
import org.eclipse.xtext.common.types.JvmParameterizedTypeReference;
import org.eclipse.xtext.common.types.JvmTypeConstraint;
import org.eclipse.xtext.common.types.JvmTypeParameter;
import org.eclipse.xtext.common.types.JvmWildcardTypeReference;
import org.eclipse.xtext.formatting2.IFormattableDocument;
import org.eclipse.xtext.formatting2.IHiddenRegionFormatter;
import org.eclipse.xtext.formatting2.regionaccess.IEObjectRegion;
import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegion;
import org.eclipse.xtext.resource.XtextResource;
Expand Down Expand Up @@ -88,15 +86,15 @@ private void formatCurlyBracket(final EObject semanticElement, final IFormattabl
// low priority so that it can be overridden by other custom formatting rules.
final ISemanticRegion open = regionFor(semanticElement).keyword("{");
final ISemanticRegion close = regionFor(semanticElement).keyword("}");
document.interior(open, close, (IHiddenRegionFormatter it) -> {
document.interior(open, close, it -> {
it.lowPriority();
it.indent();
});
document.append(open, (IHiddenRegionFormatter it) -> {
document.append(open, it -> {
it.lowPriority();
it.newLine();
});
document.prepend(close, (IHiddenRegionFormatter it) -> {
document.prepend(close, it -> {
it.lowPriority();
it.newLine();
});
Expand All @@ -117,13 +115,13 @@ private void globalFormatting(final IEObjectRegion requestRoot, final IFormattab
boolean firstRegion = true;
for (final ISemanticRegion region : requestRoot.getAllSemanticRegions()) {
if (firstRegion) {
document.prepend(region, (IHiddenRegionFormatter it) -> {
document.prepend(region, it -> {
it.lowPriority();
it.autowrap(132);
});
firstRegion = false;
} else {
document.prepend(region, (IHiddenRegionFormatter it) -> {
document.prepend(region, it -> {
it.lowPriority();
it.oneSpace();
it.autowrap(132);
Expand All @@ -134,27 +132,27 @@ private void globalFormatting(final IEObjectRegion requestRoot, final IFormattab
// CHECKSTYLE:CHECK-ON MagicNumber

protected void _format(final CheckCatalog checkcatalog, final IFormattableDocument document) {
document.prepend(checkcatalog, (IHiddenRegionFormatter it) -> {
document.prepend(checkcatalog, it -> {
it.noSpace();
it.setNewLines(0);
});
document.append(checkcatalog, (IHiddenRegionFormatter it) -> {
document.append(checkcatalog, it -> {
it.noSpace();
it.setNewLines(0, 0, 1);
});
final ISemanticRegion finalKw = regionFor(checkcatalog).keyword("final");
final ISemanticRegion catalog = regionFor(checkcatalog).keyword("catalog");
if (finalKw != null) {
document.prepend(finalKw, (IHiddenRegionFormatter it) -> {
document.prepend(finalKw, it -> {
it.setNewLines(1, 2, 2);
});
} else {
document.prepend(catalog, (IHiddenRegionFormatter it) -> {
document.prepend(catalog, it -> {
it.setNewLines(1, 1, 2);
});
}
final ISemanticRegion forKw = regionFor(checkcatalog).keyword("for");
document.prepend(forKw, (IHiddenRegionFormatter it) -> {
document.prepend(forKw, it -> {
it.setNewLines(1, 1, 2);
});
formatCurlyBracket(checkcatalog, document);
Expand Down Expand Up @@ -186,7 +184,7 @@ protected void _format(final XImportSection ximportsection, final IFormattableDo
// Generated model traversal
for (final XImportDeclaration importDeclarations : ximportsection.getImportDeclarations()) {
// ADDED: formatting added before each import
document.prepend(importDeclarations, (IHiddenRegionFormatter it) -> {
document.prepend(importDeclarations, it -> {
it.setNewLines(1, 1, 2);
});

Expand All @@ -195,7 +193,7 @@ protected void _format(final XImportSection ximportsection, final IFormattableDo
}

protected void _format(final Category category, final IFormattableDocument document) {
document.prepend(category, (IHiddenRegionFormatter it) -> {
document.prepend(category, it -> {
it.setNewLines(1, 2, 2);
});
formatCurlyBracket(category, document);
Expand All @@ -207,17 +205,17 @@ protected void _format(final Category category, final IFormattableDocument docum
}

protected void _format(final Check check, final IFormattableDocument document) {
document.prepend(check, (IHiddenRegionFormatter it) -> {
document.prepend(check, it -> {
it.setNewLines(1, 2, 2);
});
final ISemanticRegion open = regionFor(check).keyword("(");
final ISemanticRegion close = regionFor(check).keyword(")");
document.interior(open, close, (IHiddenRegionFormatter it) -> {
document.interior(open, close, it -> {
it.highPriority();
it.noSpace();
}); // High priority to override formatting from adjacent regions and parent formatter.
final ISemanticRegion message = regionFor(check).keyword("message");
document.prepend(message, (IHiddenRegionFormatter it) -> {
document.prepend(message, it -> {
it.setNewLines(1, 1, 2);
});
formatCurlyBracket(check, document);
Expand All @@ -228,11 +226,11 @@ protected void _format(final Check check, final IFormattableDocument document) {
// ADDED: formatting added around comma.
// High priority to override formatting from adjacent regions and parent formatter.
final ISemanticRegion comma = immediatelyFollowing(formalParameters).keyword(",");
document.prepend(comma, (IHiddenRegionFormatter it) -> {
document.prepend(comma, it -> {
it.highPriority();
it.noSpace();
});
document.append(comma, (IHiddenRegionFormatter it) -> {
document.append(comma, it -> {
it.highPriority();
it.setNewLines(0, 0, 1);
});
Expand All @@ -246,18 +244,18 @@ protected void _format(final Check check, final IFormattableDocument document) {

protected void _format(final SeverityRange severityrange, final IFormattableDocument document) {
final ISemanticRegion range = regionFor(severityrange).keyword("SeverityRange");
document.surround(range, (IHiddenRegionFormatter it) -> {
document.surround(range, it -> {
it.noSpace();
});
final ISemanticRegion open = regionFor(severityrange).keyword("(");
document.append(open, (IHiddenRegionFormatter it) -> {
document.append(open, it -> {
it.noSpace();
});
final ISemanticRegion close = regionFor(severityrange).keyword(")");
document.prepend(close, (IHiddenRegionFormatter it) -> {
document.prepend(close, it -> {
it.noSpace();
});
document.append(close, (IHiddenRegionFormatter it) -> {
document.append(close, it -> {
it.newLine();
});
}
Expand All @@ -272,7 +270,7 @@ protected void _format(final Member member, final IFormattableDocument document)
}

protected void _format(final Implementation implementation, final IFormattableDocument document) {
document.prepend(implementation, (IHiddenRegionFormatter it) -> {
document.prepend(implementation, it -> {
it.setNewLines(1, 2, 2);
});

Expand All @@ -299,7 +297,7 @@ protected void _format(final XListLiteral xlistliteral, final IFormattableDocume
}

protected void _format(final Context context, final IFormattableDocument document) {
document.surround(context, (IHiddenRegionFormatter it) -> {
document.surround(context, it -> {
it.setNewLines(1, 2, 2);
});

Expand All @@ -314,7 +312,7 @@ protected void _format(final ContextVariable contextvariable, final IFormattable
}

protected void _format(final XGuardExpression xguardexpression, final IFormattableDocument document) {
document.prepend(xguardexpression, (IHiddenRegionFormatter it) -> {
document.prepend(xguardexpression, it -> {
it.setNewLines(1, 2, 2);
});

Expand All @@ -324,37 +322,37 @@ protected void _format(final XGuardExpression xguardexpression, final IFormattab

protected void _format(final XIssueExpression xissueexpression, final IFormattableDocument document) {
// High priority to override formatting from adjacent regions and parent formatter.
document.prepend(xissueexpression, (IHiddenRegionFormatter it) -> {
document.prepend(xissueexpression, it -> {
it.highPriority();
it.setNewLines(1, 2, 2);
});
checkGrammarAccess.getXIssueExpressionAccess().findKeywords("#").forEach((Keyword kw) -> {
checkGrammarAccess.getXIssueExpressionAccess().findKeywords("#").forEach(kw -> {
final ISemanticRegion hash = regionFor(xissueexpression).keyword(kw);
document.surround(hash, (IHiddenRegionFormatter it) -> {
document.surround(hash, it -> {
it.highPriority();
it.noSpace();
});
});
final ISemanticRegion openSquare = regionFor(xissueexpression).keyword("[");
document.surround(openSquare, (IHiddenRegionFormatter it) -> {
document.surround(openSquare, it -> {
it.highPriority();
it.noSpace();
});
final ISemanticRegion closeSquare = regionFor(xissueexpression).keyword("]");
document.prepend(closeSquare, (IHiddenRegionFormatter it) -> {
document.prepend(closeSquare, it -> {
it.highPriority();
it.noSpace();
});
checkGrammarAccess.getXIssueExpressionAccess().findKeywords("(").forEach((Keyword kw) -> {
checkGrammarAccess.getXIssueExpressionAccess().findKeywords("(").forEach(kw -> {
final ISemanticRegion open = regionFor(xissueexpression).keyword(kw);
document.append(open, (IHiddenRegionFormatter it) -> {
document.append(open, it -> {
it.highPriority();
it.noSpace();
});
});
checkGrammarAccess.getXIssueExpressionAccess().findKeywords(")").forEach((Keyword kw) -> {
checkGrammarAccess.getXIssueExpressionAccess().findKeywords(")").forEach(kw -> {
final ISemanticRegion close = regionFor(xissueexpression).keyword(kw);
document.prepend(close, (IHiddenRegionFormatter it) -> {
document.prepend(close, it -> {
it.highPriority();
it.noSpace();
});
Expand All @@ -367,11 +365,11 @@ protected void _format(final XIssueExpression xissueexpression, final IFormattab
for (final XExpression messageParameters : xissueexpression.getMessageParameters()) {
// ADDED: formatting added around comma
final ISemanticRegion comma = immediatelyFollowing(messageParameters).keyword(",");
document.prepend(comma, (IHiddenRegionFormatter it) -> {
document.prepend(comma, it -> {
it.highPriority();
it.noSpace();
});
document.append(comma, (IHiddenRegionFormatter it) -> {
document.append(comma, it -> {
it.highPriority();
it.oneSpace();
});
Expand All @@ -381,11 +379,11 @@ protected void _format(final XIssueExpression xissueexpression, final IFormattab
for (final XExpression issueData : xissueexpression.getIssueData()) {
// ADDED: formatting added around comma
final ISemanticRegion comma = immediatelyFollowing(issueData).keyword(",");
document.prepend(comma, (IHiddenRegionFormatter it) -> {
document.prepend(comma, it -> {
it.highPriority();
it.noSpace();
});
document.append(comma, (IHiddenRegionFormatter it) -> {
document.append(comma, it -> {
it.highPriority();
it.oneSpace();
});
Expand All @@ -397,31 +395,31 @@ protected void _format(final XIssueExpression xissueexpression, final IFormattab
@Override
protected void _format(final XIfExpression xifexpression, final IFormattableDocument document) {
// High priority to override formatting from adjacent regions and parent formatter.
document.prepend(xifexpression, (IHiddenRegionFormatter it) -> {
document.prepend(xifexpression, it -> {
it.highPriority();
it.setNewLines(1, 1, 2);
});
final ISemanticRegion open = regionFor(xifexpression).keyword("(");
final ISemanticRegion close = regionFor(xifexpression).keyword(")");
document.prepend(open, (IHiddenRegionFormatter it) -> {
document.prepend(open, it -> {
it.highPriority();
it.oneSpace();
});
document.append(open, (IHiddenRegionFormatter it) -> {
document.append(open, it -> {
it.highPriority();
it.noSpace();
});
document.prepend(close, (IHiddenRegionFormatter it) -> {
document.prepend(close, it -> {
it.highPriority();
it.noSpace();
});
document.append(close, (IHiddenRegionFormatter it) -> {
document.append(close, it -> {
it.highPriority();
it.setNewLines(0);
it.oneSpace();
});
final ISemanticRegion elseKw = regionFor(xifexpression).keyword("else");
document.surround(elseKw, (IHiddenRegionFormatter it) -> {
document.surround(elseKw, it -> {
it.highPriority();
it.setNewLines(0);
it.oneSpace();
Expand All @@ -435,23 +433,23 @@ protected void _format(final XIfExpression xifexpression, final IFormattableDocu
protected void _format(final XMemberFeatureCall xfeaturecall, final IFormattableDocument document) {
// set no space after '::' in CheckUtil::hasQualifiedName(..., and also not after plain "." or "?."
// High priority to override formatting from adjacent regions and parent formatter.
checkGrammarAccess.getXMemberFeatureCallAccess().findKeywords(".").forEach((Keyword kw) -> {
checkGrammarAccess.getXMemberFeatureCallAccess().findKeywords(".").forEach(kw -> {
final ISemanticRegion dot = regionFor(xfeaturecall).keyword(kw);
document.append(dot, (IHiddenRegionFormatter it) -> {
document.append(dot, it -> {
it.highPriority();
it.noSpace();
});
});
checkGrammarAccess.getXMemberFeatureCallAccess().findKeywords("?.").forEach((Keyword kw) -> {
checkGrammarAccess.getXMemberFeatureCallAccess().findKeywords("?.").forEach(kw -> {
final ISemanticRegion queryDot = regionFor(xfeaturecall).keyword(kw);
document.append(queryDot, (IHiddenRegionFormatter it) -> {
document.append(queryDot, it -> {
it.highPriority();
it.noSpace();
});
});
checkGrammarAccess.getXMemberFeatureCallAccess().findKeywords("::").forEach((Keyword kw) -> {
checkGrammarAccess.getXMemberFeatureCallAccess().findKeywords("::").forEach(kw -> {
final ISemanticRegion colonColon = regionFor(xfeaturecall).keyword(kw);
document.append(colonColon, (IHiddenRegionFormatter it) -> {
document.append(colonColon, it -> {
it.highPriority();
it.noSpace();
});
Expand Down
11 changes: 5 additions & 6 deletions com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.util.Set;

import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.common.types.JvmField;
Expand Down Expand Up @@ -67,7 +66,7 @@ public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
uri = resource.getURI();
}
final CheckGeneratorConfig config = generatorConfigProvider.get(uri);
final Iterable<CheckCatalog> catalogs = Iterables.<CheckCatalog>filter(IteratorExtensions.<EObject>toIterable(resource.getAllContents()), CheckCatalog.class);
final Iterable<CheckCatalog> catalogs = Iterables.filter(IteratorExtensions.toIterable(resource.getAllContents()), CheckCatalog.class);
for (final CheckCatalog catalog : catalogs) {
lfFsa.generateFile(checkGeneratorNaming.issueCodesFilePath(catalog), compileIssueCodes(catalog));
lfFsa.generateFile(checkGeneratorNaming.standaloneSetupPath(catalog), compileStandaloneSetup(catalog));
Expand Down Expand Up @@ -225,13 +224,13 @@ public CharSequence bodyDoc(final CheckCatalog catalog) {
*/
public CharSequence compileIssueCodes(final CheckCatalog catalog) {
final Iterable<XIssueExpression> allIssues = generatorExtensions.checkAndImplementationIssues(catalog);
final Function1<XIssueExpression, String> keyFunction = (final XIssueExpression issue) -> {
final Function1<XIssueExpression, String> keyFunction = issue -> {
return CheckGeneratorExtensions.issueCode(issue);
};
final Function1<XIssueExpression, String> valueFunction = (final XIssueExpression issue) -> {
final Function1<XIssueExpression, String> valueFunction = issue -> {
return CheckGeneratorExtensions.issueName(issue);
};
final Map<String, String> allIssueNames = IterableExtensions.<XIssueExpression, String, String>toMap(allIssues, keyFunction, valueFunction);
final Map<String, String> allIssueNames = IterableExtensions.toMap(allIssues, keyFunction, valueFunction);
StringConcatenation builder = new StringConcatenation();
if (!StringExtensions.isNullOrEmpty(catalog.getPackageName())) {
builder.append("package ");
Expand All @@ -255,7 +254,7 @@ public CharSequence compileIssueCodes(final CheckCatalog catalog) {
builder.append(" {");
builder.newLineIfNotEmpty();
builder.newLine();
final List<String> sortedCodes = IterableExtensions.<String>sort(allIssueNames.keySet());
final List<String> sortedCodes = IterableExtensions.sort(allIssueNames.keySet());
for (final String issueCode : sortedCodes) {
builder.append(" ");
builder.append("public static final String ");
Expand Down
Loading