Improve Constant Not Found Error

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/diagnostics/LJDiagnostic.java

@@ -14,6 +14,7 @@ public class LJDiagnostic extends RuntimeException {
     private final String customMessage;
     private String file;
     private SourcePosition position;
+    private String hint;
     private static final String PIPE = " | ";
 
     public LJDiagnostic(String title, String message, SourcePosition pos, String accentColor, String customMessage) {
@@ -38,7 +39,7 @@ public String getCustomMessage() {
     }
 
     public String getDetails() {
-        return ""; // to be overridden by subclasses
+        return hint != null ? hint : "";
     }
 
     public SourcePosition getPosition() {
@@ -60,6 +61,10 @@ public String getAccentColor() {
         return accentColor;
     }
 
+    public void setHint(String hint) {
+        this.hint = hint;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/NotFoundError.java

@@ -18,6 +18,10 @@ public NotFoundError(String name, String kind) {
         this(null, name, kind, null);
     }
 
+    public NotFoundError(SourcePosition position, String name, String kind) {
+        this(position, name, kind, null);
+    }
+
     public NotFoundError(SourcePosition position, String name, String kind, TranslationTable translationTable) {
         super("Not Found Error", String.format("%s '%s' not found", kind, name), position, translationTable);
         this.name = Utils.getSimpleName(name);

liquidjava-verifier/src/main/java/liquidjava/rj_language/Predicate.java

@@ -8,6 +8,7 @@
 
 import liquidjava.api.CommandLineLauncher;
 import liquidjava.diagnostics.errors.LJError;
+import liquidjava.diagnostics.errors.NotFoundError;
 import liquidjava.processor.context.AliasWrapper;
 import liquidjava.processor.context.Context;
 import liquidjava.processor.context.GhostFunction;
@@ -103,12 +104,12 @@ private static Expression resolveStaticFinalConstants(Expression root, CtElement
             // unresolvable reference — throw an error with a helpful message and import suggestion if possible
             SourcePosition pos = context == null ? null : Utils.getLJAnnotationPosition(context, en.toString());
             String suggested = StaticConstants.findImportCandidate(en.getTypeName(), en.getConstName(), context);
-            String hint = suggested != null ? "add: import " + suggested + ";"
-                    : "add an import for '" + en.getTypeName() + "' if it is a Java class with a static final field.";
-            throw new liquidjava.diagnostics.errors.CustomError(
-                    String.format("Could not resolve '%s.%s' in refinement. If you meant the static final constant, %s",
-                            en.getTypeName(), en.getConstName(), hint),
-                    pos);
+            String hint = suggested != null ? "Add: import " + suggested + ";"
+                    : "Add an import for '" + en.getTypeName() + "' if it is a Java class with a static final field";
+            String name = en.getTypeName() + "." + en.getConstName();
+            NotFoundError error = new NotFoundError(pos, name, "Constant");
+            error.setHint(hint);
+            throw error;
         }
         return root;
     }