From 473fa758d0681e59454c1558548c3513b5f80ed9 Mon Sep 17 00:00:00 2001 From: osenan Date: Fri, 13 Feb 2026 11:55:14 +0100 Subject: [PATCH 1/5] chore: fix lintr --- R/column_functions.R | 3 ++- R/get_merge_call.R | 18 ++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/R/column_functions.R b/R/column_functions.R index 559c55d5..c5dae816 100644 --- a/R/column_functions.R +++ b/R/column_functions.R @@ -12,7 +12,8 @@ #' @export #' get_dataset_prefixed_col_names <- function(data) { - if (!is.null(attr(data, "filter_and_columns", exact = TRUE)$columns) && all(attr(data, "filter_and_columns", exact = TRUE)$columns != "")) { + if (!is.null(attr(data, "filter_and_columns", exact = TRUE)$columns) && + all(attr(data, "filter_and_columns", exact = TRUE)$columns != "")) { paste(attr(data, "dataname"), attr(data, "filter_and_columns")$columns, sep = ".") } else { NULL diff --git a/R/get_merge_call.R b/R/get_merge_call.R index b319299b..5646f37a 100644 --- a/R/get_merge_call.R +++ b/R/get_merge_call.R @@ -383,16 +383,14 @@ get_anl_relabel_call <- function(columns_source, datasets, anl_name = "ANL") { column_labels <- labels[intersect(colnames(data_used()), column_names)] # NULL for no labels at all, character(0) for no labels for a given columns - return( - if (rlang::is_empty(column_labels)) { - column_labels - } else { - stats::setNames( - column_labels, - selector[names(column_labels)] - ) - } - ) + if (rlang::is_empty(column_labels)) { + column_labels + } else { + stats::setNames( + column_labels, + selector[names(column_labels)] + ) + } } ) ) From a1f9d3c270d91e08a36af34af5645c05bad1fa5b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Feb 2026 11:00:03 +0000 Subject: [PATCH 2/5] [skip style] [skip vbump] Restyle files --- R/column_functions.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/column_functions.R b/R/column_functions.R index c5dae816..04b8138b 100644 --- a/R/column_functions.R +++ b/R/column_functions.R @@ -13,7 +13,7 @@ #' get_dataset_prefixed_col_names <- function(data) { if (!is.null(attr(data, "filter_and_columns", exact = TRUE)$columns) && - all(attr(data, "filter_and_columns", exact = TRUE)$columns != "")) { + all(attr(data, "filter_and_columns", exact = TRUE)$columns != "")) { paste(attr(data, "dataname"), attr(data, "filter_and_columns")$columns, sep = ".") } else { NULL From b6c26c4241c67f533eea69c6252613e023080812 Mon Sep 17 00:00:00 2001 From: osenan Date: Fri, 13 Feb 2026 12:14:48 +0100 Subject: [PATCH 3/5] chore: rewrite to fix linter --- R/column_functions.R | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/R/column_functions.R b/R/column_functions.R index 04b8138b..8b0bad19 100644 --- a/R/column_functions.R +++ b/R/column_functions.R @@ -12,8 +12,12 @@ #' @export #' get_dataset_prefixed_col_names <- function(data) { - if (!is.null(attr(data, "filter_and_columns", exact = TRUE)$columns) && - all(attr(data, "filter_and_columns", exact = TRUE)$columns != "")) { + if ( + all( + !is.null(attr(data, "filter_and_columns", exact = TRUE)$columns), + all(attr(data, "filter_and_columns", exact = TRUE)$columns != "") + ) + ) { paste(attr(data, "dataname"), attr(data, "filter_and_columns")$columns, sep = ".") } else { NULL From 2cb879b8f13faa6ec1c5b6c9ae346b0091e44c46 Mon Sep 17 00:00:00 2001 From: Oriol Senan <35930244+osenan@users.noreply.github.com> Date: Fri, 13 Feb 2026 15:27:45 +0100 Subject: [PATCH 4/5] Update R/column_functions.R MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lluís Revilla <185338939+llrs-roche@users.noreply.github.com> Signed-off-by: Oriol Senan <35930244+osenan@users.noreply.github.com> --- R/column_functions.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/column_functions.R b/R/column_functions.R index 8b0bad19..f7da05d8 100644 --- a/R/column_functions.R +++ b/R/column_functions.R @@ -16,7 +16,8 @@ get_dataset_prefixed_col_names <- function(data) { all( !is.null(attr(data, "filter_and_columns", exact = TRUE)$columns), all(attr(data, "filter_and_columns", exact = TRUE)$columns != "") - ) +columns <- attr(data, "filter_and_columns", exact = TRUE)$columns) +if (!is.null(columns) && all(columns != "")) { ) { paste(attr(data, "dataname"), attr(data, "filter_and_columns")$columns, sep = ".") } else { From c5cc007b291c8fbcb0cd9f1274a68c99df452e46 Mon Sep 17 00:00:00 2001 From: osenan Date: Tue, 17 Feb 2026 14:59:15 +0100 Subject: [PATCH 5/5] fix: correct error after accept suggestion --- R/column_functions.R | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/R/column_functions.R b/R/column_functions.R index f7da05d8..a0e5432f 100644 --- a/R/column_functions.R +++ b/R/column_functions.R @@ -12,13 +12,8 @@ #' @export #' get_dataset_prefixed_col_names <- function(data) { - if ( - all( - !is.null(attr(data, "filter_and_columns", exact = TRUE)$columns), - all(attr(data, "filter_and_columns", exact = TRUE)$columns != "") -columns <- attr(data, "filter_and_columns", exact = TRUE)$columns) -if (!is.null(columns) && all(columns != "")) { - ) { + columns <- attr(data, "filter_and_columns", exact = TRUE) + if (!is.null(columns) && all(columns != "")) { paste(attr(data, "dataname"), attr(data, "filter_and_columns")$columns, sep = ".") } else { NULL