Merge branch 'main' of github.com:quarto-dev/quarto-cli into main

Author: jjallaire

src/core/jupyter/jupyter.ts

@@ -1367,7 +1367,7 @@ function mdOutputDisplayData(
         lines[0] = lines[0].slice(1, -1);
         return mdMarkdownOutput(lines);
       } else {
-        return mdCodeOutput(lines);
+        return mdCodeOutput(lines.map(colors.stripColor));
       }
     }
   }

src/execute/engine.ts

@@ -157,6 +157,7 @@ export function fileEngineClaimReason(
 
 export function fileExecutionEngine(
   file: string,
+  markdown?: MappedString,
 ) {
   // get the extension and validate that it can be handled by at least one of our engines
   const ext = extname(file).toLowerCase();
@@ -171,15 +172,19 @@ export function fileExecutionEngine(
     }
   }
 
-  return markdownExecutionEngine(Deno.readTextFileSync(file));
+  // if we were passed a transformed markdown, use that for the text instead
+  // of the contents of the file.
+  return markdownExecutionEngine(
+    markdown ? markdown.value : Deno.readTextFileSync(file),
+  );
 }
 
 export async function fileExecutionEngineAndTarget(
   file: string,
   quiet?: boolean,
   markdown?: MappedString,
 ) {
-  const engine = fileExecutionEngine(file);
+  const engine = fileExecutionEngine(file, markdown);
   if (!engine) {
     throw new Error("Unable to render " + file);
   }

tests/docs/engine/_includes-r-statements.qmd

@@ -0,0 +1 @@
+An inline r value `r 7 * 11 * 13`.

tests/docs/engine/test-include-engine-detection.qmd

@@ -0,0 +1,8 @@
+---
+title: "include inline test"
+format: html
+---
+
+Here's an inline r through an include:
+
+{{< include _includes-r-statements.qmd >}}

tests/smoke/engine/include-engine-detection.test.ts

@@ -0,0 +1,23 @@
+/*
+* include-engine-detection.test.ts
+*
+* Copyright (C) 2021 by RStudio, PBC
+*
+*/
+
+import { fileLoader } from "../../utils.ts";
+import { ensureHtmlSelectorSatisfies } from "../../verify.ts";
+import { testRender } from "../render/render.ts";
+
+const qmd = fileLoader("engine")("test-include-engine-detection.qmd", "html");
+testRender(qmd.input, "html", false, [
+  ensureHtmlSelectorSatisfies(
+    qmd.output.outputPath,
+    "p",
+    (nodelist) => {
+      return Array.from(nodelist).map((x) => x.textContent).some((x) =>
+        x.indexOf("1001") !== -1
+      );
+    },
+  ),
+]);