Merge pull request jruby#9006 from headius/explicit_class_require

headius · web-flow · commit a8318f60133a · 2025-09-29T17:27:24.000-05:00
Consider .class a source extension during search
diff --git a/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java b/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
@@ -250,7 +250,12 @@ public static SuffixType getSuffixTypeForLoad(final String[] fileHolder) {
     }
 
     public static boolean isSourceExt(String file) {
-        return file.endsWith(".rb");
+        for (Suffix suffix : Suffix.SOURCES) {
+            if (file.endsWith(suffix.extension)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public static boolean isLibraryExt(String file) {
diff --git a/rakelib/rspec.rake b/rakelib/rspec.rake
@@ -71,5 +71,6 @@ namespace :spec do
 
   permute_specs "jrubyc", compile_flags do |t|
     t.pattern = 'spec/jrubyc/**/*_spec.rb'
+    t.ruby_opts << "-Xaot.loadClasses"
   end
 end
diff --git a/spec/jrubyc/java/loading_spec.rb b/spec/jrubyc/java/loading_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../spec_helper'
 
-describe "JRuby::Compiler.compile_argv" do
+describe "Ruby code compiled with JRuby::Compiler.compile_argv" do
 
   def compile_files(files)
     JRuby::Compiler.compile_argv(files)
@@ -77,4 +77,21 @@ def compile_files(files)
     expect( res ).to eql [ true, { :foo => :bar, :baz => 0 }]
   end
 
+  describe "can be required" do
+    before(:each) do
+      @old_loaded_features = $LOADED_FEATURES.dup
+    end
+
+    after(:each) do
+      $LOADED_FEATURES.replace(@old_loaded_features)
+    end
+
+    it "using base filename" do
+      puts File.exist?(File.join(FILES_DIR, 'symbol_proc.class'))
+      require File.join(FILES_DIR, 'symbol_proc.class')
+
+      expect( $symbol_proc_result ).to_not be nil
+      expect( $symbol_proc_result ).to eql [ 1, 2, 3 ]
+    end
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,12 @@ public static SuffixType getSuffixTypeForLoad(final String[] fileHolder) {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`public static boolean isSourceExt(String file) {`
`253`		`- return file.endsWith(".rb");`
	`253`	`+ for (Suffix suffix : Suffix.SOURCES) {`
	`254`	`+ if (file.endsWith(suffix.extension)) {`
	`255`	`+ return true;`
	`256`	`+ }`
	`257`	`+ }`
	`258`	`+ return false;`
`254`	`259`	`}`
`255`	`260`
`256`	`261`	`public static boolean isLibraryExt(String file) {`