From 45c79aacee8550f617a23eae444daea2765f8724 Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 5 May 2004 17:02:47 +0000
Subject: Don't include &block if we have yield parameters

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/generators/html_generator.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/rdoc/generators')

diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index 75b056b8be..13d63e5a3c 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -922,6 +922,11 @@ module Generators
         p = "(" + p + ")" unless p[0] == ?(
         
         if (block = @context.block_params)
+         # If this method has explicit block parameters, remove any
+         # explicit &block
+
+         p.sub!(/,?\s*&\w+/, '')
+
           block.gsub!(/\s*\#.*/, '')
           block = block.tr("\n", " ").squeeze(" ")
           if block[0] == ?(
-- 
cgit v1.2.3