From ed35603f0235ec3a5a7aeca73414c1dd66478bf1 Mon Sep 17 00:00:00 2001 From: kaklakariada Date: Thu, 6 Aug 2026 11:04:55 +0200 Subject: [PATCH 01/21] Avoid warning during Maven Central release --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50d150eb..6b99fcb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: - name: Publish to Maven Central Repository if: ${{ !inputs.skip-deploy-maven-central }} run: | - mvn --batch-mode deploy -PcentralPublishing \ + mvn --batch-mode deploy -Dossindex.skip=true -PcentralPublishing \ -DcentralPublishingSkipPublishing=false \ -DcentralPublishingAutoPublish=${{ inputs.maven-central-auto-publish }} \ -DcentralPublishingDeploymentName="Auto-deploy OpenFastTrace via release.yml" From 0b7338290f0dce3d33a0df04d4ba75b58df5447f Mon Sep 17 00:00:00 2001 From: kaklakariada Date: Thu, 6 Aug 2026 11:05:58 +0200 Subject: [PATCH 02/21] Fix warning about missing frontmatter --- .agents/skills/openfasttrace/SKILL.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.agents/skills/openfasttrace/SKILL.md b/.agents/skills/openfasttrace/SKILL.md index 5b458d0c..4e37b2a9 100644 --- a/.agents/skills/openfasttrace/SKILL.md +++ b/.agents/skills/openfasttrace/SKILL.md @@ -1,3 +1,8 @@ +--- +name: openfasttrace +description: Work with OpenFastTrace requirement tracing, including specification items, artifact IDs, coverage markers, Markdown and Gherkin syntax, and trace validation. Use when Codex needs to create, edit, review, or validate OpenFastTrace-traced requirements, design, implementation, tests, or documentation. +--- + # OpenFastTrace (OFT) Skill OpenFastTrace is a tool for requirement tracing across various artifacts (specifications, code, tests). From cb969826df8f010f0e0216ce1e2f14ea9166ceb7 Mon Sep 17 00:00:00 2001 From: kaklakariada Date: Thu, 6 Aug 2026 12:46:14 +0200 Subject: [PATCH 03/21] Enable compiler release option in Eclipse config --- api/.settings/org.eclipse.jdt.core.prefs | 2 +- core/.settings/org.eclipse.jdt.core.prefs | 2 +- exporter/common/.settings/org.eclipse.jdt.core.prefs | 2 +- exporter/specobject/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/gherkin/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/markdown/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/specobject/.settings/org.eclipse.jdt.core.prefs | 2 +- .../tag-importer-common/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/tag/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/xmlparser/.settings/org.eclipse.jdt.core.prefs | 2 +- importer/zip/.settings/org.eclipse.jdt.core.prefs | 2 +- product/.settings/org.eclipse.jdt.core.prefs | 2 +- reporter/aspec/.settings/org.eclipse.jdt.core.prefs | 2 +- reporter/html/.settings/org.eclipse.jdt.core.prefs | 2 +- reporter/plaintext/.settings/org.eclipse.jdt.core.prefs | 2 +- testutil/.settings/org.eclipse.jdt.core.prefs | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api/.settings/org.eclipse.jdt.core.prefs b/api/.settings/org.eclipse.jdt.core.prefs index e2b1419e..f025149b 100644 --- a/api/.settings/org.eclipse.jdt.core.prefs +++ b/api/.settings/org.eclipse.jdt.core.prefs @@ -128,7 +128,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs index c5b728db..33bb9893 100644 --- a/core/.settings/org.eclipse.jdt.core.prefs +++ b/core/.settings/org.eclipse.jdt.core.prefs @@ -118,7 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/exporter/common/.settings/org.eclipse.jdt.core.prefs b/exporter/common/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/exporter/common/.settings/org.eclipse.jdt.core.prefs +++ b/exporter/common/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs +++ b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs +++ b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs +++ b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/markdown/.settings/org.eclipse.jdt.core.prefs b/importer/markdown/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/importer/markdown/.settings/org.eclipse.jdt.core.prefs +++ b/importer/markdown/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs +++ b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/specobject/.settings/org.eclipse.jdt.core.prefs b/importer/specobject/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/importer/specobject/.settings/org.eclipse.jdt.core.prefs +++ b/importer/specobject/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs +++ b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/tag/.settings/org.eclipse.jdt.core.prefs b/importer/tag/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/importer/tag/.settings/org.eclipse.jdt.core.prefs +++ b/importer/tag/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs index e2b1419e..f025149b 100644 --- a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs +++ b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs @@ -128,7 +128,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/importer/zip/.settings/org.eclipse.jdt.core.prefs b/importer/zip/.settings/org.eclipse.jdt.core.prefs index ffe8a6a5..4a06df47 100644 --- a/importer/zip/.settings/org.eclipse.jdt.core.prefs +++ b/importer/zip/.settings/org.eclipse.jdt.core.prefs @@ -27,7 +27,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/product/.settings/org.eclipse.jdt.core.prefs b/product/.settings/org.eclipse.jdt.core.prefs index a975639e..0d3945e6 100644 --- a/product/.settings/org.eclipse.jdt.core.prefs +++ b/product/.settings/org.eclipse.jdt.core.prefs @@ -126,7 +126,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs index c5b728db..33bb9893 100644 --- a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs +++ b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs @@ -118,7 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/reporter/html/.settings/org.eclipse.jdt.core.prefs b/reporter/html/.settings/org.eclipse.jdt.core.prefs index c5b728db..33bb9893 100644 --- a/reporter/html/.settings/org.eclipse.jdt.core.prefs +++ b/reporter/html/.settings/org.eclipse.jdt.core.prefs @@ -118,7 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs index a4052256..4f6924e4 100644 --- a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs +++ b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/testutil/.settings/org.eclipse.jdt.core.prefs b/testutil/.settings/org.eclipse.jdt.core.prefs index 5bb3d14e..2356174f 100644 --- a/testutil/.settings/org.eclipse.jdt.core.prefs +++ b/testutil/.settings/org.eclipse.jdt.core.prefs @@ -118,7 +118,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 From b630b952d730e1823be88ff780460d27b08ae94c Mon Sep 17 00:00:00 2001 From: kaklakariada Date: Thu, 6 Aug 2026 13:24:20 +0200 Subject: [PATCH 04/21] Add located specification ID --- .../api/core/LinkedSpecificationItem.java | 11 +- .../api/core/LocatedSpecificationItemId.java | 173 ++++++++++++++++++ .../api/core/SourcePosition.java | 65 +++++++ .../openfasttrace/api/core/SourceRange.java | 63 +++++++ .../api/core/SpecificationItem.java | 124 ++++++++----- .../api/importer/ImportEventListener.java | 36 ++++ 6 files changed, 427 insertions(+), 45 deletions(-) create mode 100644 api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java create mode 100644 api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java create mode 100644 api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java index 1a8e7383..0f9129da 100644 --- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java +++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java @@ -8,7 +8,8 @@ * Specification items with links that can be followed. */ // [impl->dsn~linked-specification-item~1] -@SuppressWarnings("java:S1448") // This is a facade class. Reducing methods hurts expressiveness. +@SuppressWarnings("java:S1448") // This is a facade class. Reducing methods + // hurts expressiveness. public class LinkedSpecificationItem { private final SpecificationItem item; @@ -132,6 +133,7 @@ public SpecificationItem getItem() * @param status * the link status */ + //@Deprecated public void addLinkToItemWithStatus(final LinkedSpecificationItem item, final LinkStatus status) { this.links.computeIfAbsent(status, key -> new ArrayList<>()); @@ -312,7 +314,7 @@ public boolean isCoveredShallow() /** * Check if all needed attribute types are covered by approved items. - * + * * @return {@code true} if all needed attribute types are covered by * approved items */ @@ -356,6 +358,7 @@ List getIncomingItems() *

* An item counts as a defect if the following applies: *

