Merge branch '211_subset@main' of https://github.com/insightsengineering/teal.code into 211_subset@main

Author: m7pr

R/qenv-class.R

@@ -30,9 +30,7 @@ setClass(
 setMethod(
   "initialize",
   "qenv",
-  function(.Object, # nolint: object_name.
-           .xData, # nolint: object_name.
-           ...) {
+  function(.Object, .xData, code = list(), ...) { # nolint: object_name.
     new_xdata <- if (rlang::is_missing(.xData)) {
       new.env(parent = parent.env(.GlobalEnv))
     } else {
@@ -45,8 +43,9 @@ setMethod(
     # most 1 unnamed formal argument of class `environment`.
     # See methods::findMethods("initialize")$.environment
     methods::callNextMethod(
-      # Mandatory use of `xData` to build a correct [email protected]
-      .Object, new_xdata, ...
+      .Object,
+      new_xdata, # Mandatory use of unnamed environment arg
+      code = code, ...
     )
   }
 )

R/utils.R

@@ -57,7 +57,9 @@ lang2calls <- function(x) {
 #' Obtain warnings or messages from code slot
 #'
 #' @param object (`qenv`)
-#' @param what (``
+#' @param what (`"warning"` or `"message"`)
+#' @return `character(1)` containing combined message or `NULL` when no warnings/messages
+#' @keywords internal
 get_warn_message_util <- function(object, what) {
   checkmate::matchArg(what, choices = c("warning", "message"))
   messages <- lapply(object@code, "attr", what)

man/get_warn_message_util.Rd

@@ -150,13 +150,13 @@ testthat::test_that("comments from the same line are associated with it's call",
   )
 })
 
-testthat::test_that("alone comments at the end of the source are considered as a separate call", {
+testthat::test_that("alone comments at the end of the source are considered as continuation of the last call", {
   # todo: should be associated to the last call or be separted?
-  code <- c("x <- 5", "y <- 10", "# comment")
+  code <- c("x <- 5\ny <- 10\n# comment")
   q <- eval_code(eval_code(qenv(), code[1]), code[2])
   testthat::expect_identical(
-    unlist(q@code)[3],
-    "# comment"
+    unlist(q@code)[2],
+    "y <- 10\n# comment"
   )
 })