Description: Fixes the compatibility with Java 17
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/delombok/lombok/delombok/PrettyPrinter.java
+++ b/src/delombok/lombok/delombok/PrettyPrinter.java
@@ -1,16 +1,16 @@
 /*
  * Copyright (C) 2016-2025 The Project Lombok Authors.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
 
 import static com.sun.tools.javac.code.Flags.*;
 import static lombok.javac.Javac.*;
+import lombok.javac.Javac;
 import static lombok.javac.JavacTreeMaker.TreeTag.treeTag;
 import static lombok.javac.JavacTreeMaker.TypeTag.typeTag;
 
@@ -103,10 +104,10 @@
 public class PrettyPrinter extends JCTree.Visitor {
 	private static final String LINE_SEP = System.getProperty("line.separator");
 	private static final Map<TreeTag, String> OPERATORS;
-	
+
 	static {
 		Map<TreeTag, String> map = new HashMap<TreeTag, String>();
-		
+
 		map.put(treeTag("POS"), "+");
 		map.put(treeTag("NEG"), "-");
 		map.put(treeTag("NOT"), "!");
@@ -135,7 +136,7 @@
 		map.put(treeTag("MUL"), "*");
 		map.put(treeTag("DIV"), "/");
 		map.put(treeTag("MOD"), "%");
-		
+
 		map.put(treeTag("BITOR_ASG"), "|=");
 		map.put(treeTag("BITXOR_ASG"), "^=");
 		map.put(treeTag("BITAND_ASG"), "&=");
@@ -147,20 +148,20 @@
 		map.put(treeTag("MUL_ASG"), "*=");
 		map.put(treeTag("DIV_ASG"), "/=");
 		map.put(treeTag("MOD_ASG"), "%=");
-		
+
 		OPERATORS = map;
 	}
-	
+
 	private final Writer out;
 	private final JCCompilationUnit compilationUnit;
 	private List<CommentInfo> comments;
 	private final int[] textBlockStarts;
 	private final FormatPreferences formatPreferences;
-	
+
 	private final Map<JCTree, String> docComments;
 	private final DocCommentTable docTable;
 	private int indent = 0;
-	
+
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public PrettyPrinter(Writer out, JCCompilationUnit cu, List<CommentInfo> comments, int[] textBlockStarts, FormatPreferences preferences) {
 		this.out = out;
@@ -168,7 +169,7 @@
 		this.textBlockStarts = textBlockStarts;
 		this.compilationUnit = cu;
 		this.formatPreferences = preferences;
-		
+
 		/* load doc comments */ {
 			Object dc = getDocComments(compilationUnit);
 			if (dc instanceof Map<?, ?>) {
@@ -183,19 +184,19 @@
 			}
 		}
 	}
-	
+
 	private int endPos(JCTree tree) {
 		return getEndPosition(tree, compilationUnit);
 	}
-	
+
 	private boolean needsAlign, needsNewLine, onNewLine = true, needsSpace, aligned;
-	
+
 	public static final class UncheckedIOException extends RuntimeException {
 		UncheckedIOException(IOException source) {
 			super(toMsg(source));
 			setStackTrace(source.getStackTrace());
 		}
-		
+
 		private static String toMsg(Throwable t) {
 			String msg = t.getMessage();
 			String n = t.getClass().getSimpleName();
@@ -203,7 +204,7 @@
 			return n + ": " + msg;
 		}
 	}
-	
+
 	private void align() {
 		if (!onNewLine) return;
 		try {
@@ -211,23 +212,23 @@
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
-		
+
 		onNewLine = false;
 		aligned = true;
 		needsAlign = false;
 	}
-	
+
 	private void print(JCTree tree) {
 		if (tree == null) {
 			print("/*missing*/");
 			return;
 		}
-		
+
 		consumeComments(tree);
 		tree.accept(this);
 		consumeTrailingComments(endPos(tree));
 	}
-	
+
 	private void print(List<? extends JCTree> trees, String infix) {
 		boolean first = true;
 		JCTree prev = null;
@@ -242,13 +243,13 @@
 			prev = tree;
 		}
 	}
-	
+
 	private boolean suppress(JCTree tree) {
 		if (tree instanceof JCBlock) {
 			JCBlock block = (JCBlock) tree;
 			return (Position.NOPOS == block.pos) && block.stats.isEmpty();
 		}
-		
+
 		if (tree instanceof JCExpressionStatement) {
 			JCExpression expr = ((JCExpressionStatement)tree).expr;
 			if (expr instanceof JCMethodInvocation) {
@@ -259,10 +260,10 @@
 				return ((JCIdent) inv.meth).name.toString().equals("super");
 			}
 		}
-		
+
 		return false;
 	}
-	
+
 	private void print(Name name) {
 		if (name.isEmpty()) {
 			print("_");
@@ -270,7 +271,7 @@
 			print(name.toString());
 		}
 	}
-	
+
 	private void print(CharSequence s) {
 		boolean align = needsAlign;
 		if (needsNewLine && !onNewLine) println();
@@ -281,24 +282,24 @@
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
-		
+
 		needsSpace = false;
 		onNewLine = false;
 		aligned = false;
 	}
