Ignore modules when reading module-info from jar

Author: mickaelistria

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

@@ -674,7 +674,10 @@ public Void visitClass(ClassTree node, Void p) {
 		Map<JavaFileObject, File> fileObjectsToJars = new HashMap<>();
 		context.put(FILE_OBJECTS_TO_JAR_KEY, fileObjectsToJars);
 		boolean docEnabled = JavaCore.ENABLED.equals(compilerOptions.get(JavaCore.COMPILER_DOC_COMMENT_SUPPORT));
-		JavacUtils.configureJavacContext(context, compilerOptions, javaProject, JavacUtils.isTest(javaProject, sourceUnits));
+		// ignore module is a workaround for cases when we read a module-info.java from a library.
+		// Such units cause a failure later because their name is lost in ASTParser and Javac cannot treat them as modules
+		boolean ignoreModule = !Arrays.stream(sourceUnits).allMatch(u -> new String(u.getFileName()).endsWith("java"));
+		JavacUtils.configureJavacContext(context, compilerOptions, javaProject, JavacUtils.isTest(javaProject, sourceUnits), ignoreModule);
 		Options javacOptions = Options.instance(context);
 		javacOptions.put("allowStringFolding", Boolean.FALSE.toString()); // we need to keep strings as authored
 		if ((focalPoint >= 0 || !resolveBindings) && (flags & ICompilationUnit.FORCE_PROBLEM_DETECTION) == 0) {
@@ -716,8 +719,11 @@ public Void visitClass(ClassTree node, Void p) {
 					String lastSegment = split[split.length-1].replace(".class", ".java");
 					sourceUnitPath = Path.of(lastSegment);
 				}
-				if( sourceUnitPath == null )
+				if( sourceUnitPath == null ) {
+					// This can cause trouble in case the name of the file is important
+					// eg module-info.java.
 					sourceUnitPath = Path.of(new File(System.identityHashCode(sourceUnit) + '/' + MOCK_NAME_FOR_CLASSES).toURI());
+				}
 			} else if (unitFile.getName().endsWith(".jar")) {
 				sourceUnitPath = Path.of(unitFile.toURI()).resolve(System.identityHashCode(sourceUnit) + '/' + MOCK_NAME_FOR_CLASSES);
 			} else {

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/JavacUtils.java

@@ -60,17 +60,17 @@
 
 public class JavacUtils {
 
-	public static void configureJavacContext(Context context, Map<String, String> compilerOptions, IJavaProject javaProject, boolean isTest) {
-		configureJavacContext(context, compilerOptions, javaProject, null, null, isTest);
+	public static void configureJavacContext(Context context, Map<String, String> compilerOptions, IJavaProject javaProject, boolean isTest, boolean skipModules) {
+		configureJavacContext(context, compilerOptions, javaProject, null, null, isTest, skipModules);
 	}
 
 	public static void configureJavacContext(Context context, JavacConfig compilerConfig,
 	        IJavaProject javaProject, File output, boolean isTest) {
-		configureJavacContext(context, compilerConfig.compilerOptions().getMap(), javaProject, compilerConfig, output, isTest);
+		configureJavacContext(context, compilerConfig.compilerOptions().getMap(), javaProject, compilerConfig, output, isTest, false);
 	}
 
 	private static void configureJavacContext(Context context, Map<String, String> compilerOptions,
-	        IJavaProject javaProject, JavacConfig compilerConfig, File output, boolean isTest) {
+	        IJavaProject javaProject, JavacConfig compilerConfig, File output, boolean isTest, boolean skipModules) {
 		IClasspathEntry[] classpath = new IClasspathEntry[0];
 		if (javaProject != null && javaProject.getProject() != null) {
 			try {
@@ -103,7 +103,7 @@ private static void configureJavacContext(Context context, Map<String, String> c
 			JavacFileManager.preRegister(context);
 		}
 		if (javaProject instanceof JavaProject internal) {
-			configurePaths(internal, context, compilerConfig, output, isTest);
+			configurePaths(internal, context, compilerConfig, output, isTest, skipModules);
 		}
 	}
 
@@ -228,7 +228,7 @@ private static void addDebugInfos(Map<String, String> compilerOptions, Options o
 	}
 
 	private static void configurePaths(JavaProject javaProject, Context context, JavacConfig compilerConfig,
-	        File output, boolean isTest) {
+	        File output, boolean isTest, boolean skipModules) {
 		var fileManager = (StandardJavaFileManager)context.get(JavaFileManager.class);
 		try {
 			if (compilerConfig != null && !isEmpty(compilerConfig.annotationProcessorPaths())) {
@@ -338,7 +338,7 @@ private static void configurePaths(JavaProject javaProject, Context context, Jav
 				classpathFiles.addAll(outDirectories(javaProject, entry -> isTest || !entry.isTest()));
 				fileManager.setLocation(StandardLocation.CLASS_PATH, classpathFiles);
 
-				if (!moduleSourcePathEnabled && javaProject.getModuleDescription() != null) {
+				if (!skipModules && !moduleSourcePathEnabled && javaProject.getModuleDescription() != null) {
 					moduleProjects = new LinkedHashSet<>(moduleProjects);
 					moduleProjects.add(javaProject);
 					for (IJavaProject requiredModuleProject : moduleProjects) {