+ * * 
      * has duplicates
      * or (not rejected
@@ -393,7 +396,7 @@ public boolean isTransitiveDefect()
 
     /**
      * Check if the item has one or more links.
-     * 
+     *
      * @return {@code true} if the item has one or more links
      */
     public boolean hasLinks()
@@ -492,7 +495,7 @@ public int countDuplicateLinks()
 
     /**
      * Check if this item has one ore more duplicates.
-     * 
+     *
      * @return {@code true} if this item has one ore more duplicates.
      */
     public boolean hasDuplicates()
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
new file mode 100644
index 00000000..34c97c57
--- /dev/null
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
@@ -0,0 +1,173 @@
+package org.itsallcode.openfasttrace.api.core;
+
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * One occurrence of a specification item ID in an imported source artifact.
+ * Component ranges are absent when the corresponding ID component was generated
+ * by an importer instead of being present in the source.
+ */
+public final class LocatedSpecificationItemId
+{
+    private final SpecificationItemId id;
+    private final SourceRange range;
+    private final SourceRange artifactTypeRange;
+    private final SourceRange nameRange;
+    private final SourceRange revisionRange;
+
+    private LocatedSpecificationItemId(final Builder builder)
+    {
+        this.id = Objects.requireNonNull(builder.id, "id");
+        this.range = builder.range;
+        this.artifactTypeRange = builder.artifactTypeRange;
+        this.nameRange = builder.nameRange;
+        this.revisionRange = builder.revisionRange;
+    }
+
+    /**
+     * @return a new builder instance for {@link LocatedSpecificationItemId}.
+     */
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    /** @return the semantic ID */
+    public SpecificationItemId getId()
+    {
+        return this.id;
+    }
+
+    /** @return range of the complete source construct */
+    public SourceRange getRange()
+    {
+        return this.range;
+    }
+
+    /** @return source range of the artifact type, if represented in source */
+    public Optional getArtifactTypeRange()
+    {
+        return Optional.ofNullable(this.artifactTypeRange);
+    }
+
+    /** @return source range of the name, if represented in source */
+    public Optional getNameRange()
+    {
+        return Optional.ofNullable(this.nameRange);
+    }
+
+    /** @return source range of the revision, if represented in source */
+    public Optional getRevisionRange()
+    {
+        return Optional.ofNullable(this.revisionRange);
+    }
+
+    @Override
+    public boolean equals(final Object other)
+    {
+        if (!(other instanceof final LocatedSpecificationItemId that))
+        {
+            return false;
+        }
+        return Objects.equals(this.id, that.id) && Objects.equals(this.range, that.range)
+                && Objects.equals(this.artifactTypeRange, that.artifactTypeRange)
+                && Objects.equals(this.nameRange, that.nameRange)
+                && Objects.equals(this.revisionRange, that.revisionRange);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(this.id, this.range, this.artifactTypeRange, this.nameRange, this.revisionRange);
+    }
+
+    /**
+     * Builder for {@link LocatedSpecificationItemId}.
+     */
+    public static class Builder
+    {
+        private SpecificationItemId id;
+        private SourceRange range;
+        private SourceRange artifactTypeRange;
+        private SourceRange nameRange;
+        private SourceRange revisionRange;
+
+        private Builder()
+        {
+        }
+
+        /**
+         * Set the semantic ID
+         *
+         * @param id
+         *            the semantic ID
+         * @return this builder instance
+         */
+        public Builder id(final SpecificationItemId id)
+        {
+            this.id = id;
+            return this;
+        }
+
+        /**
+         * Set the source range of the complete source construct
+         *
+         * @param range
+         *            the source range
+         * @return this builder instance
+         */
+        public Builder range(final SourceRange range)
+        {
+            this.range = range;
+            return this;
+        }
+
+        /**
+         * Set the source range of the artifact type, if represented in source
+         *
+         * @param artifactTypeRange
+         *            the source range of the artifact type
+         * @return this builder instance
+         */
+        public Builder artifactTypeRange(final SourceRange artifactTypeRange)
+        {
+            this.artifactTypeRange = artifactTypeRange;
+            return this;
+        }
+
+        /**
+         * Set the source range of the name, if represented in source
+         *
+         * @param nameRange
+         *            the source range of the name
+         * @return this builder instance
+         */
+        public Builder nameRange(final SourceRange nameRange)
+        {
+            this.nameRange = nameRange;
+            return this;
+        }
+
+        /**
+         * Set the source range of the revision, if represented in source
+         *
+         * @param revisionRange
+         *            the source range of the revision
+         * @return this builder instance
+         */
+        public Builder revisionRange(final SourceRange revisionRange)
+        {
+            this.revisionRange = revisionRange;
+            return this;
+        }
+
+        /**
+         * @return a new instance of {@link LocatedSpecificationItemId}
+         */
+        public LocatedSpecificationItemId build()
+        {
+            return new LocatedSpecificationItemId(this);
+        }
+    }
+}
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
new file mode 100644
index 00000000..48c1bdfd
--- /dev/null
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
@@ -0,0 +1,65 @@
+package org.itsallcode.openfasttrace.api.core;
+
+import java.util.Objects;
+
+/**
+ * A zero-based position in source text. The character offset is measured in
+ * UTF-16 code units, matching Java strings and editor protocols.
+ */
+public final class SourcePosition
+{
+    private final int line;
+    private final int column;
+
+    /**
+     * Create a source position.
+     *
+     * @param line
+     *            zero-based line number
+     * @param column
+     *            zero-based UTF-16 character offset
+     */
+    public SourcePosition(final int line, final int column)
+    {
+        if (line < 0 || column < 0)
+        {
+            throw new IllegalArgumentException("Source positions must not be negative");
+        }
+        this.line = line;
+        this.column = column;
+    }
+
+    /** @return the zero-based line number */
+    public int getLine()
+    {
+        return this.line;
+    }
+
+    /** @return the zero-based UTF-16 character offset */
+    public int getColumn()
+    {
+        return this.column;
+    }
+
+    @Override
+    public boolean equals(final Object other)
+    {
+        if (!(other instanceof final SourcePosition that))
+        {
+            return false;
+        }
+        return this.line == that.line && this.column == that.column;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(this.line, this.column);
+    }
+
+    @Override
+    public String toString()
+    {
+        return this.line + ":" + this.column;
+    }
+}
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
new file mode 100644
index 00000000..1df85067
--- /dev/null
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
@@ -0,0 +1,63 @@
+package org.itsallcode.openfasttrace.api.core;
+
+import java.util.Objects;
+
+/** A start-inclusive, end-exclusive range in source text. */
+public final class SourceRange
+{
+    private final SourcePosition start;
+    private final SourcePosition end;
+
+    /**
+     * Create a source range.
+     *
+     * @param start
+     *            inclusive start position
+     * @param end
+     *            exclusive end position
+     */
+    public SourceRange(final SourcePosition start, final SourcePosition end)
+    {
+        this.start = Objects.requireNonNull(start, "start");
+        this.end = Objects.requireNonNull(end, "end");
+        if (end.getLine() < start.getLine()
+                || end.getLine() == start.getLine() && end.getColumn() < start.getColumn())
+        {
+            throw new IllegalArgumentException("The range end must not precede its start");
+        }
+    }
+
+    /** @return the inclusive start position */
+    public SourcePosition getStart()
+    {
+        return this.start;
+    }
+
+    /** @return the exclusive end position */
+    public SourcePosition getEnd()
+    {
+        return this.end;
+    }
+
+    @Override
+    public boolean equals(final Object other)
+    {
+        if (!(other instanceof final SourceRange that))
+        {
+            return false;
+        }
+        return Objects.equals(this.start, that.start) && Objects.equals(this.end, that.end);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(this.start, this.end);
+    }
+
+    @Override
+    public String toString()
+    {
+        return this.start + "-" + this.end;
+    }
+}
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
index 2ad655b2..f3d31a38 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
@@ -9,15 +9,15 @@
 // [impl->dsn~specification-item~3]
 public final class SpecificationItem
 {
-    private final SpecificationItemId id;
+    private final LocatedSpecificationItemId id;
     private final String title;
     private final String description;
     private final String rationale;
     private final String comment;
     private final Location location;
     private final ItemStatus status;
-    private final List coveredIds;
-    private final List dependOnIds;
+    private final List coveredIds;
+    private final List dependOnIds;
     private final List needsArtifactTypes;
     private final List tags;
     private final boolean forwards;
@@ -45,43 +45,43 @@ private SpecificationItem(final Builder builder)
      */
     public SpecificationItemId getId()
     {
-        return this.id;
+        return this.id.getId();
     }
 
     /**
      * Get the artifact type of the specification item
-     * 
+     *
      * @return artifact type
      */
     public String getArtifactType()
     {
-        return this.id.getArtifactType();
+        return this.getId().getArtifactType();
     }
 
     /**
      * Get the name part of the specification item ID
-     * 
+     *
      * 

      * Not to be mixed up with the
      * {@link org.itsallcode.openfasttrace.api.core.SpecificationItem#getTitle()}
      * of the specification item
      * 

-     * 
+     *
      * @return name part of the specification item ID
      */
     public String getName()
     {
-        return this.id.getName();
+        return this.getId().getName();
     }
 
     /**
      * Get the revision of the specification item
-     * 
+     *
      * @return revision
      */
     public int getRevision()
     {
-        return this.id.getRevision();
+        return this.getId().getRevision();
     }
 
     /**
@@ -131,7 +131,7 @@ public String getComment()
      */
     public List getCoveredIds()
     {
-        return this.coveredIds;
+        return this.coveredIds.stream().map(LocatedSpecificationItemId::getId).toList();
     }
 
     /**
@@ -141,7 +141,7 @@ public List getCoveredIds()
      */
     public List getDependOnIds()
     {
-        return this.dependOnIds;
+        return this.dependOnIds.stream().map(LocatedSpecificationItemId::getId).toList();
     }
 
     /**
@@ -181,7 +181,7 @@ public boolean needsCoverage()
 
     /**
      * Get the location where this specification item was defined.
-     * 
+     *
      * @return location of this item.
      */
     public Location getLocation()
@@ -191,7 +191,7 @@ public Location getLocation()
 
     /**
      * Get the maturity status of the specification item
-     * 
+     *
      * @return maturity status
      */
     public ItemStatus getStatus()
@@ -201,7 +201,7 @@ public ItemStatus getStatus()
 
     /**
      * Get the list of associated tags
-     * 
+     *
      * @return tags
      */
     public List getTags()
@@ -211,7 +211,7 @@ public List getTags()
 
     /**
      * Check if this item forwards coverage.
-     * 
+     *
      * @return {@code true} if this specification item forwards needed coverage
      */
     public boolean isForwarding()
@@ -220,8 +220,10 @@ public boolean isForwarding()
     }
 
     @Override
-    public boolean equals(final Object other) {
-        if (!(other instanceof final SpecificationItem that)) {
+    public boolean equals(final Object other)
+    {
+        if (!(other instanceof final SpecificationItem that))
+        {
             return false;
         }
         return forwards == that.forwards && Objects.equals(id, that.id) && Objects.equals(title, that.title)
@@ -233,14 +235,15 @@ public boolean equals(final Object other) {
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         return Objects.hash(id, title, description, rationale, comment, location, status, coveredIds, dependOnIds,
                 needsArtifactTypes, tags, forwards);
     }
 
     /**
      * Create a builder for specification items
-     * 
+     *
      * @return new {@link Builder} instance
      */
     public static Builder builder()
@@ -253,15 +256,15 @@ public static Builder builder()
      */
     public static final class Builder
     {
-        private SpecificationItemId id;
+        private LocatedSpecificationItemId id;
         private String title;
         private String description;
         private String rationale;
         private String comment;
         private ItemStatus status;
         private Location location;
-        private final List coveredIds;
-        private final List dependOnIds;
+        private final List coveredIds;
+        private final List dependOnIds;
         private final List neededArtifactTypes;
         private final List tags;
         private boolean forwards;
@@ -291,12 +294,25 @@ private Builder()
          *            the ID
          * @return this builder instance
          */
-        public Builder id(final SpecificationItemId id)
+        public Builder id(final LocatedSpecificationItemId id)
         {
             this.id = id;
             return this;
         }
 
+        /**
+         * Set the specification item ID
+         *
+         * @param id
+         *            the ID
+         * @return this builder instance
+         */
+        // @Deprecated
+        public Builder id(final SpecificationItemId id)
+        {
+            return this.id(locatedId(id));
+        }
+
         /**
          * Set the specification item ID by its parts
          *
@@ -310,10 +326,9 @@ public Builder id(final SpecificationItemId id)
          */
         public Builder id(final String artifactType, final String name, final int revision)
         {
-            this.id = new SpecificationItemId.Builder() //
-                    .artifactType(artifactType).name(name).revision(revision) //
-                    .build();
-            return this;
+            return this.id(new SpecificationItemId.Builder()
+                    .artifactType(artifactType).name(name).revision(revision)
+                    .build());
         }
 
         /**
@@ -370,7 +385,7 @@ public Builder comment(final String comment)
 
         /**
          * Set the status
-         * 
+         *
          * @param status
          *            the status
          * @return this builder instance
@@ -388,12 +403,25 @@ public Builder status(final ItemStatus status)
          *            the covered ID
          * @return this builder instance
          */
-        public Builder addCoveredId(final SpecificationItemId coveredId)
+        public Builder addCoveredId(final LocatedSpecificationItemId coveredId)
         {
             this.coveredIds.add(coveredId);
             return this;
         }
 
+        /**
+         * Add the ID of a specification item covered by the item to build
+         *
+         * @param coveredId
+         *            the covered ID
+         * @return this builder instance
+         */
+        // @Deprecated
+        public Builder addCoveredId(final SpecificationItemId coveredId)
+        {
+            return this.addCoveredId(locatedId(coveredId));
+        }
+
         /**
          * Add the ID of a specification item covered by the item to build
          *
@@ -405,13 +433,11 @@ public Builder addCoveredId(final SpecificationItemId coveredId)
          *            the revision number of the covered item
          * @return this builder instance
          */
-        public Builder addCoveredId(final String artifactType, final String name,
-                final int revision)
+        public Builder addCoveredId(final String artifactType, final String name, final int revision)
         {
-            this.coveredIds.add(new SpecificationItemId.Builder() //
-                    .artifactType(artifactType).name(name).revision(revision) //
+            return this.addCoveredId(new SpecificationItemId.Builder()
+                    .artifactType(artifactType).name(name).revision(revision)
                     .build());
-            return this;
         }
 
         /**
@@ -421,7 +447,25 @@ public Builder addCoveredId(final String artifactType, final String name,
          *            the ID the item to be build depends on
          * @return this builder instance
          */
+        // @Deprecated
         public Builder addDependOnId(final SpecificationItemId dependOnId)
+        {
+            return this.addDependOnId(locatedId(dependOnId));
+        }
+
+        private LocatedSpecificationItemId locatedId(final SpecificationItemId id)
+        {
+            return LocatedSpecificationItemId.builder().id(id).build();
+        }
+
+        /**
+         * Add the ID of a specification item the item to be build depends on
+         *
+         * @param dependOnId
+         *            the ID the item to be build depends on
+         * @return this builder instance
+         */
+        public Builder addDependOnId(final LocatedSpecificationItemId dependOnId)
         {
             this.dependOnIds.add(dependOnId);
             return this;
@@ -438,13 +482,11 @@ public Builder addDependOnId(final SpecificationItemId dependOnId)
          *            the revision number of item to be build depends on
          * @return this builder instance
          */
-        public Builder addDependOnId(final String artifactType, final String name,
-                final int revision)
+        public Builder addDependOnId(final String artifactType, final String name, final int revision)
         {
-            this.dependOnIds.add(new SpecificationItemId.Builder() //
-                    .artifactType(artifactType).name(name).revision(revision) //
+            return this.addDependOnId(new SpecificationItemId.Builder()
+                    .artifactType(artifactType).name(name).revision(revision)
                     .build());
-            return this;
         }
 
         /**
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java b/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java
index 556ef032..f42e1029 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java
@@ -23,8 +23,20 @@ public interface ImportEventListener
      * @param id
      *            the ID of the new item
      */
+    // @Deprecated
     void setId(final SpecificationItemId id);
 
+    /**
+     * The importer found the declared ID together with its source occurrence.
+     *
+     * @param id
+     *            located ID occurrence
+     */
+    default void setId(final LocatedSpecificationItemId id)
+    {
+        setId(id.getId());
+    }
+
     /**
      * The importer found the title of a specification item
      *
@@ -72,16 +84,40 @@ public interface ImportEventListener
      * @param id
      *            the ID of the item that is covered
      */
+    // @Deprecated
     void addCoveredId(final SpecificationItemId id);
 
+    /**
+     * Add a covered ID together with its source occurrence.
+     *
+     * @param id
+     *            located covered ID occurrence
+     */
+    default void addCoveredId(final LocatedSpecificationItemId id)
+    {
+        addCoveredId(id.getId());
+    }
+
     /**
      * Add the ID of a specification item that this item depends on
      *
      * @param id
      *            the ID of the item depends on
      */
+    // @Deprecated
     void addDependsOnId(final SpecificationItemId id);
 
+    /**
+     * Add a dependency ID together with its source occurrence.
+     *
+     * @param id
+     *            located dependency ID occurrence
+     */
+    default void addDependsOnId(final LocatedSpecificationItemId id)
+    {
+        addDependsOnId(id.getId());
+    }
+
     /**
      * The importer detected that the current specification object needs to be
      * covered by another specification item

From 58f201b32c91a39e5dfc1fc55ab6ab4e44317cd8 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 13:33:33 +0200
Subject: [PATCH 05/21] Fix unit tests

---
 .../api/core/LinkedSpecificationItem.java     |  3 +-
 .../api/core/SpecificationItem.java           | 35 ++++++++++++++-----
 .../api/importer/ImportEventListener.java     |  3 --
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java
index 0f9129da..1dac9588 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java
@@ -133,7 +133,6 @@ public SpecificationItem getItem()
      * @param status
      *            the link status
      */
-    //@Deprecated
     public void addLinkToItemWithStatus(final LinkedSpecificationItem item, final LinkStatus status)
     {
         this.links.computeIfAbsent(status, key -> new ArrayList<>());
@@ -163,7 +162,7 @@ private void addMyItemIdToCoveringItem(final LinkedSpecificationItem coveringIte
         if (coveringItem.getItem().getCoveredIds() != null
                 && !coveringItem.getItem().getCoveredIds().contains(getId()))
         {
-            coveringItem.getItem().getCoveredIds().add(getId());
+            coveringItem.getItem().addCoveredId(getId());
         }
     }
 
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
index f3d31a38..140c8e14 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
@@ -134,6 +134,28 @@ public List getCoveredIds()
         return this.coveredIds.stream().map(LocatedSpecificationItemId::getId).toList();
     }
 
+    /**
+     * Add a covered {@link SpecificationItemId} to the list of covered IDs
+     *
+     * @param coveredId
+     *            the covered ID to add
+     */
+    public void addCoveredId(final SpecificationItemId coveredId)
+    {
+        this.addCoveredId(locatedId(coveredId));
+    }
+
+    /**
+     * Add a covered {@link SpecificationItemId} to the list of covered IDs
+     *
+     * @param coveredId
+     *            the covered ID to add
+     */
+    public void addCoveredId(final LocatedSpecificationItemId coveredId)
+    {
+        this.coveredIds.add(coveredId);
+    }
+
     /**
      * Get the list of {@link SpecificationItemId}s this item depends on
      *
@@ -307,7 +329,6 @@ public Builder id(final LocatedSpecificationItemId id)
          *            the ID
          * @return this builder instance
          */
-        // @Deprecated
         public Builder id(final SpecificationItemId id)
         {
             return this.id(locatedId(id));
@@ -416,7 +437,6 @@ public Builder addCoveredId(final LocatedSpecificationItemId coveredId)
          *            the covered ID
          * @return this builder instance
          */
-        // @Deprecated
         public Builder addCoveredId(final SpecificationItemId coveredId)
         {
             return this.addCoveredId(locatedId(coveredId));
@@ -447,17 +467,11 @@ public Builder addCoveredId(final String artifactType, final String name, final
          *            the ID the item to be build depends on
          * @return this builder instance
          */
-        // @Deprecated
         public Builder addDependOnId(final SpecificationItemId dependOnId)
         {
             return this.addDependOnId(locatedId(dependOnId));
         }
 
-        private LocatedSpecificationItemId locatedId(final SpecificationItemId id)
-        {
-            return LocatedSpecificationItemId.builder().id(id).build();
-        }
-
         /**
          * Add the ID of a specification item the item to be build depends on
          *
@@ -574,4 +588,9 @@ public Builder forwards(final boolean forwards)
             return this;
         }
     }
+
+    private static LocatedSpecificationItemId locatedId(final SpecificationItemId id)
+    {
+        return LocatedSpecificationItemId.builder().id(id).build();
+    }
 }
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java b/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java
index f42e1029..8589d2f3 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/importer/ImportEventListener.java
@@ -23,7 +23,6 @@ public interface ImportEventListener
      * @param id
      *            the ID of the new item
      */
-    // @Deprecated
     void setId(final SpecificationItemId id);
 
     /**
@@ -84,7 +83,6 @@ default void setId(final LocatedSpecificationItemId id)
      * @param id
      *            the ID of the item that is covered
      */
-    // @Deprecated
     void addCoveredId(final SpecificationItemId id);
 
     /**
@@ -104,7 +102,6 @@ default void addCoveredId(final LocatedSpecificationItemId id)
      * @param id
      *            the ID of the item depends on
      */
-    // @Deprecated
     void addDependsOnId(final SpecificationItemId id);
 
     /**

From eba1764732f0ca6ed77ad8a861edb8db6005c7bd Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 13:48:17 +0200
Subject: [PATCH 06/21] Add unit tests for equals contract

---
 .../api/core/TestLocatedSpecificationItemId.java   | 14 ++++++++++++++
 .../openfasttrace/api/core/TestSourcePosition.java | 14 ++++++++++++++
 .../openfasttrace/api/core/TestSourceRange.java    | 14 ++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
 create mode 100644 api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java
 create mode 100644 api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java

diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
new file mode 100644
index 00000000..db708e54
--- /dev/null
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
@@ -0,0 +1,14 @@
+package org.itsallcode.openfasttrace.api.core;
+
+import org.junit.jupiter.api.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+class TestLocatedSpecificationItemId
+{
+    @Test
+    void testEqualsContract()
+    {
+        EqualsVerifier.forClass(LocatedSpecificationItemId.class).verify();
+    }
+}
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java
new file mode 100644
index 00000000..0d1daeef
--- /dev/null
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java
@@ -0,0 +1,14 @@
+package org.itsallcode.openfasttrace.api.core;
+
+import org.junit.jupiter.api.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+class TestSourcePosition
+{
+    @Test
+    void testEqualsContract()
+    {
+        EqualsVerifier.forClass(SourcePosition.class).verify();
+    }
+}
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
new file mode 100644
index 00000000..04febfc6
--- /dev/null
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
@@ -0,0 +1,14 @@
+package org.itsallcode.openfasttrace.api.core;
+
+import org.junit.jupiter.api.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+class TestSourceRange
+{
+    @Test
+    void testEqualsContract()
+    {
+        EqualsVerifier.forClass(SourceRange.class).verify();
+    }
+}

From b3cf63868739983022f11e7937cad9502281cccc Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 13:48:25 +0200
Subject: [PATCH 07/21] Add clarifying comment

---
 .../api/core/SpecificationItem.java           | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
index 140c8e14..b3b18512 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
@@ -135,7 +135,13 @@ public List getCoveredIds()
     }
 
     /**
-     * Add a covered {@link SpecificationItemId} to the list of covered IDs
+     * Add a covered {@link SpecificationItemId} to the list of covered IDs.
+     * 

+     * Note: This relies on mutating the internal state of the
+     * specification item and will be removed in a future version. Use the
+     * builder to create a new instance of the specification item with the
+     * additional covered ID instead.
+     * 

      *
      * @param coveredId
      *            the covered ID to add
@@ -145,13 +151,7 @@ public void addCoveredId(final SpecificationItemId coveredId)
         this.addCoveredId(locatedId(coveredId));
     }
 
-    /**
-     * Add a covered {@link SpecificationItemId} to the list of covered IDs
-     *
-     * @param coveredId
-     *            the covered ID to add
-     */
-    public void addCoveredId(final LocatedSpecificationItemId coveredId)
+    private void addCoveredId(final LocatedSpecificationItemId coveredId)
     {
         this.coveredIds.add(coveredId);
     }
@@ -589,6 +589,10 @@ public Builder forwards(final boolean forwards)
         }
     }
 
+    /**
+     * This creates a {@link LocatedSpecificationItemId} from a given
+     * {@link SpecificationItemId} as workaround for existing code.
+     */
     private static LocatedSpecificationItemId locatedId(final SpecificationItemId id)
     {
         return LocatedSpecificationItemId.builder().id(id).build();

From 1ffdb7148c6935cfb26b9734e1871640d68f2900 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 13:51:46 +0200
Subject: [PATCH 08/21] Add missing JavaDoc

---
 .../api/core/LocatedSpecificationItemId.java  | 34 ++++++++++++++++---
 .../api/core/SourcePosition.java              | 12 +++++--
 .../openfasttrace/api/core/SourceRange.java   | 12 +++++--
 3 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
index 34c97c57..272d52eb 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
@@ -26,6 +26,8 @@ private LocatedSpecificationItemId(final Builder builder)
     }
 
     /**
+     * Create a new builder for {@link LocatedSpecificationItemId}.
+     *
      * @return a new builder instance for {@link LocatedSpecificationItemId}.
      */
     public static Builder builder()
@@ -33,31 +35,51 @@ public static Builder builder()
         return new Builder();
     }
 
-    /** @return the semantic ID */
+    /**
+     * Get the semantic ID of this located specification item.
+     *
+     * @return the semantic ID
+     */
     public SpecificationItemId getId()
     {
         return this.id;
     }
 
-    /** @return range of the complete source construct */
+    /**
+     * Get the source range of the complete source construct.
+     *
+     * @return range of the complete source construct
+     */
     public SourceRange getRange()
     {
         return this.range;
     }
 
-    /** @return source range of the artifact type, if represented in source */
+    /**
+     * Get the source range of the artifact type, if represented in source.
+     *
+     * @return source range of the artifact type, if represented in source
+     */
     public Optional getArtifactTypeRange()
     {
         return Optional.ofNullable(this.artifactTypeRange);
     }
 
-    /** @return source range of the name, if represented in source */
+    /**
+     * Get the source range of the name, if represented in source.
+     *
+     * @return source range of the name, if represented in source
+     */
     public Optional getNameRange()
     {
         return Optional.ofNullable(this.nameRange);
     }
 
-    /** @return source range of the revision, if represented in source */
+    /**
+     * Get the source range of the revision, if represented in source.
+     *
+     * @return source range of the revision, if represented in source
+     */
     public Optional getRevisionRange()
     {
         return Optional.ofNullable(this.revisionRange);
@@ -163,6 +185,8 @@ public Builder revisionRange(final SourceRange revisionRange)
         }
 
         /**
+         * Build a new instance of {@link LocatedSpecificationItemId}.
+         * 
          * @return a new instance of {@link LocatedSpecificationItemId}
          */
         public LocatedSpecificationItemId build()
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
index 48c1bdfd..1e6f768b 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
@@ -29,13 +29,21 @@ public SourcePosition(final int line, final int column)
         this.column = column;
     }
 
-    /** @return the zero-based line number */
+    /**
+     * Get the zero-based line number.
+     *
+     * @return the zero-based line number
+     */
     public int getLine()
     {
         return this.line;
     }
 
-    /** @return the zero-based UTF-16 character offset */
+    /**
+     * Get the zero-based UTF-16 character offset.
+     * 
+     * @return the zero-based UTF-16 character offset
+     */
     public int getColumn()
     {
         return this.column;
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
index 1df85067..058b5dc1 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
@@ -27,13 +27,21 @@ public SourceRange(final SourcePosition start, final SourcePosition end)
         }
     }
 
-    /** @return the inclusive start position */
+    /**
+     * Get the inclusive start position.
+     * 
+     * @return the inclusive start position
+     */
     public SourcePosition getStart()
     {
         return this.start;
     }
 
-    /** @return the exclusive end position */
+    /**
+     * Get the exclusive end position.
+     * 
+     * @return the exclusive end position
+     */
     public SourcePosition getEnd()
     {
         return this.end;

From c1f1451cdb9e246d3b321ade0d1203846756157d Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:10:30 +0200
Subject: [PATCH 09/21] Update formatter configuration: Allow comment line
 length 120

---
 .settings/org.eclipse.jdt.core.prefs                            | 2 +-
 api/.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 core/.settings/org.eclipse.jdt.core.prefs                       | 2 +-
 doc/itsallcode_formatter.xml                                    | 2 +-
 exporter/common/.settings/org.eclipse.jdt.core.prefs            | 2 +-
 exporter/specobject/.settings/org.eclipse.jdt.core.prefs        | 2 +-
 importer/gherkin/.settings/org.eclipse.jdt.core.prefs           | 2 +-
 importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs | 2 +-
 importer/markdown/.settings/org.eclipse.jdt.core.prefs          | 2 +-
 importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs  | 2 +-
 importer/specobject/.settings/org.eclipse.jdt.core.prefs        | 2 +-
 .../tag-importer-common/.settings/org.eclipse.jdt.core.prefs    | 2 +-
 importer/tag/.settings/org.eclipse.jdt.core.prefs               | 2 +-
 importer/xmlparser/.settings/org.eclipse.jdt.core.prefs         | 2 +-
 importer/zip/.settings/org.eclipse.jdt.core.prefs               | 2 +-
 product/.settings/org.eclipse.jdt.core.prefs                    | 2 +-
 reporter/aspec/.settings/org.eclipse.jdt.core.prefs             | 2 +-
 reporter/html/.settings/org.eclipse.jdt.core.prefs              | 2 +-
 reporter/plaintext/.settings/org.eclipse.jdt.core.prefs         | 2 +-
 testutil/.settings/org.eclipse.jdt.core.prefs                   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 43262708..2b32153a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -205,7 +205,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/api/.settings/org.eclipse.jdt.core.prefs b/api/.settings/org.eclipse.jdt.core.prefs
index f025149b..a41ffdf8 100644
--- a/api/.settings/org.eclipse.jdt.core.prefs
+++ b/api/.settings/org.eclipse.jdt.core.prefs
@@ -229,7 +229,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs
index 33bb9893..116a6ca1 100644
--- a/core/.settings/org.eclipse.jdt.core.prefs
+++ b/core/.settings/org.eclipse.jdt.core.prefs
@@ -219,7 +219,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/doc/itsallcode_formatter.xml b/doc/itsallcode_formatter.xml
index 13b0601e..a4d72922 100644
--- a/doc/itsallcode_formatter.xml
+++ b/doc/itsallcode_formatter.xml
@@ -240,7 +240,7 @@
         
         
         
-        
+        
         
         
         
diff --git a/exporter/common/.settings/org.eclipse.jdt.core.prefs b/exporter/common/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/exporter/common/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/common/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/markdown/.settings/org.eclipse.jdt.core.prefs b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/importer/markdown/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/specobject/.settings/org.eclipse.jdt.core.prefs b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/importer/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/tag/.settings/org.eclipse.jdt.core.prefs b/importer/tag/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/importer/tag/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
index f025149b..a41ffdf8 100644
--- a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
@@ -229,7 +229,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/importer/zip/.settings/org.eclipse.jdt.core.prefs b/importer/zip/.settings/org.eclipse.jdt.core.prefs
index 4a06df47..9bd3b7f1 100644
--- a/importer/zip/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/zip/.settings/org.eclipse.jdt.core.prefs
@@ -128,7 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/product/.settings/org.eclipse.jdt.core.prefs b/product/.settings/org.eclipse.jdt.core.prefs
index 0d3945e6..8399af86 100644
--- a/product/.settings/org.eclipse.jdt.core.prefs
+++ b/product/.settings/org.eclipse.jdt.core.prefs
@@ -227,7 +227,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
index 33bb9893..116a6ca1 100644
--- a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
@@ -219,7 +219,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/reporter/html/.settings/org.eclipse.jdt.core.prefs b/reporter/html/.settings/org.eclipse.jdt.core.prefs
index 33bb9893..116a6ca1 100644
--- a/reporter/html/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/html/.settings/org.eclipse.jdt.core.prefs
@@ -219,7 +219,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
index 4f6924e4..35c929bb 100644
--- a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
@@ -120,7 +120,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/testutil/.settings/org.eclipse.jdt.core.prefs b/testutil/.settings/org.eclipse.jdt.core.prefs
index 2356174f..99ea89e1 100644
--- a/testutil/.settings/org.eclipse.jdt.core.prefs
+++ b/testutil/.settings/org.eclipse.jdt.core.prefs
@@ -219,7 +219,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

From 160bfcd7bdd76682a7223ab44305cbfa84e0bce5 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:13:32 +0200
Subject: [PATCH 10/21] Update formatter setting for comments

---
 .settings/org.eclipse.jdt.core.prefs                            | 2 +-
 api/.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 core/.settings/org.eclipse.jdt.core.prefs                       | 2 +-
 doc/itsallcode_formatter.xml                                    | 2 +-
 exporter/common/.settings/org.eclipse.jdt.core.prefs            | 2 +-
 exporter/specobject/.settings/org.eclipse.jdt.core.prefs        | 2 +-
 importer/gherkin/.settings/org.eclipse.jdt.core.prefs           | 2 +-
 importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs | 2 +-
 importer/markdown/.settings/org.eclipse.jdt.core.prefs          | 2 +-
 importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs  | 2 +-
 importer/specobject/.settings/org.eclipse.jdt.core.prefs        | 2 +-
 .../tag-importer-common/.settings/org.eclipse.jdt.core.prefs    | 2 +-
 importer/tag/.settings/org.eclipse.jdt.core.prefs               | 2 +-
 importer/xmlparser/.settings/org.eclipse.jdt.core.prefs         | 2 +-
 importer/zip/.settings/org.eclipse.jdt.core.prefs               | 2 +-
 product/.settings/org.eclipse.jdt.core.prefs                    | 2 +-
 reporter/aspec/.settings/org.eclipse.jdt.core.prefs             | 2 +-
 reporter/html/.settings/org.eclipse.jdt.core.prefs              | 2 +-
 reporter/plaintext/.settings/org.eclipse.jdt.core.prefs         | 2 +-
 testutil/.settings/org.eclipse.jdt.core.prefs                   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 2b32153a..55e0bdc1 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -192,7 +192,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/api/.settings/org.eclipse.jdt.core.prefs b/api/.settings/org.eclipse.jdt.core.prefs
index a41ffdf8..b6f11ddb 100644
--- a/api/.settings/org.eclipse.jdt.core.prefs
+++ b/api/.settings/org.eclipse.jdt.core.prefs
@@ -216,7 +216,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs
index 116a6ca1..9fec3cba 100644
--- a/core/.settings/org.eclipse.jdt.core.prefs
+++ b/core/.settings/org.eclipse.jdt.core.prefs
@@ -206,7 +206,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/doc/itsallcode_formatter.xml b/doc/itsallcode_formatter.xml
index a4d72922..19657240 100644
--- a/doc/itsallcode_formatter.xml
+++ b/doc/itsallcode_formatter.xml
@@ -27,7 +27,7 @@
         
         
         
-        
+        
         
         
         
diff --git a/exporter/common/.settings/org.eclipse.jdt.core.prefs b/exporter/common/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/exporter/common/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/common/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/markdown/.settings/org.eclipse.jdt.core.prefs b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/importer/markdown/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/specobject/.settings/org.eclipse.jdt.core.prefs b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/importer/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/tag/.settings/org.eclipse.jdt.core.prefs b/importer/tag/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/importer/tag/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
index a41ffdf8..b6f11ddb 100644
--- a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
@@ -216,7 +216,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/importer/zip/.settings/org.eclipse.jdt.core.prefs b/importer/zip/.settings/org.eclipse.jdt.core.prefs
index 9bd3b7f1..ec013eac 100644
--- a/importer/zip/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/zip/.settings/org.eclipse.jdt.core.prefs
@@ -115,7 +115,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/product/.settings/org.eclipse.jdt.core.prefs b/product/.settings/org.eclipse.jdt.core.prefs
index 8399af86..2f65c672 100644
--- a/product/.settings/org.eclipse.jdt.core.prefs
+++ b/product/.settings/org.eclipse.jdt.core.prefs
@@ -214,7 +214,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
index 116a6ca1..9fec3cba 100644
--- a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
@@ -206,7 +206,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/reporter/html/.settings/org.eclipse.jdt.core.prefs b/reporter/html/.settings/org.eclipse.jdt.core.prefs
index 116a6ca1..9fec3cba 100644
--- a/reporter/html/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/html/.settings/org.eclipse.jdt.core.prefs
@@ -206,7 +206,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
index 35c929bb..a7e897af 100644
--- a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
@@ -107,7 +107,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
diff --git a/testutil/.settings/org.eclipse.jdt.core.prefs b/testutil/.settings/org.eclipse.jdt.core.prefs
index 99ea89e1..6614691d 100644
--- a/testutil/.settings/org.eclipse.jdt.core.prefs
+++ b/testutil/.settings/org.eclipse.jdt.core.prefs
@@ -206,7 +206,7 @@ org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
 org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true

From 89243920c31283c4554a20194425104feeba10e5 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:23:40 +0200
Subject: [PATCH 11/21] Update formatter to latest Eclipse version

---
 .settings/org.eclipse.jdt.core.prefs             | 16 ++++++++++++++++
 .settings/org.eclipse.jdt.ui.prefs               |  2 +-
 api/.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 api/.settings/org.eclipse.jdt.ui.prefs           |  2 +-
 core/.settings/org.eclipse.jdt.core.prefs        | 16 ++++++++++++++++
 core/.settings/org.eclipse.jdt.ui.prefs          |  2 +-
 .../common/.settings/org.eclipse.jdt.core.prefs  | 16 ++++++++++++++++
 .../common/.settings/org.eclipse.jdt.ui.prefs    |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../.settings/org.eclipse.jdt.ui.prefs           |  2 +-
 .../gherkin/.settings/org.eclipse.jdt.core.prefs | 16 ++++++++++++++++
 .../gherkin/.settings/org.eclipse.jdt.ui.prefs   |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../.settings/org.eclipse.jdt.ui.prefs           |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../markdown/.settings/org.eclipse.jdt.ui.prefs  |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../.settings/org.eclipse.jdt.ui.prefs           |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../.settings/org.eclipse.jdt.ui.prefs           |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../.settings/org.eclipse.jdt.ui.prefs           |  2 +-
 .../tag/.settings/org.eclipse.jdt.core.prefs     | 16 ++++++++++++++++
 importer/tag/.settings/org.eclipse.jdt.ui.prefs  |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../xmlparser/.settings/org.eclipse.jdt.ui.prefs |  2 +-
 .../zip/.settings/org.eclipse.jdt.core.prefs     | 16 ++++++++++++++++
 importer/zip/.settings/org.eclipse.jdt.ui.prefs  |  2 +-
 product/.settings/org.eclipse.jdt.core.prefs     | 16 ++++++++++++++++
 product/.settings/org.eclipse.jdt.ui.prefs       |  2 +-
 .../aspec/.settings/org.eclipse.jdt.core.prefs   | 16 ++++++++++++++++
 .../aspec/.settings/org.eclipse.jdt.ui.prefs     |  2 +-
 .../html/.settings/org.eclipse.jdt.core.prefs    | 16 ++++++++++++++++
 reporter/html/.settings/org.eclipse.jdt.ui.prefs |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         | 16 ++++++++++++++++
 .../plaintext/.settings/org.eclipse.jdt.ui.prefs |  2 +-
 testutil/.settings/org.eclipse.jdt.core.prefs    | 16 ++++++++++++++++
 testutil/.settings/org.eclipse.jdt.ui.prefs      |  2 +-
 38 files changed, 323 insertions(+), 19 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 55e0bdc1..6575b073 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -106,8 +106,10 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -136,6 +138,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -144,6 +148,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -154,6 +159,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -179,6 +185,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -198,6 +205,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -205,6 +213,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -285,6 +294,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -377,6 +387,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -440,6 +451,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -460,6 +472,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -484,6 +498,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -501,5 +516,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 55570ef5..9bca002f 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -60,7 +60,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/api/.settings/org.eclipse.jdt.core.prefs b/api/.settings/org.eclipse.jdt.core.prefs
index b6f11ddb..02707b19 100644
--- a/api/.settings/org.eclipse.jdt.core.prefs
+++ b/api/.settings/org.eclipse.jdt.core.prefs
@@ -130,8 +130,10 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -160,6 +162,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -168,6 +172,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -178,6 +183,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -203,6 +209,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -222,6 +229,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -229,6 +237,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -302,6 +311,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -394,6 +404,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -457,6 +468,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -477,6 +489,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -501,6 +515,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -518,5 +533,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/api/.settings/org.eclipse.jdt.ui.prefs b/api/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/api/.settings/org.eclipse.jdt.ui.prefs
+++ b/api/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs
index 9fec3cba..b855895b 100644
--- a/core/.settings/org.eclipse.jdt.core.prefs
+++ b/core/.settings/org.eclipse.jdt.core.prefs
@@ -120,8 +120,10 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -150,6 +152,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -158,6 +162,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -168,6 +173,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -193,6 +199,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -212,6 +219,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -219,6 +227,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -292,6 +301,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -384,6 +394,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -447,6 +458,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -467,6 +479,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -491,6 +505,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -508,5 +523,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/core/.settings/org.eclipse.jdt.ui.prefs b/core/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/core/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/exporter/common/.settings/org.eclipse.jdt.core.prefs b/exporter/common/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/exporter/common/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/common/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/exporter/common/.settings/org.eclipse.jdt.ui.prefs b/exporter/common/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/exporter/common/.settings/org.eclipse.jdt.ui.prefs
+++ b/exporter/common/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/exporter/specobject/.settings/org.eclipse.jdt.ui.prefs b/exporter/specobject/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/exporter/specobject/.settings/org.eclipse.jdt.ui.prefs
+++ b/exporter/specobject/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/gherkin/.settings/org.eclipse.jdt.ui.prefs b/importer/gherkin/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/gherkin/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/gherkin/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/lightweightmarkup/.settings/org.eclipse.jdt.ui.prefs b/importer/lightweightmarkup/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/lightweightmarkup/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/lightweightmarkup/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/markdown/.settings/org.eclipse.jdt.core.prefs b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/importer/markdown/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/markdown/.settings/org.eclipse.jdt.ui.prefs b/importer/markdown/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/markdown/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/markdown/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/restructuredtext/.settings/org.eclipse.jdt.ui.prefs b/importer/restructuredtext/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/restructuredtext/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/restructuredtext/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/specobject/.settings/org.eclipse.jdt.core.prefs b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/importer/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/specobject/.settings/org.eclipse.jdt.ui.prefs b/importer/specobject/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/specobject/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/specobject/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/tag-importer-common/.settings/org.eclipse.jdt.ui.prefs b/importer/tag-importer-common/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/tag-importer-common/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/tag-importer-common/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/tag/.settings/org.eclipse.jdt.core.prefs b/importer/tag/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/importer/tag/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/tag/.settings/org.eclipse.jdt.ui.prefs b/importer/tag/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/tag/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/tag/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
index b6f11ddb..02707b19 100644
--- a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
@@ -130,8 +130,10 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -160,6 +162,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -168,6 +172,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -178,6 +183,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -203,6 +209,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -222,6 +229,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -229,6 +237,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -302,6 +311,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -394,6 +404,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -457,6 +468,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -477,6 +489,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -501,6 +515,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -518,5 +533,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/xmlparser/.settings/org.eclipse.jdt.ui.prefs b/importer/xmlparser/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/xmlparser/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/xmlparser/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/importer/zip/.settings/org.eclipse.jdt.core.prefs b/importer/zip/.settings/org.eclipse.jdt.core.prefs
index ec013eac..ca27e248 100644
--- a/importer/zip/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/zip/.settings/org.eclipse.jdt.core.prefs
@@ -29,8 +29,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -59,6 +61,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -67,6 +71,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -77,6 +82,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -102,6 +108,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -121,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -128,6 +136,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -201,6 +210,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -293,6 +303,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -356,6 +367,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -376,6 +388,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -400,6 +414,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -417,5 +432,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/importer/zip/.settings/org.eclipse.jdt.ui.prefs b/importer/zip/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/importer/zip/.settings/org.eclipse.jdt.ui.prefs
+++ b/importer/zip/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/product/.settings/org.eclipse.jdt.core.prefs b/product/.settings/org.eclipse.jdt.core.prefs
index 2f65c672..03872255 100644
--- a/product/.settings/org.eclipse.jdt.core.prefs
+++ b/product/.settings/org.eclipse.jdt.core.prefs
@@ -128,8 +128,10 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -158,6 +160,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -166,6 +170,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -176,6 +181,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -201,6 +207,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -220,6 +227,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -227,6 +235,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -300,6 +309,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -392,6 +402,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -455,6 +466,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -475,6 +487,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -499,6 +513,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -516,5 +531,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/product/.settings/org.eclipse.jdt.ui.prefs b/product/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/product/.settings/org.eclipse.jdt.ui.prefs
+++ b/product/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
index 9fec3cba..b855895b 100644
--- a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
@@ -120,8 +120,10 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -150,6 +152,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -158,6 +162,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -168,6 +173,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -193,6 +199,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -212,6 +219,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -219,6 +227,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -292,6 +301,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -384,6 +394,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -447,6 +458,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -467,6 +479,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -491,6 +505,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -508,5 +523,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/reporter/aspec/.settings/org.eclipse.jdt.ui.prefs b/reporter/aspec/.settings/org.eclipse.jdt.ui.prefs
index 16cb2317..8f5db901 100644
--- a/reporter/aspec/.settings/org.eclipse.jdt.ui.prefs
+++ b/reporter/aspec/.settings/org.eclipse.jdt.ui.prefs
@@ -2,7 +2,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/reporter/html/.settings/org.eclipse.jdt.core.prefs b/reporter/html/.settings/org.eclipse.jdt.core.prefs
index 9fec3cba..b855895b 100644
--- a/reporter/html/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/html/.settings/org.eclipse.jdt.core.prefs
@@ -120,8 +120,10 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -150,6 +152,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -158,6 +162,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -168,6 +173,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -193,6 +199,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -212,6 +219,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -219,6 +227,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -292,6 +301,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -384,6 +394,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -447,6 +458,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -467,6 +479,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -491,6 +505,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -508,5 +523,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/reporter/html/.settings/org.eclipse.jdt.ui.prefs b/reporter/html/.settings/org.eclipse.jdt.ui.prefs
index 16cb2317..8f5db901 100644
--- a/reporter/html/.settings/org.eclipse.jdt.ui.prefs
+++ b/reporter/html/.settings/org.eclipse.jdt.ui.prefs
@@ -2,7 +2,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
index a7e897af..9e17bb80 100644
--- a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
@@ -21,8 +21,10 @@ org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -51,6 +53,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -59,6 +63,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -69,6 +74,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -94,6 +100,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -113,6 +120,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -120,6 +128,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -193,6 +202,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -285,6 +295,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -348,6 +359,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -368,6 +380,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -392,6 +406,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -409,5 +424,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/reporter/plaintext/.settings/org.eclipse.jdt.ui.prefs b/reporter/plaintext/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/reporter/plaintext/.settings/org.eclipse.jdt.ui.prefs
+++ b/reporter/plaintext/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4
diff --git a/testutil/.settings/org.eclipse.jdt.core.prefs b/testutil/.settings/org.eclipse.jdt.core.prefs
index 6614691d..98749569 100644
--- a/testutil/.settings/org.eclipse.jdt.core.prefs
+++ b/testutil/.settings/org.eclipse.jdt.core.prefs
@@ -120,8 +120,10 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
@@ -150,6 +152,8 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
 org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
@@ -158,6 +162,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -168,6 +173,7 @@ org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
@@ -193,6 +199,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
 org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line_on_wrap
 org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -212,6 +219,7 @@ org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
 org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_markdown_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -219,6 +227,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
 org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -292,6 +301,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
@@ -384,6 +394,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
@@ -447,6 +458,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
@@ -467,6 +479,8 @@ org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=120
@@ -491,6 +505,7 @@ org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=commo
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.put_text_block_quotes_on_new_line=false
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.text_block_indentation=0
@@ -508,5 +523,6 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/testutil/.settings/org.eclipse.jdt.ui.prefs b/testutil/.settings/org.eclipse.jdt.ui.prefs
index 0a69ece3..a23c50a8 100644
--- a/testutil/.settings/org.eclipse.jdt.ui.prefs
+++ b/testutil/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_itsallcode style
-formatter_settings_version=21
+formatter_settings_version=23
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=4

From a3893a30f2e2dca72140203ff5a51962db7c51c3 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:25:05 +0200
Subject: [PATCH 12/21] Never join lines in JavaDoc comments

---
 .settings/org.eclipse.jdt.core.prefs                            | 2 +-
 api/.settings/org.eclipse.jdt.core.prefs                        | 2 +-
 core/.settings/org.eclipse.jdt.core.prefs                       | 2 +-
 exporter/common/.settings/org.eclipse.jdt.core.prefs            | 2 +-
 exporter/specobject/.settings/org.eclipse.jdt.core.prefs        | 2 +-
 importer/gherkin/.settings/org.eclipse.jdt.core.prefs           | 2 +-
 importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs | 2 +-
 importer/markdown/.settings/org.eclipse.jdt.core.prefs          | 2 +-
 importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs  | 2 +-
 importer/specobject/.settings/org.eclipse.jdt.core.prefs        | 2 +-
 .../tag-importer-common/.settings/org.eclipse.jdt.core.prefs    | 2 +-
 importer/tag/.settings/org.eclipse.jdt.core.prefs               | 2 +-
 importer/xmlparser/.settings/org.eclipse.jdt.core.prefs         | 2 +-
 importer/zip/.settings/org.eclipse.jdt.core.prefs               | 2 +-
 product/.settings/org.eclipse.jdt.core.prefs                    | 2 +-
 reporter/aspec/.settings/org.eclipse.jdt.core.prefs             | 2 +-
 reporter/html/.settings/org.eclipse.jdt.core.prefs              | 2 +-
 reporter/plaintext/.settings/org.eclipse.jdt.core.prefs         | 2 +-
 testutil/.settings/org.eclipse.jdt.core.prefs                   | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 6575b073..62b33c4c 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -452,7 +452,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/api/.settings/org.eclipse.jdt.core.prefs b/api/.settings/org.eclipse.jdt.core.prefs
index 02707b19..8add83f7 100644
--- a/api/.settings/org.eclipse.jdt.core.prefs
+++ b/api/.settings/org.eclipse.jdt.core.prefs
@@ -469,7 +469,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs
index b855895b..bfbe0900 100644
--- a/core/.settings/org.eclipse.jdt.core.prefs
+++ b/core/.settings/org.eclipse.jdt.core.prefs
@@ -459,7 +459,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/exporter/common/.settings/org.eclipse.jdt.core.prefs b/exporter/common/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/exporter/common/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/common/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/exporter/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/gherkin/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/lightweightmarkup/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/markdown/.settings/org.eclipse.jdt.core.prefs b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/importer/markdown/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/markdown/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/restructuredtext/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/specobject/.settings/org.eclipse.jdt.core.prefs b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/importer/specobject/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/specobject/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag-importer-common/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/tag/.settings/org.eclipse.jdt.core.prefs b/importer/tag/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/importer/tag/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/tag/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
index 02707b19..8add83f7 100644
--- a/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/xmlparser/.settings/org.eclipse.jdt.core.prefs
@@ -469,7 +469,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/importer/zip/.settings/org.eclipse.jdt.core.prefs b/importer/zip/.settings/org.eclipse.jdt.core.prefs
index ca27e248..d209b54c 100644
--- a/importer/zip/.settings/org.eclipse.jdt.core.prefs
+++ b/importer/zip/.settings/org.eclipse.jdt.core.prefs
@@ -368,7 +368,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/product/.settings/org.eclipse.jdt.core.prefs b/product/.settings/org.eclipse.jdt.core.prefs
index 03872255..7c61bbcb 100644
--- a/product/.settings/org.eclipse.jdt.core.prefs
+++ b/product/.settings/org.eclipse.jdt.core.prefs
@@ -467,7 +467,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
index b855895b..bfbe0900 100644
--- a/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/aspec/.settings/org.eclipse.jdt.core.prefs
@@ -459,7 +459,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/reporter/html/.settings/org.eclipse.jdt.core.prefs b/reporter/html/.settings/org.eclipse.jdt.core.prefs
index b855895b..bfbe0900 100644
--- a/reporter/html/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/html/.settings/org.eclipse.jdt.core.prefs
@@ -459,7 +459,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
index 9e17bb80..c033839c 100644
--- a/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
+++ b/reporter/plaintext/.settings/org.eclipse.jdt.core.prefs
@@ -360,7 +360,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
diff --git a/testutil/.settings/org.eclipse.jdt.core.prefs b/testutil/.settings/org.eclipse.jdt.core.prefs
index 98749569..e0ea780f 100644
--- a/testutil/.settings/org.eclipse.jdt.core.prefs
+++ b/testutil/.settings/org.eclipse.jdt.core.prefs
@@ -459,7 +459,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_line_comments=false
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never

From 3e225370f5b79ce7dcba74d5bf8aff084c3e34d8 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:25:29 +0200
Subject: [PATCH 13/21] Fix formatting

---
 .../openfasttrace/api/core/LinkedSpecificationItem.java     | 6 ++----
 .../itsallcode/openfasttrace/api/core/SourcePosition.java   | 2 +-
 .../org/itsallcode/openfasttrace/api/core/SourceRange.java  | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java
index 1dac9588..736fe91a 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java
@@ -8,13 +8,11 @@
  * Specification items with links that can be followed.
  */
 // [impl->dsn~linked-specification-item~1]
-@SuppressWarnings("java:S1448") // This is a facade class. Reducing methods
-                                // hurts expressiveness.
+@SuppressWarnings("java:S1448") // This is a facade class. Reducing methods hurts expressiveness.
 public class LinkedSpecificationItem
 {
     private final SpecificationItem item;
-    private final Map> links = new EnumMap<>(
-            LinkStatus.class);
+    private final Map> links = new EnumMap<>(LinkStatus.class);
     private final Set coveredArtifactTypes = new HashSet<>();
     private final Set coveredArtifactTypesFromApprovedItems = new HashSet<>();
     private final Set overCoveredArtifactTypes = new HashSet<>();
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
index 1e6f768b..b55104c4 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourcePosition.java
@@ -41,7 +41,7 @@ public int getLine()
 
     /**
      * Get the zero-based UTF-16 character offset.
-     * 
+     *
      * @return the zero-based UTF-16 character offset
      */
     public int getColumn()
diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
index 058b5dc1..2994572f 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
@@ -29,7 +29,7 @@ public SourceRange(final SourcePosition start, final SourcePosition end)
 
     /**
      * Get the inclusive start position.
-     * 
+     *
      * @return the inclusive start position
      */
     public SourcePosition getStart()
@@ -39,7 +39,7 @@ public SourcePosition getStart()
 
     /**
      * Get the exclusive end position.
-     * 
+     *
      * @return the exclusive end position
      */
     public SourcePosition getEnd()

From 3b6db7418203b1248dcb725e33ad2a9e4d70e41e Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:27:14 +0200
Subject: [PATCH 14/21] Update exported formatter to latest Eclipse version

---
 doc/itsallcode_formatter.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/itsallcode_formatter.xml b/doc/itsallcode_formatter.xml
index 19657240..7b19e6a3 100644
--- a/doc/itsallcode_formatter.xml
+++ b/doc/itsallcode_formatter.xml
@@ -1,6 +1,6 @@
 
-
-    
+
+    
         
         
         
@@ -79,6 +79,7 @@
         
         
         
+        
         
         
         
@@ -104,6 +105,7 @@
         
         
         
+        
         
         
         
@@ -156,12 +158,14 @@
         
         
         
+        
         
         
         
         
         
         
+        
         
         
         
@@ -196,10 +200,11 @@
         
         
         
+        
         
         
         
-        
+        
         
         
         
@@ -222,11 +227,13 @@
         
         
         
+        
         
         
         
         
         
+        
         
         
         
@@ -238,6 +245,7 @@
         
         
         
+        
         
         
         
@@ -270,18 +278,23 @@
         
         
         
+        
         
         
         
         
+        
         
         
         
         
         
         
+        
         
         
+        
+        
         
         
         
@@ -301,6 +314,7 @@
         
         
         
+        
         
         
         
@@ -324,6 +338,7 @@
         
         
         
+        
         
         
         
@@ -361,6 +376,7 @@
         
         
         
+        
         
         
         

From 65b2a874b6e1575e04600c0eec414fa02c0dd0f6 Mon Sep 17 00:00:00 2001
From: Christoph Pirkl <4711730+kaklakariada@users.noreply.github.com>
Date: Thu, 6 Aug 2026 14:48:45 +0200
Subject: [PATCH 15/21] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sebastian Bär 
---
 .../openfasttrace/api/core/LocatedSpecificationItemId.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
index 272d52eb..85688781 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
@@ -18,7 +18,7 @@ public final class LocatedSpecificationItemId
 
     private LocatedSpecificationItemId(final Builder builder)
     {
-        this.id = Objects.requireNonNull(builder.id, "id");
+        this.id = Objects.requireNonNull(builder.id, "specification item ID must not be null");
         this.range = builder.range;
         this.artifactTypeRange = builder.artifactTypeRange;
         this.nameRange = builder.nameRange;
@@ -107,7 +107,7 @@ public int hashCode()
     /**
      * Builder for {@link LocatedSpecificationItemId}.
      */
-    public static class Builder
+    public static final class Builder
     {
         private SpecificationItemId id;
         private SourceRange range;

From 112c555469e0344ed9db65ea8263fa9cd5148ee5 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:49:00 +0200
Subject: [PATCH 16/21] Add unit tests

---
 AGENTS.md                                     |  1 +
 .../core/TestLocatedSpecificationItemId.java  | 51 ++++++++++++++
 .../api/core/TestSourcePosition.java          | 34 ++++++++++
 .../api/core/TestSourceRange.java             | 66 +++++++++++++++++++
 .../api/core/TestSpecificationItem.java       | 41 ++++++++++++
 5 files changed, 193 insertions(+)

diff --git a/AGENTS.md b/AGENTS.md
index be020b79..86cff6b1 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -87,6 +87,7 @@ Needs: impl, utest
 - **Clean Code**: Meaningful names, small functiKons, single responsibility.
 - **Formatting**: Use the project's Eclipse formatter (`doc/itsallcode_formatter.xml`).
 - **Logging**: Use `java.util.logging`. Test config: `core/src/test/resources/logging.properties`.
+- **Unit tests**: Prefix test method names with `test`. Test each conditional branch in a separate test method. When asserting an exception, verify both its type and message.
 
 ### Development Workflow
 
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
index db708e54..64e9b9a7 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
@@ -1,11 +1,62 @@
 package org.itsallcode.openfasttrace.api.core;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.Optional;
+
 import org.junit.jupiter.api.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class TestLocatedSpecificationItemId
 {
+    private static final SpecificationItemId ID = SpecificationItemId.parseId("req~item~1");
+    private static final SourceRange RANGE = range(1, 0, 1, 10);
+    private static final SourceRange ARTIFACT_TYPE_RANGE = range(1, 0, 1, 3);
+    private static final SourceRange NAME_RANGE = range(1, 4, 1, 8);
+    private static final SourceRange REVISION_RANGE = range(1, 9, 1, 10);
+
+    @Test
+    void testBuildsLocatedIdWithAllRanges()
+    {
+        final LocatedSpecificationItemId locatedId = LocatedSpecificationItemId.builder().id(ID).range(RANGE)
+                .artifactTypeRange(ARTIFACT_TYPE_RANGE).nameRange(NAME_RANGE).revisionRange(REVISION_RANGE).build();
+
+        assertAll(
+                () -> assertThat(locatedId.getId(), equalTo(ID)),
+                () -> assertThat(locatedId.getRange(), equalTo(RANGE)),
+                () -> assertThat(locatedId.getArtifactTypeRange(), equalTo(Optional.of(ARTIFACT_TYPE_RANGE))),
+                () -> assertThat(locatedId.getNameRange(), equalTo(Optional.of(NAME_RANGE))),
+                () -> assertThat(locatedId.getRevisionRange(), equalTo(Optional.of(REVISION_RANGE))));
+    }
+
+    @Test
+    void testReturnsEmptyOptionalsForGeneratedIdComponents()
+    {
+        final LocatedSpecificationItemId locatedId = LocatedSpecificationItemId.builder().id(ID).build();
+
+        assertAll(
+                () -> assertThat(locatedId.getRange(), equalTo(null)),
+                () -> assertThat(locatedId.getArtifactTypeRange(), equalTo(Optional.empty())),
+                () -> assertThat(locatedId.getNameRange(), equalTo(Optional.empty())),
+                () -> assertThat(locatedId.getRevisionRange(), equalTo(Optional.empty())));
+    }
+
+    @Test
+    void testRequiresAnId()
+    {
+        assertThrows(NullPointerException.class, () -> LocatedSpecificationItemId.builder().build());
+    }
+
+    private static SourceRange range(final int startLine, final int startColumn, final int endLine,
+            final int endColumn)
+    {
+        return new SourceRange(new SourcePosition(startLine, startColumn), new SourcePosition(endLine, endColumn));
+    }
+
     @Test
     void testEqualsContract()
     {
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java
index 0d1daeef..7686d959 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourcePosition.java
@@ -1,11 +1,45 @@
 package org.itsallcode.openfasttrace.api.core;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.junit.jupiter.api.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class TestSourcePosition
 {
+    @Test
+    void testExposesZeroBasedLineAndColumn()
+    {
+        final SourcePosition position = new SourcePosition(4, 7);
+
+        assertAll(
+                () -> assertThat(position.getLine(), equalTo(4)),
+                () -> assertThat(position.getColumn(), equalTo(7)),
+                () -> assertThat(position.toString(), equalTo("4:7")));
+    }
+
+    @Test
+    void testRejectsNegativeLine()
+    {
+        final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new SourcePosition(-1, 0));
+
+        assertThat(exception.getMessage(), equalTo("Source positions must not be negative"));
+    }
+
+    @Test
+    void testRejectsNegativeColumn()
+    {
+        final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new SourcePosition(0, -1));
+
+        assertThat(exception.getMessage(), equalTo("Source positions must not be negative"));
+    }
+
     @Test
     void testEqualsContract()
     {
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
index 04febfc6..49dff955 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
@@ -1,11 +1,77 @@
 package org.itsallcode.openfasttrace.api.core;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.junit.jupiter.api.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class TestSourceRange
 {
+    private static final SourcePosition START = new SourcePosition(2, 3);
+    private static final SourcePosition END = new SourcePosition(4, 5);
+
+    @Test
+    void testExposesStartAndEndPositions()
+    {
+        final SourceRange range = new SourceRange(START, END);
+
+        assertAll(
+                () -> assertThat(range.getStart(), equalTo(START)),
+                () -> assertThat(range.getEnd(), equalTo(END)),
+                () -> assertThat(range.toString(), equalTo("2:3-4:5")));
+    }
+
+    @Test
+    void testAcceptsEmptyAndMultiLineRanges()
+    {
+        final SourcePosition position = new SourcePosition(2, 3);
+
+        assertAll(
+                () -> assertThat(new SourceRange(position, position).getEnd(), equalTo(position)),
+                () -> assertThat(new SourceRange(new SourcePosition(2, 5), new SourcePosition(3, 0)).getEnd(),
+                        equalTo(new SourcePosition(3, 0))));
+    }
+
+    @Test
+    void testRejectsNullStart()
+    {
+        final NullPointerException exception = assertThrows(NullPointerException.class,
+                () -> new SourceRange(null, END));
+
+        assertThat(exception.getMessage(), equalTo("start"));
+    }
+
+    @Test
+    void testRejectsNullEnd()
+    {
+        final NullPointerException exception = assertThrows(NullPointerException.class,
+                () -> new SourceRange(START, null));
+
+        assertThat(exception.getMessage(), equalTo("end"));
+    }
+
+    @Test
+    void testRejectsEndOnEarlierLine()
+    {
+        final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new SourceRange(END, START));
+
+        assertThat(exception.getMessage(), equalTo("The range end must not precede its start"));
+    }
+
+    @Test
+    void testRejectsEndOnEarlierColumn()
+    {
+        final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new SourceRange(new SourcePosition(2, 4), new SourcePosition(2, 3)));
+
+        assertThat(exception.getMessage(), equalTo("The range end must not precede its start"));
+    }
+
     @Test
     void testEqualsContract()
     {
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSpecificationItem.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSpecificationItem.java
index 89db3cd9..fd0e0e8e 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSpecificationItem.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSpecificationItem.java
@@ -1,11 +1,52 @@
 package org.itsallcode.openfasttrace.api.core;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
 import org.junit.jupiter.api.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 class TestSpecificationItem
 {
+    private static final SpecificationItemId ID = SpecificationItemId.parseId("req~item~1");
+    private static final SpecificationItemId COVERED_ID = SpecificationItemId.parseId("feat~covered~2");
+    private static final SpecificationItemId DEPEND_ON_ID = SpecificationItemId.parseId("req~dependency~3");
+
+    // [utest->dsn~specification-item~3]
+    @Test
+    void testBuilderAcceptsLocatedIds()
+    {
+        final SpecificationItem item = SpecificationItem.builder().id(locatedId(ID))
+                .addCoveredId(locatedId(COVERED_ID)).addDependOnId(locatedId(DEPEND_ON_ID)).build();
+
+        assertAll(
+                () -> assertThat(item.getId(), equalTo(ID)),
+                () -> assertThat(item.getCoveredIds(), contains(COVERED_ID)),
+                () -> assertThat(item.getDependOnIds(), contains(DEPEND_ON_ID)));
+    }
+
+    // [utest->dsn~specification-item~3]
+    @Test
+    void testPreservesCompatibilityForUnlocatedIds()
+    {
+        final SpecificationItem item = SpecificationItem.builder().id(ID).addCoveredId(COVERED_ID)
+                .addDependOnId(DEPEND_ON_ID).build();
+
+        assertAll(
+                () -> assertThat(item.getId(), equalTo(ID)),
+                () -> assertThat(item.getCoveredIds(), contains(COVERED_ID)),
+                () -> assertThat(item.getDependOnIds(), contains(DEPEND_ON_ID)));
+    }
+
+    private static LocatedSpecificationItemId locatedId(final SpecificationItemId id)
+    {
+        return LocatedSpecificationItemId.builder().id(id).range(
+                new SourceRange(new SourcePosition(0, 0), new SourcePosition(0, id.toString().length()))).build();
+    }
+
     @Test
     void equalsContract()
     {

From 0435c59377b726f7d68af2f45c65bcf9147bd2e1 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 14:52:34 +0200
Subject: [PATCH 17/21] Implement review findings

---
 .../api/core/LocatedSpecificationItemId.java      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
index 85688781..8d686b63 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/LocatedSpecificationItemId.java
@@ -4,9 +4,8 @@
 import java.util.Optional;
 
 /**
- * One occurrence of a specification item ID in an imported source artifact.
- * Component ranges are absent when the corresponding ID component was generated
- * by an importer instead of being present in the source.
+ * One occurrence of a specification item ID in an imported source artifact. Component ranges may be {@code null} if
+ * unknown.
  */
 public final class LocatedSpecificationItemId
 {
@@ -36,9 +35,9 @@ public static Builder builder()
     }
 
     /**
-     * Get the semantic ID of this located specification item.
+     * Get the ID of this located specification item.
      *
-     * @return the semantic ID
+     * @return the item ID
      */
     public SpecificationItemId getId()
     {
@@ -120,10 +119,10 @@ private Builder()
         }
 
         /**
-         * Set the semantic ID
+         * Set the item ID
          *
          * @param id
-         *            the semantic ID
+         *            the item ID
          * @return this builder instance
          */
         public Builder id(final SpecificationItemId id)
@@ -186,7 +185,7 @@ public Builder revisionRange(final SourceRange revisionRange)
 
         /**
          * Build a new instance of {@link LocatedSpecificationItemId}.
-         * 
+         *
          * @return a new instance of {@link LocatedSpecificationItemId}
          */
         public LocatedSpecificationItemId build()

From d3e676539a08d84baa3c3781411c28946a60a7de Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 15:00:27 +0200
Subject: [PATCH 18/21] Fix sonar finding, improve unit test

---
 .../openfasttrace/api/core/SourceRange.java   | 12 ++++----
 .../api/core/TestSourceRange.java             | 29 +++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
index 2994572f..4cd54c79 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
@@ -18,12 +18,14 @@ public final class SourceRange
      */
     public SourceRange(final SourcePosition start, final SourcePosition end)
     {
-        this.start = Objects.requireNonNull(start, "start");
-        this.end = Objects.requireNonNull(end, "end");
-        if (end.getLine() < start.getLine()
-                || end.getLine() == start.getLine() && end.getColumn() < start.getColumn())
+        this.start = Objects.requireNonNull(start, "start must not be null");
+        this.end = Objects.requireNonNull(end, "end must not be null");
+        final boolean isEndBeforeStart = end.getLine() < start.getLine();
+        final boolean isSameLineAndEndBeforeStart = end.getLine() == start.getLine()
+                && end.getColumn() < start.getColumn();
+        if (isEndBeforeStart || isSameLineAndEndBeforeStart)
         {
-            throw new IllegalArgumentException("The range end must not precede its start");
+            throw new IllegalArgumentException("The range end " + end + " must not precede its start " + start);
         }
     }
 
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
index 49dff955..7154a148 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
@@ -6,6 +6,8 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 
@@ -42,7 +44,7 @@ void testRejectsNullStart()
         final NullPointerException exception = assertThrows(NullPointerException.class,
                 () -> new SourceRange(null, END));
 
-        assertThat(exception.getMessage(), equalTo("start"));
+        assertThat(exception.getMessage(), equalTo("start must not be null"));
     }
 
     @Test
@@ -51,25 +53,22 @@ void testRejectsNullEnd()
         final NullPointerException exception = assertThrows(NullPointerException.class,
                 () -> new SourceRange(START, null));
 
-        assertThat(exception.getMessage(), equalTo("end"));
+        assertThat(exception.getMessage(), equalTo("end must not be null"));
     }
 
-    @Test
-    void testRejectsEndOnEarlierLine()
-    {
-        final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new SourceRange(END, START));
-
-        assertThat(exception.getMessage(), equalTo("The range end must not precede its start"));
-    }
-
-    @Test
-    void testRejectsEndOnEarlierColumn()
+    @ParameterizedTest
+    @CsvSource(
+    { "4, 5, 2, 3", "2, 4, 2, 3", "2, 3, 2, 2" })
+    void testRejectsEndPrecedingStart(final int startLine, final int startColumn, final int endLine,
+            final int endColumn)
     {
         final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new SourceRange(new SourcePosition(2, 4), new SourcePosition(2, 3)));
+                () -> new SourceRange(new SourcePosition(startLine, startColumn),
+                        new SourcePosition(endLine, endColumn)));
 
-        assertThat(exception.getMessage(), equalTo("The range end must not precede its start"));
+        assertThat(exception.getMessage(),
+                equalTo("The range end " + endLine + ":" + endColumn + " must not precede its start " + startLine + ":"
+                        + startColumn));
     }
 
     @Test

From d52d0b54f6e61c49397bdafc7cf50fe07f6070b6 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 15:10:50 +0200
Subject: [PATCH 19/21] Add link to refactoring ticket

---
 .../itsallcode/openfasttrace/api/core/SpecificationItem.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
index b3b18512..6e7b9727 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SpecificationItem.java
@@ -140,7 +140,8 @@ public List getCoveredIds()
      * Note: This relies on mutating the internal state of the
      * specification item and will be removed in a future version. Use the
      * builder to create a new instance of the specification item with the
-     * additional covered ID instead.
+     * additional covered ID instead. This will be implemented in
+     * issue #572.
      * 

      *
      * @param coveredId

From 0ada2357563f622e3a09bd4c5ae40edfb8c38e9d Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 15:13:11 +0200
Subject: [PATCH 20/21] Fix sonar warnings

---
 AGENTS.md                                                 | 8 +++++++-
 .../api/core/TestLocatedSpecificationItemId.java          | 4 +++-
 .../openfasttrace/api/core/TestSourceRange.java           | 6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 86cff6b1..94d7c2c3 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -87,7 +87,13 @@ Needs: impl, utest
 - **Clean Code**: Meaningful names, small functiKons, single responsibility.
 - **Formatting**: Use the project's Eclipse formatter (`doc/itsallcode_formatter.xml`).
 - **Logging**: Use `java.util.logging`. Test config: `core/src/test/resources/logging.properties`.
-- **Unit tests**: Prefix test method names with `test`. Test each conditional branch in a separate test method. When asserting an exception, verify both its type and message.
+
+#### Unit Tests
+
+- Prefix test method names with `test`.
+- Test each conditional branch in a separate test method.
+- When asserting an exception, verify both its type and message.
+- Keep only one invocation that may throw a runtime exception in the `assertThrows` lambda; prepare all inputs beforehand.
 
 ### Development Workflow
 
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
index 64e9b9a7..bad674f4 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLocatedSpecificationItemId.java
@@ -48,7 +48,9 @@ void testReturnsEmptyOptionalsForGeneratedIdComponents()
     @Test
     void testRequiresAnId()
     {
-        assertThrows(NullPointerException.class, () -> LocatedSpecificationItemId.builder().build());
+        final LocatedSpecificationItemId.Builder builder = LocatedSpecificationItemId.builder();
+
+        assertThrows(NullPointerException.class, builder::build);
     }
 
     private static SourceRange range(final int startLine, final int startColumn, final int endLine,
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
index 7154a148..06a3a657 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
@@ -62,9 +62,11 @@ void testRejectsNullEnd()
     void testRejectsEndPrecedingStart(final int startLine, final int startColumn, final int endLine,
             final int endColumn)
     {
+        final SourcePosition start = new SourcePosition(startLine, startColumn);
+        final SourcePosition end = new SourcePosition(endLine, endColumn);
+
         final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new SourceRange(new SourcePosition(startLine, startColumn),
-                        new SourcePosition(endLine, endColumn)));
+                () -> new SourceRange(start, end));
 
         assertThat(exception.getMessage(),
                 equalTo("The range end " + endLine + ":" + endColumn + " must not precede its start " + startLine + ":"

From c5d2126504b89386470111cc41cafdc924776c71 Mon Sep 17 00:00:00 2001
From: kaklakariada 
Date: Thu, 6 Aug 2026 15:15:03 +0200
Subject: [PATCH 21/21] Implement review finding

---
 .../java/org/itsallcode/openfasttrace/api/core/SourceRange.java | 2 +-
 .../org/itsallcode/openfasttrace/api/core/TestSourceRange.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
index 4cd54c79..133a5364 100644
--- a/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
+++ b/api/src/main/java/org/itsallcode/openfasttrace/api/core/SourceRange.java
@@ -68,6 +68,6 @@ public int hashCode()
     @Override
     public String toString()
     {
-        return this.start + "-" + this.end;
+        return this.start + " … " + this.end;
     }
 }
diff --git a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
index 06a3a657..e76eb71c 100644
--- a/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
+++ b/api/src/test/java/org/itsallcode/openfasttrace/api/core/TestSourceRange.java
@@ -24,7 +24,7 @@ void testExposesStartAndEndPositions()
         assertAll(
                 () -> assertThat(range.getStart(), equalTo(START)),
                 () -> assertThat(range.getEnd(), equalTo(END)),
-                () -> assertThat(range.toString(), equalTo("2:3-4:5")));
+                () -> assertThat(range.toString(), equalTo("2:3 … 4:5")));
     }
 
     @Test