Merge pull request #172 from Shopify/bitwise-aiden/update-redundant-e…

…xtend-cop Update RedundantExtendTSig to trim whole line
Shopify · Aug 16, 2023 · c84fcf2 · c84fcf2
2 parents 3cf5b67 + 5094122
commit c84fcf2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/lib/rubocop/cop/sorbet/redundant_extend_t_sig.rb b/lib/rubocop/cop/sorbet/redundant_extend_t_sig.rb
@@ -26,6 +26,7 @@ module Sorbet
       #   end
       #
       class RedundantExtendTSig < RuboCop::Cop::Base
+        include RangeHelp
         extend AutoCorrector
 
         MSG = "Do not redundantly `extend T::Sig` when it is already included in all modules."
@@ -40,7 +41,7 @@ def on_send(node)
           return unless extend_t_sig?(node)
 
           add_offense(node) do |corrector|
-            corrector.remove(node)
+            corrector.remove(range_by_whole_lines(node.source_range, include_final_newline: true))
           end
         end
       end

diff --git a/spec/rubocop/cop/sorbet/redundant_extend_t_sig_spec.rb b/spec/rubocop/cop/sorbet/redundant_extend_t_sig_spec.rb
@@ -14,7 +14,6 @@
 
       expect_correction(<<~RUBY)
         #{header}
-          #{trailing_whitespace}
         end
       RUBY
     end
@@ -43,7 +42,7 @@ module M
       ^^^^^^^^^^^^^ #{message}
     RUBY
 
-    expect_correction(a_blank_line)
+    expect_correction("")
   end
 
   it "registers an offense when using `extend ::T::Sig` (fully qualified)" do
@@ -52,7 +51,7 @@ module M
       ^^^^^^^^^^^^^^^ #{message}
     RUBY
 
-    expect_correction(a_blank_line)
+    expect_correction("")
   end
 
   it "registers an offense when using `extend T::Sig` with an explicit receiver" do
@@ -61,7 +60,7 @@ module M
       ^^^^^^^^^^^^^^^^^^^^^^^^^ #{message}
     RUBY
 
-    expect_correction(a_blank_line)
+    expect_correction("")
   end
 
   it "does not register an offense when extending other modules in the T namespace" do
@@ -71,10 +70,4 @@ module M
       end
     RUBY
   end
-
-  private
-
-  def a_blank_line
-    "\n"
-  end
 end