Merge remote-tracking branch 'origin/main' into fix/issue-1684-struct-data-param-types

Author: lsegal

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Add compatibility with RDoc 8
 - Fix TypesExplainer parsing of types following Hash collections (#1688)
 - Fix HTML generation for RBS constants without source values (#1686)
+- Fix method redefinition warnings when loading YARD with Ruby warnings enabled (#1687)
 
 # [0.9.44] - May 25th, 2026
 

lib/yard/parser/ruby/ruby_parser.rb

@@ -379,6 +379,7 @@ def on_hash(*args)
         # entries from corrupting source ranges of later hash literals and brace blocks.
         # Bare hash patterns (key: val without braces) fire no brace scanner events, so
         # we only clean up when @map[:rbrace] confirms a closing brace was scanned.
+        begin; undef on_hshptn; rescue NameError; end
         def on_hshptn(*args)
           if (@map[:rbrace] ||= []).any?
             (@map[:lbrace] ||= []).pop
@@ -443,6 +444,7 @@ def on_array(other)
         # on_rbracket scanner events. The corresponding parser events are on_aryptn/on_fndptn
         # (not on_aref), so we must clean up the bracket maps to prevent stale entries from
         # corrupting source ranges of later array indexing expressions.
+        begin; undef on_aryptn; rescue NameError; end
         def on_aryptn(*args)
           (@map[:lbracket] ||= []).pop
           (@map[:aref] ||= []).shift
@@ -451,6 +453,7 @@ def on_aryptn(*args)
           AstNode.new(:aryptn, args)
         end
 
+        begin; undef on_fndptn; rescue NameError; end
         def on_fndptn(*args)
           (@map[:lbracket] ||= []).pop
           (@map[:aref] ||= []).shift

spec/parser/ruby/ruby_parser_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'open3'
 
 RSpec.describe YARD::Parser::Ruby::RubyParser do
   def stmt(stmt)
@@ -13,6 +14,15 @@ def tokenize(stmt)
     YARD::Parser::Ruby::RubyParser.new(stmt, nil).parse.tokens
   end
 
+  it "loads without redefining parser event methods" do
+    _stdout, stderr, status = Open3.capture3(
+      RbConfig.ruby, '-w', "-I#{YARD::ROOT}", '-e', "require 'yard'"
+    )
+
+    expect(status).to be_success
+    expect(stderr).not_to include('method redefined')
+  end
+
   describe "#parse" do
     it "gets comment line numbers" do
       s = stmt <<-eof