update remove_enclosing_curly_braces

[nikolas-burkoff]

Closes #4

Compare this branch to main for existing module qenv's and also with for example:

library(teal.code)
library(teal.widgets)
library(shiny)


ui <- fluidPage(
  verbatim_popup_ui("err", "Error"),
  verbatim_popup_ui("ok", "OK")
)

server <- function(input, output, session) {

  q_ok <- reactive({
    new_qenv(
      list2env(list(y = 2, x = 1)),
      code = quote({
        x <- 1
        y <- 2
      })
    ) |> eval_code(quote({
      if (x == 1) {
        print("x = 1")
      }
    }))
  })


  verbatim_popup_srv(
    "ok",
    verbatim_content = reactive(get_code(q_ok())),
    title = "ok"
  )

  q_err <- reactive({
    new_qenv(
      list2env(list(y = 2)),
      code = quote({
        x <- 1
        y <- 2
      })
    ) |> eval_code(quote({
      if (x == 1) {
        print("x = 1")
      }
    }))
  })

  verbatim_popup_srv(
    "err",
    verbatim_content = reactive(get_code(q_err())),
    title = "Error"
  )

}

shinyApp(ui, server)

and

library(teal.code)
data_q <- new_qenv()
data_q <- eval_code(new_qenv(), "{iris_data <- iris}")
warning_qenv <- eval_code(
  data_q,
  bquote({p <- hist(iris_data[, .("Sepal.Length")], ff = "")})
)
cat(get_warnings(warning_qenv))

[Polkas]

Suggested change

	#' @return Character string without curly braces
	#' @return `character(1)` string without curly braces.

[nikolas-burkoff]

so it doesn't always return character(1) - but I have removed the upper case "C"

[Polkas]

why not vapply with character(1)?:)

[nikolas-burkoff]

[nikolas-burkoff]

and I can't really change the output of remove_enclosing_curly_braces without changing chunks which I would rather not do...

[nikolas-burkoff]

...though I guess I could if we test to make sure chunks are still good

[github-actions]

Unit Tests Summary

    1 files    12 suites   3s ⏱️
112 tests 112 ✔️ 0 💤 0 ❌
443 runs  443 ✔️ 0 💤 0 ❌

Results for commit 0bb61c8.

♻️ This comment has been updated with latest results.

[github-actions]

Code Coverage Summary

Filename                 Stmts    Miss  Cover    Missing
---------------------  -------  ------  -------  ---------------------------------------------------------------------------------------------------------------------------------------------
R/chunk.R                  150       3  98.00%   363-369
R/chunks.R                 416      41  90.14%   334, 424, 430-433, 439, 459, 466-467, 484-491, 500, 506-515, 561, 587, 593-594, 596, 612, 621, 630, 672, 675, 699-704, 1070, 1092, 1149, 1202
R/get_eval_details.R       118     118  0.00%    17-188
R/include_css_js.R           7       7  0.00%    12-19
R/qenv-concat.R             10       0  100.00%
R/qenv-constructor.R        12       0  100.00%
R/qenv-eval_code.R          48       2  95.83%   91, 100
R/qenv-get_code.R           16       0  100.00%
R/qenv-get_var.R            17       0  100.00%
R/qenv-get_warnings.R       22       0  100.00%
R/qenv-join.R               46       0  100.00%
R/qenv-show.R                4       0  100.00%
R/utils.R                   16       0  100.00%
TOTAL                      882     171  80.61%

Diff against main

Filename      Stmts    Miss  Cover
----------  -------  ------  -------
R/utils.R        -8     -19  +79.17%
TOTAL            -8     -19  +1.96%

Results for commit: 51254db

Minimum allowed coverage is 80%

♻️ This comment has been updated with latest results

[Polkas]

LGTM, tested with sample apps and with code

library(teal.code)
a <- new_qenv(
  list2env(list(y = 2, x = 1)),
  code = quote({
    x <- 1
    y <- 2
  })
) |> eval_code(quote({
  if (x == 1) {
    print("x = 1")
  }
})) 

b <- new_qenv(
  list2env(list(y = 2, x = 1)),
  code = quote({
    x <- 1
    y <- 2
  })
) |> eval_code(quote({
  if (x == 1) {
    print("x = 1")
  }
}))

c <- a |> eval_code(quote({
  c <- 4
}))

concat(a, b)|> 
  get_code() |> paste(collapse = "\n") |> cat()

join(a, c)|> 
  get_code() |> paste(collapse = "\n") |> cat()


a2 <- new_qenv(
  list2env(list(y = 2, x = 1)),
  code = quote({
    {
      x <- 1
      y <- 2
    }
  })
) |> eval_code(quote({
  if (x == 1) print("x = 1")
})) 

a2 |> get_code() |> paste(collapse = "\n") |> cat()

a3 <- new_qenv(
  list2env(list(y = 2, x = 1)),
  code = quote({
    x <- 1; y <- 2
  })
) |> eval_code(quote({
  if (x == 1) print("x = 1"); print("Hello")
}))

a3 |> get_code() |> paste(collapse = "\n") |> cat()

we tested some edge cases too.