Functions as aesthetics, fix extraspace, new message

Author: clairemcwhite

NAMESPACE

@@ -232,8 +232,8 @@ Layer <- ggproto("Layer", NULL,
     nondata_cols <- check_nondata_cols(evaled)
     if(length(nondata_cols) > 0){
       msg <- paste0(
-        "Aesthetics must be valid data columns: ", nondata_cols,
-        ". Did you forget to add stat()?"
+        "Aesthetics must be valid data columns: `", deparse(aesthetics[[nondata_cols]]), 
+        "`. Did you mistype the name of a data column or forget to add stat()?"
       )
       stop(msg, call. = FALSE)
       }
@@ -292,10 +292,10 @@ Layer <- ggproto("Layer", NULL,
 
     # Check that all columns in aesthetic stats are valid data
     nondata_stat_cols <- check_nondata_cols(stat_data)
-    if(length(nondata_stat_cols) > 0){
+    if (length(nondata_stat_cols) > 0){
       msg <- paste0(
-        "Aesthetics must be valid computed stats: ", nondata_stat_cols,
-        ". Did you map your stat in the wrong layer?"
+        "Aesthetics must be valid computed stats: `", deparse(aesthetics[[nondata_stat_cols]]),
+        "`. Did you map your stat in the wrong layer?"
       )
       stop(msg, call. = FALSE)
     }

R/layer.r

@@ -358,7 +358,7 @@ is.discrete <- function(x) {
 # returns the names of any columns that are not.
 # We define "data" as atomic types or lists, not functions or otherwise
 check_nondata_cols <- function(x) {
-  idx <- (vapply(x, function(x) rlang::is_atomic(x) || rlang::is_list(x), logical(1)))
+  idx <- (vapply(x, function(x) rlang::is_vector(x), logical(1)))
   names(x)[which(!idx)]
 }