Merge remote-tracking branch 'upstream/pr/970' into community-maintained

Author: msuliq

lib/annotate/annotate_models.rb

@@ -669,6 +669,15 @@ def get_loaded_model(model_path, file)
         $LOAD_PATH.map(&:to_s)
                   .select { |path| absolute_file.include?(path) }
                   .map { |path| absolute_file.sub(path, '').sub(/\.rb$/, '').sub(/^\//, '') }
+
+      # Handle Rails apps with collapsed model paths
+      model_paths = model_paths
+                    .select do |mpath|
+                      defined?(Rails) &&
+                      Rails.autoloaders.main.collapse_dirs.any? &&
+                      Rails.autoloaders.main.collapse_dirs.select { |path| path.match(mpath) }
+                    end.map { |mpath| mpath.sub(/\/models/, '') }
+
       model_paths
         .map { |path| get_loaded_model_by_path(path) }
         .find { |loaded_model| !loaded_model.nil? }

spec/lib/annotate/annotate_models_spec.rb

@@ -2198,6 +2198,37 @@ class FooInsideBar < ActiveRecord::Base
           expect(klass.name).to eq('Bar::FooInsideBar')
         end
       end
+
+      context 'when class Bar::Foo is defined in Rails collapsed directory' do
+        before do
+          Rails = double('Rails')
+          # rubocop:disable RSpec/MessageChain
+          allow(Rails).to receive_message_chain(:autoloaders, :main, :collapse_dirs) { Set.new(["bar/models"]) }
+          # rubocop:enable RSpec/MessageChain
+          $LOAD_PATH.unshift(dir)
+        end
+
+        let :dir do
+          AnnotateModels.model_dir[0]
+        end
+
+        let :filename do
+          'bar/models/foo.rb'
+        end
+
+        let :file_content do
+          <<~EOS
+            module Bar
+              class Foo < ActiveRecord::Base
+              end
+            end
+          EOS
+        end
+
+        it 'works' do
+          expect(klass.name).to eql('Bar::Foo')
+        end
+      end
     end
 
     context 'when class is defined inside module and class name is not capitalized normally' do