diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-11-15 14:22:46 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-11-15 14:22:46 +0100 |
| commit | dc92425f85d2f2dd187b688ff6d218d3c8e657b6 (patch) | |
| tree | e654c0016c01c34da8f5635625d04225e3c58cbd /src/eclipseAgent/lombok/eclipse | |
| parent | 1cdd42ac10c128765d3ff642d808c00eab6a1782 (diff) | |
| parent | 5cc928f471f3875f141ab1ee737cfe2613e9cdd6 (diff) | |
| download | lombok-dc92425f85d2f2dd187b688ff6d218d3c8e657b6.tar.gz lombok-dc92425f85d2f2dd187b688ff6d218d3c8e657b6.tar.bz2 lombok-dc92425f85d2f2dd187b688ff6d218d3c8e657b6.zip | |
Merge branch 'Issue_263' of https://github.com/jvanderhel/lombok into jvanderhel-Issue_263
Conflicts:
src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
Diffstat (limited to 'src/eclipseAgent/lombok/eclipse')
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java | 9 | ||||
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 6043fdef..0ad7102b 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -84,6 +84,7 @@ public class EclipsePatcher extends Agent { patchCatchReparse(sm); patchIdentifierEndReparse(sm); patchRetrieveEllipsisStartPosition(sm); + patchRetrieveRightBraceOrSemiColonPosition(sm); patchSetGeneratedFlag(sm); patchDomAstReparseIssues(sm); patchHideGeneratedNodes(sm); @@ -222,6 +223,14 @@ public class EclipsePatcher extends Agent { .transplant().request(StackRequest.RETURN_VALUE, StackRequest.PARAM2).build()); } + private static void patchRetrieveRightBraceOrSemiColonPosition(ScriptManager sm) { + sm.addScript(ScriptBuilder.wrapReturnValue() + .target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBraceOrSemiColonPosition")) + .target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBrace")) + .wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "fixRetrieveRightBraceOrSemiColonPosition", "int", "int", "int")) + .transplant().request(StackRequest.RETURN_VALUE, StackRequest.PARAM2).build()); + } + private static void patchSetGeneratedFlag(ScriptManager sm) { sm.addScript(ScriptBuilder.addField() .targetClass("org.eclipse.jdt.internal.compiler.ast.ASTNode") diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java index f5306ab9..69024afa 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java @@ -64,6 +64,10 @@ public class PatchFixes { public static int fixRetrieveEllipsisStartPosition(int original, int end) { return original == -1 ? end : original; } + + public static int fixRetrieveRightBraceOrSemiColonPosition(int original, int end) { + return original == -1 ? end : original; + } public static final int ALREADY_PROCESSED_FLAG = 0x800000; //Bit 24 |