-	
+
 	private void println() {
 		try {
 			out.write(LINE_SEP);
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
-		
+
 		onNewLine = true;
 		aligned = false;
 		needsNewLine = false;
 	}
-	
+
 	private void println(JCTree completed) {
 		if (completed != null) {
 			int endPos = endPos(completed);
@@ -309,39 +310,39 @@
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
-		
+
 		onNewLine = true;
 		aligned = false;
 		needsNewLine = false;
 	}
-	
+
 	private void println(CharSequence s) {
 		print(s);
 		println();
 	}
-	
+
 	private void println(CharSequence s, JCTree completed) {
 		print(s);
 		println(completed);
 	}
-	
+
 	private void aPrint(CharSequence s) {
 		align();
 		print(s);
 	}
-	
+
 	private void aPrintln(CharSequence s) {
 		align();
 		print(s);
 		println();
 	}
-	
+
 	private void aPrintln(CharSequence s, JCTree completed) {
 		align();
 		print(s);
 		println(completed);
 	}
-	
+
 	private void consumeComments(int until) {
 		CommentInfo head = comments.head;
 		while (comments.nonEmpty() && head.pos < until) {
@@ -350,16 +351,16 @@
 			head = comments.head;
 		}
 	}
-	
+
 	private void consumeComments(JCTree tree) {
 		consumeComments(tree.pos);
 	}
-	
+
 	private void consumeTrailingComments(int from) {
 		boolean prevNewLine = onNewLine;
 		CommentInfo head = comments.head;
 		boolean stop = false;
-		
+
 		while (comments.nonEmpty() && head.prevEndPos == from && !stop && !(head.start == StartConnection.ON_NEXT_LINE || head.start == StartConnection.START_OF_LINE)) {
 			from = head.endPos;
 			printComment(head);
@@ -367,18 +368,18 @@
 			comments = comments.tail;
 			head = comments.head;
 		}
-		
+
 		if (!onNewLine && prevNewLine) {
 			println();
 		}
 	}
-	
+
 	private String getJavadocFor(JCTree node) {
 		if (docComments != null) return docComments.get(node);
 		if (docTable != null) return docTable.getCommentText(node);
 		return null;
 	}
-	
+
 	private int dims(JCExpression vartype) {
 		if (vartype instanceof JCArrayTypeTree) {
 			return 1 + dims(((JCArrayTypeTree) vartype).elemtype);
@@ -386,10 +387,10 @@
 			JCTree underlyingType = readObject(vartype, "underlyingType", (JCTree) null);
 			if (underlyingType instanceof JCArrayTypeTree) return 1 + dims (((JCArrayTypeTree) underlyingType).elemtype);
 		}
-		
+
 		return 0;
 	}
-	
+
 	private void printComment(CommentInfo comment) {
 		switch (comment.start) {
 		case DIRECT_AFTER_PREVIOUS:
@@ -411,11 +412,11 @@
 			}
 			break;
 		}
-		
+
 		if (onNewLine && !aligned && comment.start != StartConnection.START_OF_LINE) needsAlign = true;
-		
+
 		print(comment.content);
-		
+
 		switch (comment.end) {
 		case ON_NEXT_LINE:
 			if (!aligned) {
@@ -431,32 +432,32 @@
 			break;
 		}
 	}
-	
+
 	private void printDocComment(JCTree tree) {
 		String dc = getJavadocFor(tree);
 		if (dc == null) return;
-		
+
 		aPrintln("/**");
 		boolean atStart = true;
-		
+
 		for (String line : dc.split("\\r?\\n")) {
 			if (atStart && line.trim().isEmpty()) {
 				atStart = false;
 				continue;
 			}
-			
+
 			atStart = false;
 			aPrint(" *");
 			if (!line.isEmpty() && !Character.isWhitespace(line.charAt(0))) {
 				print(" ");
 			}
-			
+
 			println(line);
 		}
-		
+
 		aPrintln(" */");
 	}
-	
+
 	private Name __INIT__, __VALUE__;
 	private Name name_init(Name someName) {
 		if (__INIT__ == null) __INIT__ = someName.table.fromChars("<init>".toCharArray(), 0, 6);
@@ -466,7 +467,7 @@
 		if (__VALUE__ == null) __VALUE__ = someName.table.fromChars("value".toCharArray(), 0, 5);
 		return __VALUE__;
 	}
-	
+
 	@Override public void visitTopLevel(JCCompilationUnit tree) {
 		printDocComment(tree);
 		JCTree n = PackageName.getPackageNode(tree);
@@ -476,23 +477,23 @@
 			print(n);
 			println(";", n);
 		}
-		
+
 		boolean first = true;
-		
+
 		for (JCTree child : tree.defs) {
 			if (!(child instanceof JCImport)) continue;
 			if (first) println();
 			first = false;
 			print(child);
 		}
-		
+
 		for (JCTree child : tree.defs) {
 			if (child instanceof JCImport) continue;
 			print(child);
 		}
 		consumeComments(Integer.MAX_VALUE);
 	}
-	
+
 	@Override public void visitImport(JCImport tree) {
 		JCTree qualid = Javac.getQualid(tree);
 		if (qualid instanceof JCFieldAccess) {
@@ -507,74 +508,74 @@
 				}
 			}
 		}
