Preserve class when adding uneval objects (#1624)

* Preserve class when adding uneval objects

* Add test

* Update NEWS

Author: wch

NEWS.md

@@ -60,6 +60,8 @@
 * Fixed problem with `geom_violin()` when quantiles requested but data
   have no range. Added unit test. (#1687)
 
+* Class of aesthetic mapping is preserved when adding `aes()` objects. (#1624)
+
 # ggplot2 2.1.0
 
 ## New features

R/plot-construction.r

@@ -92,6 +92,8 @@ add_ggplot <- function(p, object, objectname) {
     p <- update_guides(p, object)
   } else if (inherits(object, "uneval")) {
       p$mapping <- defaults(object, p$mapping)
+      # defaults() doesn't copy class, so copy it.
+      class(p$mapping) <- class(object)
 
       labels <- lapply(object, deparse)
       names(labels) <- names(object)

tests/testthat/test-add.R

@@ -0,0 +1,6 @@
+context("Adding plot elements")
+
+test_that("Mapping class is preserved when adding uneval objects", {
+  p <- ggplot(mtcars) + aes(wt, mpg)
+  expect_identical(class(p$mapping), "uneval")
+})