Better handling of chunk labels when provided as an option or yaml_op…

…tion
rundel · Aug 4, 2024 · 86649d2 · 86649d2
1 parent 28bba6d
commit 86649d2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/R/parse_rmd.R b/R/parse_rmd.R
@@ -55,7 +55,7 @@ parse_qmd = function(qmd, allow_incomplete = FALSE, parse_yaml = TRUE) {
 fix_unnamed_chunks = function(ast) {
   unk_i = 1
   for(j in seq_along(ast)) {
-    if (inherits(ast[[j]], "rmd_chunk") && ast[[j]][["name"]] == "") {
+    if (inherits(ast[[j]], "rmd_chunk") && ast[[j]][["name"]] == "" && rmd_node_label(ast[[j]]) == "") {
       ast[[j]][["name"]] = paste0("unnamed-chunk-", unk_i)
       unk_i = unk_i + 1
     }

diff --git a/R/print_tree.R b/R/print_tree.R
@@ -48,18 +48,14 @@ tree_node.rmd_code_block = function(x) {
 
 #' @exportS3Method
 tree_node.rmd_chunk = function(x) {
-  name = if (x$name != "") cli::style_bold(x$name)
-         else cli::style_italic("<unnamed>")
+  name = cli::style_bold(rmd_node_label(x))
 
   n_opt = length(x$options) + length(x$yaml_options)
-  opt = if (n_opt == 1) "1 opt, "
-        else if (n_opt != 0) paste0(length(x$options), " opts, ")
-        else ""
 
   list(
     text = "Chunk",
     #label = paste0("[", x$engine, ", ", opt, length(x$code), " lines] - ", name)
-    label = cli::pluralize("[{x$engine}, {n_opt} {?options/option/options}, {length(x$code)} line{?s}]")
+    label = cli::pluralize("[{x$engine}, {n_opt} {?options/option/options}, {length(x$code)} line{?s}] - {name}")
   )
 }
 

diff --git a/R/rmd_node.R b/R/rmd_node.R
@@ -68,8 +68,12 @@ rmd_node_label.default = function(x, ...) {
 rmd_node_label.rmd_chunk = function(x, ...) {
   name = x[["name"]]
 
-  if (name == "" & !is.null(x[["options"]][["label"]]))
-    name = x[["options"]][["label"]]
+  if (name == "") {
+    if (!is.null(x[["options"]][["label"]]))
+      name = x[["options"]][["label"]]
+    else if (!is.null(x[["yaml_options"]][["label"]]))
+      name = x[["yaml_options"]][["label"]]
+  }
 
   if (is.null(name))
     name = NA_character_

diff --git a/tests/testthat/_snaps/print_tree.md b/tests/testthat/_snaps/print_tree.md
@@ -2,22 +2,22 @@
 
     +-- YAML [4 lines]
     +-- Heading [h1] - Setup
-    |   \-- Chunk [r, 1 option, 1 line]
+    |   \-- Chunk [r, 1 option, 1 line] - setup
     \-- Heading [h1] - Content
         +-- Heading [h2] - R Markdown
         |   +-- Markdown [6 lines]
-        |   +-- Chunk [r, 0 options, 1 line]
-        |   \-- Chunk [r, 0 options, 1 line]
+        |   +-- Chunk [r, 0 options, 1 line] - cars
+        |   \-- Chunk [r, 0 options, 1 line] - unnamed-chunk-1
         \-- Heading [h2] - Including Plots
             +-- Markdown [2 lines]
-            +-- Chunk [r, 1 option, 1 line]
+            +-- Chunk [r, 1 option, 1 line] - pressure
             \-- Markdown [2 lines]
 
 ---
 
     +-- YAML [2 lines]
     +-- Heading [h3] - Load packages
-    |   \-- Chunk [r, 1 option, 2 lines]
+    |   \-- Chunk [r, 1 option, 2 lines] - load-packages
     +-- Heading [h3] - Exercise 1
     |   +-- Markdown [2 lines]
     |   \-- Heading [h4] - Solution
@@ -26,20 +26,20 @@
     |   +-- Markdown [2 lines]
     |   \-- Heading [h4] - Solution
     |       +-- Markdown [2 lines]
-    |       +-- Chunk [r, 2 options, 5 lines]
+    |       +-- Chunk [r, 2 options, 5 lines] - plot-dino
     |       +-- Markdown [2 lines]
-    |       \-- Chunk [r, 0 options, 2 lines]
+    |       \-- Chunk [r, 0 options, 2 lines] - cor-dino
     \-- Heading [h3] - Exercise 3
         +-- Markdown [2 lines]
         \-- Heading [h4] - Solution
-            +-- Chunk [r, 2 options, 5 lines]
-            \-- Chunk [r, 0 options, 2 lines]
+            +-- Chunk [r, 2 options, 5 lines] - plot-star
+            \-- Chunk [r, 0 options, 2 lines] - cor-star
 
 ---
 
     +-- YAML [2 lines]
     +-- Heading [h3] - Load packages
-    |   \-- Chunk [r, 1 option, 2 lines]
+    |   \-- Chunk [r, 1 option, 2 lines] - load-packages
     +-- Heading [h3] - Exercise 1
     |   +-- Markdown [2 lines]
     |   \-- Heading [h4] - Solution
@@ -48,16 +48,16 @@
     |   +-- Markdown [2 lines]
     |   \-- Heading [h4] - Solution
     |       +-- Markdown [4 lines]
-    |       +-- Chunk [r, 2 options, 5 lines]
+    |       +-- Chunk [r, 2 options, 5 lines] - plot-dino
     |       +-- Markdown [2 lines]
-    |       \-- Chunk [r, 0 options, 2 lines]
+    |       \-- Chunk [r, 0 options, 2 lines] - cor-dino
     \-- Heading [h3] - Exercise 3
         +-- Markdown [2 lines]
         \-- Heading [h4] - Solution
             +-- Markdown [4 lines]
-            +-- Chunk [r, 0 options, 1 line]
+            +-- Chunk [r, 0 options, 1 line] - plot-star
             +-- Markdown [2 lines]
-            \-- Chunk [r, 0 options, 1 line]
+            \-- Chunk [r, 0 options, 1 line] - cor-star
 
 ---
 
@@ -72,7 +72,7 @@
     +-- YAML [1 line]
     +-- Heading [h2] - R Markdown
     |   +-- Markdown [4 lines]
-    |   \-- Chunk [r, 0 options, 1 line]
+    |   \-- Chunk [r, 0 options, 1 line] - cars
     \-- Heading [h2] - Pandoc Raw Attribute Chunk
         +-- Markdown [2 lines]
         \-- Raw Attr Chunk [html, 5 lines]