-		
+
 		aPrint("import ");
 		if (tree.staticImport) print("static ");
 		print(qualid);
 		println(";", tree);
 	}
-	
+
 	void printModuleImport(JCTree tree) {
 		JCExpression qualid = readObject(tree, "module", null);
-		
+
 		aPrint("import module ");
 		print(qualid);
 		println(";", tree);
 	}
-	
+
 	private Name currentTypeName;
 	@Override public void visitClassDef(JCClassDecl tree) {
-		if ((tree.mods.flags & IMPLICIT_CLASS) != 0) {
+		if ((tree.mods.flags & Javac.IMPLICIT_CLASS) != 0) {
 			printClassMembers(tree.defs, false, false);
 			consumeComments(endPos(tree));
 			return;
 		}
-		
+
 		println();
 		printDocComment(tree);
 		align();
 		print(tree.mods);
-		
+
 		boolean isInterface = (tree.mods.flags & INTERFACE) != 0;
 		boolean isAnnotationInterface = isInterface && (tree.mods.flags & ANNOTATION) != 0;
 		boolean isEnum = (tree.mods.flags & ENUM) != 0;
-		boolean isRecord = (tree.mods.flags & RECORD) != 0;
-		
+		boolean isRecord = (tree.mods.flags & Javac.RECORD) != 0;
+
 		if (isAnnotationInterface) print("@interface ");
 		else if (isInterface) print("interface ");
 		else if (isEnum) print("enum ");
 		else if (isRecord) print("record ");
 		else print("class ");
-		
+
 		print(tree.name);
 		Name prevTypeName = currentTypeName;
 		currentTypeName = tree.name;
-		
+
 		if (tree.typarams.nonEmpty()) {
 			print("<");
 			print(tree.typarams, ", ");
 			print(">");
 		}
-		
+
 		if (isRecord) printRecordConstructor(tree.defs);
-		
+
 		JCTree extendsClause = getExtendsClause(tree);
 		if (extendsClause != null) {
 			print(" extends ");
 			print(extendsClause);
 		}
-		
+
 		if (tree.implementing.nonEmpty()) {
 			print(isInterface ? " extends " : " implements ");
 			print(tree.implementing, ", ");
 		}
-		
+
 		List<JCExpression> permitting = readObject(tree, "permitting", List.<JCExpression>nil());
 		if (permitting.nonEmpty()) {
 			print(" permits ");
 			print(permitting, ", ");
 		}
-		
+
 		println(" {");
 		indent++;
 		printClassMembers(tree.defs, isEnum, isInterface);
@@ -583,14 +584,14 @@
 		aPrintln("}", tree);
 		currentTypeName = prevTypeName;
 	}
-	
+
 	private void printRecordConstructor(List<JCTree> members) {
 		boolean first = true;
 		print("(");
 		for (JCTree member : members) {
 			if (member instanceof JCVariableDecl) {
 			JCVariableDecl variableDecl = (JCVariableDecl) member;
-				if ((variableDecl.mods.flags & GENERATED_MEMBER) != 0) {
+				if ((variableDecl.mods.flags & Javac.GENERATED_MEMBER) != 0) {
 					if (!first) print(", ");
 					first = false;
 					printAnnotations(variableDecl.mods.annotations, false);
@@ -600,12 +601,12 @@
 		}
 		print(")");
 	}
-	
+
 	private void printClassMembers(List<JCTree> members, boolean isEnum, boolean isInterface) {
 		Class<?> prefType = null;
 		int typeOfPrevEnumMember = isEnum ? 3 : 0; // 1 = normal, 2 = with body, 3 = no enum field yet.
 		boolean prevWasEnumMember = isEnum;
-		
+
 		for (JCTree member : members) {
 			if (typeOfPrevEnumMember == 3 && member instanceof JCMethodDecl && (((JCMethodDecl) member).mods.flags & GENERATEDCONSTR) != 0) continue;
 			boolean isEnumVar = isEnum && member instanceof JCVariableDecl && (((JCVariableDecl) member).mods.flags & ENUM) != 0;
@@ -614,7 +615,7 @@
 				if (typeOfPrevEnumMember == 3) align();
 				println(";");
 			}
-			
+
 			if (isEnumVar) {
 				if (prefType != null && prefType != JCVariableDecl.class) println();
 				switch (typeOfPrevEnumMember) {
@@ -630,7 +631,7 @@
 				JCTree init = ((JCVariableDecl) member).init;
 				typeOfPrevEnumMember = init instanceof JCNewClass && ((JCNewClass) init).def != null ? 2 : 1;
 			} else if (member instanceof JCVariableDecl) {
-				if ((((JCVariableDecl) member).mods.flags & GENERATED_MEMBER) != 0) continue;
+				if ((((JCVariableDecl) member).mods.flags & Javac.GENERATED_MEMBER) != 0) continue;
 				if (prefType != null && prefType != JCVariableDecl.class) println();
 				if (isInterface) flagMod = -1L & ~(PUBLIC | STATIC | FINAL);
 				print(member);
@@ -647,17 +648,17 @@
 				if (prefType != null) println();
 				print(member);
 			}
-			
+
 			prefType = member.getClass();
 		}
-		
+
 		if (prevWasEnumMember) {
 			prevWasEnumMember = false;
 			if (typeOfPrevEnumMember == 3) align();
 			println(";");
 		}
 	}
-	
+
 	@Override public void visitTypeParameter(JCTypeParameter tree) {
 		List<JCExpression> annotations = readObject(tree, "annotations", List.<JCExpression>nil());
 		if (!annotations.isEmpty()) {
@@ -671,7 +672,7 @@
 		}
 		consumeComments(tree);
 	}
-	
+
 	@Override public void visitVarDef(JCVariableDecl tree) {
 		printDocComment(tree);
 		align();
@@ -684,28 +685,28 @@
 		printVarDef0(tree);
 		println(";", tree);
 	}
-	
+
 	private void printVarDefInline(JCVariableDecl tree) {
 		printAnnotations(tree.mods.annotations, false);
 		printModifierKeywords(tree.mods);
 		printVarDef0(tree);
 	}
-	
+
 	private boolean innermostArrayBracketsAreVarargs = false;
 	private void printVarDef0(JCVariableDecl tree) {
 		boolean varargs = (tree.mods.flags & VARARGS) != 0;
-		
+
 		/* story time!
-		 
+
 		 in 'new int[5][6];', the 5 is the outermost and the 6 is the innermost: That means: 5 int arrays, each capable of containing 6 elements.
 		 But that's actually a crazy way to read it; you'd think that in FOO[], you should interpret that as 'an array of FOO', but that's not correct;
 		 if FOO is for example 'int[]', it's: "Modify the component type of FOO to be an array of whatever it was before.. unless FOO isn't an array, in which case,
 		 this is an array of FOO". Which is weird.
-		 
+
 		 This is particularly poignant with vargs. In: "int[]... x", the ... are actually the _INNER_ type even though varargs by definition is a modification of
 		 how to interpret the outer. The JLS just sort of lets that be: To indicate varargs, replace the lexically last [] with dots even though that's the wrong
 		 [] to modify!
-		 
+
 		 This becomes an utter shambles when annotations-on-arrays become involved. The annotation on the INNER most type is to be placed right before the ...;
 		 and because of that, we have to do crazy stuff with this innermostArrayBracketsAreVarargs flag.
 		 */
@@ -726,7 +727,7 @@
 			print(tree.init);
 		}
 	}
-	
+
 	private void printEnumMember(JCVariableDecl tree) {
 		printAnnotations(tree.mods.annotations, true);
 		print(tree.name);
@@ -737,7 +738,7 @@
 				print(constructor.args, ", ");
 				print(")");
 			}
-			
+
 			if (constructor.def != null && constructor.def.defs != null) {
 				println(" {");
 				indent++;
@@ -748,10 +749,10 @@
 			}
 		}
 	}
-	
+
 	// TODO: Test postfix syntax for methods (?), for decls. Multiline vardefs, possibly with comments. enums with bodies. constructor-local generics, method-local generics, also do/while, finally, try-with-resources, lambdas, annotations in java8 places...
 	// TODO: Whatever is JCAnnotatedType? We handle it in the 7+ bucket in the old one...
-	
+
 	@Override public void visitTypeApply(JCTypeApply tree) {
 		print(tree.clazz);
 		print("<");
@@ -761,7 +762,7 @@
 		innermostArrayBracketsAreVarargs = temp;
 		print(">");
 	}
-	
+
 	@Override public void visitWildcard(JCWildcard tree) {
 		switch (tree.getKind()) {
 		default:
@@ -778,7 +779,7 @@
 			return;
 		}
 	}
-	
+
 	@Override public void visitLiteral(JCLiteral tree) {
 		TypeTag typeTag = typeTag(tree);
 		if (CTC_INT.equals(typeTag)) print("" + tree.value);
@@ -798,7 +799,7 @@
 			}
 		}
 	}
