diff options
| author | cnuessgens <christian@nuessgens.com> | 2018-03-22 17:48:58 +0100 |
|---|---|---|
| committer | cnuessgens <christian@nuessgens.com> | 2018-03-22 17:48:58 +0100 |
| commit | 06da0854e93df222603fcc2e51c9594c16899087 (patch) | |
| tree | 66fb28a407cf3322801f241cc419767a25417e03 /src/eclipseAgent/lombok/eclipse/agent | |
| parent | 1b6de01bf187def687cb0e757da4295b0790f0ac (diff) | |
| parent | 5a5d75a931e66b03212081e35bdfdc7b6be98783 (diff) | |
| download | lombok-06da0854e93df222603fcc2e51c9594c16899087.tar.gz lombok-06da0854e93df222603fcc2e51c9594c16899087.tar.bz2 lombok-06da0854e93df222603fcc2e51c9594c16899087.zip | |
Merge remote-tracking branch 'remotes/upstream/master'
Diffstat (limited to 'src/eclipseAgent/lombok/eclipse/agent')
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/PatchVal.java | 4 | ||||
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java index e4dd7b26..3da37869 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 The Project Lombok Authors. + * Copyright (C) 2010-2018 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 @@ -212,7 +212,7 @@ public class PatchVal { } private static boolean isVar(LocalDeclaration local, BlockScope scope) { - return is(local.type, scope, "lombok.experimental.var"); + return is(local.type, scope, "lombok.experimental.var") || is(local.type, scope, "lombok.var"); } private static boolean isVal(LocalDeclaration local, BlockScope scope) { diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java index 505eb767..46237dcf 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 The Project Lombok Authors. + * Copyright (C) 2010-2018 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 @@ -103,7 +103,7 @@ public class PatchValEclipse { } private static boolean couldBeVar(TypeReference type) { - return PatchVal.couldBe("lombok.experimental.var", type); + return PatchVal.couldBe("lombok.experimental.var", type) || PatchVal.couldBe("lombok.var", type); } public static void addFinalAndValAnnotationToSingleVariableDeclaration(Object converter, SingleVariableDeclaration out, LocalDeclaration in) { |