Qute parser - improve error messages

- resolves quarkusio#6164
mkouba · Jan 9, 2020 · 4024571 · 4024571
1 parent a980ec5
commit 4024571
Show file tree

Hide file tree

Showing 15 changed files with 216 additions and 75 deletions.
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java
@@ -5,6 +5,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
 import java.lang.reflect.Modifier;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -71,7 +73,10 @@
 import io.quarkus.qute.SectionHelper;
 import io.quarkus.qute.SectionHelperFactory;
 import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateException;
 import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.TemplateLocator;
+import io.quarkus.qute.Variant;
 import io.quarkus.qute.api.ResourcePath;
 import io.quarkus.qute.api.VariantTemplate;
 import io.quarkus.qute.deployment.TemplatesAnalysisBuildItem.TemplateAnalysis;
@@ -163,15 +168,37 @@ public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
                     };
                 }
             };
+        }).addLocator(new TemplateLocator() {
+            @Override
+            public Optional<TemplateLocation> locate(String id) {
+                TemplatePathBuildItem found = templatePaths.stream().filter(p -> p.getPath().equals(id)).findAny().orElse(null);
+                if (found != null) {
+                    try {
+                        byte[] content = Files.readAllBytes(found.getFullPath());
+                        return Optional.of(new TemplateLocation() {
+                            @Override
+                            public Reader read() {
+                                return new StringReader(new String(content, StandardCharsets.UTF_8));
+                            }
+
+                            @Override
+                            public Optional<Variant> getVariant() {
+                                return Optional.empty();
+                            }
+                        });
+                    } catch (IOException e) {
+                        LOGGER.warn("Unable to read the template from path: " + found.getFullPath(), e);
+                    }
+                }
+                ;
+                return Optional.empty();
+            }
         }).build();
 
         for (TemplatePathBuildItem path : templatePaths) {
-            try {
-                Template template = dummyEngine
-                        .parse(new String(Files.readAllBytes(path.getFullPath()), StandardCharsets.UTF_8));
+            Template template = dummyEngine.getTemplate(path.getPath());
+            if (template != null) {
                 analysis.add(new TemplateAnalysis(template.getGeneratedId(), template.getExpressions(), path));
-            } catch (IOException e) {
-                LOGGER.warn("Unable to analyze the template from path: " + path.getFullPath(), e);
             }
         }
         LOGGER.debugf("Finished analysis of %s templates  in %s ms",

diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplateException.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplateException.java
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeCheckInfo.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeCheckInfo.java
@@ -17,6 +17,7 @@
 
 import io.quarkus.qute.Expression;
 import io.quarkus.qute.Expressions;
+import io.quarkus.qute.TemplateException;
 
 class TypeCheckInfo {
 

diff --git a/...sions/qute/deployment/src/test/java/io/quarkus/qute/deployment/NamedBeanNotFoundTest.java b/...sions/qute/deployment/src/test/java/io/quarkus/qute/deployment/NamedBeanNotFoundTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.qute.TemplateException;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class NamedBeanNotFoundTest {

diff --git a/...te/deployment/src/test/java/io/quarkus/qute/deployment/NamedBeanPropertyNotFoundTest.java b/...te/deployment/src/test/java/io/quarkus/qute/deployment/NamedBeanPropertyNotFoundTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.qute.TemplateException;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class NamedBeanPropertyNotFoundTest {

diff --git a/...e/deployment/src/test/java/io/quarkus/qute/deployment/ParamDeclarationWrongClassTest.java b/...e/deployment/src/test/java/io/quarkus/qute/deployment/ParamDeclarationWrongClassTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.qute.TemplateException;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class ParamDeclarationWrongClassTest {

diff --git a/...nsions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundTest.java b/...nsions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.qute.TemplateException;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class PropertyNotFoundTest {

diff --git a/...ons/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeSafeLoopFailureTest.java b/...ons/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeSafeLoopFailureTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.qute.TemplateException;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class TypeSafeLoopFailureTest {

diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java
@@ -68,7 +68,8 @@ class EngineImpl implements Engine {
 
     @Override
     public Template parse(String content, Variant variant) {
-        return new Parser(this).parse(new StringReader(content), Optional.ofNullable(variant));
+        String generatedId = generateId();
+        return new Parser(this).parse(new StringReader(content), Optional.ofNullable(variant), generatedId, generatedId);
     }
 
     @Override
@@ -131,7 +132,7 @@ private Template load(String id) {
             Optional<TemplateLocation> location = locator.locate(id);
             if (location.isPresent()) {
                 try (Reader r = location.get().read()) {
-                    return new Parser(this).parse(ensureBufferedReader(r), location.get().getVariant());
+                    return new Parser(this).parse(ensureBufferedReader(r), location.get().getVariant(), id, generateId());
                 } catch (IOException e) {
                     LOGGER.warn("Unable to close the reader for " + id, e);
                 }