kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Use TemplatePath in Digestor

This commit is contained in:
John Hawthorn 2021-04-28 17:49:02 -07:00
parent ef2cb32090
commit 54f8d0b269
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actionview/lib/action_view/digestor.rb
View File

@ -25,8 +25,8 @@ module ActionView
# (Concurrent::Map's lookups have volatile semantics)
finder.digest_cache[cache_key] || @@digest_mutex.synchronize do
finder.digest_cache.fetch(cache_key) do # re-check under lock
partial = name.include?("/_")
root = tree(name, finder, partial)
path = TemplatePath.parse(name)
root = tree(path.to_s, finder, path.partial?)
dependencies.each do |injected_dep|
root.children << Injected.new(injected_dep, nil, nil)
end if dependencies
@ -44,7 +44,9 @@ module ActionView
logical_name = name.gsub(%r|/_|, "/")
interpolated = name.include?("#")
if !interpolated && (template = find_template(finder, logical_name, [], partial, []))
path = TemplatePath.parse(name)
if !interpolated && (template = find_template(finder, path.name, [path.prefix], partial, []))
if node = seen[template.identifier] # handle cycles in the tree
node
else