Fixed Help Content in Eclipse / ecj support.

- Moved Completion proposal code to the PatchExtensionMethodCompletionProposal
class
- Moved out error reporting from EclipseAST.
- Fixed error reporting of the portals.

1 files changed, 32 insertions, 16 deletions

diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java
index dacd81b4..5342ecab 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java
@@ -40,12 +40,16 @@ public class PatchValEclipsePortal {
 			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
 			//do anything useful here.
 		} catch (IllegalAccessException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e);
 		} catch (InvocationTargetException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e.getCause());
 		} catch (NullPointerException e) {
-			e.initCause(Reflection.problem);
-			throw e;
+			if (!"false".equals(System.getProperty("lombok.debug.reflection", "false"))) {
+				e.initCause(Reflection.problem);
+				throw e;
+			}
+			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
+			//do anything useful here.
 		}
 	}
 	
@@ -56,12 +60,16 @@ public class PatchValEclipsePortal {
 			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
 			//do anything useful here.
 		} catch (IllegalAccessException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e);
 		} catch (InvocationTargetException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e.getCause());
 		} catch (NullPointerException e) {
-			e.initCause(Reflection.problem);
-			throw e;
+			if (!"false".equals(System.getProperty("lombok.debug.reflection", "false"))) {
+				e.initCause(Reflection.problem);
+				throw e;
+			}
+			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
+			//do anything useful here.
 		}
 	}
 	
@@ -72,12 +80,16 @@ public class PatchValEclipsePortal {
 			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
 			//do anything useful here.
 		} catch (IllegalAccessException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e);
 		} catch (InvocationTargetException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e.getCause());
 		} catch (NullPointerException e) {
-			e.initCause(Reflection.problem);
-			throw e;
+			if (!"false".equals(System.getProperty("lombok.debug.reflection", "false"))) {
+				e.initCause(Reflection.problem);
+				throw e;
+			}
+			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
+			//do anything useful here.
 		}
 	}
 	
@@ -88,12 +100,16 @@ public class PatchValEclipsePortal {
 			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
 			//do anything useful here.
 		} catch (IllegalAccessException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e);
 		} catch (InvocationTargetException e) {
-			Lombok.sneakyThrow(e);
+			throw Lombok.sneakyThrow(e.getCause());
 		} catch (NullPointerException e) {
-			e.initCause(Reflection.problem);
-			throw e;
+			if (!"false".equals(System.getProperty("lombok.debug.reflection", "false"))) {
+				e.initCause(Reflection.problem);
+				throw e;
+			}
+			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
+			//do anything useful here. 
 		}
 	}