Use Annotation Position in ExternalClassNotFoundWarning

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/ExternalRefinementTypeChecker.java

@@ -14,6 +14,8 @@
 import liquidjava.rj_language.Predicate;
 import liquidjava.rj_language.parsing.RefinementsParser;
 import liquidjava.utils.Utils;
+import spoon.reflect.code.CtLiteral;
+import spoon.reflect.declaration.CtAnnotation;
 import spoon.reflect.declaration.CtClass;
 import spoon.reflect.declaration.CtElement;
 import spoon.reflect.declaration.CtField;
@@ -38,12 +40,14 @@ public <T> void visitCtClass(CtClass<T> ctClass) {
 
     @Override
     public <T> void visitCtInterface(CtInterface<T> intrface) {
-        Optional<String> externalRefinements = getExternalRefinement(intrface);
-        if (externalRefinements.isPresent()) {
-            this.prefix = externalRefinements.get();
+        Optional<CtAnnotation<?>> externalRef = getExternalRefinement(intrface);
+        if (externalRef.isPresent()) {
+            @SuppressWarnings("unchecked")
+            CtLiteral<String> literal = (CtLiteral<String>) externalRef.get().getAllValues().get("value");
+            this.prefix = literal.getValue();
             if (!classExists(prefix)) {
                 String message = String.format("Could not find class '%s'", prefix);
-                diagnostics.add(new ExternalClassNotFoundWarning(intrface.getPosition(), message, prefix));
+                diagnostics.add(new ExternalClassNotFoundWarning(externalRef.get().getPosition(), message, prefix));
                 return;
             }
             getRefinementFromAnnotation(intrface);

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/TypeChecker.java

@@ -238,16 +238,13 @@ protected void handleAlias(String ref, CtElement element) throws LJError {
         }
     }
 
-    Optional<String> getExternalRefinement(CtInterface<?> intrface) {
-        Optional<String> ref = Optional.empty();
+    Optional<CtAnnotation<?>> getExternalRefinement(CtInterface<?> intrface) {
         for (CtAnnotation<? extends Annotation> ann : intrface.getAnnotations())
             if (ann.getActualAnnotation().annotationType().getCanonicalName()
                     .contentEquals("liquidjava.specification.ExternalRefinementsFor")) {
-                @SuppressWarnings("unchecked")
-                CtLiteral<String> s = (CtLiteral<String>) ann.getAllValues().get("value");
-                ref = Optional.of(s.getValue());
+                return Optional.of(ann);
             }
-        return ref;
+        return Optional.empty();
     }
 
     public void checkVariableRefinements(Predicate refinementFound, String simpleName, CtTypeReference<?> type,