From 47f155f9b976248ea3fedb03cecfbee6f1d5028e Mon Sep 17 00:00:00 2001 From: tompng Date: Tue, 12 May 2026 21:51:26 +0900 Subject: [PATCH] Fix circular require of RDoc::Parser::RubyColorizer Loading RubyColorizer will trigger autoload of RDoc::Parser, and `require_relative 'parser/ruby'`. `parser/ruby.rb` shouldn't require `ruby_colorizer.rb` to avoid circular require. --- lib/rdoc/markup/to_html.rb | 1 - lib/rdoc/parser.rb | 2 +- lib/rdoc/parser/ruby.rb | 1 - test/rdoc/parser/ruby_colorizer_test.rb | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb index 9499118120..b32722fce8 100644 --- a/lib/rdoc/markup/to_html.rb +++ b/lib/rdoc/markup/to_html.rb @@ -2,7 +2,6 @@ require 'cgi/escape' require 'cgi/util' unless defined?(CGI::EscapeExt) require 'prism' -require 'rdoc/parser/ruby_colorizer' ## # Outputs RDoc markup as HTML. diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb index 6884145cac..f118e19622 100644 --- a/lib/rdoc/parser.rb +++ b/lib/rdoc/parser.rb @@ -293,5 +293,5 @@ def handle_tab_width(body) require_relative 'parser/changelog' require_relative 'parser/markdown' require_relative 'parser/rd' - require_relative 'parser/ruby' +require_relative 'parser/ruby_colorizer' diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index b6f7f05d0a..62e529c685 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'prism' -require_relative 'ruby_colorizer' # Parse and collect document from Ruby source code. diff --git a/test/rdoc/parser/ruby_colorizer_test.rb b/test/rdoc/parser/ruby_colorizer_test.rb index b3fd1b71de..4b4b3b0502 100644 --- a/test/rdoc/parser/ruby_colorizer_test.rb +++ b/test/rdoc/parser/ruby_colorizer_test.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true require_relative '../helper' -require 'rdoc/parser/ruby_colorizer' +require 'prism' class RDocParserRubyColorizerTest < RDoc::TestCase def token(kind, text)