Remove extra newline in css output (#144)

Merge pull request 144

lib/jekyll/converters/scss.rb

@@ -158,14 +158,14 @@ def sass_configs
 
       def convert(content)
         output = ::Sass.compile_string(content, **sass_configs)
-        result = +"#{output.css}\n"
+        result = output.css
 
         if sourcemap_required?
           source_map = process_source_map(output.source_map)
           generate_source_map_page(source_map)
 
           if (sm_url = source_mapping_url)
-            result << "\n/*# sourceMappingURL=#{sm_url} */"
+            result += "#{sass_style == :compressed ? "" : "\n\n"}/*# sourceMappingURL=#{sm_url} */"
           end
         end
 

spec/sass_converter_spec.rb

@@ -22,7 +22,7 @@
   end
 
   let(:expanded_css_output) do
-    <<~CSS
+    <<~CSS.chomp
       body {
         font-family: Helvetica, sans-serif;
         font-color: fuschia;
@@ -67,13 +67,13 @@ def converter(overrides = {})
     it "does not include the charset without an associated page" do
       overrides = { "style" => :expanded }
       result = converter(overrides).convert(%(a\n  content: "あ"))
-      expect(result).to eql(%(a {\n  content: "あ";\n}\n))
+      expect(result).to eql(%(a {\n  content: "あ";\n}))
     end
 
     it "does not include the BOM without an associated page" do
       overrides = { "style" => :compressed }
       result = converter(overrides).convert(%(a\n  content: "あ"))
-      expect(result).to eql(%(a{content:"あ"}\n))
+      expect(result).to eql(%(a{content:"あ"}))
       expect(result.bytes.to_a[0..2]).not_to eql([0xEF, 0xBB, 0xBF])
     end
   end

spec/scss_converter_spec.rb

@@ -23,7 +23,7 @@
   end
 
   let(:expanded_css_output) do
-    <<~CSS
+    <<~CSS.chomp
       body {
         font-family: Helvetica, sans-serif;
         font-color: fuschia;
@@ -135,13 +135,13 @@ def converter(overrides = {})
     it "does not include the charset without an associated page" do
       overrides = { "style" => :expanded }
       result = converter(overrides).convert(%(a{content:"あ"}))
-      expect(result).to eql(%(a {\n  content: "あ";\n}\n))
+      expect(result).to eql(%(a {\n  content: "あ";\n}))
     end
 
     it "does not include the BOM without an associated page" do
       overrides = { "style" => :compressed }
       result = converter(overrides).convert(%(a{content:"あ"}))
-      expect(result).to eql(%(a{content:"あ"}\n))
+      expect(result).to eql(%(a{content:"あ"}))
       expect(result.bytes.to_a[0..2]).not_to eql([0xEF, 0xBB, 0xBF])
     end
   end
@@ -156,7 +156,7 @@ def converter(overrides = {})
 
     it "imports SCSS partial" do
       expect(File.read(test_css_file)).to eql(
-        ".half{width:50%}\n\n/*# sourceMappingURL=main.css.map */"
+        ".half{width:50%}/*# sourceMappingURL=main.css.map */"
       )
     end