Merge pull request #154 from jpenilla/fix-newline

Fix newLine option with formats that have null `end`

Author: zml2008

indra-licenser-spotless/src/main/java/net/kyori/indra/licenser/spotless/internal/IndraSpotlessLicenserExtensionImpl.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of indra, licensed under the MIT License.
  *
- * Copyright (c) 2020-2022 KyoriPowered
+ * Copyright (c) 2020-2023 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -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 -> {