diff --git a/NEWS.md b/NEWS.md index a866cf344..d5a83d440 100644 --- a/NEWS.md +++ b/NEWS.md @@ -90,6 +90,7 @@ * # nolint comments are respected with caching (#68, @krlmlr) * Properly handle all knitr document formats * Allow for (( when linting (#259, @nathaneastwood) +* Remove ^ from infix spaces to conform with tidyverse. (#302, @nathaneastwood) # lintr 0.2.0 # diff --git a/R/infix_spaces_linter.R b/R/infix_spaces_linter.R index b0d32efc4..a46f868a0 100644 --- a/R/infix_spaces_linter.R +++ b/R/infix_spaces_linter.R @@ -18,7 +18,6 @@ infix_tokens <- c( "EQ_SUB", "SPECIAL", "'/'", - "'^'", "'*'", NULL diff --git a/tests/testthat/test-infix_spaces_linter.R b/tests/testthat/test-infix_spaces_linter.R index 1be295382..a4b820f64 100644 --- a/tests/testthat/test-infix_spaces_linter.R +++ b/tests/testthat/test-infix_spaces_linter.R @@ -14,9 +14,7 @@ test_that("returns the correct linting", { "->", "%%", "/", - "^", "*", - "**", "|", "||", "&",