Merge pull request #555 from aycabta/set-ruby-title-to-method-name

Add ruby-title class to method name in HTML

Author: hsbt

lib/rdoc/token_stream.rb

@@ -14,6 +14,8 @@ module RDoc::TokenStream
   # with the given class names. Other token types are not wrapped in spans.
 
   def self.to_html token_stream
+    starting_title = false
+
     token_stream.map do |t|
       next unless t
 
@@ -49,6 +51,16 @@ def self.to_html token_stream
       else
         text = t[:text]
       end
+
+      if :on_ident == t[:kind] && starting_title
+        starting_title = false
+        style = 'ruby-identifier ruby-title'
+      end
+
+      if :on_kw == t[:kind] and 'def' == t[:text]
+        starting_title = true
+      end
+
       text = CGI.escapeHTML text
 
       if style then

test/test_rdoc_markup_to_html.rb

@@ -517,7 +517,7 @@ def bar
 
     expected = <<-'EXPECTED'
 
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier">foo</span>
+<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
   [
     <span class="ruby-string">&#39;\\&#39;</span>,
     <span class="ruby-string">&#39;\&#39;&#39;</span>,
@@ -537,7 +537,7 @@ def bar
     <span class="ruby-regexp">/#{}/</span>
   ]
 <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">bar</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
 <span class="ruby-keyword">end</span>
 </pre>
     EXPECTED
@@ -567,7 +567,7 @@ def bar
 
     expected = <<-'EXPECTED'
 
-<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier">foo</span>
+<pre class="ruby"><span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">foo</span>
   [
     <span class="ruby-string">`\\`</span>,
     <span class="ruby-string">`\&#39;\&quot;\``</span>,
@@ -577,7 +577,7 @@ def bar
     <span class="ruby-node">`#{}`</span>
   ]
 <span class="ruby-keyword">end</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">bar</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">bar</span>
 <span class="ruby-keyword">end</span>
 </pre>
     EXPECTED
@@ -619,7 +619,7 @@ def test_accept_verbatim_redefinable_operators
 
     %w[| ^ &amp; &lt;=&gt; == === =~ &gt; &gt;= &lt; &lt;= &lt;&lt; &gt;&gt; + - * / % ** ~ +@ -@ [] []= ` !  != !~].each do |html_escaped_op|
       expected += <<-EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">#{html_escaped_op}</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">#{html_escaped_op}</span>
 <span class="ruby-keyword">end</span>
       EXPECTED
     end

test/test_rdoc_parser_ruby.rb

@@ -1418,7 +1418,7 @@ def self.foo
     RUBY
 
     expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">foo</span>
+<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">foo</span>
   <span class="ruby-constant">A</span><span class="ruby-operator">::</span><span class="ruby-constant">B</span><span class="ruby-operator">::</span><span class="ruby-constant">C</span>
 <span class="ruby-keyword">end</span>
 EXPECTED
@@ -2655,7 +2655,7 @@ def blah()
 RUBY
 
     expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">blah</span>()
+<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
   <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span> <span class="ruby-keyword">do</span>
   <span class="ruby-keyword">end</span>
   <span class="ruby-keyword">for</span> <span class="ruby-identifier">i</span> <span class="ruby-keyword">in</span> (<span class="ruby-identifier">k</span>)<span class="ruby-operator">...</span><span class="ruby-identifier">n</span>
@@ -2709,7 +2709,7 @@ def blah()
 RUBY
 
     expected = <<EXPECTED
-  <span class="ruby-keyword">def</span> <span class="ruby-identifier">blah</span>()
+  <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>()
     <span class="ruby-identifier">&lt;&lt;-EOM</span> <span class="ruby-keyword">if</span> <span class="ruby-keyword">true</span>
 <span class="ruby-value"></span><span class="ruby-identifier">    EOM</span>
   <span class="ruby-keyword">end</span>
@@ -2734,7 +2734,7 @@ def blah() /bar/ end
 RUBY
 
     expected = <<EXPECTED
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">blah</span>() <span class="ruby-regexp">/bar/</span> <span class="ruby-keyword">end</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">blah</span>() <span class="ruby-regexp">/bar/</span> <span class="ruby-keyword">end</span>
 EXPECTED
     expected = expected.rstrip