Wrap partial lookups to override for tracking

lib/liquid/tags/include.rb

@@ -50,19 +50,7 @@ module Liquid
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name
 
-      partial = PartialCache.load(
+      partial = load_partial(template_name, context, parse_context)
-        template_name,
-        context: context,
-        parse_context: parse_context
-      )
-
-      context_variable_name = @alias_name || template_name.split('/').last
-
-      variable = if @variable_name_expr
-        context.evaluate(@variable_name_expr)
-      else
-        context.find_variable(template_name, raise_on_not_found: false)
-      end
 
       old_template_name = context.template_name
       old_partial       = context.partial
@@ -71,7 +59,15 @@ module Liquid
         context.partial       = true
         context.stack do
           @attributes.each do |key, value|
-            context[key] = context.evaluate(value)
+            context[key] = evaluate(context, value)
+          end
+
+          context_variable_name = @alias_name || template_name.split('/').last
+
+          variable = if @variable_name_expr
+            evaluate(context, @variable_name_expr)
+          else
+            find_variable(context, template_name, raise_on_not_found: false)
           end
 
           if variable.is_a?(Array)
@@ -103,6 +99,24 @@ module Liquid
         ] + @node.attributes.values
       end
     end
+
+    private
+
+    def evaluate(context, value)
+      context.evaluate(value)
+    end
+
+    def find_variable(context, *args)
+      context.find_variable(*args)
+    end
+
+    def load_partial(template_name, context, parse_context)
+      PartialCache.load(
+        template_name,
+        context: context,
+        parse_context: parse_context
+      )
+    end
   end
 
   Template.register_tag('include', Include)

lib/liquid/tags/render.rb

@@ -38,11 +38,7 @@ module Liquid
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name
 
-      partial = PartialCache.load(
+      partial = load_partial(template_name, context, parse_context)
-        template_name,
-        context: context,
-        parse_context: parse_context
-      )
 
       context_variable_name = @alias_name || template_name.split('/').last
 
@@ -53,14 +49,14 @@ module Liquid
         inner_context['forloop']    = forloop if forloop
 
         @attributes.each do |key, value|
-          inner_context[key] = context.evaluate(value)
+          inner_context[key] = evaluate(context, value)
         end
         inner_context[context_variable_name] = var unless var.nil?
         partial.render_to_output_buffer(inner_context, output)
         forloop&.send(:increment!)
       }
 
-      variable = @variable_name_expr ? context.evaluate(@variable_name_expr) : nil
+      variable = @variable_name_expr ? evaluate(context, @variable_name_expr) : nil
       if @for && variable.respond_to?(:each) && variable.respond_to?(:count)
         forloop = Liquid::ForloopDrop.new(template_name, variable.count, nil)
         variable.each { |var| render_partial_func.call(var, forloop) }
@@ -78,6 +74,20 @@ module Liquid
         ] + @node.attributes.values
       end
     end
+
+    private
+
+    def evaluate(context, value)
+      context.evaluate(value)
+    end
+
+    def load_partial(template_name, context, parse_context)
+      PartialCache.load(
+        template_name,
+        context: context,
+        parse_context: parse_context
+      )
+    end
   end
 
   Template.register_tag('render', Render)