use more rlang

R/aaa.R

@@ -9,9 +9,9 @@ safe_eval <- function(expr, data) {
     eval_tidy(expr, data),
     error = function(e) numeric()
   )
-  if (!is.function(value) &&
-      !is.environment(value) &&
-      !is.symbol(value) &&
+  if (!is_function(value) &&
+      !is_environment(value) &&
+      !is_symbol(value) &&
       !is.language(value) &&
       (length(value) == 1 || length(value) == nrow(data))) {
     value
@@ -26,7 +26,7 @@ require_quo <- function(expr, name) {
   }
 }
 require_stat <- function(x) {
-  if (is.call(x)) {
+  if (is_call(x)) {
     if (identical(x[[1]], quote(stat)) || identical(x[[1]], quote(after_stat))) {
       TRUE
     } else {

R/animate.R

@@ -331,7 +331,7 @@ plot_dims <- function(plot, ref_frame) {
   widths <- convertWidth(widths_rel, 'mm')
   heights_rel <- frame$heights
   heights <- convertHeight(heights_rel, 'mm')
-  if (is.list(widths)) { # New unit spec
+  if (is_list(widths)) { # New unit spec
     null_widths <- vapply(unclass(widths), `[[`, numeric(1), 1L) == 0
     null_heights <- vapply(unclass(heights), `[[`, numeric(1), 1L) == 0
   } else {

R/renderers.R

@@ -152,7 +152,7 @@ ffmpeg_renderer <- function(format = 'auto', ffmpeg = NULL, options = list(pix_f
       "mp4"
     }
   }
-  if (is.list(options)) {
+  if (is_list(options)) {
     if (is.null(names(options))) {
       cli::cli_abort('{.arg options} must be a named list')
     }
@@ -253,7 +253,7 @@ gif_file <- function(file) {
 #' @export
 print.gif_image <- function(x, ...) {
   viewer <- getOption("viewer", utils::browseURL)
-  if (is.function(viewer) && length(x)) {
+  if (is_function(viewer) && length(x)) {
     viewer(x)
   } else {
     invisible()

R/scene.R

@@ -133,7 +133,7 @@ Scene <- ggproto('Scene', NULL,
     if (is.null(vp)) {
       grid.draw(plot)
     } else {
-      if (is.character(vp)) seekViewport(vp)
+      if (is_character(vp)) seekViewport(vp)
       else pushViewport(vp)
       grid.draw(plot)
       upViewport()
@@ -145,7 +145,7 @@ Scene <- ggproto('Scene', NULL,
     label_var$data <- plot$data
     plot$plot$labels <- lapply(plot$plot$labels, function(label) {
       orig_call <- FALSE
-      if (is.call(label)) {
+      if (is_call(label)) {
         orig_call <- TRUE
         label <- list(label)
       }
@@ -159,7 +159,7 @@ Scene <- ggproto('Scene', NULL,
       })
       if (orig_call) {
         new_label[[1]]
-      } else if (is.expression(label)) {
+      } else if (is_expression(label)) {
         as.expression(new_label)
       } else {
         unlist(new_label)

R/shadow-wake.R

@@ -52,8 +52,8 @@
 #' }
 #'
 shadow_wake <- function(wake_length, size = TRUE, alpha = TRUE, colour = NULL, fill = NULL, falloff = 'cubic-in', wrap = TRUE, exclude_layer = NULL, exclude_phase = c('enter', 'exit')) {
-  if (is.logical(size)) size <- if (size) 0 else NULL
-  if (is.logical(alpha)) alpha <- if (alpha) 0 else NULL
+  if (is_logical(size)) size <- if (size) 0 else NULL
+  if (is_logical(alpha)) alpha <- if (alpha) 0 else NULL
 
   ggproto(NULL, ShadowWake,
     exclude_layer = exclude_layer,

R/transition-filter.R

@@ -211,7 +211,7 @@ assign_filters <- function(data, filters, after = FALSE, row_vars = NULL) {
       if (!do_filter[i]) return(rep(FALSE, nrow(d)))
       filter <- safe_eval(filters[[i]], d)
       filter <- filter %||% rep(TRUE, nrow(d))
-      if (!is.logical(filter)) cli::cli_abort('Filters must return a logical vector')
+      if (!is_logical(filter)) cli::cli_abort('Filters must return a logical vector')
       filter
     }))
     if (all(row_filter)) return(numeric(0))

R/transition-layers.R

@@ -85,7 +85,7 @@ NULL
 #'   exit_fade() + exit_shrink()
 #'
 transition_layers <- function(layer_length = 1, transition_length = 1, keep_layers = TRUE, from_blank = TRUE, layer_order = NULL, layer_names = NULL) {
-  if (is.logical(keep_layers)) keep_layers <- if (keep_layers) Inf else 0L
+  if (is_logical(keep_layers)) keep_layers <- if (keep_layers) Inf else 0L
   ggproto(NULL, TransitionLayers,
     params = list(
       layer_length = layer_length,

R/view-.R

@@ -17,12 +17,12 @@ View <- ggproto('View', NULL,
     plot
   },
   reset_limits = function(self, plot, xlim, ylim) {
-    if (is.logical(self$fixed_lim$x)) {
+    if (is_logical(self$fixed_lim$x)) {
       if (self$fixed_lim$x) xlim <- plot$layout$coord$limits$x
     } else {
       xlim[!is.na(self$fixed_lim$x)] <- self$fixed_lim$x[!is.na(self$fixed_lim$x)]
     }
-    if (is.logical(self$fixed_lim$y)) {
+    if (is_logical(self$fixed_lim$y)) {
       if (self$fixed_lim$y) ylim <- plot$layout$coord$limits$y
     } else {
       ylim[!is.na(self$fixed_lim$y)] <- self$fixed_lim$y[!is.na(self$fixed_lim$y)]