Partial fix for ASTConverterTest2.test0512 - missing return type with…

… name matching compilation unit treat as constructor

Signed-off-by: Rob Stryker <stryker@redhat.com>

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java

@@ -675,17 +675,26 @@ private MethodDeclaration convertMethodDecl(JCMethodDecl javac, ASTNode parent)
 		if(isConstructor && !javacNameMatchesInitAndMethodNameMatchesTypeName) {
 			malformed = true;
 		}
-		if( javacNameMatchesInit && !isConstructor ) {
+		if( javacNameMatchesError || (javacNameMatchesInit && !isConstructor )) {
 			malformed = true;
 		}
 
-		if( javacNameMatchesError) {
-			malformed = true;
-		} else {
-			res.setName(this.ast.newSimpleName(methodDeclName));
-		}
 		JCTree retTypeTree = javac.getReturnType();
 		Type retType = null;
+		if( !javacNameMatchesError) {
+			res.setName(this.ast.newSimpleName(methodDeclName));
+		} else {
+			// javac name is an error, so let's treat the return type as the name
+			if( retTypeTree instanceof JCIdent jcid) {
+				res.setName(this.ast.newSimpleName(jcid.getName().toString()));
+				retTypeTree = null;
+				if( jcid.toString().equals(getNodeName(parent))) {
+					res.setConstructor(true);
+					isConstructor = true;
+				}
+			}
+		}
+
 		if( retTypeTree == null ) {
 			if( isConstructor && this.ast.apiLevel == AST.JLS2_INTERNAL ) {
 				retType = this.ast.newPrimitiveType(convert(TypeKind.VOID));
@@ -716,11 +725,10 @@ private MethodDeclaration convertMethodDecl(JCMethodDecl javac, ASTNode parent)
 			}
 		}
 
-
-		if( this.ast.apiLevel != AST.JLS2_INTERNAL) {
-			res.setReturnType2(retType);
-		} else {
-			if (retType != null) {
+		if( retType != null ) {
+			if( this.ast.apiLevel != AST.JLS2_INTERNAL) {
+				res.setReturnType2(retType);
+			} else {
 				res.internalSetReturnType(retType);
 			}
 		}