Style code output

Author: llrs-roche

R/tm_a_pca.R

@@ -1123,7 +1123,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
     })
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_q())))
+    source_code_r <- reactive(prepare_code(decorated_output_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_a_regression.R

@@ -1011,7 +1011,7 @@ srv_a_regression <- function(id,
     })
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_q())))
+    source_code_r <- reactive(prepare_code(decorated_output_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_g_association.R

@@ -530,7 +530,7 @@ srv_tm_g_association <- function(id,
     })
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_grob_q())))
+    source_code_r <- reactive(prepare_cod(decorated_output_grob_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_g_bivariate.R

@@ -536,7 +536,7 @@ srv_g_bivariate <- function(id,
       datasets = data
     )
     qenv <- teal.code::eval_code(data(),
-                                 "library('ggplot2')")
+                                 'library("ggplot2");library("dplyr")')
 
     anl_merged_q <- reactive({
       req(anl_merged_input())
@@ -719,7 +719,8 @@ srv_g_bivariate <- function(id,
     )
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_q_facets())))
+
+    source_code_r <- reactive(prepare_code(decorated_output_q_facets()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",
@@ -1009,15 +1010,15 @@ facet_ggplot_call <- function(row_facet = character(0),
     NULL
   } else if (!identical(row_facet, character(0)) && !identical(col_facet, character(0))) {
     call(
-      "facet_grid",
+      "ggplot2::facet_grid",
       rows = call_fun_dots("vars", row_facet),
       cols = call_fun_dots("vars", col_facet),
       scales = scales
     )
   } else if (identical(row_facet, character(0)) && !identical(col_facet, character(0))) {
-    call("facet_grid", cols = call_fun_dots("vars", col_facet), scales = scales)
+    call("ggplot2::facet_grid", cols = call_fun_dots("vars", col_facet), scales = scales)
   } else if (!identical(row_facet, character(0)) && identical(col_facet, character(0))) {
-    call("facet_grid", rows = call_fun_dots("vars", row_facet), scales = scales)
+    call("ggplot2::facet_grid", rows = call_fun_dots("vars", row_facet), scales = scales)
   }
 }
 

R/tm_g_distribution.R

@@ -1372,7 +1372,7 @@ srv_distribution <- function(id,
     output$t_stats <- DT::renderDataTable(expr = tests_r())
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_q())))
+    source_code_r <- reactive(prepare_code(decorated_output_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_g_response.R

@@ -576,7 +576,7 @@ srv_g_response <- function(id,
     )
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_plot_q())))
+    source_code_r <- reactive(prepare_code(decorated_output_plot_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_g_scatterplot.R

@@ -1048,7 +1048,7 @@ srv_g_scatterplot <- function(id,
     })
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_plot_q())))
+    source_code_r <- reactive(prepare_code(decorated_output_plot_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_g_scatterplotmatrix.R

@@ -483,7 +483,7 @@ srv_g_scatterplotmatrix <- function(id,
     })
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_output_q())))
+    source_code_r <- reactive(prepare_code(decorated_output_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_missing_data.R

@@ -1376,7 +1376,7 @@ srv_missing_data <- function(id,
     })
 
     # Render R code.
-    source_code_r <- reactive(styler::style_text(teal.code::get_code(req(decorated_final_q()))))
+    source_code_r <- reactive(prepare_code(decorated_final_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",

R/tm_outliers.R

@@ -854,7 +854,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
         substitute(expr = plot_call, env = list(plot_call = plot_call))
       } else {
         substitute(
-          expr = plot_call + facet_grid(~ reorder(categorical_var_name, order)),
+          expr = plot_call + ggplot2::facet_grid(~ reorder(categorical_var_name, order)),
           env = list(plot_call = plot_call, categorical_var_name = as.name(categorical_var))
         )
       }
@@ -955,7 +955,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
           )
         )
         plot_call <- substitute(
-          expr = plot_call + facet_grid(~ reorder(categorical_var_name, order)),
+          expr = plot_call + ggplot2::facet_grid(~ reorder(categorical_var_name, order)),
           env = list(plot_call = plot_call, categorical_var_name = as.name(categorical_var))
         )
       }
@@ -1304,7 +1304,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
     })
 
     # Render R code.
-    source_code_r <- reactive(teal.code::get_code(req(decorated_final_q())))
+    source_code_r <- reactive(prepare_code(decorated_final_q()))
 
     teal.widgets::verbatim_popup_srv(
       id = "rcode",