From cc46b530b00c83bf4a867fd42d81c63bc43c0b83 Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 19 Nov 2013 00:47:33 +0000 Subject: [PATCH] * lib/rdoc: Update to RDoc master a1195ce. Changes include: Improved accessibility of the main sidebar navigation. Fixed handling of regexp options in HTML source highlighting. * test/rdoc: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ lib/rdoc.rb | 2 +- lib/rdoc/constant.rb | 10 +--------- .../darkfish/_sidebar_navigation.rhtml | 6 +++--- lib/rdoc/generator/template/darkfish/rdoc.css | 12 ++++++++--- lib/rdoc/markup/parser.rb | 4 ++-- lib/rdoc/ruby_lex.rb | 4 ++-- lib/rdoc/store.rb | 2 +- test/rdoc/test_rdoc_generator_darkfish.rb | 9 ++------- test/rdoc/test_rdoc_ruby_lex.rb | 20 +++++++++++++++++++ test/rdoc/test_rdoc_rubygems_hook.rb | 2 +- 11 files changed, 52 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6022c34e80..07c6815183 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Nov 19 09:47:02 2013 Eric Hodel + + * lib/rdoc: Update to RDoc master a1195ce. Changes include: + + Improved accessibility of the main sidebar navigation. + + Fixed handling of regexp options in HTML source highlighting. + + * test/rdoc: ditto. + Tue Nov 19 09:33:52 2013 Eric Hodel * lib/rubygems: Update to RubyGems master 6a3d9f9. Changes include: diff --git a/lib/rdoc.rb b/lib/rdoc.rb index 7f2f8913f7..4fb0c3b881 100644 --- a/lib/rdoc.rb +++ b/lib/rdoc.rb @@ -64,7 +64,7 @@ module RDoc ## # RDoc version you are using - VERSION = '4.1.0.preview.1' + VERSION = '4.1.0.preview.2' ## # Method visibilities diff --git a/lib/rdoc/constant.rb b/lib/rdoc/constant.rb index 97985cbf99..48b32aaf98 100644 --- a/lib/rdoc/constant.rb +++ b/lib/rdoc/constant.rb @@ -63,15 +63,7 @@ class RDoc::Constant < RDoc::CodeObject # for a documented class or module. def documented? - return true if super - return false unless @is_alias_for - case @is_alias_for - when String then - found = @store.find_class_or_module @is_alias_for - return false unless found - @is_alias_for = found - end - @is_alias_for.documented? + super or is_alias_for && is_alias_for.documented? end ## diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml index 7b9c4f73b3..d7f330840a 100644 --- a/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml +++ b/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml @@ -1,11 +1,11 @@ - diff --git a/lib/rdoc/generator/template/darkfish/rdoc.css b/lib/rdoc/generator/template/darkfish/rdoc.css index f86edb8367..4f22adaae1 100644 --- a/lib/rdoc/generator/template/darkfish/rdoc.css +++ b/lib/rdoc/generator/template/darkfish/rdoc.css @@ -193,7 +193,8 @@ nav h2 { text-align: center; } -nav h3 { +nav h3, +#table-of-contents-navigation { margin: 0; padding: 2px 8px 2px 8px; text-align: right; @@ -213,8 +214,13 @@ nav p { border-top: 0; } -#home-section h2, -#home-section h3 { +#home-section h2 { + text-align: center; +} + +#table-of-contents-navigation { + font-size: 1.2em; + font-weight: bold; text-align: center; } diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb index 4d0cf1127e..cc828a4513 100644 --- a/lib/rdoc/markup/parser.rb +++ b/lib/rdoc/markup/parser.rb @@ -535,8 +535,8 @@ class RDoc::Markup::Parser end ## - # Calculates the column (by character) and line of the current token from - # +scanner+ based on +byte_offset+. + # Calculates the column (by character) and line of the current token based + # on +byte_offset+. def token_pos byte_offset offset = char_pos byte_offset diff --git a/lib/rdoc/ruby_lex.rb b/lib/rdoc/ruby_lex.rb index 06a82ef978..d470d2b5f8 100644 --- a/lib/rdoc/ruby_lex.rb +++ b/lib/rdoc/ruby_lex.rb @@ -1231,8 +1231,8 @@ class RDoc::RubyLex end if @ltype == "/" - if peek(0) =~ /i|m|x|o|e|s|u|n/ - getc + while peek(0) =~ /i|m|x|o|e|s|u|n/ + str << getc end end diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb index fde6f0695b..00fa1e2329 100644 --- a/lib/rdoc/store.rb +++ b/lib/rdoc/store.rb @@ -663,7 +663,7 @@ class RDoc::Store end ## - # Converts the variable => ClassModule map +variables+ from a C parser into + # Converts the variable => ClassModule map +variables+ from a C parser into # a variable => class name map. def make_variable_map variables diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb index 1cefdbf658..ff21515dfd 100644 --- a/test/rdoc/test_rdoc_generator_darkfish.rb +++ b/test/rdoc/test_rdoc_generator_darkfish.rb @@ -219,13 +219,8 @@ class TestRDocGeneratorDarkfish < RDoc::TestCase return end - # This guard is quoted from test/ruby/test_file_exhaustive.rb - unless /emx|mswin|mingw/ =~ RUBY_PLATFORM - # on Windows, nlink is always 1. but this behavior will be changed - # in the future. - assert_operator File.stat(filename).nlink, :>, 1, - "#{filename} is not hard-linked" - end + assert_operator File.stat(filename).nlink, :>, 1, + "#{filename} is not hard-linked" end end diff --git a/test/rdoc/test_rdoc_ruby_lex.rb b/test/rdoc/test_rdoc_ruby_lex.rb index e1500c554d..22cf0f6295 100644 --- a/test/rdoc/test_rdoc_ruby_lex.rb +++ b/test/rdoc/test_rdoc_ruby_lex.rb @@ -242,6 +242,26 @@ U assert_equal expected, tokens end + def test_class_tokenize_regexp_options + tokens = RDoc::RubyLex.tokenize "/hAY/i", nil + + expected = [ + @TK::TkREGEXP.new( 0, 1, 0, "/hAY/i"), + @TK::TkNL .new( 6, 1, 6, "\n"), + ] + + assert_equal expected, tokens + + tokens = RDoc::RubyLex.tokenize "/hAY/ix", nil + + expected = [ + @TK::TkREGEXP.new( 0, 1, 0, "/hAY/ix"), + @TK::TkNL .new( 7, 1, 7, "\n"), + ] + + assert_equal expected, tokens + end + def test_class_tokenize_regexp_backref tokens = RDoc::RubyLex.tokenize "/[csh](..) [csh]\\1 in/", nil diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb index 499d5ac071..cee0810ab4 100644 --- a/test/rdoc/test_rdoc_rubygems_hook.rb +++ b/test/rdoc/test_rdoc_rubygems_hook.rb @@ -10,7 +10,7 @@ class TestRDocRubygemsHook < Gem::TestCase skip 'requires RubyGems 1.9+' unless Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.9') - @a = util_spec 'a' do |s| + @a = util_spec 'a', 2 do |s| s.rdoc_options = %w[--main MyTitle] s.extra_rdoc_files = %w[README] end