Merge branch 'master' into indent-eq-formal

lorenzwalthert · lorenzwalthert · commit b591a12b23da · 2018-02-24T23:25:41.000+01:00
merge with master containing tests already by using the ours merge strategy (i.e. prefer indent-eq-formals whenever there is a conflict)
diff --git a/API b/API
@@ -4,7 +4,7 @@
 
 create_style_guide(initialize = default_style_guide_attributes, line_break = NULL, space = NULL, token = NULL, indention = NULL, use_raw_indention = FALSE, reindention = tidyverse_reindention())
 default_style_guide_attributes(pd_flat)
-specify_math_token_spacing(zero = NULL, one = c("'+'", "'-'", "'*'", "'/'", "'^'"))
+specify_math_token_spacing(zero = "'^'", one = c("'+'", "'-'", "'*'", "'/'"))
 specify_reindention(regex_pattern = NULL, indention = 0, comments_only = TRUE)
 style_dir(path = ".", ..., style = tidyverse_style, transformers = style(...), filetype = "R", recursive = TRUE, exclude_files = NULL)
 style_file(path, ..., style = tidyverse_style, transformers = style(...))
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -14,7 +14,7 @@ Imports:
     rematch2,
     rlang,
     rprojroot,
-    tibble,
+    tibble (>= 1.4.2),
     withr
 Suggests:
     data.tree,
