asconfigc: fix resolution of mainClass if asconfig.json is not in roo…

…t of workspace (closes #718)
BowlerHatLLC · Dec 11, 2023 · dcdcb70 · dcdcb70
1 parent e9b9e04
commit dcdcb70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigC.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigC.java
@@ -564,7 +564,7 @@ private void parseConfig(JsonNode json) throws ASConfigCException {
 			// if set already, clear it because we're going to replace it
 			boolean hadMainFile = mainFile != null;
 			String mainClass = json.get(TopLevelFields.MAIN_CLASS).asText();
-			mainFile = ConfigUtils.resolveMainClass(mainClass, sourcePaths);
+			mainFile = ConfigUtils.resolveMainClass(mainClass, sourcePaths, System.getProperty("user.dir"));
 			if (mainFile == null) {
 				throw new ASConfigCException("Main class not found in source paths: " + mainClass);
 			}

diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ConfigUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ConfigUtils.java
@@ -66,10 +66,16 @@ public static String resolveMainClass(String mainClass, List<String> sourcePaths
 		}
 		// as a final fallback, try in the current working directory
 		Path mainClassPathAS = Paths.get(mainClassBasePath + FILE_EXTENSION_AS);
+		if (!mainClassPathAS.isAbsolute() && rootWorkspacePath != null) {
+			mainClassPathAS = Paths.get(rootWorkspacePath).resolve(mainClassPathAS);
+		}
 		if (mainClassPathAS.toFile().exists()) {
 			return mainClassPathAS.toString();
 		}
 		Path mainClassPathMXML = Paths.get(mainClassBasePath + FILE_EXTENSION_MXML);
+		if (!mainClassPathMXML.isAbsolute() && rootWorkspacePath != null) {
+			mainClassPathMXML = Paths.get(rootWorkspacePath).resolve(mainClassPathMXML);
+		}
 		if (mainClassPathMXML.toFile().exists()) {
 			return mainClassPathMXML.toString();
 		}