From 38920c6dce9b1bfd768596d2a278d7d9963a7384 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Sat, 19 Feb 2022 11:35:30 -0600
Subject: [PATCH] ca65: return listings if errors

---
 src/worker/tools/cc65.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/worker/tools/cc65.ts b/src/worker/tools/cc65.ts
index 8aff1e0d..fe324a58 100644
--- a/src/worker/tools/cc65.ts
+++ b/src/worker/tools/cc65.ts
@@ -1,7 +1,7 @@
 
 import { getFilenamePrefix, getRootBasePlatform } from "../../common/util";
 import { CodeListingMap, WorkerError } from "../../common/workertypes";
-import { re_crlf, BuildStepResult, anyTargetChanged, execMain, gatherFiles, msvcErrorMatcher, populateEntry, populateExtraFiles, populateFiles, print_fn, putWorkFile, setupFS, staleFiles, BuildStep, emglobal, loadNative, moduleInstFn, fixParamsWithDefines, store, makeErrorMatcher } from "../workermain";
+import { re_crlf, BuildStepResult, anyTargetChanged, execMain, gatherFiles, msvcErrorMatcher, populateEntry, populateExtraFiles, populateFiles, print_fn, putWorkFile, setupFS, staleFiles, BuildStep, emglobal, loadNative, moduleInstFn, fixParamsWithDefines, store, makeErrorMatcher, getWorkFileAsString } from "../workermain";
 import { EmscriptenModule } from "../workermain"
 
 
@@ -128,8 +128,12 @@ export function assembleCA65(step: BuildStep): BuildStepResult {
             args.unshift.apply(args, ["-D", "__MAIN__=1"]);
         }
         execMain(step, CA65, args);
-        if (errors.length)
-            return { errors: errors };
+        if (errors.length) {
+            // TODO?
+            let listings : CodeListingMap = {};
+            listings[step.path] = { lines:[], text:getWorkFileAsString(step.path) };
+            return { errors, listings };
+        }
         objout = FS.readFile(objpath, { encoding: 'binary' });
         lstout = FS.readFile(lstpath, { encoding: 'utf8' });
         putWorkFile(objpath, objout);