Skip to content

Fix newLine option with formats that have null end #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2023
Merged

Fix newLine option with formats that have null end #154

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31c576d
Fix newLine option with formats that have null `end`
jpenilla Oct 12, 2023
4bd777e
spotlessApply
jpenilla Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...n/java/net/kyori/indra/licenser/spotless/internal/IndraSpotlessLicenserExtensionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,14 @@ private static String formatHeader(final String header, final HeaderFormat forma
final String lineSeparator = System.lineSeparator();
// Apply header format to contents
final String prefix = format.begin() != null ? format.begin() + lineSeparator : "";
final String suffix;
String suffix;
if (format.end() != null) {
if (newLine) {
suffix = lineSeparator + format.end() + lineSeparator + lineSeparator;
} else {
suffix = lineSeparator + format.end() + lineSeparator;
}
suffix = lineSeparator + format.end() + lineSeparator;
} else {
suffix = "";
suffix = lineSeparator;
}
if (newLine) {
suffix = suffix + lineSeparator;
}
return LINE_SPLIT.splitAsStream(header)
.map(line -> {
Expand Down