Adapt conversion to new TypePattern setter

mickaelistria · Feb 10, 2025 · 45fab23 · 45fab23
1 parent c640bdc
commit 45fab23
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java
@@ -48,8 +48,9 @@
 import com.sun.tools.javac.parser.ParserFactory;
 import com.sun.tools.javac.parser.Tokens.Comment;
 import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
-import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.TreeInfo;
+import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
 import com.sun.tools.javac.tree.JCTree.JCAnnotation;
 import com.sun.tools.javac.tree.JCTree.JCAnyPattern;
@@ -124,7 +125,6 @@
 import com.sun.tools.javac.tree.JCTree.JCWildcard;
 import com.sun.tools.javac.tree.JCTree.JCYield;
 import com.sun.tools.javac.tree.JCTree.Tag;
-import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.JCDiagnostic;
 import com.sun.tools.javac.util.Log;
@@ -1924,7 +1924,11 @@ private Pattern convert(JCPattern jcPattern) {
 			if (jcPattern instanceof JCBindingPattern jcBindingPattern) {
 				TypePattern jdtPattern = this.ast.newTypePattern();
 				commonSettings(jdtPattern, jcBindingPattern);
-				jdtPattern.setPatternVariable((SingleVariableDeclaration)convertVariableDeclaration(jcBindingPattern.var));
+				if (this.ast.apiLevel < AST.JLS22) {
+					jdtPattern.setPatternVariable((SingleVariableDeclaration)convertVariableDeclaration(jcBindingPattern.var));
+				} else {
+					jdtPattern.setPatternVariable(convertVariableDeclaration(jcBindingPattern.var));
+				}
 				return jdtPattern;
 			} else if (jcPattern instanceof JCRecordPattern jcRecordPattern) {
 				RecordPattern jdtPattern = this.ast.newRecordPattern();