1 files changed, 28 insertions, 2 deletions

diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 78c20d39..a41264e8 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -106,6 +106,7 @@ import lombok.javac.Javac;
 import lombok.javac.JavacAugments;
 import lombok.javac.JavacNode;
 import lombok.javac.JavacTreeMaker;
+import lombok.javac.JavacTreeMaker.TypeTag;
 import lombok.permit.Permit;
 
 /**
@@ -1286,6 +1287,7 @@ public class JavacHandlerUtil {
 		static Type classEnter(JCTree tree, JavacNode parent) {
 			Enter enter = Enter.instance(parent.getContext());
 			Env<AttrContext> classEnv = enter.getEnv((TypeSymbol) parent.getElement());
+			if (classEnv == null) return null;
 			Type type = (Type) Permit.invokeSneaky(classEnter, enter, tree, classEnv);
 			if (type == null) return null;
 			type.complete();
@@ -1902,7 +1904,7 @@ public class JavacHandlerUtil {
 	
 	public static JCExpression namePlusTypeParamsToTypeReference(JavacTreeMaker maker, JavacNode parentType, Name typeName, boolean instance, List<JCTypeParameter> params, List<JCAnnotation> annotations) {
 		JCExpression r = null;
-		if (parentType != null && parentType.getKind() == Kind.TYPE) {
+		if (parentType != null && parentType.getKind() == Kind.TYPE && !parentType.getName().isEmpty()) {
 			JCClassDecl td = (JCClassDecl) parentType.get();
 			boolean outerInstance = instance && ((td.mods.flags & Flags.STATIC) == 0);
 			List<JCTypeParameter> outerParams = instance ? td.typarams : List.<JCTypeParameter>nil();
@@ -1979,6 +1981,13 @@ public class JavacHandlerUtil {
 	}
 	
 	/**
+	 * Returns {@code true} if the provided node is an actual class, an enum or a record and not some other type declaration (so, not an annotation definition or interface).
+	 */
+	public static boolean isClassEnumOrRecord(JavacNode typeNode) {
+		return isClassAndDoesNotHaveFlags(typeNode, Flags.INTERFACE | Flags.ANNOTATION);
+	}
+	
+	/**
 	 * Returns {@code true} if the provided node is a record declaration (so, not an annotation definition, interface, enum, or plain class).
 	 */
 	public static boolean isRecord(JavacNode typeNode) {
@@ -1994,6 +2003,21 @@ public class JavacHandlerUtil {
 		return (typeDeclflags & flags) == 0;
 	}
 	
+	/**
+	 * Returns {@code true} if the provided node supports static methods and types (top level or static class)
+	 */
+	public static boolean isStaticAllowed(JavacNode typeNode) {
+		boolean staticAllowed = true;
+		
+		while (typeNode.getKind() != Kind.COMPILATION_UNIT) {
+			if (!staticAllowed) return false;
+			
+			staticAllowed = typeNode.isStatic();
+			typeNode = typeNode.up();
+		}
+		return true;
+	}
+	
 	public static JavacNode upToTypeNode(JavacNode node) {
 		if (node == null) throw new NullPointerException("node");
 		while ((node != null) && !(node.get() instanceof JCClassDecl)) node = node.up();
@@ -2028,7 +2052,9 @@ public class JavacHandlerUtil {
 	private static JCExpression cloneType0(JavacTreeMaker maker, JCTree in) {
 		if (in == null) return null;
 		
-		if (in instanceof JCPrimitiveTypeTree) return (JCExpression) in;
+		if (in instanceof JCPrimitiveTypeTree) {
+			return maker.TypeIdent(TypeTag.typeTag(in));
+		}
 		
 		if (in instanceof JCIdent) {
 			return maker.Ident(((JCIdent) in).name);