Handles the TypePattern DOM API modifications in the JDT.UI

Fixes #1994
eclipse-jdt · Feb 10, 2025 · cb33fee · cb33fee
1 parent bb20580
commit cb33fee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/...eclipse/jdt/internal/corext/fix/OneIfRatherThanDuplicateBlocksThatFallThroughFixCore.java b/...eclipse/jdt/internal/corext/fix/OneIfRatherThanDuplicateBlocksThatFallThroughFixCore.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2024 Fabrice TIERCELIN and others.
+ * Copyright (c) 2021, 2025 Fabrice TIERCELIN and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -33,8 +33,8 @@
 import org.eclipse.jdt.core.dom.InfixExpression;
 import org.eclipse.jdt.core.dom.Pattern;
 import org.eclipse.jdt.core.dom.PatternInstanceofExpression;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.TypePattern;
+import org.eclipse.jdt.core.dom.VariableDeclaration;
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
 import org.eclipse.jdt.core.dom.rewrite.TargetSourceRangeComputer;
 
@@ -106,8 +106,8 @@ private class PatternNameVisitor extends ASTVisitor {
 				public boolean visit(PatternInstanceofExpression node) {
 					Pattern p= node.getPattern();
 					if (p instanceof TypePattern typePattern) {
-						SingleVariableDeclaration patternVariable= typePattern.getPatternVariable();
-						patternNames.add(patternVariable.getName().getFullyQualifiedName());
+						VariableDeclaration patternVariable= node.getAST().apiLevel() < AST.JLS22 ? typePattern.getPatternVariable() : typePattern.getPatternVariable2();
+					    patternNames.add(patternVariable.getName().getFullyQualifiedName());
 					}
 					return true;
 				}

diff --git a/...re extension/org/eclipse/jdt/internal/corext/fix/PatternMatchingForInstanceofFixCore.java b/...re extension/org/eclipse/jdt/internal/corext/fix/PatternMatchingForInstanceofFixCore.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2024 Fabrice TIERCELIN and others.
+ * Copyright (c) 2021, 2025 Fabrice TIERCELIN and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -39,6 +39,7 @@
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.Statement;
 import org.eclipse.jdt.core.dom.TypePattern;
+import org.eclipse.jdt.core.dom.VariableDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
@@ -220,7 +221,7 @@ public SourceRange computeSourceRange(final ASTNode nodeWithComment) {
 			}
 			if ((ast.apiLevel() == AST.JLS20 && ast.isPreviewEnabled()) || ast.apiLevel() > AST.JLS20) {
 				TypePattern newTypePattern= ast.newTypePattern();
-				newTypePattern.setPatternVariable(newSVDecl);
+				newTypePattern.setPatternVariable((VariableDeclaration) newSVDecl);
 				newInstanceof.setPattern(newTypePattern);
 			} else {
 				newInstanceof.setRightOperand(newSVDecl);

diff --git a/...ng/org/eclipse/jdt/internal/corext/refactoring/surround/SurroundWithTryCatchAnalyzer.java b/...ng/org/eclipse/jdt/internal/corext/refactoring/surround/SurroundWithTryCatchAnalyzer.java
@@ -30,8 +30,8 @@
 import org.eclipse.jdt.core.dom.Pattern;
 import org.eclipse.jdt.core.dom.PatternInstanceofExpression;
 import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.TypePattern;
+import org.eclipse.jdt.core.dom.VariableDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 
@@ -96,17 +96,17 @@ public boolean visit(VariableDeclarationStatement node) {
 
 			@Override
 			public boolean visit(PatternInstanceofExpression node) {
-				SingleVariableDeclaration svd= node.getRightOperand();
+				VariableDeclaration vd= node.getRightOperand();
 				AST ast= node.getAST();
 				if (ast.apiLevel() == AST.JLS20 && ast.isPreviewEnabled() || ast.apiLevel() > AST.JLS20) {
 					Pattern p= node.getPattern();
 					if (p instanceof TypePattern typePattern) {
-						svd= typePattern.getPatternVariable();
+						vd= ast.apiLevel() < AST.JLS22 ? typePattern.getPatternVariable() : typePattern.getPatternVariable2();
 					} else {
 						return false;
 					}
 				}
-				SimpleName name= svd.getName();
+				SimpleName name= vd.getName();
 				IBinding binding= name.resolveBinding();
 				if (binding instanceof IVariableBinding) {
 					variableBindings.put(name, (IVariableBinding) binding);

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MergeConditionalBlocksCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MergeConditionalBlocksCleanUp.java
@@ -35,9 +35,9 @@
 import org.eclipse.jdt.core.dom.InfixExpression;
 import org.eclipse.jdt.core.dom.Pattern;
 import org.eclipse.jdt.core.dom.PatternInstanceofExpression;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.Statement;
 import org.eclipse.jdt.core.dom.TypePattern;
+import org.eclipse.jdt.core.dom.VariableDeclaration;
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
 
 import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
@@ -161,7 +161,7 @@ private class PatternNameVisitor extends ASTVisitor {
 			public boolean visit(PatternInstanceofExpression node) {
 				Pattern p= node.getPattern();
 				if (p instanceof TypePattern typePattern) {
-					SingleVariableDeclaration patternVariable= typePattern.getPatternVariable();
+					final VariableDeclaration patternVariable= node.getAST().apiLevel() < AST.JLS22 ? typePattern.getPatternVariable() : typePattern.getPatternVariable2();
 					patternNames.add(patternVariable.getName().getFullyQualifiedName());
 				}
 				return true;