From 01702f70d063b7c7685f8c4de94e6d1718047390 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <r.zwitserloot@projectlombok.org>
Date: Sun, 18 Apr 2021 05:44:12 +0200
Subject: [StandardException] generate an error if the annotation is on a class
 that extends nothing.

---
 src/core/lombok/eclipse/handlers/HandleStandardException.java | 8 +++++++-
 src/core/lombok/javac/handlers/HandleStandardException.java   | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/lombok/eclipse/handlers/HandleStandardException.java b/src/core/lombok/eclipse/handlers/HandleStandardException.java
index 1a2542f4..def6e495 100755
--- a/src/core/lombok/eclipse/handlers/HandleStandardException.java
+++ b/src/core/lombok/eclipse/handlers/HandleStandardException.java
@@ -48,7 +48,13 @@ public class HandleStandardException extends EclipseAnnotationHandler<StandardEx
 		
 		EclipseNode typeNode = annotationNode.up();
 		if (!isClass(typeNode)) {
-			annotationNode.addError("@StandardException is only supported on a class.");
+			annotationNode.addError("@StandardException is only supported on a class");
+			return;
+		}
+		
+		TypeDeclaration classDef = (TypeDeclaration) typeNode.get();
+		if (classDef.superclass == null) {
+			annotationNode.addError("@StandardException requires that you extend a Throwable type");
 			return;
 		}
 		
diff --git a/src/core/lombok/javac/handlers/HandleStandardException.java b/src/core/lombok/javac/handlers/HandleStandardException.java
index 39913a90..ea1a0c5c 100644
--- a/src/core/lombok/javac/handlers/HandleStandardException.java
+++ b/src/core/lombok/javac/handlers/HandleStandardException.java
@@ -59,6 +59,12 @@ public class HandleStandardException extends JavacAnnotationHandler<StandardExce
 			return;
 		}
 		
+		JCClassDecl classDef = (JCClassDecl) typeNode.get();
+		if (classDef.extending == null) {
+			annotationNode.addError("@StandardException requires that you extend a Throwable type");
+			return;
+		}
+		
 		AccessLevel access = annotation.getInstance().access();
 		if (access == null) access = AccessLevel.PUBLIC;
 		if (access == AccessLevel.NONE) {
-- 
cgit