-	
+
 	private void printTextBlock(String s) {
 		println("\"\"\"");
 		needsAlign = true;
@@ -822,7 +823,7 @@
 		print("\"\"\"");
 		indent--;
 	}
-	
+
 	@Override public void visitMethodDef(JCMethodDecl tree) {
 		boolean isConstructor = tree.name == name_init(tree.name);
 		if (isConstructor && (tree.mods.flags & GENERATEDCONSTR) != 0) return;
@@ -834,7 +835,7 @@
 			print(tree.typarams, ", ");
 			print("> ");
 		}
-		
+
 		if (isConstructor) {
 			print(currentTypeName == null ? "<init>" : currentTypeName);
 		} else {
@@ -842,22 +843,22 @@
 			print(" ");
 			print(tree.name);
 		}
-		
+
 		boolean argsLessConstructor = false;
-		if (isConstructor && (tree.mods.flags & COMPACT_RECORD_CONSTRUCTOR) != 0) {
+		if (isConstructor && (tree.mods.flags & Javac.COMPACT_RECORD_CONSTRUCTOR) != 0) {
 			argsLessConstructor = true;
 		}
-		
+
 		boolean first = true;
 		if (!argsLessConstructor) {
 			print("(");
-			
+
 			JCVariableDecl recvparam = readObject(tree, "recvparam", null);
 			if (recvparam != null) {
 				printVarDefInline(recvparam);
 				first = false;
 			}
-			
+
 			for (JCVariableDecl param : tree.params) {
 				if (!first) print(", ");
 				first = false;
@@ -865,30 +866,30 @@
 			}
 			print(")");
 		}
-		
+
 		if (tree.thrown.nonEmpty()) {
 			print(" throws ");
 			print(tree.thrown, ", ");
 		}
-		
+
 		if (tree.defaultValue != null) {
 			print(" default ");
 			print(tree.defaultValue);
 		}
-		
+
 		if (tree.body != null) {
 			print(" ");
 			print(tree.body);
 		} else println(";", tree);
 	}
