Skip to content

Commit 1e9b93d

Browse files
Remove undesirable_operator_linter() from .lintr_new (#1767)
* Remove `undesirable_operator_linter` from `.lintr_new` Closes #1766 Add it back once #1692 is resolved * Update test-settings.R * remaining
1 parent 7a4fcee commit 1e9b93d

File tree

8 files changed

+9
-13
lines changed

8 files changed

+9
-13
lines changed

.lintr_new

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ linters: linters_with_defaults(
2323
redundant_ifelse_linter(),
2424
sprintf_linter(),
2525
strings_as_factors_linter(),
26-
undesirable_operator_linter(),
2726
unnecessary_lambda_linter(),
2827
unneeded_concatenation_linter(allow_single_expression = FALSE),
2928
yoda_test_linter()

R/expect_lint.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ expect_lint <- function(content, checks, ..., file = NULL, language = "en") {
8484
lint_fields <- unique(c(names(formals(Lint)), "linter"))
8585
Map(
8686
function(lint, check) {
87-
itr <<- itr + 1L # nolint: undesirable_operator.
87+
itr <<- itr + 1L
8888
lapply(names(check), function(field) {
8989
if (!field %in% lint_fields) {
9090
stop(sprintf(

R/get_source_expressions.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ tab_offsets <- function(tab_columns) {
588588
tab_columns - 1L,
589589
function(tab_idx) {
590590
offset <- 7L - (tab_idx + cum_offset) %% 8L # using a tab width of 8 characters
591-
cum_offset <<- cum_offset + offset # nolint: undesirable_operator.
591+
cum_offset <<- cum_offset + offset
592592
offset
593593
},
594594
integer(1L),

R/lint.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ highlight_string <- function(message, column_number = NULL, ranges = NULL) {
667667
line <- fill_with(" ", maximum)
668668

669669
lapply(ranges, function(range) {
670-
substr(line, range[1L], range[2L]) <<- fill_with("~", range[2L] - range[1L] + 1L) # nolint: undesirable_operator.
670+
substr(line, range[1L], range[2L]) <<- fill_with("~", range[2L] - range[1L] + 1L)
671671
})
672672

673673
substr(line, column_number, column_number + 1L) <- "^"

R/object_usage_linter.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ parse_check_usage <- function(expression,
248248
vals <- list()
249249

250250
report <- function(x) {
251-
vals[[length(vals) + 1L]] <<- x # nolint: undesirable_operator.
251+
vals[[length(vals) + 1L]] <<- x
252252
}
253253

254254
withr::with_options(

R/utils.R

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ flatten_list <- function(x, class) {
2828
itr <- 1L
2929
assign_item <- function(x) {
3030
if (inherits(x, class)) {
31-
res[[itr]] <<- x # nolint: undesirable_operator.
32-
itr <<- itr + 1L # nolint: undesirable_operator.
31+
res[[itr]] <<- x
32+
itr <<- itr + 1L
3333
} else if (is.list(x)) {
3434
lapply(x, assign_item)
3535
}
@@ -174,7 +174,7 @@ read_lines <- function(file, encoding = settings$encoding, ...) {
174174
readLines(file, warn = TRUE, ...),
175175
warning = function(w) {
176176
if (grepl("incomplete final line found on", w$message, fixed = TRUE)) {
177-
terminal_newline <<- FALSE # nolint: undesirable_operator.
177+
terminal_newline <<- FALSE
178178
invokeRestart("muffleWarning")
179179
}
180180
}

R/zzz.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ settings <- NULL
295295
}
296296
}
297297

298-
default_settings <<- list( # nolint: undesirable_operator.
298+
default_settings <<- list(
299299
linters = default_linters,
300300
encoding = "UTF-8",
301301
exclude = rex::rex("#", any_spaces, "nolint"),
@@ -325,7 +325,7 @@ settings <- NULL
325325
error_on_lint = logical_env("LINTR_ERROR_ON_LINT") %||% FALSE
326326
)
327327

328-
settings <<- list2env(default_settings, parent = emptyenv()) # nolint: undesirable_operator.
328+
settings <<- list2env(default_settings, parent = emptyenv())
329329
invisible()
330330
}
331331
# nocov end

tests/testthat/test-settings.R

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# nolint start: undesirable_operator.
2-
# This test file tests multiple internal lintr functions, so we need to allow lintr:::*
31
test_that("it uses default settings if none provided", {
42
lintr:::read_settings(NULL)
53

@@ -121,4 +119,3 @@ test_that("it has a smart default for encodings", {
121119
lintr:::read_settings(pkg_file)
122120
expect_identical(settings$encoding, "ISO8859-1")
123121
})
124-
# nolint end

0 commit comments

Comments
 (0)