aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/google/escapevelocity/Macro.java
diff options
context:
space:
mode:
authorRon Shapiro <ronshapiro@google.com>2019-05-02 09:24:54 -0400
committerGitHub <noreply@github.com>2019-05-02 09:24:54 -0400
commit67e258966c479a1153a385d48f06dbf827b6057c (patch)
tree7dee6967f17c226b0fa2a14980628e86a79dd7d1 /src/main/java/com/google/escapevelocity/Macro.java
parent4bb1d7445fc2f99dbf4371e6f3177b5b1e4c5d60 (diff)
parentb515e83e6e713ff7ae6035c181b968ed67cb59db (diff)
downloadescapevelocity-67e258966c479a1153a385d48f06dbf827b6057c.tar.gz
Merge pull request #3 from google/sync-4-30-2019
Moe Sync
Diffstat (limited to 'src/main/java/com/google/escapevelocity/Macro.java')
-rw-r--r--src/main/java/com/google/escapevelocity/Macro.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/escapevelocity/Macro.java b/src/main/java/com/google/escapevelocity/Macro.java
index b7a547f..afa7bf0 100644
--- a/src/main/java/com/google/escapevelocity/Macro.java
+++ b/src/main/java/com/google/escapevelocity/Macro.java
@@ -17,11 +17,12 @@ package com.google.escapevelocity;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import java.lang.reflect.Method;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
/**
* A macro definition. Macros appear in templates using the syntax {@code #macro (m $x $y) ... #end}
* and each one produces an instance of this class. Evaluating a macro involves setting the
@@ -131,5 +132,10 @@ class Macro {
};
}
}
+
+ @Override
+ public ImmutableSet<Method> publicMethodsWithName(Class<?> startClass, String name) {
+ return originalEvaluationContext.publicMethodsWithName(startClass, name);
+ }
}
}