-	
+
 	@Override public void visitSkip(JCSkip that) {
 		if (onNewLine && !aligned) {
 			align();
 		}
 		println(";");
 	}
-	
+
 	@Override public void visitAnnotation(JCAnnotation tree) {
 		print("@");
 		print(tree.annotationType);
@@ -906,32 +907,32 @@
 		if (!done) print(tree.args, ", ");
 		print(")");
 	}
-	
+
 	@Override public void visitTypeArray(JCArrayTypeTree tree) {
 		printTypeArray0(tree);
 	}
-	
+
 	@Override public void visitNewArray(JCNewArray tree) {
 		JCTree elem = tree.elemtype;
 		int dims = 0;
 		if (elem != null) {
 			print("new ");
-			
+
 			while (elem instanceof JCArrayTypeTree) {
 				dims++;
 				elem = ((JCArrayTypeTree) elem).elemtype;
 			}
 			print(elem);
-			
+
 			for (JCExpression expr : tree.dims) {
 				print("[");
 				print(expr);
 				print("]");
 			}
 		}
-		
+
 		for (int i = 0; i < dims; i++) print("[]");
-		
+
 		if (tree.elems != null) {
 			if (elem != null) print("[] ");
 			print("{");
@@ -939,7 +940,7 @@
 			print("}");
 		}
 	}
-	
+
 	@Override public void visitNewClass(JCNewClass tree) {
 		if (tree.encl != null) {
 			print(tree.encl);
@@ -950,7 +951,7 @@
 			print(((JCUnary) tree.args.head).arg);
 			print(".");
 		}
-		
+
 		print("new ");
 		if (!tree.typeargs.isEmpty()) {
 			print("<");
@@ -976,17 +977,17 @@
 			currentTypeName = previousTypeName;
 		}
 	}
-	
+
 	@Override public void visitIndexed(JCArrayAccess tree) {
 		print(tree.indexed);
 		print("[");
 		print(tree.index);
 		print("]");
 	}
-	
+
 	@Override public void visitTypeIdent(JCPrimitiveTypeTree tree) {
 		TypeTag typeTag = typeTag(tree);
-		
+
 		if (CTC_BYTE.equals(typeTag)) print("byte");
 		else if (CTC_CHAR.equals(typeTag)) print("char");
 		else if (CTC_SHORT.equals(typeTag)) print("short");
@@ -998,7 +999,7 @@
 		else if (CTC_VOID.equals(typeTag)) print("void");
 		else print("error");
 	}
-	
+
 	@Override public void visitLabelled(JCLabeledStatement tree) {
 		aPrint(tree.label);
 		print(":");
@@ -1012,15 +1013,15 @@
 			print(tree.body);
 		}
 	}
-	
+
 	private long flagMod = -1L;
 	private static final long DEFAULT = 1L<<43;
-	
+
 	@Override public void visitModifiers(JCModifiers tree) {
 		printAnnotations(tree.annotations, true);
 		printModifierKeywords(tree);
 	}
-	
+
 	private void printAnnotations(List<JCAnnotation> annotations, boolean newlines) {
 		for (JCAnnotation ann : annotations) {
 			print(ann);
@@ -1030,11 +1031,11 @@
 			} else print(" ");
 		}
 	}
-	
+
 	private void printModifierKeywords(JCModifiers tree) {
 		long v = flagMod & tree.flags;
 		flagMod = -1L;
-		
+
 		if ((v & SYNTHETIC) != 0) print("/* synthetic */ ");
 		if ((v & PUBLIC) != 0) print("public ");
 		if ((v & PRIVATE) != 0) print("private ");
@@ -1046,22 +1047,22 @@
 		if ((v & TRANSIENT) != 0) print("transient ");
 		if ((v & NATIVE) != 0) print("native ");
 		if ((v & ABSTRACT) != 0) print("abstract ");
-		if ((v & SEALED) != 0) print("sealed ");
-		if ((v & NON_SEALED) != 0) print("non-sealed "); // Yes, this is a real keyword.
+		if ((v & Javac.SEALED) != 0) print("sealed ");
+		if ((v & Javac.NON_SEALED) != 0) print("non-sealed "); // Yes, this is a real keyword.
 		if ((v & STRICTFP) != 0) print("strictfp ");
 		if ((v & DEFAULT) != 0 && (v & INTERFACE) == 0) print("default ");
 	}
-	
+
 	@Override public void visitSelect(JCFieldAccess tree) {
 		print(tree.selected);
 		print(".");
 		print(tree.name);
 	}
-	
+
 	@Override public void visitIdent(JCIdent tree) {
 		print(tree.name);
 	}
