diff options
| author | Nobuyoshi Nakada <[email protected]> | 2021-04-10 01:58:09 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2021-07-05 11:34:33 +0900 |
| commit | 7c8aa0a5d2bc3f079077d113b350a58d7b7c2b0d (patch) | |
| tree | 0bed6d29e4bcfde19dad6dc9833f2ec6938f648f | |
| parent | 46ab28d6c9a80e91f6f56e9f902e0eff8eb1207e (diff) | |
[ruby/rdoc] Allow a label in a link to another document text
https://github.com/ruby/rdoc/commit/85bb2d33bb
| -rw-r--r-- | lib/rdoc/markup/to_html.rb | 4 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_markup_to_html.rb | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb index 8ae4dd4720..6a8ca8a2d7 100644 --- a/lib/rdoc/markup/to_html.rb +++ b/lib/rdoc/markup/to_html.rb @@ -357,8 +357,8 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then "<img src=\"#{url}\" />" else - if scheme != 'link' and /\.(?:rb|rdoc|md)\z/i =~ url - url = url.sub(%r%\A([./]*)(.*)\z%) { "#$1#{$2.tr('.', '_')}.html" } + if scheme != 'link' and %r%\A([./]*+)(.*?\.)(rb|rdoc|md)(?=\z|#)%i =~ url + url = "#$1#{$2.tr('.', '_')}#$3.html#{$'}" end text = text.sub %r%^#{scheme}:/*%i, '' diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb index 29da968abc..f7887f081b 100644 --- a/test/rdoc/test_rdoc_markup_to_html.rb +++ b/test/rdoc/test_rdoc_markup_to_html.rb @@ -743,6 +743,10 @@ EXPECTED @to.gen_url('doc/example.rdoc', 'example') assert_equal '<a href="../ex_doc/example_rdoc.html">example</a>', @to.gen_url('../ex.doc/example.rdoc', 'example') + assert_equal '<a href="doc/example_rdoc.html#label-one">example</a>', + @to.gen_url('doc/example.rdoc#label-one', 'example') + assert_equal '<a href="../ex_doc/example_rdoc.html#label-two">example</a>', + @to.gen_url('../ex.doc/example.rdoc#label-two', 'example') end def test_gen_url_md_file @@ -750,6 +754,10 @@ EXPECTED @to.gen_url('doc/example.md', 'example') assert_equal '<a href="../ex_doc/example_md.html">example</a>', @to.gen_url('../ex.doc/example.md', 'example') + assert_equal '<a href="doc/example_md.html#label-one">example</a>', + @to.gen_url('doc/example.md#label-one', 'example') + assert_equal '<a href="../ex_doc/example_md.html#label-two">example</a>', + @to.gen_url('../ex.doc/example.md#label-two', 'example') end def test_gen_url_rb_file @@ -757,6 +765,10 @@ EXPECTED @to.gen_url('doc/example.rb', 'example') assert_equal '<a href="../ex_doc/example_rb.html">example</a>', @to.gen_url('../ex.doc/example.rb', 'example') + assert_equal '<a href="doc/example_rb.html#label-one">example</a>', + @to.gen_url('doc/example.rb#label-one', 'example') + assert_equal '<a href="../ex_doc/example_rb.html#label-two">example</a>', + @to.gen_url('../ex.doc/example.rb#label-two', 'example') end def test_handle_regexp_HYPERLINK_link |