Undo some changes in jdt.core that are no longer relevant

Signed-off-by: Rob Stryker <[email protected]>

Author: Rob Stryker

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/DOMLocalVariableLocator.java

@@ -20,6 +20,7 @@
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.VariableDeclaration;
+import org.eclipse.jdt.internal.core.LocalVariable;
 import org.eclipse.jdt.internal.core.search.LocatorResponse;
 
 public class DOMLocalVariableLocator extends DOMPatternLocator {
@@ -31,6 +32,12 @@ public DOMLocalVariableLocator(LocalVariableLocator lcl) {
 		this.locator = lcl;
 	}
 
+	private LocalVariable getLocalVariable() {
+		if( this.locator.pattern instanceof LocalVariablePattern lvp )
+			return lvp.localVariable;
+		return null;
+	}
+	
 	@Override
 	public LocatorResponse match(Name node, NodeSetWrapper nodeSet, MatchLocator locator) {
 		if (node.getLocationInParent() instanceof ChildPropertyDescriptor descriptor
@@ -40,7 +47,7 @@ public LocatorResponse match(Name node, NodeSetWrapper nodeSet, MatchLocator loc
 						|| descriptor == QualifiedName.QUALIFIER_PROPERTY)
 				// local variables cannot be qualified
 				&& node instanceof SimpleName simple 
-				&& this.locator.getLocalVariable().getElementName().equals(simple.getIdentifier())) {
+				&& Objects.equals(getLocalVariable() == null ? null : getLocalVariable().getElementName(), simple.getIdentifier())) {
 			return toResponse(POSSIBLE_MATCH);
 		}
 		return toResponse(IMPOSSIBLE_MATCH);
@@ -51,7 +58,7 @@ public LocatorResponse resolveLevel(org.eclipse.jdt.core.dom.ASTNode node, IBind
 		if (!(binding instanceof IVariableBinding)) {
 			return toResponse(IMPOSSIBLE_MATCH);
 		}
-		if (Objects.equals(binding.getJavaElement(), this.locator.getLocalVariable())) {
+		if (Objects.equals(binding.getJavaElement(), getLocalVariable())) {
 			return toResponse(ACCURATE_MATCH);
 		}
 		return toResponse(INACCURATE_MATCH);
@@ -69,7 +76,7 @@ public LocatorResponse match(VariableDeclaration node, NodeSetWrapper nodeSet, M
 		int declarationsLevel = IMPOSSIBLE_MATCH;
 		if (this.locator.pattern.findDeclarations)
 			if (this.locator.matchesName(this.locator.pattern.name, node.getName().getIdentifier().toCharArray()))
-				if (node.getStartPosition() == this.locator.getLocalVariable().declarationSourceStart)
+				if (getLocalVariable() != null && node.getStartPosition() == getLocalVariable().declarationSourceStart)
 					declarationsLevel = this.locator.pattern.mustResolve ? POSSIBLE_MATCH : ACCURATE_MATCH;
 
 		// Use the stronger match

org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/JavaSearchPattern.java

@@ -401,7 +401,6 @@ final void setTypeArguments(char[][][] typeArguments) {
 	 */
 	void storeTypeSignaturesAndArguments(IType type) {
 		if (type.isResolved()) {
-			String k = type.getKey();
 			BindingKey bindingKey = new BindingKey(type.getKey());
 			if (bindingKey.isParameterizedType() || bindingKey.isRawType()) {
 				String signature = bindingKey.toSignature();

org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/LocalVariableLocator.java

@@ -50,7 +50,7 @@ public int match(LocalDeclaration node, MatchingNodeSet nodeSet) {
 
 	return nodeSet.addMatch(node, referencesLevel >= declarationsLevel ? referencesLevel : declarationsLevel); // use the stronger match
 }
-protected LocalVariable getLocalVariable() {
+private LocalVariable getLocalVariable() {
 	return ((LocalVariablePattern) this.pattern).localVariable;
 }
 @Override

org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PossibleMatch.java

@@ -56,16 +56,11 @@ public PossibleMatch(MatchLocator locator, IResource resource, Openable openable
 	this.resource = resource;
 	this.openable = openable;
 	this.document = document;
-	this.nodeSet = createMatchingNodeSet(mustResolve);
+	this.nodeSet = new MatchingNodeSet(mustResolve);
 	char[] qualifiedName = getQualifiedName();
 	if (qualifiedName != null)
 		this.compoundName = CharOperation.splitOn('.', qualifiedName);
 }
-
-protected MatchingNodeSet createMatchingNodeSet(boolean mustResolve) {
-	return new MatchingNodeSet(mustResolve);
-}
-
 public void cleanUp() {
 	this.source = null;
 	if (this.parsedUnit != null) {