From 33bfb0b013ce8d12a86f6c50adb3366b88bc8313 Mon Sep 17 00:00:00 2001 From: Vladimir Panfilov Date: Fri, 11 Oct 2019 11:08:41 +0300 Subject: [PATCH] handle unnamed lists in merge_lists function Unnamed lists can now be overriden by another config section (fix https://github.com/rstudio/config/issues/24) --- R/merge.R | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/R/merge.R b/R/merge.R index 5a60263..12ddaa4 100644 --- a/R/merge.R +++ b/R/merge.R @@ -27,6 +27,8 @@ merge_lists <- function (base_list, overlay_list, recursive = TRUE) { base_list else { merged_list <- base_list + + # merge named lists for (name in names(overlay_list)) { base <- base_list[[name]] overlay <- overlay_list[[name]] @@ -38,6 +40,11 @@ merge_lists <- function (base_list, overlay_list, recursive = TRUE) { overlay_list[which(names(overlay_list) %in% name)]) } } + + # merge unnamed lists + if (is.null(names(base_list)) && is.null(names(overlay_list))) { + merged_list <- overlay_list + } merged_list } }