Merge pull request #295 from repinel/fix-new-line-after-multi-line-co…

…mment

Remove extra new line after multi-line comments

lib/sprockets/directive_processor.rb

@@ -115,7 +115,7 @@ def process_source(source)
 
         data = String.new("")
         data.force_encoding(body.encoding)
-        data << header << "\n" unless header.empty?
+        data << header unless header.empty?
         data << body
         # Ensure body ends in a new line
         data << "\n" if data.length > 0 && data[-1] != "\n"
@@ -146,7 +146,11 @@ def extract_directives(header)
           processed_header << line
         end
 
-        return processed_header.chomp, directives
+        processed_header.chomp!
+        # Ensure header ends in a new line like before it was processed
+        processed_header << "\n" if processed_header.length > 0 && header[-1] == "\n"
+
+        return processed_header, directives
       end
 
       # Gathers comment directives in the source and processes them.

test/fixtures/asset/multi_line_comment.js

@@ -0,0 +1,2 @@
+/******/ function foo() {
+}

test/test_asset.rb

@@ -862,7 +862,7 @@ def setup
   end
 
   test "require_self inserts the current file's body at the specified point" do
-    assert_equal "/* b.css */\n\nb { display: none }\n/*\n\n\n\n */\n\n\nbody {}\n.project {}\n", asset("require_self.css").to_s
+    assert_equal "/* b.css */\nb { display: none }\n/*\n\n\n\n */\n\nbody {}\n.project {}\n", asset("require_self.css").to_s
   end
 
   test "multiple require_self directives raises and error" do
@@ -1054,6 +1054,11 @@ def setup
       asset("semicolons.js").to_s
   end
 
+  test 'keeps code in same line after multi-line comments' do
+    assert_equal "/******/ function foo() {\n}\n",
+      asset('multi_line_comment.js').to_s
+  end
+
   test "should not fail if home is not set in environment" do
     begin
       home, ENV["HOME"] = ENV["HOME"], nil

test/test_bundle.rb

@@ -39,7 +39,7 @@ class TestStylesheetBundle < Sprockets::TestCase
       metadata: {}
     }
 
-    data = "/* b.css */\n\nb { display: none }\n/*\n\n\n\n */\n\n\nbody {}\n.project {}\n"
+    data = "/* b.css */\nb { display: none }\n/*\n\n\n\n */\n\nbody {}\n.project {}\n"
     result = Sprockets::Bundle.call(input)
     assert_equal data, result[:data]
     assert_equal [

test/test_environment.rb

@@ -230,7 +230,7 @@ def self.test(name, &block)
   end
 
   test "find index.css in directory" do
-    assert_equal ".c {}\n.d {}\n/*\n\n */\n\n", @env["mobile.css"].to_s
+    assert_equal ".c {}\n.d {}\n/*\n\n */\n", @env["mobile.css"].to_s
   end
 
   test "ignore index.min.js in directory" do