From a273d8c03f512a928b3f06f2a7ac0c41fa559a8a Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 14 Sep 2025 22:25:01 +0200
Subject: [PATCH 01/18] Add new check for format

---
 .github/workflows/tests-code.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index 901526eeafc..d12af1339af 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -114,6 +114,17 @@ jobs:
         run: |
           ./gradlew --no-configuration-cache :rewriteDryRun
 
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: koppor/intellij-format@update-to-latest-intellij
+        with:
+          mask: *.java
+          settings: "config/IntelliJ Code Style.xml"
+          message: ""
+          verify: true
+
   modernizer:
     name: Modernizer
     runs-on: ubuntu-latest

From 6f9b3539e3baf4a3da91812e5ceb67bb0b5b158e Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 14 Sep 2025 22:30:45 +0200
Subject: [PATCH 02/18] Introduce formatting issue

---
 .../jabref/logic/ai/summarization/GenerateSummaryTask.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java b/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
index 72a8e4b94fc..97264edb583 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
@@ -208,9 +208,7 @@ public String summarizeOneDocument(String filePath, String document) throws Inte
 
         int passes = 0;
 
-        // @formatter:off
-        do {
-            // @formatter:on
+        do{
             passes++;
             LOGGER.debug("Summarizing chunk(s) for file \"{}\" of entry {} ({} pass)", filePath, citationKey, passes);
 

From 3a98a4ad6476908320631a9ddccfdc97422a1d94 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 14 Sep 2025 22:40:05 +0200
Subject: [PATCH 03/18] Fix quotes

---
 .github/workflows/tests-code.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index d12af1339af..5912732efcf 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -120,7 +120,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: koppor/intellij-format@update-to-latest-intellij
         with:
-          mask: *.java
+          mask: "*.java"
           settings: "config/IntelliJ Code Style.xml"
           message: ""
           verify: true

From 533bc5bf5134178bea8ff73f3af5646eb221880e Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 14 Sep 2025 23:24:56 +0200
Subject: [PATCH 04/18] Try to fix parameter

---
 .github/workflows/tests-code.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index 5912732efcf..03d5d6069dd 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -121,7 +121,7 @@ jobs:
       - uses: koppor/intellij-format@update-to-latest-intellij
         with:
           mask: "*.java"
-          settings: "config/IntelliJ Code Style.xml"
+          settings: '"config/IntelliJ Code Style.xml"'
           message: ""
           verify: true
 

From 0e0ba7a6d655dd738a61ab0717c09b6e289dabcf Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 14 Sep 2025 23:56:03 +0200
Subject: [PATCH 05/18] Change action

---
 .github/workflows/tests-code.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index 03d5d6069dd..e712cd209e8 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -118,12 +118,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: koppor/intellij-format@update-to-latest-intellij
+      - uses: koppor/intellij-idea-format@update-to-latest-intellij
         with:
-          mask: "*.java"
-          settings: '"config/IntelliJ Code Style.xml"'
-          message: ""
-          verify: true
+          file-mask: "*.java"
+          settings-file: "config/IntelliJ Code Style.xml"
 
   modernizer:
     name: Modernizer

From 6f285ffad70dbe4e79e085a9468bdf664ea6dda3 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 14 Sep 2025 23:56:47 +0200
Subject: [PATCH 06/18] Add failing

---
 .github/workflows/tests-code.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index e712cd209e8..d4fe928c344 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -122,6 +122,8 @@ jobs:
         with:
           file-mask: "*.java"
           settings-file: "config/IntelliJ Code Style.xml"
+      # job should fail in case there are changes
+      - run: git diff-files --quiet
 
   modernizer:
     name: Modernizer

From 458970113400fcc3435f34fae0a5fd713218f786 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:01:44 +0200
Subject: [PATCH 07/18] Add another bad thing

---
 .../org/jabref/http/server/resources/LibrariesResource.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java b/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java
index b8dbb9f9b5b..7d17b24d961 100644
--- a/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java
+++ b/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java
@@ -19,10 +19,10 @@
 public class LibrariesResource {
 
     @Inject
-    private SrvStateManager srvStateManager;
+    private SrvStateManager     srvStateManager;
 
     @Inject
-    private FilesToServe filesToServe;
+    private FilesToServe    filesToServe;
 
     @Inject
     private Gson gson;

From e3840290c92008a2c9f30003e1579f88d9a29d14 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:04:23 +0200
Subject: [PATCH 08/18] Add step name

---
 .github/workflows/tests-code.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index d4fe928c344..54b670867dd 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -123,7 +123,8 @@ jobs:
           file-mask: "*.java"
           settings-file: "config/IntelliJ Code Style.xml"
       # job should fail in case there are changes
-      - run: git diff-files --quiet
+      - name: Check if any files changed
+        run: git diff-files --quiet
 
   modernizer:
     name: Modernizer

From 5826af31591183c7831fefddecf4aa5fe4d8f93b Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:05:20 +0200
Subject: [PATCH 09/18] Output changed files

---
 .github/workflows/tests-code.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index 54b670867dd..45268d290ff 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -124,7 +124,7 @@ jobs:
           settings-file: "config/IntelliJ Code Style.xml"
       # job should fail in case there are changes
       - name: Check if any files changed
-        run: git diff-files --quiet
+        run: git diff-files
 
   modernizer:
     name: Modernizer

From fd435807a0992e3a19e18e935d38b6c31d6698af Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:08:54 +0200
Subject: [PATCH 10/18] Output changes

---
 .github/workflows/tests-code.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml
index 45268d290ff..6b126371337 100644
--- a/.github/workflows/tests-code.yml
+++ b/.github/workflows/tests-code.yml
@@ -124,7 +124,7 @@ jobs:
           settings-file: "config/IntelliJ Code Style.xml"
       # job should fail in case there are changes
       - name: Check if any files changed
-        run: git diff-files
+        run: git diff --exit-code
 
   modernizer:
     name: Modernizer

From d08fc556abd1f41db0a29a2beb21f1c756499ede Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:26:42 +0200
Subject: [PATCH 11/18] Do not align parameters

---
 config/IntelliJ Code Style.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/IntelliJ Code Style.xml b/config/IntelliJ Code Style.xml
index 6cee9322160..2e23ea4a5e1 100644
--- a/config/IntelliJ Code Style.xml	
+++ b/config/IntelliJ Code Style.xml	
@@ -35,6 +35,7 @@
     </option>
     <option name="RECORD_COMPONENTS_WRAP" value="0" />
     <option name="MULTI_CATCH_TYPES_WRAP" value="0" />
+    <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
   </JavaCodeStyleSettings>
   <codeStyleSettings language="JAVA">
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
@@ -306,4 +307,4 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>
\ No newline at end of file

From c98c62e13552180de9fbf0d9255908989ae85142 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:31:46 +0200
Subject: [PATCH 12/18] Disable JavaDoc formatting

---
 config/IntelliJ Code Style.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/IntelliJ Code Style.xml b/config/IntelliJ Code Style.xml
index 2e23ea4a5e1..dbe682cecbb 100644
--- a/config/IntelliJ Code Style.xml	
+++ b/config/IntelliJ Code Style.xml	
@@ -35,7 +35,7 @@
     </option>
     <option name="RECORD_COMPONENTS_WRAP" value="0" />
     <option name="MULTI_CATCH_TYPES_WRAP" value="0" />
-    <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+    <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
   </JavaCodeStyleSettings>
   <codeStyleSettings language="JAVA">
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />

From d22a47216edbf940cabb84408d7c31f8b7afd3dc Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:34:54 +0200
Subject: [PATCH 13/18] Comment on wrong format

---
 .github/ghprcomment.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/ghprcomment.yml b/.github/ghprcomment.yml
index 7e5f9de7092..4a4d9776ee3 100644
--- a/.github/ghprcomment.yml
+++ b/.github/ghprcomment.yml
@@ -39,6 +39,13 @@
 
     You can then run these tests in IntelliJ to reproduce the failing tests locally.
     We offer a quick test running howto in the section [Final build system checks](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.html#final-build-system-checks) in our setup guide.
+- jobName: format
+  workflowName: 'Source Code Tests'
+  message: >
+    Your code currently does not meet JabRef's code guidelines.
+    IntelliJ auto format covers some cases.
+    There seem to be issues with your code style and autoformat configuration.
+    Please reformat your code (<kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>L</kbd>) and commit, then push.
 - jobName: Checkstyle
   workflowName: 'Source Code Tests'
   message: >

From 7d702a83a92a2de2c226fce09d4c56ac181d132b Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:39:57 +0200
Subject: [PATCH 14/18] Revert "Add another bad thing"

This reverts commit 458970113400fcc3435f34fae0a5fd713218f786.
---
 .../org/jabref/http/server/resources/LibrariesResource.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java b/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java
index 7d17b24d961..b8dbb9f9b5b 100644
--- a/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java
+++ b/jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java
@@ -19,10 +19,10 @@
 public class LibrariesResource {
 
     @Inject
-    private SrvStateManager     srvStateManager;
+    private SrvStateManager srvStateManager;
 
     @Inject
-    private FilesToServe    filesToServe;
+    private FilesToServe filesToServe;
 
     @Inject
     private Gson gson;

From fc5cf346cd96e1837ea1da9f05060d13e38c5330 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:40:25 +0200
Subject: [PATCH 15/18] Revert "Introduce formatting issue"

This reverts commit 6f9b3539e3baf4a3da91812e5ceb67bb0b5b158e.
---
 .../jabref/logic/ai/summarization/GenerateSummaryTask.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java b/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
index 97264edb583..72a8e4b94fc 100644
--- a/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
+++ b/jablib/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
@@ -208,7 +208,9 @@ public String summarizeOneDocument(String filePath, String document) throws Inte
 
         int passes = 0;
 
-        do{
+        // @formatter:off
+        do {
+            // @formatter:on
             passes++;
             LOGGER.debug("Summarizing chunk(s) for file \"{}\" of entry {} ({} pass)", filePath, citationKey, passes);
 

From 7a4edc5eaa5b6d6d945a6014c383b967bc40d2a2 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:41:26 +0200
Subject: [PATCH 16/18] Remove empty lines

---
 .../formatter/bibtexfields/RemoveNewlinesFormatterTest.java      | 1 -
 .../formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java   | 1 -
 .../formatter/bibtexfields/TrimWhitespaceFormatterTest.java      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java b/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
index 777af811194..58974a038d4 100644
--- a/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
+++ b/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
@@ -1,4 +1,3 @@
-
 package org.jabref.logic.formatter.bibtexfields;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java b/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java
index b6e233c846a..b91a144166f 100644
--- a/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java
+++ b/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java
@@ -1,4 +1,3 @@
-
 package org.jabref.logic.formatter.bibtexfields;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java b/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
index 48798526272..137e4e52bf0 100644
--- a/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
+++ b/jablib/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
@@ -1,4 +1,3 @@
-
 package org.jabref.logic.formatter.bibtexfields;
 
 import org.junit.jupiter.api.BeforeEach;

From 7e4d4697ad373d2fec8ea06a4d4d3f8e01f151a1 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:44:09 +0200
Subject: [PATCH 17/18] Fix formatting issue

---
 .../src/test/java/org/jabref/logic/exporter/CffExporterTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jablib/src/test/java/org/jabref/logic/exporter/CffExporterTest.java b/jablib/src/test/java/org/jabref/logic/exporter/CffExporterTest.java
index b98ceb8e263..2adbd77dfd1 100644
--- a/jablib/src/test/java/org/jabref/logic/exporter/CffExporterTest.java
+++ b/jablib/src/test/java/org/jabref/logic/exporter/CffExporterTest.java
@@ -1,4 +1,3 @@
-
 package org.jabref.logic.exporter;
 
 import java.io.IOException;

From 48e757b2f4da5450935751c30212f1ad58db149e Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 15 Sep 2025 00:51:35 +0200
Subject: [PATCH 18/18] Revise code style message in ghprcomment.yml

---
 .github/ghprcomment.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ghprcomment.yml b/.github/ghprcomment.yml
index 4a4d9776ee3..b226733c9d9 100644
--- a/.github/ghprcomment.yml
+++ b/.github/ghprcomment.yml
@@ -46,6 +46,9 @@
     IntelliJ auto format covers some cases.
     There seem to be issues with your code style and autoformat configuration.
     Please reformat your code (<kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>L</kbd>) and commit, then push.
+
+
+    In special cases, consider using `// formatter:off` and `// formatter:on` annotations to allow deviation from the code style.
 - jobName: Checkstyle
   workflowName: 'Source Code Tests'
   message: >