Partial Fix for testAnonymousTypeMethodReferenceSearchGh432_part1

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

Part 2

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

Author: robstryker

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacMethodBinding.java

@@ -325,7 +325,12 @@ private IMethod getJavaElementForMethodDeclaration(IType currentType, MethodDecl
 		if (result.exists()) {
 			return result;
 		}
-		return declaredMethod(result).orElse(null);
+		Optional<IMethod> r1 = declaredMethod(result);
+		if( r1 != null && r1.isPresent())
+			return r1.get();
+		if( result != null )
+			return result;
+		return null;
 	}
 
 	private Optional<IMethod> declaredMethod(IMethod method) {

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java

@@ -680,9 +680,12 @@ static void getKey(StringBuilder builder, Type typeToBuild, String n, boolean is
 				nameAsString = nameAsString.replace('.', '/');
 			}
 			nameAsString = nameAsString.replaceFirst("\\$([0-9]+)([A-Za-z$_][A-Za-z$_0-9]*)", "\\$$1\\$$2");
+			nameAsString = nameAsString.replaceFirst("\\$\\$", "\\$");
+
 			if (typeToBuild.tsym.isAnonymous()) {
 				ASTNode node = resolver.symbolToDeclaration.get(typeToBuild.tsym);
 				if (node != null && node.getParent() instanceof ClassInstanceCreation cic) {
+					nameAsString = nameAsString.replaceFirst("\\$([0-9]+)([A-Za-z$_][A-Za-z$_0-9]*)", "\\$$1");
 					nameAsString = nameAsString.replaceFirst("\\$([0-9]+)", "\\$" + cic.getType().getStartPosition());
 				}
 			} else if (!(typeToBuild.tsym.owner instanceof ClassSymbol)) {