Fix Scope Positions

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/processor/context/ContextHistory.java

@@ -6,9 +6,16 @@
 import java.util.Set;
 
 import liquidjava.utils.Utils;
+import spoon.reflect.code.CtBlock;
+import spoon.reflect.code.CtFor;
+import spoon.reflect.code.CtForEach;
+import spoon.reflect.code.CtIf;
+import spoon.reflect.code.CtTry;
+import spoon.reflect.code.CtWhile;
 import spoon.reflect.cu.SourcePosition;
+import spoon.reflect.declaration.CtConstructor;
 import spoon.reflect.declaration.CtElement;
-import spoon.reflect.declaration.CtParameter;
+import spoon.reflect.declaration.CtMethod;
 
 public class ContextHistory {
     private static ContextHistory instance;
@@ -60,11 +67,10 @@ public void saveContext(CtElement element, Context context) {
     }
 
     private String getScopePosition(CtElement element) {
-        CtElement startElement = element instanceof CtParameter<?> ? element.getParent() : element;
-        SourcePosition annPosition = Utils.getFirstLJAnnotationPosition(startElement);
-        SourcePosition pos = element.getPosition();
-        return String.format("%d:%d-%d:%d", annPosition.getLine(), annPosition.getColumn(), pos.getEndLine(),
-                pos.getEndColumn());
+        SourcePosition startPos = Utils.getRealPosition(element);
+        SourcePosition endPos = element.getPosition();
+        return String.format("%d:%d-%d:%d", startPos.getLine(), startPos.getColumn(), endPos.getEndLine(),
+                endPos.getEndColumn() - 1);
     }
 
     public Set<RefinedVariable> getLocalVars() {

liquidjava-verifier/src/main/java/liquidjava/utils/Utils.java

@@ -5,9 +5,17 @@
 import java.util.stream.Stream;
 
 import liquidjava.utils.constants.Types;
+import spoon.reflect.code.CtBlock;
+import spoon.reflect.code.CtFor;
+import spoon.reflect.code.CtForEach;
+import spoon.reflect.code.CtIf;
+import spoon.reflect.code.CtTry;
+import spoon.reflect.code.CtWhile;
 import spoon.reflect.cu.SourcePosition;
 import spoon.reflect.declaration.CtAnnotation;
+import spoon.reflect.declaration.CtConstructor;
 import spoon.reflect.declaration.CtElement;
+import spoon.reflect.declaration.CtMethod;
 import spoon.reflect.factory.Factory;
 import spoon.reflect.reference.CtTypeReference;
 
@@ -69,4 +77,19 @@ private static boolean hasRefinementValue(CtAnnotation<?> annotation, String ref
         Map<String, ?> values = annotation.getValues();
         return Stream.of("value", "to", "from").anyMatch(key -> refinement.equals(String.valueOf(values.get(key))));
     }
+
+    public static SourcePosition getRealPosition(CtElement element) {
+        if (element instanceof CtBlock<?> block) {
+            CtElement parent = block.getParent();
+            if (parent instanceof CtIf ctIf) {
+                if (ctIf.getThenStatement() == element) {
+                    return ctIf.getPosition();
+                }
+            } else if (parent instanceof CtFor || parent instanceof CtForEach || parent instanceof CtWhile
+                    || parent instanceof CtTry || parent instanceof CtMethod<?> || parent instanceof CtConstructor<?>) {
+                return parent.getPosition();
+            }
+        }
+        return element.getPosition();
+    }
 }