Run air format . to update formatting

Author: cderv

src/resources/rmd/execute.R

@@ -19,8 +19,11 @@ execute <- function(
   markdown
 ) {
   # calculate knit_root_dir (before we setwd below)
-  knit_root_dir <- if (!is.null(cwd)) tools::file_path_as_absolute(cwd) else
+  knit_root_dir <- if (!is.null(cwd)) {
+    tools::file_path_as_absolute(cwd)
+  } else {
     NULL
+  }
 
   # change to input dir and make input relative (matches
   # behavior/expectations of rmarkdown::render code)
@@ -210,8 +213,11 @@ execute <- function(
   # include supporting files
   supporting <- if (
     !is.null(intermediates_dir) && file_test("-d", intermediates_dir)
-  )
-    rmarkdown:::abs_path(intermediates_dir) else character()
+  ) {
+    rmarkdown:::abs_path(intermediates_dir)
+  } else {
+    character()
+  }
 
   # ammend knit_meta with paged table if df_print == "paged"
   if (df_print == "paged") {
@@ -287,7 +293,9 @@ knitr_options <- function(format, resourceDir, handledLanguages) {
 
   # opt_knit for compatibility w/ rmarkdown::render
   to <- format$pandoc$to
-  if (identical(to, "pdf")) to <- "latex"
+  if (identical(to, "pdf")) {
+    to <- "latex"
+  }
   opts_knit <- list(
     quarto.version = 1,
     rmarkdown.pandoc.from = format$pandoc$from,
@@ -397,7 +405,9 @@ knitr_options_with_cache <- function(input, format, opts) {
 knitr_cache_dir <- function(input, format) {
   pandoc_to <- format$pandoc$to
   base_pandoc_to <- gsub('[-+].*', '', pandoc_to)
-  if (base_pandoc_to == 'html4') base_pandoc_to <- 'html'
+  if (base_pandoc_to == 'html4') {
+    base_pandoc_to <- 'html'
+  }
   cache_dir <- rmarkdown:::knitr_cache_dir(input, base_pandoc_to)
   cache_dir <- gsub("/$", "", cache_dir)
   cache_dir
@@ -669,8 +679,9 @@ is_dashboard_output <- function(format) {
 
 # apply patches to output as required
 apply_patches <- function(format, includes) {
-  if (format$pandoc$to %in% c("slidy", "revealjs"))
+  if (format$pandoc$to %in% c("slidy", "revealjs")) {
     includes <- apply_slides_patch(includes)
+  }
   includes
 }
 
@@ -771,12 +782,15 @@ has_crop_tools <- function(warn = TRUE) {
     ghostscript = unname(tools::find_gs_cmd())
   )
   missing <- tools[tools == ""]
-  if (length(missing) == 0) return(TRUE)
+  if (length(missing) == 0) {
+    return(TRUE)
+  }
   x <- paste0(names(missing), collapse = ", ")
-  if (warn)
+  if (warn) {
     warning(
       sprintf("\nTool(s) not installed or not in PATH: %s", x),
       "\n-> As a result, figure cropping will be disabled."
     )
+  }
   FALSE
 }

src/resources/rmd/hooks.R

@@ -159,7 +159,9 @@ knitr_hooks <- function(format, resourceDir, handledLanguages) {
     opts_hooks[[option]] <<- function(options) {
       if (identical(options[[option]], FALSE)) {
         options[[option]] <- TRUE
-        for (hide in hidden) options[[paste0(hide, ".hidden")]] <- TRUE
+        for (hide in hidden) {
+          options[[paste0(hide, ".hidden")]] <- TRUE
+        }
       }
       options
     }
@@ -191,8 +193,9 @@ knitr_hooks <- function(format, resourceDir, handledLanguages) {
         # prefix for classes
         classes <- c("cell-output", paste0("cell-output-", classes))
         # add .hidden class if keep-hidden hook injected an option
-        if (isTRUE(options[[paste0(type, ".hidden")]]))
+        if (isTRUE(options[[paste0(type, ".hidden")]])) {
           classes <- c(classes, "hidden")
+        }
         output_div(x, NULL, classes)
       }
     })
@@ -390,26 +393,32 @@ knitr_hooks <- function(format, resourceDir, handledLanguages) {
       forwardAttr,
       sprintf("%s='%s'", unknown_opts, unknown_values)
     )
-    if (length(forwardAttr) > 0)
-      forwardAttr <- paste0(" ", paste(forwardAttr, collapse = " ")) else
+    if (length(forwardAttr) > 0) {
+      forwardAttr <- paste0(" ", paste(forwardAttr, collapse = " "))
+    } else {
       forwardAttr <- ""
+    }
 
     # handle classes
     classes <- c("cell", options[["classes"]])
-    if (is.character(options[["panel"]]))
+    if (is.character(options[["panel"]])) {
       classes <- c(classes, paste0("panel-", options[["panel"]]))
-    if (is.character(options[["column"]]))
+    }
+    if (is.character(options[["column"]])) {
       classes <- c(classes, paste0("column-", options[["column"]]))
+    }
     if (is.character(options[["fig-column"]])) {
       classes <- c(classes, paste0("fig-column-", options[["fig-column"]]))
     } else if (is.character(options[["fig.column"]])) {
       # knitr < 1.44 compatibility where fig- -> fig.
       classes <- c(classes, paste0("fig-column-", options[["fig.column"]]))
     }
-    if (is.character(options[["tbl-column"]]))
+    if (is.character(options[["tbl-column"]])) {
       classes <- c(classes, paste0("tbl-column-", options[["tbl-column"]]))
-    if (is.character(options[["cap-location"]]))
+    }
+    if (is.character(options[["cap-location"]])) {
       classes <- c(classes, paste0("caption-", options[["cap-location"]]))
+    }
     if (is.character(options[["fig-cap-location"]])) {
       classes <- c(
         classes,
@@ -422,11 +431,12 @@ knitr_hooks <- function(format, resourceDir, handledLanguages) {
         paste0("fig-cap-location-", options[["fig.cap-location"]])
       )
     }
-    if (is.character(options[["tbl-cap-location"]]))
+    if (is.character(options[["tbl-cap-location"]])) {
       classes <- c(
         classes,
         paste0("tbl-cap-location-", options[["tbl-cap-location"]])
       )
+    }
 
     if (isTRUE(options[["include.hidden"]])) {
       classes <- c(classes, "hidden")
@@ -498,11 +508,11 @@ knitr_hooks <- function(format, resourceDir, handledLanguages) {
           attr <- paste(attr, paste0('lst-cap="', options[["lst-cap"]], '"'))
         }
       }
-      if (identical(options[["code-overflow"]], "wrap"))
-        class <- paste(class, "code-overflow-wrap") else if (
-        identical(options[["code-overflow"]], "scroll")
-      )
+      if (identical(options[["code-overflow"]], "wrap")) {
+        class <- paste(class, "code-overflow-wrap")
+      } else if (identical(options[["code-overflow"]], "scroll")) {
         class <- paste(class, "code-overflow-scroll")
+      }
       fold <- options[["code-fold"]]
       if (!is.null(fold)) {
         attr <- paste(
@@ -615,7 +625,9 @@ knitr_plot_hook <- function(format) {
 
     # classes
     classes <- paste0("cell-output-display")
-    if (isTRUE(options[["plot.hidden"]])) classes <- c(classes, "hidden")
+    if (isTRUE(options[["plot.hidden"]])) {
+      classes <- c(classes, "hidden")
+    }
 
     # label
     placeholder <- output_label_placeholder(options)
@@ -746,7 +758,9 @@ knitr_plot_hook <- function(format) {
       }
 
       # result = "asis" specific
-      if (identical(options[["results"]], "asis")) return(md)
+      if (identical(options[["results"]], "asis")) {
+        return(md)
+      }
 
       # enclose in output div
       output_div(md, NULL, classes)
@@ -1063,8 +1077,13 @@ figure_cap <- function(options) {
   if (is.null(output_label) || is_figure_label(output_label)) {
     fig.cap <- options[["fig.cap"]]
     fig.subcap <- options[["fig.subcap"]]
-    if (length(fig.subcap) != 0) fig.subcap else if (length(fig.cap) != 0)
-      fig.cap else ""
+    if (length(fig.subcap) != 0) {
+      fig.subcap
+    } else if (length(fig.cap) != 0) {
+      fig.cap
+    } else {
+      ""
+    }
   } else {
     ""
   }
@@ -1151,8 +1170,12 @@ latex_animation <- function(x, options) {
 
   ow = options$out.width
   # maxwidth does not work with animations
-  if (identical(ow, '\\maxwidth')) ow = NULL
-  if (is.numeric(ow)) ow = paste0(ow, 'px')
+  if (identical(ow, '\\maxwidth')) {
+    ow = NULL
+  }
+  if (is.numeric(ow)) {
+    ow = paste0(ow, 'px')
+  }
   size = paste(
     c(
       sprintf('width=%s', ow),
@@ -1165,7 +1188,9 @@ latex_animation <- function(x, options) {
   aniopts = options$aniopts
   aniopts = if (is.na(aniopts)) NULL else gsub(';', ',', aniopts)
   size = paste(c(size, sprintf('%s', aniopts)), collapse = ',')
-  if (nzchar(size)) size = sprintf('[%s]', size)
+  if (nzchar(size)) {
+    size = sprintf('[%s]', size)
+  }
   sprintf(
     '\\animategraphics%s{%s}{%s}{%s}{%s}',
     size,

src/resources/rmd/patch.R

@@ -111,7 +111,9 @@ wrap_asis_output <- function(options, x) {
   }
   classes <- paste0("cell-output-display")
   attrs <- NULL
-  if (isTRUE(options[["output.hidden"]])) classes <- paste0(classes, " .hidden")
+  if (isTRUE(options[["output.hidden"]])) {
+    classes <- paste0(classes, " .hidden")
+  }
 
   if (identical(options[["html-table-processing"]], "none")) {
     attrs <- paste(attrs, "html-table-processing=none")
@@ -130,7 +132,9 @@ wrap_asis_output <- function(options, x) {
   }
 
   # If asis output, don't include the output div
-  if (identical(options[["results"]], "asis")) return(x)
+  if (identical(options[["results"]], "asis")) {
+    return(x)
+  }
 
   output_div(x, output_label_placeholder(options), classes, attrs)
 }

src/resources/rmd/rmd.R

@@ -34,8 +34,11 @@
     knit_meta <- lapply(data, jsonlite::unserializeJSON)
 
     # determine files_dir
-    files_dir <- if (!is.null(libDir)) libDir else
+    files_dir <- if (!is.null(libDir)) {
+      libDir
+    } else {
       rmarkdown:::knitr_files_dir(output)
+    }
 
     # yield pandoc format
     list(
@@ -60,7 +63,9 @@
 
     # bail if we don't have any perserved chunks and aren't doing code linking
     code_link <- isHTML && isTRUE(format$render$`code-link`)
-    if (length(preserved_chunks) == 0 && code_link == FALSE) return()
+    if (length(preserved_chunks) == 0 && code_link == FALSE) {
+      return()
+    }
 
     # change to input dir and make input relative
     oldwd <- setwd(dirname(rmarkdown:::abs_path(input)))
@@ -191,8 +196,12 @@
 
   run <- function(input, port, host) {
     shiny_args <- list()
-    if (!is.null(port)) shiny_args$port <- port
-    if (!is.null(host)) shiny_args$host <- host
+    if (!is.null(port)) {
+      shiny_args$port <- port
+    }
+    if (!is.null(host)) {
+      shiny_args$host <- host
+    }
 
     # we already ran quarto render before the call to run
     Sys.setenv(RMARKDOWN_RUN_PRERENDER = "0")
@@ -226,7 +235,9 @@
   # print execute-debug message ("spin" and "run" don't pass format option)
   debug <- (!request$action %in% c("spin", "run")) &&
     isTRUE(params$format$execute[["debug"]])
-  if (debug) message("[knitr engine]: ", request$action)
+  if (debug) {
+    message("[knitr engine]: ", request$action)
+  }
 
   # dispatch request
   if (request$action == "spin") {
@@ -267,7 +278,9 @@
   }
 
   # write results
-  if (debug) message("[knitr engine]: writing results")
+  if (debug) {
+    message("[knitr engine]: writing results")
+  }
   resultJson <- jsonlite::toJSON(auto_unbox = TRUE, result)
   xfun:::write_utf8(paste(resultJson, collapse = "\n"), request[["results"]])
   if (debug) message("[knitr engine]: exiting")