[ctran#969] Add support for Rails autoloader collapsed directories

bazay · Oct 4, 2022 · d145e4c · d145e4c
1 parent ae0b79c
commit d145e4c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/lib/annotate/annotate_models.rb b/lib/annotate/annotate_models.rb
@@ -611,6 +611,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 |model_path|
+          defined?(Rails) &&
+          Rails.autoloaders.main.collapse_dirs.any? &&
+          Rails.autoloaders.main.collapse_dirs.select { |path| path.match(model_path) }
+        end.map { |model_path| model_path.sub(/\/models/, '') }
+
       model_paths
         .map { |path| get_loaded_model_by_path(path) }
         .find { |loaded_model| !loaded_model.nil? }