Improve error messages about conflicted parameters (#2854)

yutannihilation · clauswilke · commit fa3cd8fbd4c9 · 2018-09-17T21:38:57.000-05:00
* Improve error messages about conflicted parameters

* Use "must" for error messages

* Add periods

* Address comments

* Add a missing period
diff --git a/R/geom-jitter.r b/R/geom-jitter.r
@@ -39,7 +39,7 @@ geom_jitter <- function(mapping = NULL, data = NULL,
                         inherit.aes = TRUE) {
   if (!missing(width) || !missing(height)) {
     if (!missing(position)) {
-      stop("Specify either `position` or `width`/`height`", call. = FALSE)
+      stop("You must specify either `position` or `width`/`height`.", call. = FALSE)
     }
 
     position <- position_jitter(width = width, height = height)
diff --git a/R/geom-label.R b/R/geom-label.R
@@ -17,7 +17,7 @@ geom_label <- function(mapping = NULL, data = NULL,
                        inherit.aes = TRUE) {
   if (!missing(nudge_x) || !missing(nudge_y)) {
     if (!missing(position)) {
-      stop("Specify either `position` or `nudge_x`/`nudge_y`", call. = FALSE)
+      stop("You must specify either `position` or `nudge_x`/`nudge_y`.", call. = FALSE)
     }
 
     position <- position_nudge(nudge_x, nudge_y)
diff --git a/R/geom-text.r b/R/geom-text.r
@@ -136,7 +136,7 @@ geom_text <- function(mapping = NULL, data = NULL,
 {
   if (!missing(nudge_x) || !missing(nudge_y)) {
     if (!missing(position)) {
-      stop("Specify either `position` or `nudge_x`/`nudge_y`", call. = FALSE)
+      stop("You must specify either `position` or `nudge_x`/`nudge_y`.", call. = FALSE)
     }
 
     position <- position_nudge(nudge_x, nudge_y)
diff --git a/R/sf.R b/R/sf.R
@@ -347,7 +347,7 @@ geom_sf_text <- function(mapping = aes(), data = NULL,
 
   if (!missing(nudge_x) || !missing(nudge_y)) {
     if (!missing(position)) {
-      stop("Specify either `position` or `nudge_x`/`nudge_y`", call. = FALSE)
+      stop("You must specify either `position` or `nudge_x`/`nudge_y`.", call. = FALSE)
     }
 
     position <- position_nudge(nudge_x, nudge_y)

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ geom_jitter <- function(mapping = NULL, data = NULL,`
`39`	`39`	`inherit.aes = TRUE) {`
`40`	`40`	`if (!missing(width) \|\| !missing(height)) {`
`41`	`41`	`if (!missing(position)) {`
`42`		- stop("Specify either `position` or `width`/`height`", call. = FALSE)
	`42`	+ stop("You must specify either `position` or `width`/`height`.", call. = FALSE)
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`position <- position_jitter(width = width, height = height)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ geom_label <- function(mapping = NULL, data = NULL,`
`17`	`17`	`inherit.aes = TRUE) {`
`18`	`18`	`if (!missing(nudge_x) \|\| !missing(nudge_y)) {`
`19`	`19`	`if (!missing(position)) {`
`20`		- stop("Specify either `position` or `nudge_x`/`nudge_y`", call. = FALSE)
	`20`	+ stop("You must specify either `position` or `nudge_x`/`nudge_y`.", call. = FALSE)
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`position <- position_nudge(nudge_x, nudge_y)`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ geom_text <- function(mapping = NULL, data = NULL,`
`136`	`136`	`{`
`137`	`137`	`if (!missing(nudge_x) \|\| !missing(nudge_y)) {`
`138`	`138`	`if (!missing(position)) {`
`139`		- stop("Specify either `position` or `nudge_x`/`nudge_y`", call. = FALSE)
	`139`	+ stop("You must specify either `position` or `nudge_x`/`nudge_y`.", call. = FALSE)
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`position <- position_nudge(nudge_x, nudge_y)`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ geom_sf_text <- function(mapping = aes(), data = NULL,`
`347`	`347`
`348`	`348`	`if (!missing(nudge_x) \|\| !missing(nudge_y)) {`
`349`	`349`	`if (!missing(position)) {`
`350`		- stop("Specify either `position` or `nudge_x`/`nudge_y`", call. = FALSE)
	`350`	+ stop("You must specify either `position` or `nudge_x`/`nudge_y`.", call. = FALSE)
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`position <- position_nudge(nudge_x, nudge_y)`