Reformat codebase (more carefully) by subhramit · Pull Request #13885 · JabRef/jabref

subhramit · 2025-09-13T16:57:10Z

Sisyphus says hi again

Follow-up to #13872

Line break at -> at switch/case cannot be configured. See https://youtrack.jetbrains.com/issue/IDEA-330487/Disable-line-breaks-after-switch-cases-on-simple-on-liner-case-blocks-in-switch-expression
do .. while needs to be guarded with @formatter:off/on, because of https://youtrack.jetbrains.com/issue/IDEA-379266/Formatter-Braces-placement-End-of-line-does-not-work-with-do...while?backToIssues=false

Mandatory checks

I own the copyright of the code submitted and I license it under the MIT license
[/] I manually tested my changes in running JabRef (always required)
[/] I added JUnit tests for changes (if applicable)
[/] I added screenshots in the PR description (if change is visible to the user)
[/] I described the change in CHANGELOG.md in a way that is understandable for the average user (if change is visible to the user)
[/] I checked the user documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request updating file(s) in https://github.com/JabRef/user-documentation/tree/main/en.

Siedlerchr · 2025-09-13T17:05:53Z

jabgui/src/main/java/org/jabref/Launcher.java

-        Level logLevel = Arrays.stream(args).anyMatch("--debug"::equalsIgnoreCase)
-                ? Level.DEBUG
-                : Level.INFO;
+        Level logLevel =


Can we move this to one line?

Done manually in 3aa77ac

WOuld not do this as a general rule. There are many locations - LIKE THIS ONE- where it should not be reduced to one line, because it is not easily readable anymore, gets to wide to the right etc.
I know exactly about this one, because i deliberately decided to do so here.

# Conflicts: # jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/cell/sidebuttons/ToggleMergeUnmergeButton.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/CommentMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FieldMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FileMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/GroupMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/KeywordMerger.java # jablib/src/main/java/org/jabref/logic/layout/format/HTMLChars.java # jablib/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java # jablib/src/main/java/org/jabref/model/entry/identifier/EprintIdentifier.java

subhramit · 2025-09-13T18:15:14Z

jabgui/src/main/java/org/jabref/gui/LibraryTab.java

     *
     * @param dataLoadingTask The task to execute to load the data asynchronously.
-     * @param file the path to the file (loaded by the dataLoadingTask)
+     * @param file            the path to the file (loaded by the dataLoadingTask)


This is a bit odd

Might be formatted to "createLibraryTab" in the next line?

IntelliJ style - description always on the same column

subhramit · 2025-09-13T18:15:31Z

jabgui/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java

-     * @param backupDir The backup directory
+     * @param backupDir    The backup directory


This is relatively okay

subhramit · 2025-09-13T18:30:41Z

Anybody objecting to this PR must do so right away or forever hold their silence.

calixtus · 2025-09-13T19:42:44Z

I will check. Give me a few minutes

calixtus · 2025-09-13T19:49:36Z

Still feels off, but is no show stopper

koppor · 2025-09-13T20:00:08Z

Still feels off, but is no show stopper

The closing is below the dot, because it belongs to the select.... Better than if the formatter moved everything to the right 😅

* Fix non record comments by carl # Conflicts: # jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/cell/sidebuttons/ToggleMergeUnmergeButton.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/CommentMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FieldMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FileMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/GroupMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/KeywordMerger.java # jablib/src/main/java/org/jabref/logic/layout/format/HTMLChars.java # jablib/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java # jablib/src/main/java/org/jabref/model/entry/identifier/EprintIdentifier.java * Add file exceptions * Remove shebang line * Remove shebang line * Remove shebang line * Expand variables & rename class --------- Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

