Merge pull request #3764 from Rawi01/update-index

Update annotation value index

Author: rzwitserloot

src/core/lombok/core/AnnotationValues.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2022 The Project Lombok Authors.
+ * Copyright (C) 2009-2024 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -182,6 +182,7 @@ public List<String> getAsStringList(String methodName) {
 					"I can't make sense of this annotation value. Try using a fully qualified literal.", idx);
 			}
 			out.add((String) result);
+			idx++;
 		}
 
 		return Collections.unmodifiableList(out);

test/core/src/lombok/CompilerMessageMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 The Project Lombok Authors.
+ * Copyright (C) 2012-2024 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,7 @@
 public class CompilerMessageMatcher {
 	/** Line Number (starting at 1) */
 	private final List<Integer> lineNumbers = new ArrayList<Integer>();
+	private final List<Long> positions = new ArrayList<Long>();
 	private final List<List<String>> messages = new ArrayList<List<String>>();
 	private boolean optional;
 
@@ -48,14 +49,17 @@ public boolean isOptional() {
 	public static CompilerMessageMatcher asCompilerMessageMatcher(CompilerMessage message) {
 		CompilerMessageMatcher cmm = new CompilerMessageMatcher();
 		cmm.lineNumbers.add((int) message.getLine());
+		cmm.positions.add(message.getPosition());
 		cmm.messages.add(Arrays.asList(message.getMessage().split("\\s+")));
 		return cmm;
 	}
 
 	@Override public String toString() {
 		StringBuilder out = new StringBuilder();
 		for (int i = 0; i < lineNumbers.size(); i++) {
-			out.append(lineNumbers.get(i)).append(" ");
+			out.append(lineNumbers.get(i));
+			if (positions.get(i) != null) out.append(":").append(positions.get(i));
+			out.append(" ");
 			for (String part : messages.get(i)) out.append(part).append(" ");
 			if (out.length() > 0) out.setLength(out.length() - 1);
 			out.append(" |||| ");
@@ -67,8 +71,8 @@ public static CompilerMessageMatcher asCompilerMessageMatcher(CompilerMessage me
 	public boolean matches(CompilerMessage message) {
 		outer:
 		for (int i = 0; i < lineNumbers.size(); i++) {
-			//Allow an off-by-1 in line numbers; when running tests that sometimes happens for as yet unknown reasons.
-			if (message.getLine() != lineNumbers.get(i) && message.getLine() -1 != lineNumbers.get(i)) continue;
+			if (message.getLine() != lineNumbers.get(i)) continue;
+			if (positions.get(i) != null && !positions.get(i).equals(message.getPosition())) continue;
 			for (String token : messages.get(i)) {
 				if (!message.getMessage().contains(token)) continue outer;
 			}
@@ -88,7 +92,7 @@ public static List<CompilerMessageMatcher> readAll(InputStream rawIn) throws IOE
 		return out;
 	}
 
-	private static final Pattern PATTERN = Pattern.compile("^(-?\\d+) (.*)$");
+	private static final Pattern PATTERN = Pattern.compile("^(-?\\d+)(?::(\\d+))? (.*)$");
 
 	private static CompilerMessageMatcher read(String line) {
 		line = line.trim();
@@ -108,7 +112,8 @@ private static CompilerMessageMatcher read(String line) {
 			Matcher m = PATTERN.matcher(part);
 			if (!m.matches()) throw new IllegalArgumentException("Typo in test file: " + line);
 			cmm.lineNumbers.add(Integer.parseInt(m.group(1)));
-			cmm.messages.add(Arrays.asList(m.group(2).split("\\s+")));
+			cmm.positions.add(m.group(2) != null ? Long.parseLong(m.group(2)) : null);
+			cmm.messages.add(Arrays.asList(m.group(3).split("\\s+")));
 		}
 
 		return cmm;

test/transform/resource/before/EqualsAndHashCodeOfAndExcludeError.java

@@ -0,0 +1,14 @@
+// skip-compare-contents
+@lombok.EqualsAndHashCode(of={"x", Const.A})
+final class EqualsAndHashCodeErrorOf {
+	int x;
+}
+
+@lombok.EqualsAndHashCode(exclude={"x", Const.A})
+final class EqualsAndHashCodeErrorExclude {
+	int x;
+}
+
+class Const {
+	static final String A = "A";
+}

test/transform/resource/messages-delombok/DelegateFlagUsage.java.messages

@@ -1 +1 @@
-4 Use of @Delegate is flagged according to lombok configuration.
+5 Use of @Delegate is flagged according to lombok configuration.

test/transform/resource/messages-delombok/DelegateOnStatic.java.messages

@@ -1,2 +1,2 @@
-6 @Delegate is legal only on instance fields or no-argument instance methods.
-10 @Delegate is legal only on instance fields or no-argument instance methods.
+7 @Delegate is legal only on instance fields or no-argument instance methods.
+11 @Delegate is legal only on instance fields or no-argument instance methods.

test/transform/resource/messages-delombok/DelegateRecursion.java.messages

@@ -1 +1 @@
-4 @Delegate does not support recursion (delegating to a type that itself has @Delegate members). Member "inner" is @Delegate in type "DelegateRecursionCenter"
+5 @Delegate does not support recursion (delegating to a type that itself has @Delegate members). Member "inner" is @Delegate in type "DelegateRecursionCenter"

test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeError.java.messages

@@ -0,0 +1,2 @@
+2:60 You must use constant literals in lombok annotations; they cannot be references to (static) fields.
+7:160 You must use constant literals in lombok annotations; they cannot be references to (static) fields.

test/transform/resource/messages-delombok/EqualsAndHashCodeOfAndExcludeWarn.java.messages

@@ -1,2 +1,2 @@
-1 This field does not exist.
-6 This field does not exist, or would have been excluded anyway.
+2 This field does not exist.
+7 This field does not exist, or would have been excluded anyway.

test/transform/resource/messages-delombok/ExtensionMethodAmbiguousFunctional.java.messages

@@ -1 +1 @@
-9 reference to ambiguous is ambiguous both method <T,R>ambiguous(T,java.util.function.Function<T,R>) in ExtensionMethodAmbiguousFunctional.Extensions and method <T>ambiguous(T,java.util.function.Consumer<T>) in ExtensionMethodAmbiguousFunctional.Extensions match
+10 reference to ambiguous is ambiguous both method <T,R>ambiguous(T,java.util.function.Function<T,R>) in ExtensionMethodAmbiguousFunctional.Extensions and method <T>ambiguous(T,java.util.function.Consumer<T>) in ExtensionMethodAmbiguousFunctional.Extensions match

test/transform/resource/messages-delombok/JacksonizedSuperBuilderWithJsonDeserialize.java.messages

@@ -1 +1 @@
-1 @JsonDeserialize already exists on class. Either delete @JsonDeserialize, or remove @Jacksonized and manually configure Jackson.
+2 @JsonDeserialize already exists on class. Either delete @JsonDeserialize, or remove @Jacksonized and manually configure Jackson.