DOM Code selector failing to properly convert VariableDeclarationFragment (eclipse-jdt#4054)

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

Author: robstryker

org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/DOMCodeSelector.java

@@ -287,6 +287,10 @@ public IJavaElement[] codeSelect(int offset, int length) throws JavaModelExcepti
 					if (parent != null && bindingNode instanceof SingleVariableDeclaration variableDecl) {
 						return new IJavaElement[] { DOMToModelPopulator.toLocalVariable(variableDecl, (JavaElement)parent) };
 					}
+					if( parent != null && bindingNode instanceof VariableDeclarationFragment vdf) {
+						// Parent might be statement or expression
+						return new IJavaElement[] { DOMToModelPopulator.toLocalVariable(vdf, (JavaElement)parent) };
+					}
 				}
 			}
 		}

org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DOMToModelPopulator.java

@@ -887,6 +887,33 @@ public static LocalVariable toLocalVariable(SingleVariableDeclaration parameter,
 		return toLocalVariable(parameter, parent, parameter.getParent() instanceof MethodDeclaration);
 	}
 
+	public static LocalVariable toLocalVariable(VariableDeclarationFragment fragment, JavaElement parent) {
+		if (fragment.getParent() instanceof VariableDeclarationStatement variableDeclaration) {
+			return new LocalVariable(parent,
+				fragment.getName().getIdentifier(),
+				variableDeclaration.getStartPosition(),
+				variableDeclaration.getStartPosition() + variableDeclaration.getLength() - 1,
+				fragment.getName().getStartPosition(),
+				fragment.getName().getStartPosition() + fragment.getName().getLength() - 1,
+				Util.getSignature(variableDeclaration.getType()),
+				null, // I don't think we need this, also it's the ECJ's annotation node
+				toModelFlags(variableDeclaration.getModifiers(), false),
+				false);
+		} else if (fragment.getParent() instanceof VariableDeclarationExpression variableDeclaration) {
+			return new LocalVariable(parent,
+					fragment.getName().getIdentifier(),
+					variableDeclaration.getStartPosition(),
+					variableDeclaration.getStartPosition() + variableDeclaration.getLength() - 1,
+					fragment.getName().getStartPosition(),
+					fragment.getName().getStartPosition() + fragment.getName().getLength() - 1,
+					Util.getSignature(variableDeclaration.getType()),
+					null, // I don't think we need this, also it's the ECJ's annotation node
+					toModelFlags(variableDeclaration.getModifiers(), false),
+					false);
+		}
+		return null;
+	}
+
 	private static LocalVariable toLocalVariable(SingleVariableDeclaration parameter, JavaElement parent, boolean isParameter) {
 		return new LocalVariable(parent,
 				parameter.getName().getIdentifier(),