WIP - alternate solution to CompletionContextTests.test0123

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

Author: Rob Stryker

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

@@ -283,7 +283,7 @@ private void resolveRequestedBindingKeys(JavacBindingResolver bindingResolver, S
 			var compiler = ToolProvider.getSystemJavaCompiler();
 			var context = new Context();
 			JavacTask task = (JavacTask) compiler.getTask(null, null, null, List.of(), List.of(), List.of());
-			bindingResolver = new JavacBindingResolver(null, task, context, new JavacConverter(null, null, context, null, true, -1), null, null);
+			bindingResolver = new JavacBindingResolver(null, task, context, createJavacConverter(opts.getMap(), null, null, context, null, true, -1), null, null);
 		}
 
 		for (CompilationUnit cu : units) {
@@ -744,7 +744,7 @@ public Void visitClass(ClassTree node, Void p) {
 					}
 					CompilationUnit res = result.get(sourceUnits[i]);
 					AST ast = res.ast;
-					JavacConverter converter = new JavacConverter(ast, javacCompilationUnit, context, rawText, docEnabled, focalPoint);
+					JavacConverter converter = createJavacConverter(compilerOptions, ast, javacCompilationUnit, context, rawText, docEnabled, focalPoint);
 					converter.populateCompilationUnit(res, javacCompilationUnit);
 					// javadoc problems explicitly set as they're not sent to DiagnosticListener (maybe find a flag to do it?)
 					var javadocProblems = converter.javadocDiagnostics.stream()
@@ -849,7 +849,17 @@ public void postVisit(ASTNode node) {
 
 		return result;
 	}
-
+	
+	private JavacConverter createJavacConverter(Map<String, String> compilerOptions, AST ast, JCCompilationUnit javacCompilationUnit, 
+			Context context, String rawText, boolean docEnabled, int focalPoint) {
+		String v = compilerOptions.get(org.eclipse.jdt.internal.core.CompilationUnit.COMPILER_COMPLETION_PARSER_ATTR);
+		if( "true".equals(v)) {
+			return new JavacCompletionConverter(ast, javacCompilationUnit, context, rawText, docEnabled, focalPoint);
+		} else {
+			return new JavacConverter(ast, javacCompilationUnit, context, rawText, docEnabled, focalPoint);
+		}
+	}
+	
 	/// cleans up context after analysis (nothing left to process)
 	/// but remain it usable by bindings by keeping filemanager available.
 	public static void cleanup(Context context) {

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

@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2024, Red Hat, Inc. and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.jdt.core.dom;
+
+import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
+import com.sun.tools.javac.tree.JCTree.JCErroneous;
+import com.sun.tools.javac.util.Context;
+
+public class JavacCompletionConverter extends JavacConverter {
+
+	public JavacCompletionConverter(AST ast, JCCompilationUnit javacCompilationUnit, Context context, String rawText,
+			boolean buildJavadoc, int focalPoint) {
+		super(ast, javacCompilationUnit, context, rawText, buildJavadoc, focalPoint);
+	}
+	protected Expression convertErroneousExpression(JCErroneous error) {
+		Expression e = super.convertErroneousExpression(error);
+		if( e == null ) {
+			int pos = error.getPreferredPosition();
+			char c = this.rawText.length() > pos ? this.rawText.charAt(pos) : 0;
+			if (error.getErrorTrees().isEmpty() && c == '"') {
+				  int newLine = this.rawText.indexOf('\n', pos);
+				  int lineEnd = newLine == -1 ? this.rawText.length() - 1 : newLine;
+				  String litText = this.rawText.substring(pos+1, lineEnd);
+				  Expression res = convertStringToLiteral(litText, pos, lineEnd, null);
+				  res.setSourceRange(pos,  lineEnd - pos);
+				  return res;
+				}
+		}
+		return e;
+	}
+}

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

@@ -161,6 +161,7 @@ private JavacConverter(AST ast, JCCompilationUnit javacCompilationUnit, Context
 		this.buildJavadoc = buildJavadoc;
 		this.focalPoint = -1;
 	}
+
 	public JavacConverter(AST ast, JCCompilationUnit javacCompilationUnit, 
 			Context context, String rawText, boolean buildJavadoc, int focalPoint) {
 		this(ast, javacCompilationUnit, context, rawText, buildJavadoc);
@@ -2009,25 +2010,9 @@ private Expression convertExpression(JCExpression javac) {
 
 		// Handle errors or default situation
 		if (javac instanceof JCErroneous error) {
-			int pos = javac.getPreferredPosition();
-			char c = this.rawText.length() > pos ? this.rawText.charAt(pos) : 0;
-			if (error.getErrorTrees().isEmpty() && c == '"') {
-				  int newLine = this.rawText.indexOf('\n', pos);
-				  int lineEnd = newLine == -1 ? this.rawText.length() - 1 : newLine;
-				  String litText = this.rawText.substring(pos+1, lineEnd);
-				  Expression res = convertStringToLiteral(litText, pos, lineEnd, null);
-				  res.setSourceRange(pos,  lineEnd - pos);
-				  return res;
-				}
-			if (error.getErrorTrees().size() == 1) {
-				JCTree tree = error.getErrorTrees().get(0);
-				if (tree instanceof JCExpression nestedExpr) {
-					try {
-						return convertExpression(nestedExpr);
-					} catch (Exception ex) {
-						// pass-through: do not break when attempting such reconcile
-					}
-				}
+			Expression e = convertErroneousExpression(error);
+			if( e != null ) {
+				return e;
 			}
 		}
 		if( shouldRecoverWithSimpleName(javac)) {
@@ -2038,6 +2023,20 @@ private Expression convertExpression(JCExpression javac) {
 		}
 		return null;
 	}
+	
+	protected Expression convertErroneousExpression(JCErroneous error) {
+		if (error.getErrorTrees().size() == 1) {
+			JCTree tree = error.getErrorTrees().get(0);
+			if (tree instanceof JCExpression nestedExpr) {
+				try {
+					return convertExpression(nestedExpr);
+				} catch (Exception ex) {
+					// pass-through: do not break when attempting such reconcile
+				}
+			}
+		}
+		return null;
+	}
 
 	private boolean shouldRecoverWithSimpleName(JCExpression javac) {
 		if( javac instanceof JCNewClass)
@@ -2297,7 +2296,7 @@ private Expression convertLiteral(JCLiteral literal) {
 		throw new UnsupportedOperationException("Not supported yet " + literal + "\n of type" + literal.getClass().getName());
 	}
 
-	private Expression convertStringToLiteral(String string, int pos, int endPos, JCLiteral literal) {
+	protected Expression convertStringToLiteral(String string, int pos, int endPos, JCLiteral literal) {
 		boolean malformed = false;
 		if (this.rawText.charAt(pos) == '"'
 				&& this.rawText.charAt(pos + 1) == '"'

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionContextTests.java

@@ -3374,6 +3374,8 @@ public void test0122() throws JavaModelException {
 		"completion token location=UNKNOWN",
 		result.context);
 }
+
+// TODO The dom tree has an added node called CompletionOnStringLiteral that the regular tree doesn't have.
 public void test0123() throws JavaModelException {
 	this.workingCopies = new ICompilationUnit[1];
 	this.workingCopies[0] = getWorkingCopy(

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

@@ -71,6 +71,7 @@
 public class CompilationUnit extends Openable implements ICompilationUnit, org.eclipse.jdt.internal.compiler.env.ICompilationUnit, SuffixConstants {
 	public static boolean DOM_BASED_OPERATIONS = Boolean.getBoolean(CompilationUnit.class.getSimpleName() + ".DOM_BASED_OPERATIONS"); //$NON-NLS-1$
 	public static boolean DOM_BASED_COMPLETION = Boolean.getBoolean(CompilationUnit.class.getSimpleName() + ".codeComplete.DOM_BASED_OPERATIONS"); //$NON-NLS-1$
+	public static String COMPILER_COMPLETION_PARSER_ATTR = JavaCore.PLUGIN_ID + ".compiler.completion.parser.enablement"; //$NON-NLS-1$
 
 	/**
 	 * Internal synonym for deprecated constant AST.JSL2
@@ -458,7 +459,7 @@ public void codeComplete(int offset, CompletionRequestor requestor, WorkingCopyO
 @Override
 public void codeComplete(int offset, CompletionRequestor requestor, WorkingCopyOwner workingCopyOwner, IProgressMonitor monitor) throws JavaModelException {
 	if (DOM_BASED_COMPLETION) {
-		new DOMCompletionEngine(offset, getOrBuildAST(workingCopyOwner, offset), this, workingCopyOwner, requestor, monitor).run();
+		new DOMCompletionEngine(offset, getOrBuildCompletionAST(workingCopyOwner, offset), this, workingCopyOwner, requestor, monitor).run();
 		return;
 	}
 	codeComplete(
@@ -490,11 +491,20 @@ public IJavaElement[] codeSelect(int offset, int length, WorkingCopyOwner workin
 	}
 }
 
+public org.eclipse.jdt.core.dom.CompilationUnit getOrBuildCompletionAST(WorkingCopyOwner workingCopyOwner, int focalPosition) throws JavaModelException {
+	return getOrBuildAST(workingCopyOwner, focalPosition, Map.of(COMPILER_COMPLETION_PARSER_ATTR, Boolean.TRUE.toString()));
+}
+
 public org.eclipse.jdt.core.dom.CompilationUnit getOrBuildAST(WorkingCopyOwner workingCopyOwner, int focalPosition) throws JavaModelException {
+	return getOrBuildAST(workingCopyOwner, focalPosition, Collections.EMPTY_MAP);
+}
+
+private org.eclipse.jdt.core.dom.CompilationUnit getOrBuildAST(WorkingCopyOwner workingCopyOwner, int focalPosition, Map<String,String> additionalCompilerOptions) throws JavaModelException {
 	if (this.ast != null) {
 		return this.ast;
 	}
 	Map<String, String> options = getOptions(true);
+	options.putAll(additionalCompilerOptions);
 	ASTParser parser = ASTParser.newParser(new AST(options).apiLevel()); // go through AST constructor to convert options to apiLevel
 	// but we should probably instead just use the latest Java version
 	// supported by the compiler