Improve Extract method refactoring: you can extract method for code that also contains @SneakyThrows

3 files changed, 29 insertions, 2 deletions

diff --git a/src/core/lombok/eclipse/handlers/HandleSneakyThrows.java b/src/core/lombok/eclipse/handlers/HandleSneakyThrows.java
index 10e92106..6c00258e 100644
--- a/src/core/lombok/eclipse/handlers/HandleSneakyThrows.java
+++ b/src/core/lombok/eclipse/handlers/HandleSneakyThrows.java
@@ -231,8 +231,10 @@ public class HandleSneakyThrows extends EclipseAnnotationHandler<SneakyThrows> {
 		tryStatement.catchBlocks = new Block[] { block };
 		
 		// Positions for in-method generated nodes are special
-		tryStatement.sourceStart = method.bodyStart;
-		tryStatement.sourceEnd = method.bodyEnd;
+//		tryStatement.sourceStart = method.bodyStart;
+//		tryStatement.sourceEnd = method.bodyEnd;
+		tryStatement.sourceStart = pS;
+		tryStatement.sourceEnd = pE;
 
 		return tryStatement;
 	}
diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
index 0ac62c79..6b899807 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
@@ -85,6 +85,7 @@ public class EclipsePatcher extends Agent {
 			patchIdentifierEndReparse(sm);
 			patchRetrieveEllipsisStartPosition(sm);
 			patchSetGeneratedFlag(sm);
+			patchDomAstReparseIssues(sm);
 			patchHideGeneratedNodes(sm);
 			patchPostCompileHookEclipse(sm);
 			patchFixSourceTypeConverter(sm);
@@ -98,6 +99,17 @@ public class EclipsePatcher extends Agent {
 		if (reloadExistingClasses) sm.reloadClasses(instrumentation);
 	}
 	
+	private static void patchDomAstReparseIssues(ScriptManager sm) {
+		sm.addScript(ScriptBuilder.replaceMethodCall()
+				.target(new MethodTarget("org.eclipse.jdt.internal.core.dom.rewrite.ASTRewriteAnalyzer", "visit"))
+				.methodToReplace(new Hook("org.eclipse.jdt.internal.core.dom.rewrite.TokenScanner", "getTokenEndOffset", "int", "int", "int"))
+				.replacementMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getTokenEndOffsetFixed", "int", "org.eclipse.jdt.internal.core.dom.rewrite.TokenScanner", "int", "int", "java.lang.Object"))
+				.requestExtra(StackRequest.PARAM1)
+				.transplant()
+				.build());
+		
+	}
+
 	private static void patchPostCompileHookEclipse(ScriptManager sm) {
 		sm.addScript(ScriptBuilder.wrapMethodCall()
 				.target(new MethodTarget("org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder", "writeClassFileContents"))
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
index 949cf711..a331a49e 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
@@ -32,11 +32,13 @@ import java.util.List;
 import lombok.core.DiagnosticsReceiver;
 import lombok.core.PostCompiler;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.IAnnotatable;
 import org.eclipse.jdt.core.IAnnotation;
 import org.eclipse.jdt.core.IMethod;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.internal.compiler.ast.Annotation;
+import org.eclipse.jdt.internal.core.dom.rewrite.TokenScanner;
 
 public class PatchFixes {
 	public static int fixRetrieveStartingCatchPosition(int original, int start) {
@@ -80,6 +82,17 @@ public class PatchFixes {
 		}
 	}
 	
+	public static int getTokenEndOffsetFixed(TokenScanner scanner, int token, int startOffset, Object domNode) throws CoreException {
+		boolean isGenerated = false;
+		try {
+			isGenerated = (Boolean) domNode.getClass().getField("$isGenerated").get(domNode);
+		} catch (Exception e) {
+			// If this fails, better to break some refactor scripts than to crash eclipse.
+		}
+		if (isGenerated) return -1;
+		return scanner.getTokenEndOffset(token, startOffset);
+	}
+	
 	public static IMethod[] removeGeneratedMethods(IMethod[] methods) throws Exception {
 		List<IMethod> result = new ArrayList<IMethod>();
 		for (IMethod m : methods) {