Use descendant search

Shopify · Oct 16, 2023 · c23a8fc · c23a8fc
1 parent e168f8c
commit c23a8fc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/lib/rubocop/cop/sorbet/forbid_type_aliased_shapes.rb b/lib/rubocop/cop/sorbet/forbid_type_aliased_shapes.rb
@@ -46,8 +46,17 @@ class ForbidTypeAliasedShapes < RuboCop::Cop::Base
           )
         PATTERN
 
+        # @!method shape_type_alias?(node)
+        def_node_matcher(:shape_type_alias?, <<-PATTERN)
+          (block
+            (send (const {nil? cbase} :T) :type_alias)
+            (args)
+            `hash
+          )
+        PATTERN
+
         def on_block(node)
-          add_offense(node) if type_alias?(node) || nested_type_alias?(node)
+          add_offense(node) if shape_type_alias?(node)
         end
 
         alias_method :on_numblock, :on_block

diff --git a/spec/rubocop/cop/sorbet/forbid_type_aliased_shapes_spec.rb b/spec/rubocop/cop/sorbet/forbid_type_aliased_shapes_spec.rb
@@ -22,8 +22,14 @@ def message
 
   it("disallows defining type aliases that contain nested shapes") do
     expect_offense(<<~RUBY)
-      Foo = T.type_alias { [{ foo: Integer }] }
-            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{message}
+      A = T.type_alias { [{ foo: Integer }] }
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{message}
+      B = T.type_alias { T.nilable({ foo: Integer }) }
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{message}
+      C = T.type_alias { T::Hash[Symbol, { foo: Integer }] }
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{message}
+      D = T.type_alias { T::Hash[Symbol, T::Array[T.any(String, { foo: Integer })]] }
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{message}
     RUBY
   end
 end