fix newline option bug

Author: jesseschroder

lib/annotate/annotate_models.rb

@@ -208,6 +208,10 @@ def get_schema_info(klass, header, options = {}) # rubocop:disable Metrics/Metho
       end
 
       info << get_schema_footer_text(klass, options)
+
+      info.chomp!("#\n") if options[:with_trailing_newline]
+
+      info
     end
 
     def get_schema_header_text(klass, options = {})
@@ -228,8 +232,6 @@ def get_schema_footer_text(_klass, options = {})
         info << "#--\n"
         info << "# #{END_MARK}\n"
         info << "#++\n"
-      elsif options[:with_trailing_newline]
-        info << "\n"
       else
         info << "#\n"
       end
@@ -461,6 +463,8 @@ def annotate_one_file(file_name, info_block, position, options = {})
                         magic_comments_block + (old_content.rstrip + "\n\n" + wrapped_info_block)
                       elsif magic_comments_block.empty?
                         magic_comments_block + wrapped_info_block + old_content.lstrip
+                      elsif options[:with_trailing_newline]
+                        magic_comments_block + "\n" + wrapped_info_block + old_content
                       else
                         magic_comments_block + "\n" + wrapped_info_block + old_content.lstrip
                       end

spec/lib/annotate/annotate_models_spec.rb

@@ -1468,12 +1468,12 @@ def mock_column(name, type, options = {})
 
               let :expected_result do
                 <<~EOS
-                    # Schema Info
-                    #
-                    # Table name: users
-                    #
-                    #  id   :integer          not null, primary key
-                    #  name :string(50)       not null
+                  # Schema Info
+                  #
+                  # Table name: users
+                  #
+                  #  id   :integer          not null, primary key
+                  #  name :string(50)       not null
 
                 EOS
               end