✨ Allow #embed file replacement and preserve eol-tokens (#5600)

compiler-explorer · Oct 21, 2023 · c6d3fa6 · c6d3fa6
1 parent c4616b3
commit c6d3fa6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/static/compiler-service.ts b/static/compiler-service.ts
@@ -318,20 +318,20 @@ export class CompilerService {
     }
 
     public async expandToFiles(source: string): Promise<SourceAndFiles> {
-        const includes = new IncludeDownloads();
+        const includesOrEmbeds = new IncludeDownloads();
 
-        const includeFind = /^\s*#\s*include\s*["<](https?:\/\/[^">]+)[">]/;
+        const includeOrEmbedFind = /^\s*#\s*(include|embed)\s*["<](https?:\/\/[^">]+)[">]/;
         const lines = source.split('\n');
         for (const idx in lines) {
             const line = lines[idx];
-            const match = line.match(includeFind);
+            const match = line.match(includeOrEmbedFind);
             if (match) {
-                const download = includes.include(match[1]);
-                lines[idx] = `#include "${download.filename}"`;
+                const download = includesOrEmbeds.include(match[2]);
+                lines[idx] = line.replace(includeOrEmbedFind, `#${match[1]} "${download.filename}"`);
             }
         }
 
-        const files: FiledataPair[] = await includes.allDownloadsAsFileDataPairs();
+        const files: FiledataPair[] = await includesOrEmbeds.allDownloadsAsFileDataPairs();
 
         return {
             source: lines.join('\n'),