-	
+
 	@Override public void visitApply(JCMethodInvocation tree) {
 		if (tree.typeargs.nonEmpty()) {
 			if (tree.meth instanceof JCFieldAccess) {
@@ -1080,12 +1081,12 @@
 		} else {
 			print(tree.meth);
 		}
-		
+
 		print("(");
 		print(tree.args, ", ");
 		print(")");
 	}
-	
+
 	@Override public void visitAssert(JCAssert tree) {
 		aPrint("assert ");
 		print(tree.cond);
@@ -1095,22 +1096,22 @@
 		}
 		println(";", tree);
 	}
-	
+
 	@Override public void visitAssign(JCAssign tree) {
 		print(tree.lhs);
 		print(" = ");
 		print(tree.rhs);
 	}
-	
+
 	@Override public void visitAssignop(JCAssignOp tree) {
 		print(tree.lhs);
 		String opname = operator(treeTag(tree));
 		print(" " + opname + " ");
 		print(tree.rhs);
 	}
-	
+
 	private static final int PREFIX = 14;
-	
+
 	@Override public void visitUnary(JCUnary tree) {
 		String op = operator(treeTag(tree));
 		if (treeTag(tree).getOperatorPrecedenceLevel() == PREFIX) {
@@ -1121,7 +1122,7 @@
 			print(op);
 		}
 	}
-	
+
 	@Override public void visitBinary(JCBinary tree) {
 		String op = operator(treeTag(tree));
 		print(tree.lhs);
@@ -1130,24 +1131,24 @@
 		print(" ");
 		print(tree.rhs);
 	}
-	
+
 	@Override public void visitTypeTest(JCInstanceOf tree) {
 		print(tree.expr);
 		print(" instanceof ");
-		
+
 		/** With java14, instead of a type (field 'clazz'), there's now a pattern (field 'pattern', of type JCTree, which is either a JCPattern for new-style instanceof, or if not it's the same as what 'clazz' held) */
 		JCTree c = readObject(tree, "clazz", null); // JDK-13
 		if (c == null) c = readObject(tree, "pattern", null); // JDK14+
 		print(c);
 	}
-	
+
 	@Override public void visitTypeCast(JCTypeCast tree) {
 		print("(");
 		print(tree.clazz);
 		print(") ");
 		print(tree.expr);
 	}
-	
+
 	@Override public void visitBlock(JCBlock tree) {
 		if (tree.pos == Position.NOPOS && tree.stats.isEmpty()) return;
 		if (onNewLine) align();
@@ -1159,10 +1160,10 @@
 		indent--;
 		aPrintln("}", tree);
 	}
-	
+
 	@Override public void visitBreak(JCBreak tree) {
 		aPrint("break");
-		
+
 		JCExpression value = readObject(tree, "value", null); // JDK 12+
 		if (value != null) {
 			print(" ");
@@ -1176,7 +1177,7 @@
 		}
 		println(";", tree);
 	}
-	
+
 	@Override public void visitContinue(JCContinue tree) {
 		aPrint("continue");
 		if (tree.label != null) {
@@ -1185,7 +1186,7 @@
 		}
 		println(";", tree);
 	}
-	
+
 	@Override public void visitConditional(JCConditional tree) {
 		print(tree.cond);
 		print(" ? ");
@@ -1193,13 +1194,13 @@
 		print(" : ");
 		print(tree.falsepart);
 	}
-	
+
 	@Override public void visitParens(JCParens tree) {
 		print("(");
 		print(tree.expr);
 		print(")");
 	}
-	
+
 	@Override public void visitReturn(JCReturn tree) {
 		aPrint("return");
 		if (tree.expr != null) {
@@ -1208,13 +1209,13 @@
 		}
 		println(";", tree);
 	}
-	
+
 	@Override public void visitThrow(JCThrow tree) {
 		aPrint("throw ");
 		print(tree.expr);
 		println(";", tree);
 	}
