Catch and log runtime ST4 errors (not just loader errors)

facebookarchive · Jul 10, 2014 · a743629 · a743629
1 parent 1edc68d
commit a743629
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/swift-generator/src/main/java/com/facebook/swift/generator/util/TemplateLoader.java b/swift-generator/src/main/java/com/facebook/swift/generator/util/TemplateLoader.java
@@ -52,7 +52,7 @@ public InputSupplier<InputStreamReader> apply(@Nonnull String templateFileName)
 
     private static final Logger LOG = LoggerFactory.getLogger(TemplateLoader.class);
 
-    private final STErrorListener ERROR_LISTENER = new LoaderErrorListener();
+    private final STErrorListener ERROR_LISTENER = new ErrorListener();
 
     private final Iterable<String> templateFileNames;
     private volatile STGroup stg = null;
@@ -85,6 +85,7 @@ protected STGroup getTemplateGroup(Iterable<String> templateFileNames) throws IO
 
             // Combine the header and all .st files and load everything into a StringTemplateGroup
             stg = new STGroup();
+            stg.setListener(ERROR_LISTENER);
             for (String templateFileName : templateFileNames) {
                 stg.importTemplates(getTemplateGroupFromFile(templateFileName));
             }
@@ -107,7 +108,7 @@ protected STGroup getTemplateGroupFromFile(String fileName) throws IOException
         return stg;
     }
 
-    private static class LoaderErrorListener implements STErrorListener
+    private static class ErrorListener implements STErrorListener
     {
         @Override
         public void compileTimeError(STMessage msg)