diff --git a/R/rules-spacing.R b/R/rules-spacing.R
@@ -27,9 +27,11 @@ set_space_around_op <- function(pd_flat) {
 #' @param zero Character vector of tokens that should be surrounded with zero
 #'   spaces.
 style_space_around_math_token <- function(strict, zero, one, pd_flat) {
+  # We remove spaces for zero (e.g., around ^ in the tidyverse style guide)
+  # even for strict = FALSE to be consistent with the : operator
   pd_flat %>%
-    style_space_around_token(strict, zero, 0L) %>%
-    style_space_around_token(strict, one, 1L)
+    style_space_around_token(strict = TRUE, zero, 0L) %>%
+    style_space_around_token(strict = strict, one, 1L)
 }
 
 #' Set spacing of token to a certain level
@@ -240,7 +242,7 @@ set_space_after_bang_bang <- function(pd_flat) {
     (pd_flat$newlines == 0L) &
     (pd_flat$token_before == "'!'")
 
-  pd_flat$spaces[last_bang] <- 1L
+  pd_flat$spaces[last_bang] <- 0L
   pd_flat
 }
 
diff --git a/R/style_guides.R b/R/style_guides.R
@@ -290,20 +290,15 @@ character_to_ordered <- function(x, levels, name = substitute(x)) {
 #'   math_token_spacing = specify_math_token_spacing(zero = "'+'"),
 #'   strict = TRUE
 #' )
-#' style_text(
-#'   "1+1   -3",
-#'   math_token_spacing = tidyverse_math_token_spacing(),
-#'   strict = TRUE
-#' )
 #' @name math_token_spacing
 NULL
 
 #' @describeIn math_token_spacing Allows to fully specify the math token
 #'   spacing.
 #' @export
 specify_math_token_spacing <-
-  function(zero = NULL,
-           one = c("'+'", "'-'", "'*'", "'/'", "'^'")) {
+  function(zero = "'^'",
+           one = c("'+'", "'-'", "'*'", "'/'")) {
     assert_tokens(c(one, zero))
     lst(
       one = setdiff(c(math_token, one), zero),
@@ -318,9 +313,17 @@ specify_math_token_spacing <-
 #' style_text(
 #'   "1+1   -3",
 #'   math_token_spacing = tidyverse_math_token_spacing(),
+#'   strict = FALSE
+#' )
+#' style_text(
+#'   "1+1   -3",
+#'   math_token_spacing = tidyverse_math_token_spacing(),
 #'   strict = TRUE
 #' )
 #' @export
 tidyverse_math_token_spacing <- function() {
-  specify_math_token_spacing(one = c("'+'", "'-'", "'*'", "'/'", "'^'"))
+  specify_math_token_spacing(
+    zero = "'^'",
+    one = c("'+'", "'-'", "'*'", "'/'")
+  )
 }
diff --git a/man/math_token_spacing.Rd b/man/math_token_spacing.Rd
diff --git a/tests/testthat/indention_multiple/overall-in.R b/tests/testthat/indention_multiple/overall-in.R
@@ -17,7 +17,7 @@ a <- function(x) {
   c(
     list(x + 2),
     c(c(
-      26 ^ 2, # FIXME ^ operator has to be surrounded by one space (or none?!), never multiple
+      26 ^ 2,
       8,
       7
   )))
diff --git a/tests/testthat/indention_multiple/overall-in_tree b/tests/testthat/indention_multiple/overall-in_tree
diff --git a/tests/testthat/indention_multiple/overall-out.R b/tests/testthat/indention_multiple/overall-out.R
@@ -17,7 +17,7 @@ a <- function(x) {
   c(
     list(x + 2),
     c(c(
-      26 ^ 2, # FIXME ^ operator has to be surrounded by one space (or none?!), never multiple
+      26^2,
       8,
       7
     ))
diff --git a/tests/testthat/math_token_spacing/non_strict_math_spacing_all-out.R b/tests/testthat/math_token_spacing/non_strict_math_spacing_all-out.R
@@ -1 +1 @@
-1 + +1   -       3 / 23 * 3 ^ 4
+1 + +1   -       3 / 23 * 3^4
diff --git a/tests/testthat/math_token_spacing/strict_math_spacing_all-out.R b/tests/testthat/math_token_spacing/strict_math_spacing_all-out.R
@@ -1 +1 @@
-1 + +1 - 3 / 23 * 3 ^ 4
+1 + +1 - 3 / 23 * 3^4
diff --git a/tests/testthat/spacing/bang_bang_spacing-out.R b/tests/testthat/spacing/bang_bang_spacing-out.R
@@ -1,5 +1,5 @@
-a(! !! x)
-k(!! g)
-a(!!! x)
-a(!! ! x)
+a(! !!x)
+k(!!g)
+a(!!!x)
+a(!! !x)
 a(!b)
diff --git a/tests/testthat/strict/non_strict-out.R b/tests/testthat/strict/non_strict-out.R
@@ -65,7 +65,7 @@ test <- function() {
   a > b
   a * b
   a / b
-  a ^ b
+  a^b
   a & b
   a | b
   a := b
diff --git a/tests/testthat/strict/strict-out.R b/tests/testthat/strict/strict-out.R
@@ -65,7 +65,7 @@ test <- function() {
   a > b
   a * b
   a / b
-  a ^ b
+  a^b
   a & b
   a | b
   a := b
diff --git a/tests/testthat/tidyeval/bang_bang-out.R b/tests/testthat/tidyeval/bang_bang-out.R
@@ -1,9 +1,9 @@
 nameshift <- c(SL = "Sepal.Length")
-head(dplyr::rename(iris[, 1:2], ! ! ! nameshift), 3)
-head(dplyr::rename(iris[, 1:2], !! ! nameshift), 3)
-head(dplyr::rename(iris[, 1:2], !!! nameshift), 3)
+head(dplyr::rename(iris[, 1:2], ! ! !nameshift), 3)
+head(dplyr::rename(iris[, 1:2], !! !nameshift), 3)
+head(dplyr::rename(iris[, 1:2], !!!nameshift), 3)
 my_summarise <- function(df, group_var) {
   df %>%
-    group_by(! ! group_var) %>%
+    group_by(! !group_var) %>%
     summarise(a = mean(a))
 }
diff --git a/tests/testthat/tidyeval/setting_var_names-out.R b/tests/testthat/tidyeval/setting_var_names-out.R
@@ -1,6 +1,6 @@
 mtcars %>%
   group_by(am) %>%
   summarise(
-    !! mean_nm := mean(cyl),
-    !! count_nm := n()
+    !!mean_nm := mean(cyl),
+    !!count_nm := n()
   )
diff --git a/tests/testthat/token_adding_removing/if_else_non_strict-out.R b/tests/testthat/token_adding_removing/if_else_non_strict-out.R
@@ -42,7 +42,7 @@ if (TRUE)
 
 if (FALSE)
   1 + a * (31 / 2) else
-  3 ^ k
+  3^k
 
 
 if (TRUE)
diff --git a/tests/testthat/token_adding_removing/if_else_strict-out.R b/tests/testthat/token_adding_removing/if_else_strict-out.R
@@ -47,7 +47,7 @@ if (TRUE) {
 if (FALSE) {
   1 + a * (31 / 2)
 } else {
-  3 ^ k
+  3^k
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ a <- function(x) {`
`17`	`17`	`c(`
`18`	`18`	`list(x + 2),`
`19`	`19`	`c(c(`
`20`		`- 26 ^ 2, # FIXME ^ operator has to be surrounded by one space (or none?!), never multiple`
	`20`	`+ 26 ^ 2,`
`21`	`21`	`8,`
`22`	`22`	`7`
`23`	`23`	`)))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1 + +1 - 3 / 23 * 3 ^ 4`
	`1`	`+1 + +1 - 3 / 23 * 3^4`