[rubocop#743] Implement auto-correct for EmptyLineBetweenDefs cop

jonas054 · Feb 8, 2014 · e47e9ac · e47e9ac
1 parent 257b761
commit e47e9ac
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * New cop `FileName` makes sure that source files have snake_case names. ([@bbatsov][])
 * [#743](https://github.com/bbatsov/rubocop/issues/743): `SingleLineMethods` cop does auto-correction. ([@jonas054][])
 * [#743](https://github.com/bbatsov/rubocop/issues/743): `Semicolon` cop does auto-correction. ([@jonas054][])
+* [#743](https://github.com/bbatsov/rubocop/issues/743): `EmptyLineBetweenDefs` cop does auto-correction. ([@jonas054][])
 
 ### Changes
 

diff --git a/lib/rubocop/cop/style/empty_line_between_defs.rb b/lib/rubocop/cop/style/empty_line_between_defs.rb
@@ -33,6 +33,13 @@ def def_start(node)
         def def_end(node)
           node.loc.end.line
         end
+
+        def autocorrect(node)
+          range = range_with_surrounding_space(node.loc.expression, :left)
+          @corrections << lambda do |corrector|
+            corrector.insert_before(range, "\n")
+          end
+        end
       end
     end
   end

diff --git a/spec/rubocop/cli_spec.rb b/spec/rubocop/cli_spec.rb
@@ -58,6 +58,7 @@ def abs(path)
                                              'def func1',
                                              '  do_something',
                                              'end',
+                                             '',
                                              'def func2',
                                              '  do_1',
                                              '  do_2',
@@ -66,11 +67,11 @@ def abs(path)
         expect($stdout.string).to eq(['',
                                       '6   TrailingWhitespace',
                                       '4   Semicolon',
-                                      '2   EmptyLineBetweenDefs',
                                       '2   SingleLineMethods',
                                       '1   DefWithParentheses',
+                                      '1   EmptyLineBetweenDefs',
                                       '--',
-                                      '15  Total',
+                                      '14  Total',
                                       '',
                                       ''].join("\n"))
       end

diff --git a/spec/rubocop/cop/style/empty_line_between_defs_spec.rb b/spec/rubocop/cop/style/empty_line_between_defs_spec.rb
@@ -102,6 +102,14 @@
     expect(cop.offences.size).to eq(1)
   end
 
+  it 'auto-corrects adjacent one-liners by default' do
+    corrected = autocorrect_source(cop, ['  def a; end',
+                                         '  def b; end'])
+    expect(corrected).to eq(['  def a; end',
+                             '',
+                             '  def b; end'].join("\n"))
+  end
+
   context 'when AllowAdjacentOneLineDefs is enabled' do
     let(:cop_config) { { 'AllowAdjacentOneLineDefs' => true } }