diff options
69 files changed, 167 insertions, 180 deletions
diff --git a/src/core/lombok/javac/CapturingDiagnosticListener.java b/src/core/lombok/javac/CapturingDiagnosticListener.java index 45b4047a..a0ac6adc 100644 --- a/src/core/lombok/javac/CapturingDiagnosticListener.java +++ b/src/core/lombok/javac/CapturingDiagnosticListener.java @@ -52,7 +52,7 @@ public class CapturingDiagnosticListener implements DiagnosticListener<JavaFileO "^" + Pattern.quote(file.getAbsolutePath()) + "\\s*:\\s*\\d+\\s*:\\s*(?:warning:\\s*)?(.*)$", Pattern.DOTALL).matcher(msg); if (m.matches()) msg = m.group(1); - messages.add(new CompilerMessage(d.getLineNumber(), d.getColumnNumber(), d.getStartPosition(), d.getKind() == Kind.ERROR, msg)); + messages.add(new CompilerMessage(d.getLineNumber(), d.getStartPosition(), d.getKind() == Kind.ERROR, msg)); } public void suppress(int start, int end) { @@ -67,15 +67,12 @@ public class CapturingDiagnosticListener implements DiagnosticListener<JavaFileO /** Line Number (starting at 1) */ private final long line; - /** Preferably column, but if that is hard to calculate (e.g. in ecj), then position is acceptable. */ - private final long columnOrPosition; private final long position; private final boolean isError; private final String message; - public CompilerMessage(long line, long columnOrPosition, long position, boolean isError, String message) { + public CompilerMessage(long line, long position, boolean isError, String message) { this.line = line; - this.columnOrPosition = columnOrPosition; this.position = position; this.isError = isError; this.message = message; @@ -89,10 +86,6 @@ public class CapturingDiagnosticListener implements DiagnosticListener<JavaFileO return position; } - public long getColumnOrPosition() { - return columnOrPosition; - } - public boolean isError() { return isError; } @@ -107,7 +100,6 @@ public class CapturingDiagnosticListener implements DiagnosticListener<JavaFileO result = prime * result + (isError ? 1231 : 1237); result = prime * result + (int) (line ^ (line >>> 32)); result = prime * result + ((message == null) ? 0 : message.hashCode()); - result = prime * result + (int) (columnOrPosition ^ (columnOrPosition >>> 32)); return result; } @@ -121,12 +113,11 @@ public class CapturingDiagnosticListener implements DiagnosticListener<JavaFileO if (message == null) { if (other.message != null) return false; } else if (!message.equals(other.message)) return false; - if (columnOrPosition != other.columnOrPosition) return false; return true; } @Override public String toString() { - return String.format("%d:%d %s %s", line, columnOrPosition, isError ? "ERROR" : "WARNING", message); + return String.format("%d %s %s", line, isError ? "ERROR" : "WARNING", message); } } } diff --git a/test/core/src/lombok/CompilerMessageMatcher.java b/test/core/src/lombok/CompilerMessageMatcher.java index af12e199..db288749 100644 --- a/test/core/src/lombok/CompilerMessageMatcher.java +++ b/test/core/src/lombok/CompilerMessageMatcher.java @@ -38,30 +38,26 @@ public class CompilerMessageMatcher { /** Line Number (starting at 1) */ private final long line; - /** Position is either column number, OR position in file starting from the first byte. */ - private final long position; private final Collection<String> messageParts; - public CompilerMessageMatcher(long line, long position, String message) { + public CompilerMessageMatcher(long line, String message) { this.line = line; - this.position = position; this.messageParts = Arrays.asList(message.split("\\s+")); } public static CompilerMessageMatcher asCompilerMessageMatcher(CompilerMessage message) { - return new CompilerMessageMatcher(message.getLine(), message.getColumnOrPosition(), message.getMessage()); + return new CompilerMessageMatcher(message.getLine(), message.getMessage()); } @Override public String toString() { StringBuilder parts = new StringBuilder(); for (String part : messageParts) parts.append(part).append(" "); if (parts.length() > 0) parts.setLength(parts.length() - 1); - return String.format("%d:%d %s", line, position, parts); + return String.format("%d %s", line, parts); } public boolean matches(CompilerMessage message) { if (message.getLine() != this.line) return false; - if (message.getColumnOrPosition() != this.position) return false; for (String token : messageParts) { if (!message.getMessage().contains(token)) return false; } @@ -78,12 +74,12 @@ public class CompilerMessageMatcher { return out; } - private static final Pattern PATTERN = Pattern.compile("^(\\d+):(\\d+) (.*)$"); + private static final Pattern PATTERN = Pattern.compile("^(\\d+) (.*)$"); private static CompilerMessageMatcher read(String line) { line = line.trim(); if (line.isEmpty()) return null; Matcher m = PATTERN.matcher(line); if (!m.matches()) throw new IllegalArgumentException("Typo in test file: " + line); - return new CompilerMessageMatcher(Integer.parseInt(m.group(1)), Integer.parseInt(m.group(2)), m.group(3)); + return new CompilerMessageMatcher(Integer.parseInt(m.group(1)), m.group(2)); } } diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index f7294f1f..586c124a 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -112,7 +112,7 @@ public class RunTestsViaEcj extends AbstractRunTests { CategorizedProblem[] problems = compilationResult.getAllProblems(); if (problems != null) for (CategorizedProblem p : problems) { - messages.add(new CompilerMessage(p.getSourceLineNumber(), p.getSourceStart(), p.getSourceStart(), p.isError(), p.getMessage())); + messages.add(new CompilerMessage(p.getSourceLineNumber(), p.getSourceStart(), p.isError(), p.getMessage())); } CompilationUnitDeclaration cud = compilationUnit_.get(); diff --git a/test/transform/resource/messages-delombok/Accessors.java.messages b/test/transform/resource/messages-delombok/Accessors.java.messages index 367621bd..265bc745 100644 --- a/test/transform/resource/messages-delombok/Accessors.java.messages +++ b/test/transform/resource/messages-delombok/Accessors.java.messages @@ -1 +1 @@ -19:9 Not generating setter for this field: It does not fit your @Accessors prefix list.
\ No newline at end of file +19 Not generating setter for this field: It does not fit your @Accessors prefix list.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages b/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages index aeeb0c86..a04b4f9b 100644 --- a/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages +++ b/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages @@ -1,2 +1,2 @@ -1:1 @Getter, @Setter, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. -12:1 @Value is not allowed on builder classes.
\ No newline at end of file +1 @Getter, @Setter, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. +12 @Value is not allowed on builder classes.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages b/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages index 06b88c10..4f915bbe 100644 --- a/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages +++ b/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages @@ -1 +1 @@ -1:1 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. +1 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages index 057a7521..b3490fd0 100644 --- a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages +++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages @@ -1,3 +1,3 @@ -1:1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). -10:1 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). -19:1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +10 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). +19 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages index 9a0b29f3..f5dfd559 100644 --- a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages +++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages @@ -1,2 +1,2 @@ -4:1 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). -15:1 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +4 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +15 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). diff --git a/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages b/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages index ae5dd265..9fac15c4 100644 --- a/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages +++ b/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages @@ -1 +1 @@ -1:1 This does nothing; provide either level or makeFinal or both.
\ No newline at end of file +1 This does nothing; provide either level or makeFinal or both.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages b/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages index 7a326742..7d99aa69 100644 --- a/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages @@ -1,8 +1,8 @@ -8:9 Not generating isFoo(): A method with that name already exists -14:9 Not generating isFoo(): A method with that name already exists (getFoo) -32:9 Not generating getFoo(): A method with that name already exists -50:9 Not generating getFoo(): A method with that name already exists -62:9 Not generating isFoo(): A method with that name already exists -68:9 Not generating isFoo(): A method with that name already exists (getFoo) -86:9 Not generating getFoo(): A method with that name already exists -104:9 Not generating getFoo(): A method with that name already exists +8 Not generating isFoo(): A method with that name already exists +14 Not generating isFoo(): A method with that name already exists (getFoo) +32 Not generating getFoo(): A method with that name already exists +50 Not generating getFoo(): A method with that name already exists +62 Not generating isFoo(): A method with that name already exists +68 Not generating isFoo(): A method with that name already exists (getFoo) +86 Not generating getFoo(): A method with that name already exists +104 Not generating getFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-delombok/GetterBoolean.java.messages b/test/transform/resource/messages-delombok/GetterBoolean.java.messages index 91ad3512..ab9d659d 100644 --- a/test/transform/resource/messages-delombok/GetterBoolean.java.messages +++ b/test/transform/resource/messages-delombok/GetterBoolean.java.messages @@ -1 +1 @@ -13:9 Not generating isFoo(): A method with that name already exists (getFoo)
\ No newline at end of file +13 Not generating isFoo(): A method with that name already exists (getFoo)
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages b/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages index 5c72fd56..5cb47108 100644 --- a/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages +++ b/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages @@ -1,6 +1,6 @@ -2:9 'lazy' requires the field to be private and final. -6:9 'lazy' requires the field to be private and final. -10:9 'lazy' requires the field to be private and final. -14:9 'lazy' does not work with AccessLevel.NONE. -17:1 'lazy' is not supported for @Getter on a type. -22:9 'lazy' requires field initialization.
\ No newline at end of file +2 'lazy' requires the field to be private and final. +6 'lazy' requires the field to be private and final. +10 'lazy' requires the field to be private and final. +14 'lazy' does not work with AccessLevel.NONE. +17 'lazy' is not supported for @Getter on a type. +22 'lazy' requires field initialization.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages b/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages index 4c82f730..26c30298 100644 --- a/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages +++ b/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages @@ -1 +1 @@ -3:1 'onMethod' is not supported for @Getter on a type.
\ No newline at end of file +3 'onMethod' is not supported for @Getter on a type.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages b/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages index b5bad45b..af1e3b7a 100644 --- a/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages +++ b/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages @@ -1,4 +1,4 @@ -2:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -3:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -4:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -5:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +2 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +3 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +4 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +5 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages index 8aa22226..db5f9891 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages @@ -1 +1 @@ -1:1 Field 'log' already exists. +1 Field 'log' already exists. diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages index 570a169b..128a0c62 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages @@ -1 +1 @@ -2:9 @Log is not legal on non-static inner classes.
\ No newline at end of file +2 @Log is not legal on non-static inner classes.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages index ebc23411..262fbb27 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages @@ -1 +1 @@ -2:9 @Log is legal only on types.
\ No newline at end of file +2 @Log is legal only on types.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages index a525dd27..08f6bb7b 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages @@ -1,2 +1,2 @@ -1:1 @Log is legal only on classes and enums. -4:1 @Log is legal only on classes and enums.
\ No newline at end of file +1 @Log is legal only on classes and enums. +4 @Log is legal only on classes and enums.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages b/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages index ac87adcd..042c97f8 100644 --- a/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages @@ -1 +1 @@ -22:89 @NonNull is meaningless on a primitive. +22 @NonNull is meaningless on a primitive. diff --git a/test/transform/resource/messages-delombok/NonNullPlain.java.messages b/test/transform/resource/messages-delombok/NonNullPlain.java.messages index 67eb8abe..4033f645 100644 --- a/test/transform/resource/messages-delombok/NonNullPlain.java.messages +++ b/test/transform/resource/messages-delombok/NonNullPlain.java.messages @@ -1 +1 @@ -7:9 @NonNull is meaningless on a primitive.
\ No newline at end of file +8 @NonNull is meaningless on a primitive.
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages b/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages index 9cece93c..4b1e209b 100644 --- a/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2:9 Not generating setFoo(): A method with that name already exists -8:9 Not generating setFoo(): A method with that name already exists -14:9 Not generating setFoo(): A method with that name already exists -20:9 Not generating setFoo(): A method with that name already exists -38:9 Not generating setFoo(): A method with that name already exists -44:9 Not generating setFoo(): A method with that name already exists (setIsFoo) -50:9 Not generating setFoo(): A method with that name already exists +2 Not generating setFoo(): A method with that name already exists +8 Not generating setFoo(): A method with that name already exists +14 Not generating setFoo(): A method with that name already exists +20 Not generating setFoo(): A method with that name already exists +38 Not generating setFoo(): A method with that name already exists +44 Not generating setFoo(): A method with that name already exists (setIsFoo) +50 Not generating setFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-delombok/SetterOnMethod.java.messages b/test/transform/resource/messages-delombok/SetterOnMethod.java.messages index 9473d5b3..1be8f1ea 100644 --- a/test/transform/resource/messages-delombok/SetterOnMethod.java.messages +++ b/test/transform/resource/messages-delombok/SetterOnMethod.java.messages @@ -1,7 +1,7 @@ -3:34 incompatible types -4:44 incompatible types -6:26 incompatible types -11:26 incompatible types -14:44 incompatible types -6:1 'onMethod' is not supported for @Setter on a type. -11:1 'onMethod' is not supported for @Setter on a type. +3 incompatible types +4 incompatible types +6 incompatible types +11 incompatible types +14 incompatible types +6 'onMethod' is not supported for @Setter on a type. +11 'onMethod' is not supported for @Setter on a type. diff --git a/test/transform/resource/messages-delombok/SetterOnParam.java.messages b/test/transform/resource/messages-delombok/SetterOnParam.java.messages index b8c69eca..828d9511 100644 --- a/test/transform/resource/messages-delombok/SetterOnParam.java.messages +++ b/test/transform/resource/messages-delombok/SetterOnParam.java.messages @@ -1,7 +1,7 @@ -3:33 incompatible types -4:43 incompatible types -6:25 incompatible types -11:25 incompatible types -14:43 incompatible types -6:1 'onParam' is not supported for @Setter on a type. -11:1 'onParam' is not supported for @Setter on a type. +3 incompatible types +4 incompatible types +6 incompatible types +11 incompatible types +14 incompatible types +6 'onParam' is not supported for @Setter on a type. +11 'onParam' is not supported for @Setter on a type. diff --git a/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages b/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages index 7324f6f3..86cbd0e6 100644 --- a/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages +++ b/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages @@ -1,2 +1,2 @@ -2:34 incompatible types -2:54 incompatible types +2 incompatible types +2 incompatible types diff --git a/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages b/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages index 7acd35ed..ec74f090 100644 --- a/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages +++ b/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages @@ -1 +1 @@ -2:10 cannot find symbol +2 cannot find symbol diff --git a/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages b/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages index f282d34d..ae351773 100644 --- a/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages +++ b/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages @@ -1 +1 @@ -5:9 The field write does not exist. +5 The field write does not exist. diff --git a/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages index 5d6bc958..fe0653c8 100644 --- a/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages +++ b/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages @@ -1 +1 @@ -5:9 non-static variable read cannot be referenced from a static context
\ No newline at end of file +5 non-static variable read cannot be referenced from a static context
\ No newline at end of file diff --git a/test/transform/resource/messages-delombok/ValErrors.java.messages b/test/transform/resource/messages-delombok/ValErrors.java.messages index 887b8c21..bb33c6de 100644 --- a/test/transform/resource/messages-delombok/ValErrors.java.messages +++ b/test/transform/resource/messages-delombok/ValErrors.java.messages @@ -1,2 +1,2 @@ -5:21 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved -9:21 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) +5 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved +9 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) diff --git a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages index 9bca1be6..7166b550 100644 --- a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages +++ b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages @@ -1 +1 @@ -6:53 'val' is not allowed in old-style for loops +6 'val' is not allowed in old-style for loops diff --git a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages b/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages index b68f6398..d5e30e28 100644 --- a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2:9 Not generating withFoo(): A method with that name already exists -12:9 Not generating withFoo(): A method with that name already exists -22:9 Not generating withFoo(): A method with that name already exists -32:9 Not generating withFoo(): A method with that name already exists -62:9 Not generating withFoo(): A method with that name already exists -72:9 Not generating withFoo(): A method with that name already exists (withIsFoo) -82:9 Not generating withFoo(): A method with that name already exists +2 Not generating withFoo(): A method with that name already exists +12 Not generating withFoo(): A method with that name already exists +22 Not generating withFoo(): A method with that name already exists +32 Not generating withFoo(): A method with that name already exists +62 Not generating withFoo(): A method with that name already exists +72 Not generating withFoo(): A method with that name already exists (withIsFoo) +82 Not generating withFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages b/test/transform/resource/messages-delombok/WitherOnStatic.java.messages index 9dd69e75..3af59fa1 100644 --- a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages +++ b/test/transform/resource/messages-delombok/WitherOnStatic.java.messages @@ -1,2 +1,2 @@ -2:9 Not generating wither for this field: Withers cannot be generated for static fields. -3:9 Not generating wither for this field: Withers cannot be generated for static fields. +2 Not generating wither for this field: Withers cannot be generated for static fields. +3 Not generating wither for this field: Withers cannot be generated for static fields. diff --git a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages b/test/transform/resource/messages-delombok/WitherWithDollar.java.messages index 74eeabba..84603868 100644 --- a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages +++ b/test/transform/resource/messages-delombok/WitherWithDollar.java.messages @@ -1 +1 @@ -2:9 Not generating wither for this field: Withers cannot be generated for fields starting with $. +2 Not generating wither for this field: Withers cannot be generated for fields starting with $. diff --git a/test/transform/resource/messages-ecj/Accessors.java.messages b/test/transform/resource/messages-ecj/Accessors.java.messages index 3e6bbd69..c955f664 100644 --- a/test/transform/resource/messages-ecj/Accessors.java.messages +++ b/test/transform/resource/messages-ecj/Accessors.java.messages @@ -1 +1 @@ -19:530 Not generating setter for this field: It does not fit your @Accessors prefix list. +19 Not generating setter for this field: It does not fit your @Accessors prefix list. diff --git a/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages b/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages index 8ffc6e26..84942101 100644 --- a/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages +++ b/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages @@ -1,2 +1,2 @@ -1:0 @Getter, @Setter, @FieldDefaults, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. -12:331 @Value is not allowed on builder classes.
\ No newline at end of file +1 @Getter, @Setter, @FieldDefaults, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. +12 @Value is not allowed on builder classes.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages index 50f2e97f..4f915bbe 100644 --- a/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages +++ b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages @@ -1 +1 @@ -1:0 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. +1 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages index db144316..b3490fd0 100644 --- a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages @@ -1,3 +1,3 @@ -1:0 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). -10:125 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). -19:274 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +10 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). +19 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages index cf6ebea2..f5dfd559 100644 --- a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages @@ -1,2 +1,2 @@ -4:57 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). -15:194 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +4 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +15 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). diff --git a/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages b/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages index 5903679b..9fac15c4 100644 --- a/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages +++ b/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages @@ -1 +1 @@ -1:0 This does nothing; provide either level or makeFinal or both.
\ No newline at end of file +1 This does nothing; provide either level or makeFinal or both.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages b/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages index ae62a1fb..7d99aa69 100644 --- a/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages @@ -1,8 +1,8 @@ -8:102 Not generating isFoo(): A method with that name already exists -14:186 Not generating isFoo(): A method with that name already exists (getFoo) -32:436 Not generating getFoo(): A method with that name already exists -50:688 Not generating getFoo(): A method with that name already exists -62:868 Not generating isFoo(): A method with that name already exists -68:961 Not generating isFoo(): A method with that name already exists (getFoo) -86:1240 Not generating getFoo(): A method with that name already exists -104:1510 Not generating getFoo(): A method with that name already exists +8 Not generating isFoo(): A method with that name already exists +14 Not generating isFoo(): A method with that name already exists (getFoo) +32 Not generating getFoo(): A method with that name already exists +50 Not generating getFoo(): A method with that name already exists +62 Not generating isFoo(): A method with that name already exists +68 Not generating isFoo(): A method with that name already exists (getFoo) +86 Not generating getFoo(): A method with that name already exists +104 Not generating getFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/GetterBoolean.java.messages b/test/transform/resource/messages-ecj/GetterBoolean.java.messages index 8ae086f6..8ebf0a31 100644 --- a/test/transform/resource/messages-ecj/GetterBoolean.java.messages +++ b/test/transform/resource/messages-ecj/GetterBoolean.java.messages @@ -1 +1 @@ -13:220 Not generating isFoo(): A method with that name already exists (getFoo) +13 Not generating isFoo(): A method with that name already exists (getFoo) diff --git a/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages b/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages index 9ecf0fc0..b18843e6 100644 --- a/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages +++ b/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages @@ -1,6 +1,6 @@ -2:35 'lazy' requires the field to be private and final. -6:132 'lazy' requires the field to be private and final. -10:232 'lazy' requires the field to be private and final. -14:315 'lazy' does not work with AccessLevel.NONE. -17:412 'lazy' is not supported for @Getter on a type. -22:544 'lazy' requires field initialization. +2 'lazy' requires the field to be private and final. +6 'lazy' requires the field to be private and final. +10 'lazy' requires the field to be private and final. +14 'lazy' does not work with AccessLevel.NONE. +17 'lazy' is not supported for @Getter on a type. +22 'lazy' requires field initialization. diff --git a/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages b/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages index 804e8a3c..26c30298 100644 --- a/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages +++ b/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages @@ -1 +1 @@ -3:50 'onMethod' is not supported for @Getter on a type.
\ No newline at end of file +3 'onMethod' is not supported for @Getter on a type.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages b/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages index f87b9f13..af1e3b7a 100644 --- a/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages +++ b/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages @@ -1,4 +1,4 @@ -2:31 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -3:93 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -4:144 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -5:210 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +2 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +3 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +4 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +5 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages index 859e29d8..db5f9891 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages @@ -1 +1 @@ -1:0 Field 'log' already exists. +1 Field 'log' already exists. diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages index 570a169b..128a0c62 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages @@ -1 +1 @@ -2:9 @Log is not legal on non-static inner classes.
\ No newline at end of file +2 @Log is not legal on non-static inner classes.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages index b6848135..81e9b718 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages @@ -1 +1 @@ -2:30 The annotation @Slf4j is disallowed for this location +2 The annotation @Slf4j is disallowed for this location diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages index b9f8b63f..949886d5 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages @@ -1,2 +1,2 @@ -1:0 @Slf4j is legal only on classes and enums. -4:67 @Slf4j is legal only on classes and enums. +1 @Slf4j is legal only on classes and enums. +4 @Slf4j is legal only on classes and enums. diff --git a/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages b/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages index 1539929b..4b7d18b3 100644 --- a/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages @@ -1,3 +1,3 @@ -15:460 Dead code -22:683 @NonNull is meaningless on a primitive. -28:823 Dead code
\ No newline at end of file +15 Dead code +22 @NonNull is meaningless on a primitive. +28 Dead code
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/NonNullPlain.java.messages b/test/transform/resource/messages-ecj/NonNullPlain.java.messages index 96eed252..1c33c701 100644 --- a/test/transform/resource/messages-ecj/NonNullPlain.java.messages +++ b/test/transform/resource/messages-ecj/NonNullPlain.java.messages @@ -1 +1 @@ -7:116 @NonNull is meaningless on a primitive.
\ No newline at end of file +7 @NonNull is meaningless on a primitive.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages index 5fc0a365..4b1e209b 100644 --- a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2:17 Not generating setFoo(): A method with that name already exists -8:96 Not generating setFoo(): A method with that name already exists -14:174 Not generating setFoo(): A method with that name already exists -20:252 Not generating setFoo(): A method with that name already exists -38:480 Not generating setFoo(): A method with that name already exists -44:570 Not generating setFoo(): A method with that name already exists (setIsFoo) -50:653 Not generating setFoo(): A method with that name already exists +2 Not generating setFoo(): A method with that name already exists +8 Not generating setFoo(): A method with that name already exists +14 Not generating setFoo(): A method with that name already exists +20 Not generating setFoo(): A method with that name already exists +38 Not generating setFoo(): A method with that name already exists +44 Not generating setFoo(): A method with that name already exists (setIsFoo) +50 Not generating setFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/SetterOnMethod.java.messages b/test/transform/resource/messages-ecj/SetterOnMethod.java.messages index ecfa3f69..8e7ff7f8 100644 --- a/test/transform/resource/messages-ecj/SetterOnMethod.java.messages +++ b/test/transform/resource/messages-ecj/SetterOnMethod.java.messages @@ -1,2 +1,2 @@ -6:0 'onMethod' is not supported for @Setter on a type. -11:0 'onMethod' is not supported for @Setter on a type.
\ No newline at end of file +6 'onMethod' is not supported for @Setter on a type. +11 'onMethod' is not supported for @Setter on a type.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SetterOnParam.java.messages b/test/transform/resource/messages-ecj/SetterOnParam.java.messages index 7d0c4a1e..dbab4caa 100644 --- a/test/transform/resource/messages-ecj/SetterOnParam.java.messages +++ b/test/transform/resource/messages-ecj/SetterOnParam.java.messages @@ -1,2 +1,2 @@ -6:0 'onParam' is not supported for @Setter on a type. -11:0 'onParam' is not supported for @Setter on a type.
\ No newline at end of file +6 'onParam' is not supported for @Setter on a type. +11 'onParam' is not supported for @Setter on a type.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages b/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages index eb33b0df..87edc6c2 100644 --- a/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages +++ b/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages @@ -1 +1 @@ -2:35 Getter cannot be resolved to a type +2 Getter cannot be resolved to a type diff --git a/test/transform/resource/messages-ecj/SynchronizedName.java.messages b/test/transform/resource/messages-ecj/SynchronizedName.java.messages index 0ad3be0a..5322f9d2 100644 --- a/test/transform/resource/messages-ecj/SynchronizedName.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedName.java.messages @@ -1 +1 @@ -8:185 The static field SynchronizedName.READ should be accessed in a static way +8 The static field SynchronizedName.READ should be accessed in a static way diff --git a/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages index b07f020c..ae351773 100644 --- a/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages @@ -1 +1 @@ -5:120 The field write does not exist. +5 The field write does not exist. diff --git a/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages index 834877ef..98b9c948 100644 --- a/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages @@ -1 +1 @@ -5:127 Cannot make a static reference to the non-static field SynchronizedNameStaticToInstanceRef.read +5 Cannot make a static reference to the non-static field SynchronizedNameStaticToInstanceRef.read diff --git a/test/transform/resource/messages-ecj/ValErrors.java.messages b/test/transform/resource/messages-ecj/ValErrors.java.messages index fda58094..6d53ddd6 100644 --- a/test/transform/resource/messages-ecj/ValErrors.java.messages +++ b/test/transform/resource/messages-ecj/ValErrors.java.messages @@ -1,2 +1,2 @@ -5:95 d cannot be resolved to a variable -9:143 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) +5 d cannot be resolved to a variable +9 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) diff --git a/test/transform/resource/messages-ecj/ValInBasicFor.java.messages b/test/transform/resource/messages-ecj/ValInBasicFor.java.messages index 068d72b9..43cd7ce8 100644 --- a/test/transform/resource/messages-ecj/ValInBasicFor.java.messages +++ b/test/transform/resource/messages-ecj/ValInBasicFor.java.messages @@ -1,4 +1,4 @@ -6:160 'val' is not allowed in old-style for loops -6:171 Type mismatch: cannot convert from int to val -6:174 'val' is not allowed in old-style for loops -6:187 'val' is not allowed in old-style for loops +6 'val' is not allowed in old-style for loops +6 Type mismatch: cannot convert from int to val +6 'val' is not allowed in old-style for loops +6 'val' is not allowed in old-style for loops diff --git a/test/transform/resource/messages-ecj/ValRawType.java.messages b/test/transform/resource/messages-ecj/ValRawType.java.messages index b7669ede..2a1fbba6 100644 --- a/test/transform/resource/messages-ecj/ValRawType.java.messages +++ b/test/transform/resource/messages-ecj/ValRawType.java.messages @@ -1 +1 @@ -13:260 List is a raw type. References to generic type List<E> should be parameterized +13 List is a raw type. References to generic type List<E> should be parameterized diff --git a/test/transform/resource/messages-ecj/ValueExperimental.java.messages b/test/transform/resource/messages-ecj/ValueExperimental.java.messages index db4520ca..e454a878 100644 --- a/test/transform/resource/messages-ecj/ValueExperimental.java.messages +++ b/test/transform/resource/messages-ecj/ValueExperimental.java.messages @@ -1 +1 @@ -1:7 The type Value is deprecated
\ No newline at end of file +1 The type Value is deprecated
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages b/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages index 87459eb2..d5e30e28 100644 --- a/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2:17 Not generating withFoo(): A method with that name already exists -12:141 Not generating withFoo(): A method with that name already exists -22:264 Not generating withFoo(): A method with that name already exists -32:386 Not generating withFoo(): A method with that name already exists -62:746 Not generating withFoo(): A method with that name already exists -72:880 Not generating withFoo(): A method with that name already exists (withIsFoo) -82:1008 Not generating withFoo(): A method with that name already exists +2 Not generating withFoo(): A method with that name already exists +12 Not generating withFoo(): A method with that name already exists +22 Not generating withFoo(): A method with that name already exists +32 Not generating withFoo(): A method with that name already exists +62 Not generating withFoo(): A method with that name already exists +72 Not generating withFoo(): A method with that name already exists (withIsFoo) +82 Not generating withFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/WitherOnStatic.java.messages b/test/transform/resource/messages-ecj/WitherOnStatic.java.messages index 72e39f62..3af59fa1 100644 --- a/test/transform/resource/messages-ecj/WitherOnStatic.java.messages +++ b/test/transform/resource/messages-ecj/WitherOnStatic.java.messages @@ -1,2 +1,2 @@ -2:24 Not generating wither for this field: Withers cannot be generated for static fields. -3:73 Not generating wither for this field: Withers cannot be generated for static fields. +2 Not generating wither for this field: Withers cannot be generated for static fields. +3 Not generating wither for this field: Withers cannot be generated for static fields. diff --git a/test/transform/resource/messages-ecj/WitherWithDollar.java.messages b/test/transform/resource/messages-ecj/WitherWithDollar.java.messages index 93203dbb..84603868 100644 --- a/test/transform/resource/messages-ecj/WitherWithDollar.java.messages +++ b/test/transform/resource/messages-ecj/WitherWithDollar.java.messages @@ -1 +1 @@ -2:26 Not generating wither for this field: Withers cannot be generated for fields starting with $. +2 Not generating wither for this field: Withers cannot be generated for fields starting with $. diff --git a/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages b/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages index fd23a32a..57556bf3 100644 --- a/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-idempotent/NonNullOnParameter.java.messages @@ -1 +1 @@ -33:89 @NonNull is meaningless on a primitive.
\ No newline at end of file +33 @NonNull is meaningless on a primitive.
\ No newline at end of file diff --git a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages index c48da311..1d8c4d9c 100644 --- a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages +++ b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages @@ -1,3 +1,3 @@ -4:9 @NonNull is meaningless on a primitive. -18:29 @NonNull is meaningless on a primitive. -44:26 @NonNull is meaningless on a primitive.
\ No newline at end of file +3 @NonNull is meaningless on a primitive. +15 @NonNull is meaningless on a primitive. +37 @NonNull is meaningless on a primitive.
\ No newline at end of file diff --git a/test/transform/resource/messages-idempotent/SimpleTypeResolution.java.messages b/test/transform/resource/messages-idempotent/SimpleTypeResolution.java.messages index 7acd35ed..ec74f090 100644 --- a/test/transform/resource/messages-idempotent/SimpleTypeResolution.java.messages +++ b/test/transform/resource/messages-idempotent/SimpleTypeResolution.java.messages @@ -1 +1 @@ -2:10 cannot find symbol +2 cannot find symbol diff --git a/test/transform/resource/messages-idempotent/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-idempotent/SynchronizedNameStaticToInstanceRef.java.messages index ed3eccb1..53b39d98 100644 --- a/test/transform/resource/messages-idempotent/SynchronizedNameStaticToInstanceRef.java.messages +++ b/test/transform/resource/messages-idempotent/SynchronizedNameStaticToInstanceRef.java.messages @@ -1 +1 @@ -5:66 non-static variable read cannot be referenced from a static context +5 non-static variable read cannot be referenced from a static context diff --git a/test/transform/resource/messages-idempotent/ValErrors.java.messages b/test/transform/resource/messages-idempotent/ValErrors.java.messages index 9bee37d4..c2432c6a 100644 --- a/test/transform/resource/messages-idempotent/ValErrors.java.messages +++ b/test/transform/resource/messages-idempotent/ValErrors.java.messages @@ -1,3 +1,3 @@ -3:44 cannot find symbol -6:17 cannot find symbol -6:25 illegal initializer for <none> +3 cannot find symbol +6 cannot find symbol +6 illegal initializer for <none> diff --git a/test/transform/resource/messages-idempotent/ValInBasicFor.java.messages b/test/transform/resource/messages-idempotent/ValInBasicFor.java.messages index fb675485..67842eb9 100644 --- a/test/transform/resource/messages-idempotent/ValInBasicFor.java.messages +++ b/test/transform/resource/messages-idempotent/ValInBasicFor.java.messages @@ -1 +1 @@ -5:53 'val' is not allowed in old-style for loops +5 'val' is not allowed in old-style for loops |