Merge pull request #526 from aycabta/fix-handling-variable-expansion-for-yield

Fix variable expansion in yield

Author: aycabta

lib/rdoc/any_method.rb

@@ -276,8 +276,7 @@ def param_seq
       # &block
       params.sub!(/,?\s*&\w+/, '')
 
-      block = @block_params.gsub(/\s*\#.*/, '')
-      block = block.tr("\n", " ").squeeze(" ")
+      block = @block_params.tr("\n", " ").squeeze(" ")
       if block[0] == ?(
         block.sub!(/^\(/, '').sub!(/\)/, '')
       end

test/test_rdoc_any_method.rb

@@ -89,6 +89,15 @@ def test_markup_code_empty
     assert_equal '', @c2_a.markup_code
   end
 
+  def test_markup_code_with_variable_expansion
+    m = RDoc::AnyMethod.new nil, 'method'
+    m.parent = @c1
+    m.block_params = '"Hello, #{world}", yield_arg'
+    m.params = 'a'
+
+    assert_equal '(a) { |"Hello, #{world}", yield_arg| ... }', m.param_seq
+  end
+
   def test_marshal_dump
     @store.path = Dir.tmpdir
     top_level = @store.add_file 'file.rb'