merge

m7pr · m7pr · commit dfd7657e4813 · 2024-10-30T12:24:09.000+01:00
Merge branch '211_subset@main' of https://github.com/insightsengineering/teal.code into 211_subset@main # Conflicts: # R/utils-get_code_dependency.R
diff --git a/R/extract_code_as_is_prototype.R b/R/extract_code_as_is_prototype.R
@@ -46,7 +46,6 @@ get_line_ids <- function(pd) {
 }
 
 split_code <- function(code, parsed_code) {
-
   pd <- utils::getParseData(parsed_code)
   pd <- pd[pd$token != "';'", ]
   lines_ids <- get_line_ids(pd)
diff --git a/R/utils-get_code_dependency.R b/R/utils-get_code_dependency.R
@@ -69,6 +69,7 @@ get_code_dependency <- function(code, names, check_names = TRUE) {
   code_ids <- sort(unique(c(lib_ind, ind)))
   code_split[code_ids]
   #trimws(paste(as.character(code[code_ids]), comments[code_ids]))
+
 }
 
 #' Locate function call token

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ get_line_ids <- function(pd) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`split_code <- function(code, parsed_code) {`
`49`		`-`
`50`	`49`	`pd <- utils::getParseData(parsed_code)`
`51`	`50`	`pd <- pd[pd$token != "';'", ]`
`52`	`51`	`lines_ids <- get_line_ids(pd)`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ get_code_dependency <- function(code, names, check_names = TRUE) {`
`69`	`69`	`code_ids <- sort(unique(c(lib_ind, ind)))`
`70`	`70`	`code_split[code_ids]`
`71`	`71`	`#trimws(paste(as.character(code[code_ids]), comments[code_ids]))`
	`72`	`+`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`#' Locate function call token`