-	
+
 	@Override public void visitWhileLoop(JCWhileLoop tree) {
 		aPrint("while ");
 		if (tree.cond instanceof JCParens) {
@@ -1228,7 +1229,7 @@
 		print(tree.body);
 		// make sure to test while (true) ; and while(true){} and while(true) x = 5;
 	}
-	
+
 	@Override public void visitForLoop(JCForLoop tree) {
 		aPrint("for (");
 		if (tree.init.nonEmpty()) {
@@ -1274,7 +1275,7 @@
 		print(") ");
 		print(tree.body);
 	}
-	
+
 	@Override public void visitForeachLoop(JCEnhancedForLoop tree) {
 		aPrint("for (");
 		JCTree varOrRecordPattern = readObject(tree, "varOrRecordPattern", null);
@@ -1290,7 +1291,7 @@
 		print(") ");
 		print(tree.body);
 	}
-	
+
 	@Override public void visitIf(JCIf tree) {
 		aPrint("if ");
 		if (tree.cond instanceof JCParens) {
@@ -1319,13 +1320,13 @@
 			print(tree.elsepart);
 		}
 	}
-	
+
 	@Override public void visitExec(JCExpressionStatement tree) {
 		align();
 		print(tree.expr);
 		println(";", tree);
 	}
-	
+
 	@Override public void visitDoLoop(JCDoWhileLoop tree) {
 		aPrint("do ");
 		if (tree.body instanceof JCBlock) {
@@ -1334,7 +1335,7 @@
 			print(((JCBlock) tree.body).stats, "");
 			indent--;
 			aPrint("}");
-			
+
 		} else print(tree.body);
 		print(" while ");
 		if (tree.cond instanceof JCParens) {
@@ -1346,7 +1347,7 @@
 		}
 		println(";", tree);
 	}
-	
+
 	@Override public void visitSynchronized(JCSynchronized tree) {
 		aPrint("synchronized ");
 		if (tree.lock instanceof JCParens) {
@@ -1359,10 +1360,10 @@
 		print(" ");
 		print(tree.body);
 	}
-	
+
 	@Override public void visitCase(JCCase tree) {
 		// Starting with JDK12, switches allow multiple expressions per case, and can take the form of an expression (preview feature).
-		
+
 		List<JCTree> pats = readObject(tree, "labels", null); // JDK 17+
 		if (pats == null) {
 			pats = readObject(tree, "pats", null); // JDK 12-17
@@ -1371,22 +1372,22 @@
 			JCTree pat = readObject(tree, "pat", null); // JDK -11
 			pats = pat == null ? List.<JCTree>nil() : List.of(pat);
 		}
-		
+
 		if (pats.isEmpty() || pats.size() == 1 && pats.head.getClass().getName().endsWith("$JCDefaultCaseLabel")) {
 			aPrint("default");
 		} else {
 			aPrint("case ");
 			print(pats, ", ");
-			
+
 			JCExpression guard = readObject(tree, "guard", null); // JDK 21+
 			if (guard != null) {
 				print(" when ");
 				print(guard);
 			}
 		}
-		
+
 		Enum<?> caseKind = readObject(tree, "caseKind", null); // JDK 12+
-		
+
 		if (caseKind != null && caseKind.name().equalsIgnoreCase("RULE")) {
 			print(" -> ");
 			if (tree.stats.head instanceof JCBreak) {
@@ -1411,14 +1412,14 @@
 			indent--;
 		}
 	}
-	
+
 	@Override public void visitCatch(JCCatch tree) {
 		print(" catch (");
 		print(tree.param);
 		print(") ");
 		print(tree.body);
 	}
-	
+
 	@Override public void visitSwitch(JCSwitch tree) {
 		aPrint("switch ");
 		if (tree.selector instanceof JCParens) {
@@ -1435,7 +1436,7 @@
 		if (ruleStyle) indent--;
 		aPrintln("}", tree);
 	}
-	
+
 	void printSwitchExpression(JCTree tree) {
 		aPrint("switch ");
 		JCExpression selector = readObject(tree, "selector", null);
@@ -1454,14 +1455,14 @@
 		if (ruleStyle) indent--;
 		aPrint("}");
 	}
-	
+
 	void printYieldExpression(JCTree tree) {
 		aPrint("yield ");
 		JCExpression value = readObject(tree, "value", null);
 		print(value);
 		println(";", tree);
 	}
-	
+
 	void printBindingPattern(JCTree tree) {
 		JCTree var = readObject(tree, "var", tree);
 		if (var instanceof JCVariableDecl) {
@@ -1472,27 +1473,27 @@
 			print((Name) readObject(var, "name", null));
 		}
 	}
-	
+
 	void printDefaultCase(JCTree tree) {
 		print("default");
 	}
-	
+
 	void printGuardPattern(JCTree tree) {
 		print((JCTree) readObject(tree, "patt", null));
 		print(" && ");
 		print((JCExpression) readObject(tree, "expr", null));
 	}
-	
+
 	void printParenthesizedPattern(JCTree tree) {
 		print("(");
 		print((JCTree) readObject(tree, "pattern", null));
 		print(")");
 	}
-	
+
 	void printConstantCaseLabel(JCTree tree) {
 		print((JCTree) readObject(tree, "expr", null));
 	}
-	
+
 	void printPatternCaseLabel(JCTree tree) {
 		print((JCTree) readObject(tree, "pat", null));
 		JCTree guard = readObject(tree, "guard", null);
@@ -1501,7 +1502,7 @@
 			print(guard);
 		}
 	}
-	
+
 	void printRecordPattern(JCTree tree) {
 		print((JCTree) readObject(tree, "deconstructor", null));
 		print("(");
@@ -1513,7 +1514,7 @@
 			print(var.name);
 		}
 	}
-	
+
 	@Override public void visitTry(JCTry tree) {
 		aPrint("try ");
 		List<?> resources = readObject(tree, "resources", List.nil());
@@ -1570,7 +1571,7 @@
 		}
 		println(tree);
 	}
-	
+
 	private void printCatch(JCCatch catchBlock) {
 		print(" catch (");
 		printVarDefInline(catchBlock.param); // ExprType1 | ExprType2 handled via JCTypeUnion.
@@ -1580,23 +1581,23 @@
 		indent--;
 		aPrint("}");
 	}
-	
+
 	public void visitErroneous(JCErroneous tree) {
 		print("(ERROR)");
 	}
-	
+
 	private static String operator(TreeTag tag) {
 		String op = OPERATORS.get(tag);
 		if (op == null) return "(?op?)";
 		return op;
 	}
-	
+
 	private static String quoteChars(String s) {
 		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < s.length(); i++) sb.append(quoteChar(s.charAt(i)));
 		return sb.toString();
 	}
-	
+
 	private static String quoteChar(char ch) {
 		switch (ch) {
 		case '\b': return "\\b";
@@ -1612,12 +1613,12 @@
 			return String.valueOf(ch);
 		}
 	}
-	
+
 	private static final Method getExtendsClause, getEndPosition;
-	
+
 	static {
 		getExtendsClause = getMethod(JCClassDecl.class, "getExtendsClause", new Class<?>[0]);
-		
+
 		if (getJavaCompilerVersion() < 8) {
 			getEndPosition = getMethod(DiagnosticPosition.class, "getEndPosition", java.util.Map.class);
 		} else {
@@ -1625,7 +1626,7 @@
 		}
 		Permit.setAccessible(getEndPosition);
 	}
-	
+
 	private static Method getMethod(Class<?> clazz, String name, Class<?>... paramTypes) {
 		try {
 			return Permit.getMethod(clazz, name, paramTypes);
@@ -1633,7 +1634,7 @@
 			throw sneakyThrow(e);
 		}
 	}
-	
+
 	private static Method getMethod(Class<?> clazz, String name, String... paramTypes) {
 		try {
 			Class<?>[] c = new Class[paramTypes.length];
@@ -1645,24 +1646,24 @@
 			throw sneakyThrow(e);
 		}
 	}
-	
+
 	public static JCTree getExtendsClause(JCClassDecl decl) {
 		return (JCTree) Permit.invokeSneaky(getExtendsClause, decl);
 	}
-	
+
 	static RuntimeException sneakyThrow(Throwable t) {
 		if (t == null) throw new NullPointerException("t");
 		PrettyPrinter.<RuntimeException>sneakyThrow0(t);
 		return null;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	private static <T extends Throwable> void sneakyThrow0(Throwable t) throws T {
 		throw (T)t;
 	}
-	
+
 	private static final Map<Class<?>, Map<String, Field>> reflectionCache = new HashMap<Class<?>, Map<String, Field>>();
-	
+
 	@SuppressWarnings("unchecked")
 	private <T> T readObject(JCTree tree, String fieldName, T defaultValue) {
 		Class<?> tClass = tree.getClass();
@@ -1677,18 +1678,18 @@
 			}
 			c.put(fieldName, f);
 		}
-		
+
 		try {
 			return (T) f.get(tree);
 		} catch (Exception e) {
 			return defaultValue;
 		}
 	}
