From bb0b7da197082692c456e5898b938a1a3d55b8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Dinis=20Ferreira?= Date: Fri, 12 Jun 2026 22:27:50 +0200 Subject: [PATCH] chore: emit LF from MWE2 code generation All seven workflows requested "\r\n" while the repository stores and checks out LF everywhere (.gitattributes, line-endings CI check), so every regeneration wrote files that disagreed byte-wise with the checkout. Flip the lineDelimiter settings and the line.separator preference that ddk-configuration links into the other projects' .settings. Also set preferXtendStubs = false for the FormatterTestLanguage workflow: its stub classes exist as handwritten .java files, and with the default the generator's exact-path existence check misses them and resurrects .xtend duplicates that were deliberately removed in 2024. No regeneration is included: the committed src-gen is already pure LF in the index, so this only changes what future regenerations emit. Refs #1345. Co-Authored-By: Claude Fable 5 --- .../src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 | 2 +- .../src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 | 2 +- .../src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2 | 2 +- .../src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2 | 2 +- .../tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2 | 3 ++- .../src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2 | 2 +- .../src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 | 2 +- ddk-configuration/.settings/org.eclipse.core.runtime.prefs | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 index ad0e8a081..d66b7e32c 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 @@ -109,7 +109,7 @@ Workflow { } code = { encoding = "UTF-8" - lineDelimiter = "\r\n" + lineDelimiter = "\n" fileHeader = "/*\n * generated by Xtext\n */" preferXtendStubs = false } diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 index 0af1514f8..9731d4e6f 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 @@ -90,7 +90,7 @@ Workflow { } code = { encoding = "UTF-8" - lineDelimiter = "\r\n" + lineDelimiter = "\n" fileHeader = "/*\n * generated by Xtext\n */" preferXtendStubs = false } diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2 index 12c077344..038a37d7c 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2 @@ -78,7 +78,7 @@ Workflow { } code = { encoding = "UTF-8" - lineDelimiter = "\r\n" + lineDelimiter = "\n" fileHeader = "/*\n * generated by Xtext\n */" preferXtendStubs = false } diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2 index fc08c4ef1..c47f886b4 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2 @@ -54,7 +54,7 @@ Workflow { } code = { encoding = "UTF-8" - lineDelimiter = "\r\n" + lineDelimiter = "\n" fileHeader = "/*\n * generated by Xtext\n */" } } diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2 index c12c4dbc8..db98dadf4 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormatterTestLanguage.mwe2 @@ -41,7 +41,8 @@ Workflow { } code = { encoding = "UTF-8" - lineDelimiter = "\r\n" + lineDelimiter = "\n" + preferXtendStubs = false fileHeader = "/*\n * generated by Xtext\n */" } } diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2 index 04d8f70a5..006a2ea70 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2 @@ -90,7 +90,7 @@ Workflow { } code = { encoding = "UTF-8" - lineDelimiter = "\r\n" + lineDelimiter = "\n" fileHeader = "/*\n * generated by Xtext\n */" preferXtendStubs = false } diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 index 9c503789f..6bf233e44 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 @@ -90,7 +90,7 @@ Workflow { } code = { encoding = "UTF-8" - lineDelimiter = "\r\n" + lineDelimiter = "\n" fileHeader = "/*\n * generated by Xtext\n */" preferXtendStubs = false } diff --git a/ddk-configuration/.settings/org.eclipse.core.runtime.prefs b/ddk-configuration/.settings/org.eclipse.core.runtime.prefs index de53b9e7b..6e9dbe8f3 100644 --- a/ddk-configuration/.settings/org.eclipse.core.runtime.prefs +++ b/ddk-configuration/.settings/org.eclipse.core.runtime.prefs @@ -1,3 +1,3 @@ #Thu Nov 18 13:45:58 CET 2010 eclipse.preferences.version=1 -line.separator=\r\n +line.separator=\n