feat: wrap commit message to 72 characters

It seems a hard wrap at 72 characters is the de-facto standard.

Author: darrachequesne

src/com/leroymerlin/commit/CommitMessage.java

@@ -1,11 +1,14 @@
 package com.leroymerlin.commit;
 
+import org.apache.commons.lang.WordUtils;
+
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 /**
  * @author Damien Arrachequesne <damien.arrachequesne@gmail.com>
  */
 class CommitMessage {
+    private static final int MAX_LINE_LENGTH = 72; // https://stackoverflow.com/a/2120040/5138796
     private final String content;
 
     CommitMessage(ChangeType changeType, String changeScope, String shortDescription, String longDescription, String closedIssues, String breakingChanges) {
@@ -26,14 +29,13 @@ private String buildContent(ChangeType changeType, String changeScope, String sh
                 .append(shortDescription)
                 .append(System.lineSeparator())
                 .append(System.lineSeparator())
-                .append(breakLines(longDescription, 100));
+                .append(WordUtils.wrap(longDescription, MAX_LINE_LENGTH));
 
         if (isNotBlank(breakingChanges)) {
             builder
                     .append(System.lineSeparator())
                     .append(System.lineSeparator())
-                    .append("BREAKING CHANGE: ")
-                    .append(breakingChanges);
+                    .append(WordUtils.wrap("BREAKING CHANGE: " + breakingChanges, MAX_LINE_LENGTH));
         }
 
         if (isNotBlank(closedIssues)) {
@@ -49,31 +51,6 @@ private String buildContent(ChangeType changeType, String changeScope, String sh
         return builder.toString();
     }
 
-    private static String breakLines(String input, int maxLineLength) {
-        String[] tokens = input.split("\\s+");
-        StringBuilder output = new StringBuilder(input.length());
-        int lineLength = 0;
-        for (int i = 0; i < tokens.length; i++) {
-            String word = tokens[i];
-
-            boolean shouldAddNewLine = lineLength + (" " + word).length() > maxLineLength;
-            if (shouldAddNewLine) {
-                if (i > 0) {
-                    output.append(System.lineSeparator());
-                }
-                lineLength = 0;
-            }
-            boolean shouldAddSpace = i < tokens.length - 1 &&
-                    (lineLength + (word + " ").length() + tokens[i + 1].length() <= maxLineLength);
-            if (shouldAddSpace) {
-                word += " ";
-            }
-            output.append(word);
-            lineLength += word.length();
-        }
-        return output.toString();
-    }
-
     @Override
     public String toString() {
         return content;

src/com/leroymerlin/commit/CommitPanel.form

@@ -70,7 +70,9 @@
             <preferred-size width="150" height="50"/>
           </grid>
         </constraints>
-        <properties/>
+        <properties>
+          <lineWrap value="true"/>
+        </properties>
       </component>
       <component id="83b17" class="javax.swing.JLabel">
         <constraints>
@@ -104,13 +106,15 @@
           <text value="Breaking changes"/>
         </properties>
       </component>
-      <component id="d09c0" class="javax.swing.JTextField" binding="breakingChanges">
+      <component id="15a33" class="javax.swing.JTextArea" binding="breakingChanges">
         <constraints>
           <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
-        <properties/>
+        <properties>
+          <lineWrap value="true"/>
+        </properties>
       </component>
     </children>
   </grid>

src/com/leroymerlin/commit/CommitPanel.java

@@ -16,7 +16,7 @@ public class CommitPanel {
     private JTextField shortDescription;
     private JTextArea longDescription;
     private JTextField closedIssues;
-    private JTextField breakingChanges;
+    private JTextArea breakingChanges;
 
     CommitPanel(Project project) {
         for (ChangeType type : ChangeType.values()) {

tests/com/leroymerlin/commit/CommitMessageTest.java

@@ -14,19 +14,20 @@ public void testFormatCommit() {
                 "#16709", "");
         String expected = "fix(ngStyle): skip setting empty value when new style has the property\n" +
                 "\n" +
-                "Previously, all the properties in oldStyles are set to empty value once. Using AngularJS with \n" +
-                "jQuery 3.3.1, this disables the CSS transition as reported in jquery/jquery#4185.\n" +
+                "Previously, all the properties in oldStyles are set to empty value once.\n" +
+                "Using AngularJS with jQuery 3.3.1, this disables the CSS transition as\n" +
+                "reported in jquery/jquery#4185.\n" +
                 "\n" +
                 "Closes #16709";
-        assertEquals(commitMessage.toString(), expected);
+        assertEquals(expected, commitMessage.toString());
     }
 
     @Test
     public void testFormatCommit_withoutScope() {
         CommitMessage commitMessage = new CommitMessage(ChangeType.STYLE, "",
                 "fix eslint error", "", "", "");
         String expected = "style: fix eslint error\n\n";
-        assertEquals(commitMessage.toString(), expected);
+        assertEquals(expected, commitMessage.toString());
     }
 
     @Test
@@ -37,10 +38,29 @@ public void testFormatCommit_withMultipleClosedIssues() {
                 "#7925,#15002", "");
         String expected = "feat($route): add support for the `reloadOnUrl` configuration option\n" +
                 "\n" +
-                "Enables users to specify that a particular route should not be reloaded after a URL change.\n" +
+                "Enables users to specify that a particular route should not be reloaded\n" +
+                "after a URL change.\n" +
                 "\n" +
                 "Closes #7925\n" +
                 "Closes #15002";
-        assertEquals(commitMessage.toString(), expected);
+        assertEquals(expected, commitMessage.toString());
+    }
+
+    @Test
+    public void testFormatCommit_withLongBreakingChange() {
+        CommitMessage commitMessage = new CommitMessage(ChangeType.FEAT, "", "break everything","", "",
+                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
+        String expected = "feat: break everything\n" +
+                "\n" +
+                "\n" +
+                "\n" +
+                "BREAKING CHANGE: Lorem ipsum dolor sit amet, consectetur adipiscing\n" +
+                "elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n" +
+                "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi\n" +
+                "ut aliquip ex ea commodo consequat. Duis aute irure dolor in\n" +
+                "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla\n" +
+                "pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa\n" +
+                "qui officia deserunt mollit anim id est laborum.";
+        assertEquals(expected, commitMessage.toString());
     }
 }