diff options
| -rw-r--r-- | src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java | 11 | ||||
| -rw-r--r-- | src/core/lombok/experimental/Tolerate.java | 35 | ||||
| -rw-r--r-- | src/core/lombok/javac/handlers/JavacHandlerUtil.java | 11 | ||||
| -rw-r--r-- | test/transform/resource/after-delombok/Tolerate.java | 49 | ||||
| -rw-r--r-- | test/transform/resource/after-ecj/Tolerate.java | 35 | ||||
| -rw-r--r-- | test/transform/resource/before/Tolerate.java | 23 |
6 files changed, 164 insertions, 0 deletions
diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 874efb4e..c5135802 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -51,6 +51,7 @@ import lombok.core.handlers.HandlerUtil; import lombok.eclipse.EclipseAST; import lombok.eclipse.EclipseNode; import lombok.experimental.Accessors; +import lombok.experimental.Tolerate; import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; @@ -108,6 +109,7 @@ import org.eclipse.jdt.internal.compiler.lookup.TypeIds; import org.eclipse.jdt.internal.compiler.lookup.WildcardBinding; import org.osgi.framework.Bundle; + /** * Container for static utility methods useful to handlers written for eclipse. */ @@ -1222,6 +1224,15 @@ public class EclipseHandlerUtil { if (params < minArgs || params > maxArgs) continue; } + + boolean tolerate = false; + if (def.annotations != null) { + for (Annotation anno : def.annotations) { + tolerate |= typeMatches(Tolerate.class, node, anno.type); + } + } + if (tolerate) continue; + return getGeneratedBy(def) == null ? MemberExistsResult.EXISTS_BY_USER : MemberExistsResult.EXISTS_BY_LOMBOK; } } diff --git a/src/core/lombok/experimental/Tolerate.java b/src/core/lombok/experimental/Tolerate.java new file mode 100644 index 00000000..626a5890 --- /dev/null +++ b/src/core/lombok/experimental/Tolerate.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2009-2013 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 + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.experimental; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Put on any method to make lombok pretend it doesn't exist, i.e., to generate a method which would otherwise be skipped due to possible conflicts. + */ +@Target({ElementType.METHOD}) +@Retention(RetentionPolicy.SOURCE) +public @interface Tolerate { +} diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 6a60a420..474c5faa 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -47,6 +47,7 @@ import lombok.core.configuration.NullCheckExceptionType; import lombok.core.handlers.HandlerUtil; import lombok.delombok.LombokOptionsFactory; import lombok.experimental.Accessors; +import lombok.experimental.Tolerate; import lombok.javac.Javac; import lombok.javac.JavacNode; import lombok.javac.JavacTreeMaker; @@ -591,6 +592,16 @@ public class JavacHandlerUtil { if (params < minArgs || params > maxArgs) continue; } + + boolean tolerate = false; + List<JCAnnotation> annotations = md.getModifiers().getAnnotations(); + if (annotations != null) { + for (JCAnnotation anno : annotations) { + tolerate |= typeMatches(Tolerate.class, node, anno.getAnnotationType()); + } + } + if (tolerate) continue; + return getGeneratedBy(def) == null ? MemberExistsResult.EXISTS_BY_USER : MemberExistsResult.EXISTS_BY_LOMBOK; } } diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java new file mode 100644 index 00000000..fbb42f1b --- /dev/null +++ b/test/transform/resource/after-delombok/Tolerate.java @@ -0,0 +1,49 @@ +import java.util.regex.Pattern; + +class Tolerate { + + private Pattern pattern; + + @lombok.experimental.Tolerate + public void setPattern(String pattern) { + setPattern(Pattern.compile(pattern)); + } + + @java.lang.SuppressWarnings("all") + public void setPattern(final Pattern pattern) { + this.pattern = pattern; + } + + @java.lang.SuppressWarnings("all") + public Pattern getPattern() { + return this.pattern; + } +} +class Tolerate2 { + private final Pattern pattern; + + @lombok.experimental.Tolerate + public Tolerate2 withPattern(String pattern) { + return withPattern(Pattern.compile(pattern)); + } + + public Tolerate2 withPattern(String nameGlob, String extensionGlob) { + return withPattern(nameGlob.replace("*", ".*") + "\\." + extensionGlob.replace("*", ".*")); + } + + @java.lang.SuppressWarnings("all") + public Pattern getPattern() { + return this.pattern; + } + + @java.lang.SuppressWarnings("all") + public Tolerate2 withPattern(final Pattern pattern) { + return this.pattern == pattern ? this : new Tolerate2(pattern); + } + + @java.beans.ConstructorProperties({"pattern"}) + @java.lang.SuppressWarnings("all") + public Tolerate2(final Pattern pattern) { + this.pattern = pattern; + } +} diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java new file mode 100644 index 00000000..b5039a98 --- /dev/null +++ b/test/transform/resource/after-ecj/Tolerate.java @@ -0,0 +1,35 @@ +import java.util.regex.Pattern; +@lombok.Setter @lombok.Getter class Tolerate { + private Pattern pattern; + Tolerate() { + super(); + } + public @lombok.experimental.Tolerate void setPattern(String pattern) { + setPattern(Pattern.compile(pattern)); + } + public @java.lang.SuppressWarnings("all") void setPattern(final Pattern pattern) { + this.pattern = pattern; + } + public @java.lang.SuppressWarnings("all") Pattern getPattern() { + return this.pattern; + } +} +@lombok.Getter @lombok.experimental.Wither @lombok.AllArgsConstructor class Tolerate2 { + private final Pattern pattern; + public @lombok.experimental.Tolerate Tolerate2 withPattern(String pattern) { + return withPattern(Pattern.compile(pattern)); + } + public Tolerate2 withPattern(String nameGlob, String extensionGlob) { + return withPattern(((nameGlob.replace("*", ".*") + "\\.") + extensionGlob.replace("*", ".*"))); + } + public @java.lang.SuppressWarnings("all") Pattern getPattern() { + return this.pattern; + } + public @java.lang.SuppressWarnings("all") Tolerate2 withPattern(final Pattern pattern) { + return ((this.pattern == pattern) ? this : new Tolerate2(pattern)); + } + public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") Tolerate2(final Pattern pattern) { + super(); + this.pattern = pattern; + } +} diff --git a/test/transform/resource/before/Tolerate.java b/test/transform/resource/before/Tolerate.java new file mode 100644 index 00000000..d1744aa6 --- /dev/null +++ b/test/transform/resource/before/Tolerate.java @@ -0,0 +1,23 @@ +import java.util.regex.Pattern; + +@lombok.Setter @lombok.Getter +class Tolerate { + private Pattern pattern; + + @lombok.experimental.Tolerate public void setPattern(String pattern) { + setPattern(Pattern.compile(pattern)); + } +} + +@lombok.Getter @lombok.experimental.Wither @lombok.AllArgsConstructor +class Tolerate2 { + private final Pattern pattern; + + @lombok.experimental.Tolerate public Tolerate2 withPattern(String pattern) { + return withPattern(Pattern.compile(pattern)); + } + + public Tolerate2 withPattern(String nameGlob, String extensionGlob) { + return withPattern(nameGlob.replace("*", ".*") + "\\." + extensionGlob.replace("*", ".*")); + } +} |