Merge pull request #1096 from chdh/chdh/helpFix

Remove trailing blanks from wrapped help text
tj · Nov 15, 2019 · f7778ce · f7778ce
2 parents 35404b8 + 11abe21
commit f7778ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -1429,7 +1429,7 @@ function wrap(str, width, indent) {
     if (line.slice(-1) === '\n') {
       line = line.slice(0, line.length - 1);
     }
-    return ((i > 0 && indent) ? Array(indent + 1).join(' ') : '') + line;
+    return ((i > 0 && indent) ? Array(indent + 1).join(' ') : '') + line.trimRight();
   }).join('\n');
 }
 

diff --git a/tests/helpwrap.test.js b/tests/helpwrap.test.js
@@ -13,8 +13,8 @@ test('when long option description then wrap and indent', () => {
 `Usage:  [options]
 
 Options:
-  -x -extra-long-option-switch  kjsahdkajshkahd kajhsd akhds kashd kajhs dkha 
-                                dkh aksd ka dkha kdh kasd ka kahs dkh sdkh 
+  -x -extra-long-option-switch  kjsahdkajshkahd kajhsd akhds kashd kajhs dkha
+                                dkh aksd ka dkha kdh kasd ka kahs dkh sdkh
                                 askdh aksd kashdk ahsd kahs dkha skdh
   -h, --help                    output usage information
 `;
@@ -34,7 +34,7 @@ test('when long option description and default then wrap and indent', () => {
 `Usage:  [options]
 
 Options:
-  -x -extra-long-option <value>  kjsahdkajshkahd kajhsd akhds (default: "aaa 
+  -x -extra-long-option <value>  kjsahdkajshkahd kajhsd akhds (default: "aaa
                                  bbb ccc ddd eee fff ggg")
   -h, --help                     output usage information
 `;
@@ -59,7 +59,7 @@ Options:
   -h, --help                    output usage information
 
 Commands:
-  alpha                         Lorem mollit quis dolor ex do eu quis ad insa 
+  alpha                         Lorem mollit quis dolor ex do eu quis ad insa
                                 a commodo esse.
 `;