Use os.eol for line endings

When running in node, use os.eol to choose line endings - windows will use \r\n, linux will use \n. Fixes #260
beautifier · Oct 11, 2013 · 5af378a · 5af378a
1 parent d0d79c9
commit 5af378a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/js/lib/beautify.js b/js/lib/beautify.js
@@ -303,8 +303,10 @@
 
 
             sweet_code = output_lines[0].text.join('');
+            var os = (os || {});
+            var eol = os['eol'] || '\n';
             for (var line_index = 1; line_index < output_lines.length; line_index++) {
-                sweet_code += '\n' + output_lines[line_index].text.join('');
+                sweet_code += eol + output_lines[line_index].text.join('');
             }
             sweet_code = sweet_code.replace(/[\r\n ]+$/, '');
             return sweet_code;

diff --git a/js/test/beautify-tests.js b/js/test/beautify-tests.js
@@ -3,7 +3,8 @@
 
 function run_beautifier_tests(test_obj, Urlencoded, js_beautify, html_beautify)
 {
-
+    var os = (os || {});
+    var eol = os['eol'] || '\n';
     var opts = {
         indent_size: 4,
         indent_char: ' ',
@@ -32,6 +33,10 @@ function run_beautifier_tests(test_obj, Urlencoded, js_beautify, html_beautify)
     function test_fragment(input, expected)
     {
         expected = expected || input;
+        if(eol !== '\n') {
+            expected = expected.replace('\r\n','\n');
+            expected = expected.replace('\n',eol);
+        }
         sanitytest.expect(input, expected);
         // if the expected is different from input, run it again
         // expected output should be unchanged when run twice.