Support new type_member / type_template syntax

Signed-off-by: Alexandre Terrasa <alexandre.terrasa@shopify.com>
Shopify · Apr 27, 2022 · 30d8ac6 · 30d8ac6
1 parent 2fce9e3
commit 30d8ac6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/rubocop/cop/sorbet/binding_constants_without_type_alias.rb b/lib/rubocop/cop/sorbet/binding_constants_without_type_alias.rb
@@ -57,12 +57,18 @@ class BindingConstantWithoutTypeAlias < RuboCop::Cop::Cop
           )
         PATTERN
 
-        def_node_matcher(:generic_parameter_decl?, <<-PATTERN)
+        def_node_matcher(:generic_parameter_decl_call?, <<-PATTERN)
           (
             send nil? {:type_template :type_member} ...
           )
         PATTERN
 
+        def_node_matcher(:generic_parameter_decl_block_call?, <<-PATTERN)
+          (block
+            (send nil? {:type_template :type_member}) ...
+          )
+        PATTERN
+
         def_node_search(:method_needing_aliasing_on_t?, <<-PATTERN)
           (
             send
@@ -81,7 +87,7 @@ def not_dynamic_type_creation_with_block?(node)
         end
 
         def not_generic_parameter_decl?(node)
-          !generic_parameter_decl?(node)
+          !generic_parameter_decl_call?(node) && !generic_parameter_decl_block_call?(node)
         end
 
         def not_nil?(node)

diff --git a/spec/rubocop/cop/sorbet/binding_constant_without_type_alias_spec.rb b/spec/rubocop/cop/sorbet/binding_constant_without_type_alias_spec.rb
@@ -62,12 +62,14 @@ def deprecation
     it("allows assigning type_member to a constant") do
       expect_no_offenses(<<~RUBY)
         A = type_member(fixed: T.untyped)
+        A = type_member { { fixed: T.class_of(::ActiveRecord::Base) } }
       RUBY
     end
 
     it("allows assigning type_template to a constant") do
       expect_no_offenses(<<~RUBY)
         A = type_template(fixed: T.untyped)
+        A = type_template { { fixed: T.class_of(::ActiveRecord::Base) } }
       RUBY
     end