Skip to content

Match absolute paths in the irb_require already-loaded check #1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tompng merged 2 commits into from
Sep 15, 2026
+22 −1
Merged

Match absolute paths in the irb_require already-loaded check #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb4e16e
Match absolute paths in the irb_require already-loaded check
youdie006 Sep 15, 2026
74e609f
Initialize the counter before requiring in the new test
youdie006 Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/irb/command/load.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def execute(arg)
def execute_internal(file_name = nil)
raise_cmd_argument_error unless file_name

rex = Regexp.new("\\A#{Regexp.escape(file_name)}(?:\\.o|\\.rb)?\\z")
rex = Regexp.new("(?:\\A|/)#{Regexp.escape(file_name)}(?:\\.o|\\.rb)?\\z")
return false if $".find{|f| f =~ rex}

case file_name
Expand Down
21 changes: 21 additions & 0 deletions test/irb/test_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,27 @@ def test_irb_require_file_matches_exact_name
assert_match(/foo_loaded/, out)
assert_match(/foo2_loaded/, out)
end

def test_irb_require_skips_file_already_loaded_by_require
File.write("#{@tmpdir}/irb_require_probe.rb", "$irb_require_probe_count += 1\n")
File.write("#{@tmpdir}/probe.rb", "'probe_loaded'\n")
File.write("#{@tmpdir}/irb_require.rb", "'prefix_loaded'\n")

out, err = execute_lines(
"$LOAD_PATH.unshift '#{@tmpdir}'\n",
"$irb_require_probe_count = 0\n",
"require 'irb_require_probe'\n",
"irb_require 'irb_require_probe'\n",
"$irb_require_probe_count\n",
"irb_require 'probe'\n",
"irb_require 'irb_require'\n",
)

assert_empty(err)
assert_match(/=> 1\n/, out)
assert_match(/probe_loaded/, out)
assert_match(/prefix_loaded/, out)
end
end

class WorkspaceCommandTestCase < CommandTestCase
Expand Down