Fallback to resolving compilation unit from filename as previously

INRIA · Aug 27, 2020 · 9567ad5 · 9567ad5
1 parent 5ff8503
commit 9567ad5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,9 @@ maven-eclipse.xml
 !.idea/codeStyleSettings.xml
 *.iml
 
+# VSCode
+.vscode
+
 # Spoon
 spooned-classes/
 spooned/
@@ -31,3 +34,6 @@ doc/_jekyll/_site/
 
 # Nodejs
 node_modules/
+
+# Gradle
+.gradle
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
   <artifactId>spoon-core</artifactId>
   <packaging>jar</packaging>
-  <version>8.3.0-SNAPSHOT</version>
+  <version>8.4.0-SNAPSHOT</version>
   <name>Spoon Core</name>
   <description>Spoon is a tool for meta-programming, analysis and transformation of Java programs.</description>
   <url>http://spoon.gforge.inria.fr/</url>

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTBatchCompiler.java b/src/main/java/spoon/support/compiler/jdt/JDTBatchCompiler.java
@@ -91,7 +91,14 @@ public CompilationUnit[] getCompilationUnits() {
 							} else {
 								lastSlash += 1;
 							}
-							compilationUnit.module = this.module.name();
+
+							if (this.module == null) {
+								compilationUnit.module = CharOperation.subarray(modulePath, lastSlash, modulePath.length);
+							} else {
+								//TODO the module name parsed by JDK compiler is in `this.modNames`, consider using that instead?
+								compilationUnit.module = this.module.name();
+							}
+
 							pathToModName.put(String.valueOf(modulePath), compilationUnit.module);
 						}
 					} else {