-	
+
 	public void visitTypeBoundKind(TypeBoundKind tree) {
 		print(String.valueOf(tree.kind));
 	}
-	
+
 	@Override public void visitTree(JCTree tree) {
 		String className = tree.getClass().getName();
 		if (className.endsWith("$JCTypeUnion")) {
@@ -1730,16 +1731,16 @@
 			throw new AssertionError("Unhandled tree type: " + tree.getClass() + ": " + tree);
 		}
 	}
-	
+
 	private boolean isCaseRuleStyle(JCCase tree) {
 		if (tree == null) return false;
 		Enum<?> caseKind = readObject(tree, "caseKind", null); // JDK 12+
 		return caseKind != null && caseKind.name().equalsIgnoreCase("RULE");
 	}
-	
+
 	private boolean jcAnnotatedTypeInit = false;
 	private Class<?> jcAnnotatedTypeClass = null;
-	
+
 	private boolean isJcAnnotatedType(Object o) {
 		if (o == null) return false;
 		if (jcAnnotatedTypeInit) return jcAnnotatedTypeClass == o.getClass();
@@ -1751,7 +1752,7 @@
 		}
 		return false;
 	}
-	
+
 	private void printMemberReference0(JCTree tree) {
 		print(readObject(tree, "expr", (JCExpression) null));
 		print("::");
@@ -1763,7 +1764,7 @@
 		}
 		print(readObject(tree, "mode", new Object()).toString().equals("INVOKE") ? readObject(tree, "name", (Name) null) : "new");
 	}
-	
+
 	private void printLambda0(JCTree tree) {
 		List<JCVariableDecl> params = readObject(tree, "params", List.<JCVariableDecl>nil());
 		boolean explicit = true;
@@ -1801,7 +1802,7 @@
 			print(body);
 		}
 	}
-	
+
 	private void printAnnotatedType0(JCTree tree) {
 		JCTree underlyingType = readObject(tree, "underlyingType", (JCTree) null);
 		if (underlyingType instanceof JCFieldAccess) {
@@ -1818,11 +1819,11 @@
 			print(underlyingType);
 		}
 	}
-	
+
 	private void printTypeArray0(JCTree tree) {
 		JCTree inner = tree;
 		int dimCount = 0;
-		
+
 		while (true) {
 			if (inner instanceof JCArrayTypeTree) {
 				inner = ((JCArrayTypeTree) inner).elemtype;
@@ -1838,9 +1839,9 @@
 			}
 			break;
 		}
-		
+
 		print(inner);
-		
+
 		inner = tree;
 		while (true) {
 			if (inner instanceof JCArrayTypeTree) {