* upstream/main: Add hint on auto formatting (#13886) Add ADR-0050 on code formatter (#13895) Reformat codebase (more carefully) (#13885) New Crowdin updates (#13892) Fix record wrapping (#13889) Fix JavaDoc (#13888) Improve IntelliJ settings (#13887) Manual code reformattings (#13883)

* Add cleanup dialog tabs with individual tab preferences * Fixed indentation and added commenting * Fix Trag-bot review issues - Removed trivial comments - Renamed PDF-related variables - Updated methods to return Optional - Used Optional property for FieldFormatterCleanups * Fix Trag-bot review issues - Removed trivial comments - Fixed CHANGELOG.md * Fix Trag-bot review issues - Removed trivial comments - Improved Optional checks - Perform null check for other parameters * Avoid nested Optionals, returning Optional<CleanupPreferences> directly * Refactor CleanupPreferences by keeping one assertion per test * Converted tests to assertEquals * Maintain consistent naming conventions * Returns CleanupPreferences directly since value is always present * Initial review refactor draft - Create new ViewModel, pull logic from Action and SingleAction into ViewModel - Move Apply button to each tab - Remove categories from ENUM and keep enums of all jobs in each respective tab to be used for cleanup * fix import error! * Reformat codebase (more carefully) (#13885) * Fix non record comments by carl # Conflicts: # jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/cell/sidebuttons/ToggleMergeUnmergeButton.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/CommentMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FieldMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FileMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/GroupMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/KeywordMerger.java # jablib/src/main/java/org/jabref/logic/layout/format/HTMLChars.java # jablib/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java # jablib/src/main/java/org/jabref/model/entry/identifier/EprintIdentifier.java * Add file exceptions * Remove shebang line * Remove shebang line * Remove shebang line * Expand variables & rename class --------- Co-authored-by: Oliver Kopp <kopp.dev@gmail.com> * fix import error & merge * Apply OpenRewrite Cleanup * Refactor Cleanup Tabs - Moved cleanup panel logic into CleanupDialogViewModel for better separation of UI and logic - Changed tabSupplier and taskExecutor from Optional to nullable parameters - Moved updateWith logic into the record for cleaner preference updates. - General design improvements: more maintainable. * Fix getDisplayName method * Fix formatting * Trag-bot review and fix en properties * fix indentation plssss * format properly and change to observablelist * fix formatting entriestoprocess (please) * Updated names and changed optional dependencies back to nullable * Refactored panels to use separate ViewModels - Introduced ViewModels to encapsulate state and logic for panels. - Replaced direct UI manipulation with bidirectional bindings. - Ensures cleaner UI logic, easier maintenance * Moved ALL_JOBS to respective ViewModels, small naming changes * Replaced requireNotNull to @NotNull following #13957 * Address review feedback in CleanupDialogViewModel - Remove redundant comments following self-explanatory code - Add modifiedEntriesCount > 0 condition - Use "entry(s)" localization form for clean up message --------- Co-authored-by: Subhramit Basu <subhramit.bb@live.in> Co-authored-by: Oliver Kopp <kopp.dev@gmail.com> Co-authored-by: Christoph <siedlerkiller@gmail.com>

* Add cleanup dialog tabs with individual tab preferences * Fixed indentation and added commenting * Fix Trag-bot review issues - Removed trivial comments - Renamed PDF-related variables - Updated methods to return Optional - Used Optional property for FieldFormatterCleanups * Fix Trag-bot review issues - Removed trivial comments - Fixed CHANGELOG.md * Fix Trag-bot review issues - Removed trivial comments - Improved Optional checks - Perform null check for other parameters * Avoid nested Optionals, returning Optional<CleanupPreferences> directly * Refactor CleanupPreferences by keeping one assertion per test * Converted tests to assertEquals * Maintain consistent naming conventions * Returns CleanupPreferences directly since value is always present * Initial review refactor draft - Create new ViewModel, pull logic from Action and SingleAction into ViewModel - Move Apply button to each tab - Remove categories from ENUM and keep enums of all jobs in each respective tab to be used for cleanup * fix import error! * Reformat codebase (more carefully) (JabRef#13885) * Fix non record comments by carl # Conflicts: # jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/cell/sidebuttons/ToggleMergeUnmergeButton.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/CommentMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FieldMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/FileMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/GroupMerger.java # jabgui/src/main/java/org/jabref/gui/mergeentries/threewaymerge/fieldsmerger/KeywordMerger.java # jablib/src/main/java/org/jabref/logic/layout/format/HTMLChars.java # jablib/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java # jablib/src/main/java/org/jabref/model/entry/identifier/EprintIdentifier.java * Add file exceptions * Remove shebang line * Remove shebang line * Remove shebang line * Expand variables & rename class --------- Co-authored-by: Oliver Kopp <kopp.dev@gmail.com> * fix import error & merge * Apply OpenRewrite Cleanup * Refactor Cleanup Tabs - Moved cleanup panel logic into CleanupDialogViewModel for better separation of UI and logic - Changed tabSupplier and taskExecutor from Optional to nullable parameters - Moved updateWith logic into the record for cleaner preference updates. - General design improvements: more maintainable. * Fix getDisplayName method * Fix formatting * Trag-bot review and fix en properties * fix indentation plssss * format properly and change to observablelist * fix formatting entriestoprocess (please) * Updated names and changed optional dependencies back to nullable * Refactored panels to use separate ViewModels - Introduced ViewModels to encapsulate state and logic for panels. - Replaced direct UI manipulation with bidirectional bindings. - Ensures cleaner UI logic, easier maintenance * Moved ALL_JOBS to respective ViewModels, small naming changes * Replaced requireNotNull to @NotNull following JabRef#13957 * Address review feedback in CleanupDialogViewModel - Remove redundant comments following self-explanatory code - Add modifiedEntriesCount > 0 condition - Use "entry(s)" localization form for clean up message --------- Co-authored-by: Subhramit Basu <subhramit.bb@live.in> Co-authored-by: Oliver Kopp <kopp.dev@gmail.com> Co-authored-by: Christoph <siedlerkiller@gmail.com>

Siedlerchr reviewed Sep 13, 2025

View reviewed changes

This was referenced Sep 13, 2025

Improve IntelliJ settings #13887

Merged

Fix JavaDoc #13888

Merged

koppor added the dev: code-quality Issues related to code or architecture decisions label Sep 13, 2025

subhramit force-pushed the reformat-again branch from b188c47 to a8507e2 Compare September 13, 2025 18:03

Add file exceptions

226fff5

koppor added the status: awaiting-second-review For non-trivial changes label Sep 13, 2025

koppor added 3 commits September 13, 2025 20:13

Remove shebang line

b255a5d

Remove shebang line

b24c9e5

Remove shebang line

74f1743

koppor previously approved these changes Sep 13, 2025

View reviewed changes

subhramit commented Sep 13, 2025

View reviewed changes

subhramit added 2 commits September 13, 2025 23:58

Expand variables & rename class

add4002

Merge remote-tracking branch 'origin/reformat-again' into reformat-again

6e914a6

subhramit dismissed koppor’s stale review via 6e914a6 September 13, 2025 18:28

subhramit changed the title ~~IntelliJ auto-format~~ Reformat codebase (more carefully) Sep 13, 2025

subhramit added the project: jabcon label Sep 13, 2025

koppor approved these changes Sep 13, 2025

View reviewed changes

koppor mentioned this pull request Sep 13, 2025

Use prettier-java JabRef/jabref-koppor#717

Closed

3 tasks

calixtus approved these changes Sep 13, 2025

View reviewed changes

calixtus added this pull request to the merge queue Sep 13, 2025

Merged via the queue into JabRef:main with commit f3cfa49 Sep 13, 2025
50 checks passed

calixtus deleted the reformat-again branch September 13, 2025 20:06

koppor mentioned this pull request Sep 13, 2025

Add ADR-0050 on code formatter #13895

Merged

1 task

koppor mentioned this pull request Sep 14, 2025

Add new check for format #13909

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Reformat codebase (more carefully)#13885

Reformat codebase (more carefully)#13885
calixtus merged 7 commits intoJabRef:mainfrom
subhramit:reformat-again

subhramit commented Sep 13, 2025 •

edited by koppor

Loading

Uh oh!

Siedlerchr Sep 13, 2025

Uh oh!

subhramit Sep 13, 2025

Uh oh!

calixtus Sep 13, 2025

Uh oh!

subhramit Sep 13, 2025

Uh oh!

calixtus Sep 13, 2025

Uh oh!

koppor Sep 13, 2025

Uh oh!

subhramit Sep 13, 2025

Uh oh!

subhramit commented Sep 13, 2025

Uh oh!

calixtus commented Sep 13, 2025

Uh oh!

calixtus commented Sep 13, 2025 •

edited

Loading

Uh oh!

koppor commented Sep 13, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		* @param backupDir The backup directory
		* @param backupDir The backup directory

Uh oh!

Conversation

subhramit commented Sep 13, 2025 • edited by koppor Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Mandatory checks

Uh oh!

Siedlerchr Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

subhramit Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

calixtus Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

subhramit Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

calixtus Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

koppor Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

subhramit Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

subhramit commented Sep 13, 2025

Uh oh!

calixtus commented Sep 13, 2025

Uh oh!

calixtus commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koppor commented Sep 13, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

subhramit commented Sep 13, 2025 •

edited by koppor

Loading

calixtus commented Sep 13, 2025 •

edited

Loading