apply tests when applicable

Author: teunbrand

R/coord-cartesian-.R

@@ -159,7 +159,7 @@ view_scales_from_scale <- function(scale, coord_limits = NULL, expand = TRUE) {
 }
 
 panel_guides_grob <- function(guides, position, theme, labels = NULL) {
-  if (!inherits(guides, "Guides")) {
+  if (!is.guides(guides)) {
     return(zeroGrob())
   }
   pair <- guides$get_position(position)

R/facet-.R

@@ -437,7 +437,7 @@ as_facets_list <- function(x) {
 }
 
 validate_facets <- function(x) {
-  if (inherits(x, "uneval")) {
+  if (is.mapping(x)) {
     cli::cli_abort("Please use {.fn vars} to supply facet variables.")
   }
   # Native pipe have higher precedence than + so any type of gg object can be

R/fortify.R

@@ -79,7 +79,7 @@ fortify.default <- function(model, data, ...) {
     "or an object coercible by {.fn fortify}, or a valid ",
     "{.cls data.frame}-like object coercible by {.fn as.data.frame}"
   )
-  if (inherits(model, "uneval")) {
+  if (is.mapping(model)) {
     msg <- c(
       paste0(msg, ", not ", obj_type_friendly(model), "."),
       "i" = "Did you accidentally pass {.fn aes} to the {.arg data} argument?"

R/geom-defaults.R

@@ -98,7 +98,7 @@ get_geom_defaults <- function(geom, theme = theme_get()) {
   if (is.character(geom)) {
     geom <- check_subclass(geom, "Geom")
   }
-  if (inherits(geom, "Geom")) {
+  if (is.geom(geom)) {
     out <- geom$use_defaults(data = NULL, theme = theme)
     return(out)
   }

R/geom-label.R

@@ -78,7 +78,7 @@ GeomLabel <- ggproto("GeomLabel", Geom,
     data <- coord$transform(data, panel_params)
     data$vjust <- compute_just(data$vjust, data$y, data$x, data$angle)
     data$hjust <- compute_just(data$hjust, data$x, data$y, data$angle)
-    if (!inherits(label.padding, "margin")) {
+    if (!is.margin("margin")) {
       label.padding <- rep(label.padding, length.out = 4)
     }
 

R/guide-.R

@@ -377,7 +377,7 @@ Guide <- ggproto(
   # Renders tickmarks
   build_ticks = function(key, elements, params, position = params$position,
                          length = elements$ticks_length) {
-    if (!inherits(elements, "element")) {
+    if (!is.element(elements)) {
       elements <- elements$ticks
     }
     if (!inherits(elements, "element_line")) {

R/guides-.R

@@ -69,7 +69,7 @@ NULL
 guides <- function(...) {
   args <- list2(...)
   if (length(args) > 0) {
-    if (is.list(args[[1]]) && !inherits(args[[1]], "guide")) args <- args[[1]]
+    if (is.list(args[[1]]) && !is.guide(args[[1]])) args <- args[[1]]
     args <- rename_aes(args)
   }
 
@@ -138,7 +138,7 @@ Guides <- ggproto(
     if (is.null(guides)) {
       return(invisible())
     }
-    if (inherits(guides, "Guides")) {
+    if (is.guides(guides)) {
       guides <- guides$guides
     }
     self$guides <- defaults(guides, self$guides)
@@ -862,7 +862,7 @@ validate_guide <- function(guide) {
       guide <- fun()
     }
   }
-  if (inherits(guide, "Guide")) {
+  if (is.guide(guide)) {
     return(guide)
   }
   if (inherits(guide, "guide") && is.list(guide)) {

R/layer.R

@@ -58,8 +58,8 @@
 #'   `NA`, the default, includes if any aesthetics are mapped.
 #'   `FALSE` never includes, and `TRUE` always includes.
 #'   It can also be a named logical vector to finely select the aesthetics to
-#'   display. To include legend keys for all levels, even 
-#'   when no data exists, use `TRUE`.  If `NA`, all levels are shown in legend, 
+#'   display. To include legend keys for all levels, even
+#'   when no data exists, use `TRUE`.  If `NA`, all levels are shown in legend,
 #'   but unobserved levels are omitted.
 #' @param inherit.aes If `FALSE`, overrides the default aesthetics,
 #'   rather than combining with them. This is most useful for helper functions
@@ -203,7 +203,7 @@ layer <- function(geom = NULL, stat = NULL,
 }
 
 validate_mapping <- function(mapping, call = caller_env()) {
-  if (!inherits(mapping, "uneval")) {
+  if (!is.mapping(mapping)) {
     msg <- "{.arg mapping} must be created by {.fn aes}."
     # Native pipe have higher precedence than + so any type of gg object can be
     # expected here, not just ggplot

R/plot-build.R

@@ -288,7 +288,7 @@ ggplot_gtable.ggplot_built <- function(data) {
   plot_margin <- calc_element("plot.margin", theme)
   plot_table  <- gtable_add_padding(plot_table, plot_margin)
 
-  if (inherits(theme$plot.background, "element")) {
+  if (is.element(theme$plot.background)) {
     plot_table <- gtable_add_grob(plot_table,
       element_render(theme, "plot.background"),
       t = 1, l = 1, b = -1, r = -1, name = "background", z = -Inf)

R/plot-construction.R

@@ -149,7 +149,7 @@ ggplot_add.labels <- function(object, plot, object_name) {
 }
 #' @export
 ggplot_add.Guides <- function(object, plot, object_name) {
-  if (inherits(plot$guides, "Guides")) {
+  if (is.guides(plot$guides)) {
     # We clone the guides object to prevent modify-in-place of guides
     old <- plot$guides
     new <- ggproto(NULL, old)