enable return_linter

.lintr

@@ -2,7 +2,6 @@ linters: all_linters(
   object_usage_linter = NULL,
   implicit_assignment_linter = NULL,
   object_length_linter = NULL,
-  return_linter = NULL,
   namespace_linter = NULL,
   unreachable_code_linter = NULL,
   cyclocomp_linter(25),

.lintr_restrictive

@@ -2,7 +2,6 @@ linters: all_linters(
   object_usage_linter = NULL,
   implicit_assignment_linter = NULL,
   object_length_linter = NULL,
-  return_linter = NULL,
   namespace_linter = NULL,
   unreachable_code_linter = NULL,
   cyclocomp_linter(25),

R/JSON.R

@@ -22,7 +22,7 @@ tfrmt_to_json <- function(tfrmt, path = NULL) {
         message(paste0("Writing json file out to:\n", path))
         write(output, path)
     } else {
-        return(output)
+        output
     }
 }
 
@@ -94,7 +94,7 @@ as_json.quosure <- function(x) {
     out <- x %>%
         rlang::as_label()
     if (out != "<empty>") {
-        return(out)
+        out
     }
 }
 

R/apply_col_style_plan.R

@@ -94,7 +94,7 @@ apply_col_style_plan <- function(
 
     force(.data)
 
-    return(.data)
+    .data
 }
 
 # function to get all columns the col_style_structure applies to

R/apply_row_grp_plan.R

@@ -243,7 +243,7 @@ fill_post_space <- function(post_space, fill, width) {
         fill_val <- stringr::str_sub(post_space, 1, width) # truncate to data width if needed
     }
 
-    return(fill_val)
+    fill_val
 }
 
 

R/col_plan.R

@@ -164,15 +164,15 @@ check_span_structure_dots <- function(x) {
             ~ lapply(trim_vars_quo_c(.x), function(x) {
                 if (is.name(x)) {
                     if (identical(rlang::as_label(x), "<empty>")) {
-                        return(NULL)
+                        return(NULL) # nolint: return_linter
                     } else {
-                        return(rlang::quo(!!x))
+                        return(rlang::quo(!!x)) # nolint: return_linter
                     }
                 } else if (is.call(x)) {
                     if (is_valid_tidyselect_call(x)) {
                         rlang::quo(!!x)
                     } else if (is_valid_quo_call(x)) {
-                        return(rlang::eval_tidy(x))
+                        return(rlang::eval_tidy(x)) # nolint: return_linter
                     } else {
                         rlang::abort(
                             message = paste0(
@@ -188,7 +188,7 @@ check_span_structure_dots <- function(x) {
                         )
                     }
                 } else if (is.character(x)) {
-                    return(as_length_one_quo.character(x))
+                    return(as_length_one_quo.character(x)) # nolint: return_linter
                 } else {
                     rlang::abort(
                         "Unexpected entry type in span_structure()",
@@ -210,7 +210,7 @@ is_valid_tidyselect_call <- function(x) {
     if (as.character(as.list(x)[[1]]) == "-") {
         x <- x[[-1]]
         if (is.name(x)) {
-            return(TRUE)
+            return(TRUE) # nolint: return_linter
         }
     }
     as.character(as.list(x)[[1]]) %in% c(names(tidyselect::vars_select_helpers))
@@ -221,7 +221,7 @@ is_valid_quo_call <- function(x) {
     if (as.character(as.list(x)[[1]]) == "-") {
         x <- x[[-1]]
         if (is.name(x)) {
-            return(TRUE)
+            return(TRUE) # nolint: return_linter
         }
     }
     as.character(as.list(x)[[1]]) %in% c("vars", "quo")
@@ -231,17 +231,17 @@ check_col_plan_dots <- function(x) {
     lapply(x, function(x) {
         if (is.name(x)) {
             if (identical(rlang::as_label(x), "<empty>")) {
-                return(NULL)
+                return(NULL) # nolint: return_linter
             } else {
-                return(rlang::quo(!!x))
+                return(rlang::quo(!!x)) # nolint: return_linter
             }
         } else if (is.call(x)) {
             if (is_valid_tidyselect_call(x)) {
                 rlang::quo(!!x)
             } else if (
                 is_valid_quo_call(x) || is_valid_span_structure_call(x)
             ) {
-                return(rlang::eval_tidy(x))
+                return(rlang::eval_tidy(x)) # nolint: return_linter
             } else {
                 stop(
                     "Invalid entry: `",
@@ -256,7 +256,7 @@ check_col_plan_dots <- function(x) {
                 )
             }
         } else if (is.character(x)) {
-            return(as_length_one_quo.character(x))
+            return(as_length_one_quo.character(x)) # nolint: return_linter
         } else {
             stop("Unexpected entry type in span_structure()")
         }

R/extract_data.R

@@ -98,6 +98,6 @@ extract_data <- function(x, col_delim = "_") {
             )
         )
 
-        return(extracted_list)
+        extracted_list
     }
 }

R/tfrmt.R

@@ -238,11 +238,11 @@ check_tfrmt <- function(
 ) {
     if (!missing(tfrmt)) {
         if (is_tfrmt(tfrmt)) {
-            return(invisible(NULL))
+            return(invisible(NULL)) # nolint: return_linter
         }
 
         if (allow_null && is.null(tfrmt)) {
-            return(invisible(NULL))
+            return(invisible(NULL)) # nolint: return_linter
         }
     }
 
@@ -307,12 +307,12 @@ quo_get <- function(
 
         if (missing(arg_call)) {
             ## args not defined can quietly return empty expressions.
-            return(quote(expr = ))
+            return(quote(expr = )) # nolint: return_linter
         } else {
             if (
                 identical(arg_call, rlang::quo()) || identical(arg_call, vars())
             ) {
-                return(arg_call)
+                return(arg_call) # nolint: return_linter
             }
 
             # don't try to eval quosures if it is intended to be a quosure
@@ -346,9 +346,10 @@ quo_get <- function(
                             is_basic_list(arg_call_results$result))
                     ) {
                         if (arg %in% as_var_args) {
-                            return(as_vars(arg_call_results$result))
+                            return(as_vars(arg_call_results$result)) # nolint: return_linter
                         } else {
                             return(
+                                # nolint: return_linter
                                 as_length_one_quo(
                                     arg_call_results$result,
                                     arg = as.character(arg)
@@ -358,7 +359,7 @@ quo_get <- function(
                     }
                 } else {
                     ## return value as normal if not a var or quo arg
-                    return(arg_call_results$result)
+                    return(arg_call_results$result) # nolint: return_linter
                 }
             }
 
@@ -392,7 +393,7 @@ quo_get <- function(
                     )
                 }
 
-                return(arg_val)
+                return(arg_val) # nolint: return_linter
             } else {
                 rlang::abort(
                     paste0(

R/tfrmt_layer.R

@@ -354,5 +354,5 @@ reset_component <- function(tfrmt_obj, component_name) {
     tfrmt_obj[[component_name]] <- NULL
 
     # Return the modified tfrmt object
-    return(tfrmt_obj)
+    tfrmt_obj
 }