Respect preview output format (#785)

ElianHugh · web-flow · commit 2333f697da49 · 2021-09-11T13:12:53.000+08:00
* Respect output format

* Fix anchor tags
diff --git a/R/rmarkdown/preview.R b/R/rmarkdown/preview.R
@@ -4,13 +4,29 @@ if (!requireNamespace("rmarkdown", quietly = TRUE)) {
 }
 
 # get values from extension-set env values
-
 knit_dir <- Sys.getenv("VSCR_KNIT_DIR")
 lim <- Sys.getenv("VSCR_LIM")
 file_path <- Sys.getenv("VSCR_FILE_PATH")
 output_file_loc <- Sys.getenv("VSCR_OUTPUT_FILE")
 tmp_dir <- Sys.getenv("VSCR_TMP_DIR")
 
+# if an output format ends up as html, we should not overwrite
+# the format with rmarkdown::html_document()
+set_html <- tryCatch(
+    expr = {
+        lines <- suppressWarnings(readLines(file_path, encoding = "UTF-8"))
+        out <- rmarkdown:::output_format_from_yaml_front_matter(lines)
+        output_format <- rmarkdown:::create_output_format(out$name, out$options)
+        if (!output_format$pandoc$to == "html") {
+            rmarkdown::html_document()
+        } else {
+            NULL
+        }
+    }, error = function(e) {
+        rmarkdown::html_document()
+    }
+)
+
 # set the knitr chunk eval directory
 # mainly affects source calls
 knitr::opts_knit[["set"]](root.dir = knit_dir)
@@ -20,7 +36,7 @@ cat(
     lim,
     rmarkdown::render(
         file_path,
-        output_format = rmarkdown::html_document(),
+        output_format = set_html,
         output_file = output_file_loc,
         intermediates_dir = tmp_dir
     ),
diff --git a/src/rmarkdown/preview.ts b/src/rmarkdown/preview.ts
@@ -71,7 +71,7 @@ class RMarkdownPreview extends vscode.Disposable {
     }
 
     private getHtmlContent(htmlContent: string): void {
-        let content = htmlContent.replace(/<(\w+)\s+(href|src)="(?!\w+:)/g,
+        let content = htmlContent.replace(/<(\w+)\s+(href|src)="(?!(\w+:)|#)/g,
             `<$1 $2="${String(this.panel.webview.asWebviewUri(vscode.Uri.file(tmpDir())))}/`);
 
         const re = new RegExp('<html[^\\n]*>.*</html>', 'ms');
@@ -82,12 +82,11 @@ class RMarkdownPreview extends vscode.Disposable {
             content = `<html><head></head><body><pre>${html}</pre></body></html>`;
         }
 
-        this.htmlLightContent = content;
-
         const $ = cheerio.load(content);
-        const chunkCol = String(config().get('rmarkdown.chunkBackgroundColor'));
+        this.htmlLightContent = $.html();
 
         // make the output chunks a little lighter to stand out
+        const chunkCol = String(config().get('rmarkdown.chunkBackgroundColor'));
         const colReg = /[0-9.]+/g;
         const regOut = chunkCol.match(colReg);
         const outCol = `rgba(${regOut[0] ?? 100}, ${regOut[1] ?? 100}, ${regOut[2] ?? 100}, ${Number(regOut[3]) + 0.05 ?? .5})`;
@@ -113,6 +112,9 @@ class RMarkdownPreview extends vscode.Disposable {
             pre > code {
                 background: transparent;
             }
+            h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+                color: inherit;
+            }
         </style>
         `;
         $('head').append(style);
