rdoc 6.5.1.1 → 6.6.0

data/lib/rdoc/markup/attribute_manager.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
+
 ##
 # Manages changes of attributes in a block of text
 
-unless MatchData.method_defined?(:match_length)
-  using Module.new {
-    refine(MatchData) {
-      def match_length(nth)
-        b, e = offset(nth)
-        e - b if b
-      end
-    }
-  }
-end
-
 class RDoc::Markup::AttributeManager
+  unless ::MatchData.method_defined?(:match_length)
+    using ::Module.new {
+      refine(::MatchData) {
+        def match_length(nth) # :nodoc:
+          b, e = offset(nth)
+          e - b if b
+        end
+      }
+    }
+  end
 
   ##
   # The NUL character
@@ -400,4 +400,3 @@ class RDoc::Markup::AttributeManager
   end
 
 end
-

data/lib/rdoc/markup/attributes.rb

@@ -68,4 +68,3 @@ class RDoc::Markup::Attributes
   end
 
 end
-

data/lib/rdoc/markup/blank_line.rb

@@ -25,4 +25,3 @@ class RDoc::Markup::BlankLine
   end
 
 end
-

data/lib/rdoc/markup/block_quote.rb

@@ -12,4 +12,3 @@ class RDoc::Markup::BlockQuote < RDoc::Markup::Raw
   end
 
 end
-

data/lib/rdoc/markup/document.rb

@@ -162,4 +162,3 @@ class RDoc::Markup::Document
   end
 
 end
-

data/lib/rdoc/markup/formatter.rb

@@ -263,4 +263,3 @@ class RDoc::Markup::Formatter
   end
 
 end
-

data/lib/rdoc/markup/hard_break.rb

@@ -29,4 +29,3 @@ class RDoc::Markup::HardBreak
   end
 
 end
-

data/lib/rdoc/markup/heading.rb

@@ -76,4 +76,3 @@ RDoc::Markup::Heading =
   end
 
 end
-

data/lib/rdoc/markup/include.rb

@@ -40,4 +40,3 @@ class RDoc::Markup::Include
   end
 
 end
-

data/lib/rdoc/markup/indented_paragraph.rb

@@ -45,4 +45,3 @@ class RDoc::Markup::IndentedParagraph < RDoc::Markup::Raw
   end
 
 end
-

data/lib/rdoc/markup/list.rb

@@ -99,4 +99,3 @@ class RDoc::Markup::List
   end
 
 end
-

data/lib/rdoc/markup/list_item.rb

@@ -97,4 +97,3 @@ class RDoc::Markup::ListItem
   end
 
 end
-

data/lib/rdoc/markup/paragraph.rb

@@ -26,4 +26,3 @@ class RDoc::Markup::Paragraph < RDoc::Markup::Raw
   end
 
 end
-

data/lib/rdoc/markup/raw.rb

@@ -67,4 +67,3 @@ class RDoc::Markup::Raw
   end
 
 end
-

data/lib/rdoc/markup/regexp_handling.rb

@@ -38,4 +38,3 @@ class RDoc::Markup::RegexpHandling
   end
 
 end
-

data/lib/rdoc/markup/rule.rb

@@ -18,4 +18,3 @@ class RDoc::Markup::Rule < Struct.new :weight
   end
 
 end
-

data/lib/rdoc/markup/to_ansi.rb

@@ -91,4 +91,3 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
   end
 
 end
-

data/lib/rdoc/markup/to_html.rb

@@ -430,7 +430,9 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
 
   def parseable? text
     verbose, $VERBOSE = $VERBOSE, nil
-    eval("BEGIN {return true}\n#{text}")
+    catch(:valid) do
+      eval("BEGIN { throw :valid, true }\n#{text}")
+    end
   rescue SyntaxError
     false
   ensure
@@ -445,4 +447,3 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
   end
 
 end
-

data/lib/rdoc/markup/to_html_crossref.rb

@@ -173,4 +173,3 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
   end
 
 end
-

data/lib/rdoc/markup/to_html_snippet.rb

@@ -282,4 +282,3 @@ class RDoc::Markup::ToHtmlSnippet < RDoc::Markup::ToHtml
   end
 
 end
-

data/lib/rdoc/markup/to_joined_paragraph.rb

@@ -25,9 +25,9 @@ class RDoc::Markup::ToJoinedParagraph < RDoc::Markup::Formatter
   def accept_paragraph paragraph
     parts = paragraph.parts.chunk do |part|
       String === part
-    end.map do |string, chunk|
+    end.flat_map do |string, chunk|
       string ? chunk.join.rstrip : chunk
-    end.flatten
+    end
 
     paragraph.parts.replace parts
   end
@@ -44,4 +44,3 @@ class RDoc::Markup::ToJoinedParagraph < RDoc::Markup::Formatter
   alias accept_table           ignore
 
 end
-

data/lib/rdoc/markup/to_label.rb

