Merging tool for code style XML files, remove formatter version lock #3532
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.



This is a refined version of #3498. It removes the Eclipse formatter version lock (not needed any more, since the bug in the formatter has been fixed). In addition, it adds a small Java utility that can be used to merge two XML code style files.
New tool for merging Eclipse code style files: Every few versions, the Eclipse formatter comes with a few new options for configuration. It was a very annoying to find out which keys are missing in the style file
scripts/tools/checkstyle/keyCodeStyle.xml, so this PR adds a small tool to merge two such files. It resides in the same directory as the style file.The easiest way to add the new options to our style file is to open the Eclipse GUI and export the style (in this example to
scripts/tools/checkstyle/eclipse.xml). The styles could then be merged like this:Afterwards, since the tool makes sure to sort the entries by the keys, it can be easily seen via
git diff keyCodeStyle.xmlwhat has changes. Optionally, you can now set the values of the new keys (by manually editing the file).In contrast to #3498, the formatter is configured to not touch code blocks in comments.
Intended Change
Type of pull request
Ensuring quality
The contributions within this pull request are licensed under GPLv2 (only) for inclusion in KeY.