From d954d5d14657d7a85af13822deafd2e9f7be9942 Mon Sep 17 00:00:00 2001
From: Ryan <ryanwjackson@users.noreply.github.com>
Date: Sun, 16 Feb 2020 18:23:00 -0800
Subject: [PATCH] Fix new lines after comments for rubocop compatibility (#757)

* Fix new lines after comments for rubocop compatability

Fix #552, #607
---
 lib/annotate/annotate_models.rb           |  4 ++--
 spec/lib/annotate/annotate_models_spec.rb | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/annotate/annotate_models.rb b/lib/annotate/annotate_models.rb
index d6e3a0866..daecd3e8d 100644
--- a/lib/annotate/annotate_models.rb
+++ b/lib/annotate/annotate_models.rb
@@ -540,9 +540,9 @@ def annotate_one_file(file_name, info_block, position, options = {})
         new_content = if %w(after bottom).include?(options[position].to_s)
                         magic_comments_block + (old_content.rstrip + "\n\n" + wrapped_info_block)
                       elsif magic_comments_block.empty?
-                        magic_comments_block + wrapped_info_block + "\n" + old_content.lstrip
+                        magic_comments_block + wrapped_info_block + old_content.lstrip
                       else
-                        magic_comments_block + "\n" + wrapped_info_block + "\n" + old_content.lstrip
+                        magic_comments_block + "\n" + wrapped_info_block + old_content.lstrip
                       end
       else
         # replace the old annotation with the new one
diff --git a/spec/lib/annotate/annotate_models_spec.rb b/spec/lib/annotate/annotate_models_spec.rb
index c078afcf1..1ae7efcde 100644
--- a/spec/lib/annotate/annotate_models_spec.rb
+++ b/spec/lib/annotate/annotate_models_spec.rb
@@ -2495,7 +2495,7 @@ def annotate_one_file(options = {})
       it "should put annotation before class if :position == #{position}" do
         annotate_one_file position: position
         expect(File.read(@model_file_name))
-          .to eq("#{@schema_info}\n#{@file_content}")
+          .to eq("#{@schema_info}#{@file_content}")
       end
     end
 
@@ -2510,7 +2510,7 @@ def annotate_one_file(options = {})
     it 'should wrap annotation if wrapper is specified' do
       annotate_one_file wrapper_open: 'START', wrapper_close: 'END'
       expect(File.read(@model_file_name))
-        .to eq("# START\n#{@schema_info}# END\n\n#{@file_content}")
+        .to eq("# START\n#{@schema_info}# END\n#{@file_content}")
     end
 
     describe 'with existing annotation' do
@@ -2551,7 +2551,7 @@ def annotate_one_file(options = {})
                              ])
           @schema_info = AnnotateModels.get_schema_info(klass, '== Schema Info', show_foreign_keys: true)
           annotate_one_file
-          expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
+          expect(File.read(@model_file_name)).to eq("#{@schema_info}#{@file_content}")
         end
       end
     end
@@ -2565,12 +2565,12 @@ def annotate_one_file(options = {})
 
       it 'should retain current position' do
         annotate_one_file
-        expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
+        expect(File.read(@model_file_name)).to eq("#{@schema_info}#{@file_content}")
       end
 
       it 'should retain current position even when :position is changed to :after' do
         annotate_one_file position: :after
-        expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
+        expect(File.read(@model_file_name)).to eq("#{@schema_info}#{@file_content}")
       end
 
       it 'should change position to :after when force: true' do
@@ -2598,7 +2598,7 @@ def annotate_one_file(options = {})
 
       it 'should change position to :before when force: true' do
         annotate_one_file position: :before, force: true
-        expect(File.read(@model_file_name)).to eq("#{@schema_info}\n#{@file_content}")
+        expect(File.read(@model_file_name)).to eq("#{@schema_info}#{@file_content}")
       end
     end
 
@@ -2622,7 +2622,7 @@ class Foo::User < ActiveRecord::Base
                          ])
       schema_info = AnnotateModels.get_schema_info(klass, '== Schema Info')
       AnnotateModels.annotate_one_file(model_file_name, schema_info, position: :before)
-      expect(File.read(model_file_name)).to eq("#{schema_info}\n#{file_content}")
+      expect(File.read(model_file_name)).to eq("#{schema_info}#{file_content}")
     end
 
     it 'should not touch magic comments' do
@@ -2652,7 +2652,7 @@ class User < ActiveRecord::Base
         annotate_one_file position: :before
         schema_info = AnnotateModels.get_schema_info(@klass, '== Schema Info')
 
-        expect(File.read(model_file_name)).to eq("#{magic_comment}\n\n#{schema_info}\n#{content}")
+        expect(File.read(model_file_name)).to eq("#{magic_comment}\n\n#{schema_info}#{content}")
       end
     end
 
@@ -2664,7 +2664,7 @@ class User < ActiveRecord::Base
 
         annotate_one_file position: :before
 
-        expect(File.read(model_file_name)).to eq("#{magic_comment}\n\n#{schema_info}\n#{content}")
+        expect(File.read(model_file_name)).to eq("#{magic_comment}\n\n#{schema_info}#{content}")
       end
     end