Merge pull request #206 from Shopify/deprecate-one-ancestor-per-line

Shopify · Apr 16, 2024 · 2cfb6cc · 2cfb6cc
2 parents d6f0206 + c517b7f
commit 2cfb6cc
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 324 deletions.
diff --git a/config/default.yml b/config/default.yml
@@ -200,11 +200,6 @@ Sorbet/BuggyObsoleteStrictMemoization:
   Safe: true
   SafeAutoCorrect: false
 
-Sorbet/OneAncestorPerLine:
-  Description: 'Enforces one ancestor per call to requires_ancestor'
-  Enabled: false
-  VersionAdded: '0.6.0'
-
 Sorbet/RedundantExtendTSig:
   Description: >-
     Forbid the usage of redundant `extend T::Sig`.

diff --git a/config/obsoletion.yml b/config/obsoletion.yml
@@ -3,4 +3,6 @@
 #
 # See: https://docs.rubocop.org/rubocop/extensions.html#config-obsoletions
 #
-{}
+removed:
+  Sorbet/OneAncestorPerLine:
+    reason: '`require_ancestor` now takes a block instead of arguments'
diff --git a/lib/rubocop/cop/sorbet/one_ancestor_per_line.rb b/lib/rubocop/cop/sorbet/one_ancestor_per_line.rb
diff --git a/lib/rubocop/cop/sorbet_cops.rb b/lib/rubocop/cop/sorbet_cops.rb
@@ -10,7 +10,6 @@
 require_relative "sorbet/forbid_type_aliased_shapes"
 require_relative "sorbet/forbid_untyped_struct_props"
 require_relative "sorbet/implicit_conversion_method"
-require_relative "sorbet/one_ancestor_per_line"
 require_relative "sorbet/callback_conditionals_binding"
 require_relative "sorbet/forbid_t_struct"
 require_relative "sorbet/forbid_t_unsafe"

diff --git a/manual/cops.md b/manual/cops.md
@@ -31,7 +31,6 @@ In the following section you find all available cops:
 * [Sorbet/KeywordArgumentOrdering](cops_sorbet.md#sorbetkeywordargumentordering)
 * [Sorbet/MultipleTEnumValues](cops_sorbet.md#sorbetmultipletenumvalues)
 * [Sorbet/ObsoleteStrictMemoization](cops_sorbet.md#sorbetobsoletestrictmemoization)
-* [Sorbet/OneAncestorPerLine](cops_sorbet.md#sorbetoneancestorperline)
 * [Sorbet/RedundantExtendTSig](cops_sorbet.md#sorbetredundantextendtsig)
 * [Sorbet/SignatureBuildOrder](cops_sorbet.md#sorbetsignaturebuildorder)
 * [Sorbet/SingleLineRbiClassModuleDefinitions](cops_sorbet.md#sorbetsinglelinerbiclassmoduledefinitions)

diff --git a/manual/cops_sorbet.md b/manual/cops_sorbet.md
@@ -703,30 +703,6 @@ def foo
 end
 ```
 
-## Sorbet/OneAncestorPerLine
-
-Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
---- | --- | --- | --- | ---
-Disabled | Yes | Yes  | 0.6.0 | -
-
-Ensures one ancestor per requires_ancestor line
-rather than chaining them as a comma-separated list.
-
-### Examples
-
-```ruby
-# bad
-module SomeModule
-  requires_ancestor Kernel, Minitest::Assertions
-end
-
-# good
-module SomeModule
-  requires_ancestor Kernel
-  requires_ancestor Minitest::Assertions
-end
-```
-
 ## Sorbet/RedundantExtendTSig
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged

diff --git a/spec/rubocop/cop/sorbet/one_ancestor_per_line_spec.rb b/spec/rubocop/cop/sorbet/one_ancestor_per_line_spec.rb