[comment addon] Make sure whitespace on empty lines is preserved

lukehaas · web-flow · commit 52b26e84c339 · 2022-05-26T16:15:42.000+02:00
diff --git a/addon/comment/comment.js b/addon/comment/comment.js
@@ -78,7 +78,7 @@
         var baseString = null;
         for (var i = from.line; i < end; ++i) {
           var line = self.getLine(i);
-          var whitespace = line.slice(0, firstNonWS(line));
+          var whitespace = line.search(nonWS) === -1 ? line : line.slice(0, firstNonWS(line));
           if (baseString == null || baseString.length > whitespace.length) {
             baseString = whitespace;
           }
diff --git a/test/comment_test.js b/test/comment_test.js
@@ -81,6 +81,10 @@ namespace = "comment_";
     cm.lineComment(Pos(1, 0), Pos(2), {indent: true});
   }, simpleProg, "function foo() {\n//   return bar;\n// }");
 
+  test("emptyIndentedLine", "javascript", function(cm) {
+    cm.lineComment(Pos(1, 2), Pos(1, 2), {indent: true});
+  }, "function foo() {\n  \n}", "function foo() {\n  // \n}");
+
   test("singleEmptyLine", "javascript", function(cm) {
     cm.setCursor(1);
     cm.execCommand("toggleComment");

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`var baseString = null;`
`79`	`79`	`for (var i = from.line; i < end; ++i) {`
`80`	`80`	`var line = self.getLine(i);`
`81`		`- var whitespace = line.slice(0, firstNonWS(line));`
	`81`	`+ var whitespace = line.search(nonWS) === -1 ? line : line.slice(0, firstNonWS(line));`
`82`	`82`	`if (baseString == null \|\| baseString.length > whitespace.length) {`
`83`	`83`	`baseString = whitespace;`
`84`	`84`	`}`