@@ -72,4 +72,3 @@ class RDoc::Markup::ToLabel < RDoc::Markup::Formatter
   alias start_accepting           ignore
 
 end
-

data/lib/rdoc/markup/to_markdown.rb

@@ -189,4 +189,3 @@ class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
   end
 
 end
-

data/lib/rdoc/markup/to_rdoc.rb

@@ -342,4 +342,3 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
   end
 
 end
-

data/lib/rdoc/markup/to_table_of_contents.rb

@@ -86,4 +86,3 @@ class RDoc::Markup::ToTableOfContents < RDoc::Markup::Formatter
   # :startdoc:
 
 end
-

data/lib/rdoc/markup/to_test.rb

@@ -67,4 +67,3 @@ class RDoc::Markup::ToTest < RDoc::Markup::Formatter
   # :startdoc:
 
 end
-

data/lib/rdoc/markup/to_tt_only.rb

@@ -118,4 +118,3 @@ class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
   end
 
 end
-

data/lib/rdoc/markup/verbatim.rb

@@ -81,4 +81,3 @@ class RDoc::Markup::Verbatim < RDoc::Markup::Raw
   end
 
 end
-

data/lib/rdoc/meta_method.rb

@@ -4,4 +4,3 @@
 
 class RDoc::MetaMethod < RDoc::AnyMethod
 end
-

data/lib/rdoc/method_attr.rb

@@ -416,4 +416,3 @@ class RDoc::MethodAttr < RDoc::CodeObject
   end
 
 end
-

data/lib/rdoc/mixin.rb

@@ -118,4 +118,3 @@ class RDoc::Mixin < RDoc::CodeObject
   end
 
 end
-

data/lib/rdoc/normal_class.rb

@@ -90,4 +90,3 @@ class RDoc::NormalClass < RDoc::ClassModule
   end
 
 end
-

data/lib/rdoc/normal_module.rb

@@ -71,4 +71,3 @@ class RDoc::NormalModule < RDoc::ClassModule
   end
 
 end
-

data/lib/rdoc/options.rb

@@ -565,9 +565,10 @@ class RDoc::Options
 
     @op_dir ||= 'doc'
 
-    @rdoc_include << "." if @rdoc_include.empty?
     root = @root.to_s
-    @rdoc_include << root unless @rdoc_include.include?(root)
+    if @rdoc_include.empty? || !@rdoc_include.include?(root)
+      @rdoc_include << root
+    end
 
     @exclude = self.exclude
 

data/lib/rdoc/parser/changelog.rb

@@ -332,4 +332,3 @@ class RDoc::Parser::ChangeLog < RDoc::Parser
     end
   end
 end
-

data/lib/rdoc/parser/markdown.rb

@@ -20,5 +20,3 @@ class RDoc::Parser::Markdown < RDoc::Parser
   end
 
 end
-
-

data/lib/rdoc/parser/rd.rb

@@ -20,4 +20,3 @@ class RDoc::Parser::RD < RDoc::Parser
   end
 
 end
-

data/lib/rdoc/parser/ripper_state_lex.rb

@@ -368,7 +368,7 @@ class RDoc::Parser::RipperStateLex
   private def get_symbol_tk(tk)
     is_symbol = true
     symbol_tk = Token.new(tk.line_no, tk.char_no, :on_symbol)
-    if ":'" == tk[:text] or ':"' == tk[:text]
+    if ":'" == tk[:text] or ':"' == tk[:text] or tk[:text].start_with?('%s')
       tk1 = get_string_tk(tk)
       symbol_tk[:text] = tk1[:text]
       symbol_tk[:state] = tk1[:state]

data/lib/rdoc/parser/ruby.rb

@@ -8,6 +8,9 @@
 #       by Keiju ISHITSUKA (Nippon Rational Inc.)
 #
 
+require 'ripper'
+require_relative 'ripper_state_lex'
+
 ##
 # Extracts code elements from a source file returning a TopLevel object
 # containing the constituent file elements.
@@ -138,9 +141,6 @@
 # Note that by default, the :method: directive will be ignored if there is a
 # standard rdocable item following it.
 
-require 'ripper'
-require_relative 'ripper_state_lex'
-
 class RDoc::Parser::Ruby < RDoc::Parser
 
   parse_files_matching(/\.rbw?$/)
@@ -2134,7 +2134,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
       if :on_nl == tk[:kind] or (:on_kw == tk[:kind] && 'def' == tk[:text]) then
         return
       elsif :on_comment == tk[:kind] or :on_embdoc == tk[:kind] then
-        return unless tk[:text] =~ /\s*:?([\w-]+):\s*(.*)/
+        return unless tk[:text] =~ /:?\b([\w-]+):\s*(.*)/
 
         directive = $1.downcase
 

data/lib/rdoc/parser/ruby_tools.rb

@@ -163,5 +163,3 @@ module RDoc::Parser::RubyTools
   end
 
 end
-
-

data/lib/rdoc/parser/text.rb

@@ -9,4 +9,3 @@
 
 module RDoc::Parser::Text
 end
-