Suppress include and extend inside method block

Author: tompng

lib/rdoc/parser/prism_ruby.rb

@@ -35,6 +35,17 @@ def initialize(top_level, content, options, stats)
     @container = top_level
     @visibility = :public
     @singleton = false
+    @include_extend_suppressed = false
+  end
+
+  # Suppress `extend` and `include` within block
+  # because they might be a metaprogramming block
+  # example: `Module.new { include M }` `M.module_eval { include N }`
+
+  def suppress_include_extend
+    @include_extend_suppressed = true
+    yield
+    @include_extend_suppressed = false
   end
 
   # Dive into another container
@@ -43,9 +54,11 @@ def with_container(container, singleton: false)
     old_container = @container
     old_visibility = @visibility
     old_singleton = @singleton
+    old_include_extend_suppressed = @include_extend_suppressed
     @visibility = :public
     @container = container
     @singleton = singleton
+    @include_extend_suppressed = false
     unless singleton
       @module_nesting.push container
 
@@ -58,6 +71,7 @@ def with_container(container, singleton: false)
     @container = old_container
     @visibility = old_visibility
     @singleton = old_singleton
+    @include_extend_suppressed = old_include_extend_suppressed
     @module_nesting.pop unless singleton
   end
 
@@ -471,6 +485,7 @@ def add_attributes(names, rw, line_no)
   end
 
   def add_includes_extends(names, rdoc_class, line_no) # :nodoc:
+    return if @include_extend_suppressed
     comment = consecutive_comment(line_no)
     handle_consecutive_comment_directive(@container, comment)
     names.each do |name|
@@ -736,13 +751,22 @@ def visit_call_node(node)
         when :private_class_method
           _visit_call_public_private_class_method(node, :private) { super }
         else
+          node.arguments&.accept(self)
           super
         end
       else
         super
       end
     end
 
+    def visit_block_node(node)
+      @scanner.suppress_include_extend do
+        # include and extend inside block are not documentable
+        # method definition might also not work but document it for now.
+        super
+      end
+    end
+
     def visit_alias_method_node(node)
       @scanner.process_comments_until(node.location.start_line - 1)
       return unless node.old_name.is_a?(Prism::SymbolNode) && node.new_name.is_a?(Prism::SymbolNode)

test/rdoc/test_rdoc_parser_prism_ruby.rb

@@ -1927,6 +1927,35 @@ def d; end
     assert_equal ['a', 'f'], mod.method_list.map(&:name)
   end
 
+  def test_include_extend_suppressed_within_block
+    util_parser <<~RUBY
+      module M; end
+      module N; end
+      module O: end
+      class A
+        metaprogramming do
+          include M
+          extend N
+          class B
+            include M
+            extend N
+          end
+          include M
+          extend N
+        end
+        include O
+        extend O
+      end
+    RUBY
+    a, b = @store.all_classes
+    unless accept_legacy_bug?
+      assert_equal ['O'], a.includes.map(&:name)
+      assert_equal ['O'], a.extends.map(&:name)
+    end
+    assert_equal ['M'], b.includes.map(&:name)
+    assert_equal ['N'], b.extends.map(&:name)
+  end
+
   def test_multibyte_method_name
     content = <<~RUBY
       class Foo