Attempt to fix tests - 1

SougandhS · SougandhS · commit 805d62d4226b · 2025-07-29T11:34:50.000+05:30
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTEvaluationEngine.java
@@ -631,10 +631,12 @@ private ICompiledExpression createExpressionFromAST(String snippet, EvaluationSo
 								+ problem.getMessage()));
 					} else if (problemId == IProblem.ConflictingPackageFromModules || problemId == IProblem.ConflictingPackageFromOtherModules) {
 						errorSequence.setModuleConflict(true);
+						errorSequence.addError(problem.getMessage());
+						return errorSequence;
 					}
 				}
 			}
-			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);
 				}

Original file line number	Diff line number	Diff line change
`@@ -631,10 +631,12 @@ private ICompiledExpression createExpressionFromAST(String snippet, EvaluationSo`
`631`	`631`	`+ problem.getMessage()));`
`632`	`632`	`} else if (problemId == IProblem.ConflictingPackageFromModules \|\| problemId == IProblem.ConflictingPackageFromOtherModules) {`
`633`	`633`	`errorSequence.setModuleConflict(true);`
	`634`	`+ errorSequence.addError(problem.getMessage());`
	`635`	`+ return errorSequence;`
`634`	`636`	`}`
`635`	`637`	`}`
`636`	`638`	`}`
`637`		`- if (snippetError \|\| runMethodError \|\| errorSequence.hasModuleConflicts()) {`
	`639`	`+ if (snippetError \|\| runMethodError) {`
`638`	`640`	`if (runMethodError) {`
`639`	`641`	`errorSequence.addError(EvaluationEngineMessages.ASTEvaluationEngine_Evaluations_must_contain_either_an_expression_or_a_block_of_well_formed_statements_1);`
`640`	`642`	`}`