Merge pull request rails#52978 from intrip/fix-infinite-loop-for-dependency-with-non-trailing-interpolation

Fix infinite loop computing ERB dependencies with non-trailing interpolations

Author: jhawthorn

actionview/lib/action_view/dependency_tracker/erb_tracker.rb

@@ -122,23 +122,26 @@ def add_static_dependency(dependencies, dependency, quote_type)
             wildcard_dependency = +""
 
             while !scanner.eos?
-              next unless scanner.scan_until(/\#{/)
-
-              unmatched_brackets = 1
-              wildcard_dependency << scanner.pre_match
-
-              while unmatched_brackets > 0 && !scanner.eos?
-                scanner.scan_until(/[{}]/)
-
-                case scanner.matched
-                when "{"
-                  unmatched_brackets += 1
-                when "}"
-                  unmatched_brackets -= 1
+              if scanner.scan_until(/\#{/)
+                unmatched_brackets = 1
+                wildcard_dependency << scanner.pre_match
+
+                while unmatched_brackets > 0 && !scanner.eos?
+                  scanner.scan_until(/[{}]/)
+
+                  case scanner.matched
+                  when "{"
+                    unmatched_brackets += 1
+                  when "}"
+                    unmatched_brackets -= 1
+                  end
                 end
-              end
 
-              wildcard_dependency << "*"
+                wildcard_dependency << "*"
+              else
+                wildcard_dependency << scanner.rest
+                scanner.terminate
+              end
             end
 
             dependencies << wildcard_dependency

actionview/test/template/dependency_tracker_test.rb

@@ -235,6 +235,18 @@ def test_dependencies_with_interpolation_are_resolved_with_view_paths
 
     assert_equal ["events/_completed", "events/_event", "events/index"], tracker.dependencies
   end
+
+  def test_dependencies_with_interpolation_non_trailing
+    view_paths = ActionView::PathSet.new([File.expand_path("../fixtures/digestor", __dir__)])
+
+    template = FakeTemplate.new(%q{
+      <%= render "#{type}/comments" %>
+    }, :erb)
+
+    tracker = make_tracker("interpolation/_string", template, view_paths)
+
+    assert_equal [ "*/comments" ], tracker.dependencies
+  end
 end
 
 class ERBTrackerTest < ActiveSupport::TestCase