Attempt to fix tests - 2

Author: SougandhS

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java

@@ -33,6 +33,7 @@
 import org.eclipse.debug.ui.IValueDetailListener;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.debug.core.IEvaluationRunnable;
 import org.eclipse.jdt.debug.core.IJavaArray;
 import org.eclipse.jdt.debug.core.IJavaArrayType;
@@ -466,8 +467,16 @@ private Expression getCompiledExpression(IJavaObject javaObject, IJavaDebugTarge
 						.getCompiledExpression(snippet, javaObject);
 				if (res != null) {
 					Expression exp = new Expression(res, evaluationEngine);
-					if (exp.getExpression().hasModuleConflicts()) {
-						return null;
+					if (exp.getExpression().hasErrors()) {
+						boolean hasModuleError = false;
+						for (int prblemID : exp.getExpression().getProblemIDs()) {
+							if (prblemID == IProblem.ConflictingPackageFromModules || prblemID == IProblem.ConflictingPackageFromOtherModules) {
+								hasModuleError = true;
+							}
+						}
+						if (hasModuleError) {
+							return null;
+						}
 					}
 					fCacheMap.put(key, exp);
 					return exp;

org.eclipse.jdt.debug/eval/org/eclipse/jdt/debug/eval/ICompiledExpression.java

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.jdt.debug.eval;
 
+import java.util.List;
+
 import org.eclipse.jdt.core.dom.Message;
 
 /**
@@ -63,11 +65,11 @@ public interface ICompiledExpression {
 	public String[] getErrorMessages();
 
 	/**
-	 * Returns whether the expression has any module conflicts or not.
+	 * Returns the list of <code>IProblem</code> id's of the compiled expression
 	 *
-	 * @return whether the expression has any module conflicts or not.
+	 * @return the list of IProblem id's of the compiled expression
 	 * @since 3.24
 	 */
-	public boolean hasModuleConflicts();
+	public List<Integer> getProblemIDs();
 
 }

org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java

@@ -629,12 +629,11 @@ private ICompiledExpression createExpressionFromAST(String snippet, EvaluationSo
 						runMethodError = true;
 						DebugPlugin.log(new Status(IStatus.WARNING, DebugPlugin.getUniqueIdentifier(), "Compile error during code evaluation: " //$NON-NLS-1$
 								+ problem.getMessage()));
-					} else if (problemId == IProblem.ConflictingPackageFromModules || problemId == IProblem.ConflictingPackageFromOtherModules) {
-						errorSequence.setModuleConflict(true);
 					}
+					errorSequence.addProblemID(problemId);
 				}
 			}
-			if (snippetError || runMethodError || errorSequence.hasModuleConflicts()) {
+			if (snippetError || runMethodError) {
 				if (runMethodError) {
 					errorSequence.addError(EvaluationEngineMessages.ASTEvaluationEngine_Evaluations_must_contain_either_an_expression_or_a_block_of_well_formed_statements_1);
 				}

org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstructionSequence.java

@@ -30,13 +30,13 @@ public class InstructionSequence implements ICompiledExpression {
 	private final List<String> fErrors;
 	private final String fSnippet;
 	private CoreException fException;
-	private boolean fhasModuleErrors;
+	private final List<Integer> fProblemIDs;
 
 	public InstructionSequence(String snippet) {
 		fInstructions = new ArrayList<>(10);
 		fErrors = new ArrayList<>();
 		fSnippet = snippet;
-		fhasModuleErrors = false;
+		fProblemIDs = new ArrayList<>();
 	}
 
 	/**
@@ -151,17 +151,18 @@ public int getEnd() {
 	}
 
 	/**
-	 * Sets whether the expression has any module conflicting issues or not.
+	 * Adds the <code>IProblem<code> id of the error.
 	 */
-	public void setModuleConflict(boolean moduleConflict) {
-		fhasModuleErrors = moduleConflict;
+	public void addProblemID(int probID) {
+		fProblemIDs.add(probID);
 	}
 
 	/**
-	 * @see org.eclipse.jdt.debug.eval.ICompiledExpression#hasModuleConflicts()
+	 * @see org.eclipse.jdt.debug.eval.ICompiledExpression#getProblemIDs()
 	 */
 	@Override
-	public boolean hasModuleConflicts() {
-		return fhasModuleErrors;
+	public List<Integer> getProblemIDs() {
+		return fProblemIDs;
 	}
+
 }