Merge pull request #316 from lorenzwalthert/tilde

- Spaces around tilde (#316).

Author: lorenzwalthert

R/rules-spacing.R

@@ -20,16 +20,16 @@ set_space_around_op <- function(pd_flat) {
 }
 
 #' Style spacing around math tokens
-#' @inheritParams style_space_around_math_token_one
+#' @inheritParams style_space_around_token
 #' @param one Character vector with tokens that should be surrounded by at
 #'   least one space (depending on `strict = TRUE` in the styling functions
 #'   [style_text()] and friends). See 'Examples'.
 #' @param zero Character vector of tokens that should be surrounded with zero
 #'   spaces.
 style_space_around_math_token <- function(strict, zero, one, pd_flat) {
   pd_flat %>%
-    style_space_around_math_token_one(strict, zero, 0L) %>%
-    style_space_around_math_token_one(strict, one, 1L)
+    style_space_around_token(strict, zero, 0L) %>%
+    style_space_around_token(strict, one, 1L)
 }
 
 #' Set spacing of token to a certain level
@@ -41,7 +41,7 @@ style_space_around_math_token <- function(strict, zero, one, pd_flat) {
 #' @param tokens Character vector with tokens that should be styled.
 #' @param level Scalar indicating the amount of spaces that should be inserted
 #'   around the `tokens`.
-style_space_around_math_token_one <- function(pd_flat, strict, tokens, level) {
+style_space_around_token <- function(pd_flat, strict, tokens, level) {
   op_after <- pd_flat$token %in% tokens
   op_before <- lead(op_after, default = FALSE)
   idx_before <- op_before & (pd_flat$newlines == 0L)

R/style_guides.R

@@ -80,6 +80,8 @@ tidyverse_style <- function(scope = "tokens",
         math_token_spacing$zero,
         math_token_spacing$one
       ),
+      partial(
+        style_space_around_token, strict = strict, tokens = "'~'", level = 1),
       if (strict) set_space_around_op else add_space_around_op,
       if (strict) set_space_after_comma else add_space_after_comma,
       remove_space_after_opening_paren,

R/token-define.R

@@ -19,6 +19,7 @@ token <- tribble(
   "*"    , "math"        , "'*'"         ,
   "/"    , "math"        , "'/'"         ,
   "^"    , "math"        , "'^'"         ,
+  "~"    , "formula"     , "'~'"         ,
   "if"   , "cond"        , "IF"          ,
   "else" , "cond"        , "ELSE"        ,
   "in"   , "loop_cond"   , "IN"          ,

man/style_space_around_math_token_one.Rd renamed to man/style_space_around_token.Rd

@@ -140,3 +140,4 @@ lm(a~b+c,data=NA)
 lm(a~.-1,data=NA)
 a~b:c
 a~b :c
+a   ~   b  : c

tests/testthat/strict/non_strict-in.R

@@ -135,7 +135,8 @@ test <- function() {
 
 
 # formula
-lm(a~b + c, data = NA)
-lm(a~. - 1, data = NA)
-a~b:c
-a~b:c
+lm(a ~ b + c, data = NA)
+lm(a ~ . - 1, data = NA)
+a ~ b:c
+a ~ b:c
+a   ~   b:c

tests/testthat/strict/non_strict-in_tree

@@ -139,4 +139,5 @@ test <- function() {
 lm(a~b+c,data=NA)
 lm(a~.-1,data=NA)
 a~b:c
+a   ~   b  : c
 a~b :c

tests/testthat/strict/non_strict-out.R

@@ -140,7 +140,8 @@ test <- function() {
 
 
 # formula
-lm(a~b + c, data = NA)
-lm(a~. - 1, data = NA)
-a~b:c
-a~b:c
+lm(a ~ b + c, data = NA)
+lm(a ~ . - 1, data = NA)
+a ~ b:c
+a ~ b:c
+a ~ b:c