Add cloneWithNewName to let successfully from-imported macros be

imported as EagerMacroFunction to avoid ClassCastException

src/main/java/com/hubspot/jinjava/lib/fn/MacroFunction.java

@@ -202,6 +202,10 @@ public int hashCode() {
     );
   }
 
+  public MacroFunction cloneWithNewName(String name) {
+    return new MacroFunction(this, name);
+  }
+
   private boolean alreadyDeferredInEarlierCall(
     String key,
     JinjavaInterpreter interpreter

src/main/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunction.java

@@ -58,6 +58,10 @@ public EagerMacroFunction(
     );
   }
 
+  EagerMacroFunction(MacroFunction source, String name) {
+    super(source, name);
+  }
+
   public Object doEvaluate(
     Map<String, Object> argMap,
     Map<String, Object> kwargMap,
@@ -334,4 +338,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return super.hashCode();
   }
+
+  @Override
+  public EagerMacroFunction cloneWithNewName(String name) {
+    return new EagerMacroFunction(this, name);
+  }
 }

src/main/java/com/hubspot/jinjava/lib/tag/FromTag.java

@@ -170,7 +170,7 @@ public static boolean integrateChild(
       if (val != null) {
         MacroFunction toImport = (MacroFunction) val;
         if (!importMapping.getKey().equals(importMapping.getValue())) {
-          toImport = new MacroFunction(toImport, importMapping.getValue());
+          toImport = toImport.cloneWithNewName(importMapping.getValue());
         }
         interpreter.getContext().addGlobalMacro(toImport);
       } else {

src/test/java/com/hubspot/jinjava/EagerTest.java

@@ -1634,4 +1634,9 @@ public void prepareContext(Context context) {
       "keeps-meta-context-variables-through-import/test"
     );
   }
+
+  @Test
+  public void itReconstructsFromedMacro() {
+    expectedTemplateInterpreter.assertExpectedOutput("reconstructs-fromed-macro/test");
+  }
 }

src/test/resources/eager/handles-deferred-modification-in-caller/test.expected.jinja

@@ -1,7 +1,10 @@
 {% set my_list = ['a', 'b'] %}\
 {% set __macro_callerino_729568755_temp_variable_0__ %}\
+{% set __macro_caller_172086791_temp_variable_0__ %}\
 {% do my_list.append(deferred) %}\
 {{ my_list }}\
+{% endset %}\
+{{ __macro_caller_172086791_temp_variable_0__ }}\
 {% do my_list.append('d') %}\
 {% endset %}\
 {% call __macro_callerino_729568755_temp_variable_0__ %}\

src/test/resources/eager/reconstructs-fromed-macro/has-macro.jinja

@@ -0,0 +1,3 @@
+{% macro upper(param) %}
+ {{ param|upper }}
+{% endmacro %}

src/test/resources/eager/reconstructs-fromed-macro/test.expected.jinja

@@ -0,0 +1,6 @@
+{% set deferred_import_resource_path = 'eager/reconstructs-fromed-macro/has-macro.jinja' %}\
+{% macro to_upper(param) %}
+ {{ filter:upper.filter(param, ____int3rpr3t3r____) }}
+{% endmacro %}\
+{% set deferred_import_resource_path = null %}\
+{{ to_upper(deferred) }}

src/test/resources/eager/reconstructs-fromed-macro/test.jinja

@@ -0,0 +1,3 @@
+{% from './has-macro.jinja' import upper as to_upper %}
+
+{{ to_upper(deferred) }}