diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-14 21:13:41 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-14 21:13:41 +0000 |
| commit | 1df8d6dbc37d3da200a8335f053bbf554984081f (patch) | |
| tree | a9b809a5f5588a09a8e3a180889508cfd89b86ce | |
| parent | b782aea75f5b9e8d49ef12b9f7fe3ef0dbf9fd51 (diff) | |
| download | ruby-1df8d6dbc37d3da200a8335f053bbf554984081f.tar.gz | |
* lib/rdoc/markup/attribute_manager.rb: fixing ri output when special
characters are inside html tags. Thanks Tomo Kazahaya! [Bug #3512]
* test/rdoc/test_attribute_manager.rb: corresponding test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/markup/attribute_manager.rb | 4 | ||||
| -rw-r--r-- | test/rdoc/test_attribute_manager.rb | 16 |
3 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Jul 15 06:11:29 2010 Aaron Patterson <aaron@tenderlovemaking.com> + + * lib/rdoc/markup/attribute_manager.rb: fixing ri output when special + characters are inside html tags. Thanks Tomo Kazahaya! [Bug #3512] + Thu Jul 15 06:01:42 2010 Tanaka Akira <akr@fsij.org> * time.c (guess_local_offset): use the UTC offset of an older date on diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb index 5b9e070efb..37014b6e9f 100644 --- a/lib/rdoc/markup/attribute_manager.rb +++ b/lib/rdoc/markup/attribute_manager.rb @@ -112,7 +112,7 @@ class RDoc::Markup::AttributeManager # first do matching ones tags = @matching_word_pairs.keys.join("") - re = /(^|\W)([#{tags}])([#:\\]?[\w.\/-]+?\S?)\2(\W|$)/ + re = /(^|[^\w#{NULL}])([#{tags}])([#:\\]?[\w.\/-]+?\S?)\2(\W|$)/ 1 while str.gsub!(re) do attr = @matching_word_pairs[$2] @@ -228,8 +228,8 @@ class RDoc::Markup::AttributeManager @attrs = RDoc::Markup::AttrSpan.new @str.length - convert_attrs @str, @attrs convert_html @str, @attrs + convert_attrs @str, @attrs convert_specials @str, @attrs unmask_protected_sequences diff --git a/test/rdoc/test_attribute_manager.rb b/test/rdoc/test_attribute_manager.rb index 9506f3b40f..e908b86b02 100644 --- a/test/rdoc/test_attribute_manager.rb +++ b/test/rdoc/test_attribute_manager.rb @@ -11,6 +11,22 @@ class TestAttributeManager < MiniTest::Unit::TestCase @klass = RDoc::Markup::AttributeManager end + def test_convert_attrs_ignores_code + collector = RDoc::Markup::AttrSpan.new 10 + str = 'foo <code>__send__</code> bar' + @am.convert_html str, collector + @am.convert_attrs str, collector + assert_match(/__send__/, str) + end + + def test_convert_attrs_ignores_tt + collector = RDoc::Markup::AttrSpan.new 10 + str = 'foo <tt>__send__</tt> bar' + @am.convert_html str, collector + @am.convert_attrs str, collector + assert_match(/__send__/, str) + end + def test_initial_word_pairs word_pairs = @am.matching_word_pairs assert word_pairs.is_a?(Hash) |