nerge

Merge branch 'main' of https://github.com/olivroy/reuseme

# Conflicts:
#	TODO.R

Author: olivroy

DESCRIPTION

@@ -35,8 +35,8 @@ Suggests:
     curl,
     gert,
     gt,
-    pillar,
     magick,
+    pillar,
     testthat (>= 3.2.1),
     withr
 Config/testthat/edition: 3

R/escape-inline-markup.R

@@ -122,3 +122,4 @@ replace_r_var <- function(x) {
 #' #> "{{gt_var}} in {{gt_var}} in gt_var in {.file {gt_var}}."
 #' escape_markup("{gt_var} in {{gt_var}} in gt_var in {.file {gt_var}}.")
 #' #> "{{gt_var}} in {{gt_var}} in gt_var in {.file gt_var}."
+NULL

R/files-conflicts.R

@@ -85,7 +85,7 @@ solve_file_name_conflict <- function(files, regex, dir = ".", extra_msg = NULL,
   }
   bullets_df <-
     rlang::set_names(files) |>
-    purrr::map(\(x) readLines(x, encoding = "UTF-8")) |>
+    purrr::map(\(x) readLines(x, encoding = "UTF-8", warn = FALSE)) |>
     purrr::map(\(x) tibble::enframe(x, name = "line_number", value = "content")) |>
     dplyr::bind_rows(.id = "file")
 
@@ -145,7 +145,7 @@ get_referenced_files <- function(files) {
   # Create a list of genuine referenced files
   # TODO Add false positive references
   # TODO fs::path and file.path should be handled differently
-  purrr::map(files, \(x) readLines(x, encoding = "UTF-8")) |>
+  purrr::map(files, \(x) readLines(x, encoding = "UTF-8", warn = FALSE)) |>
     purrr::list_c(ptype = "character") |>
     stringr::str_subset(pattern = "\\:\\:dav.+lt|\\:\\:nw_|g.docs_l.n|target-|\\.0pt", negate = TRUE) |> # remove false positive from .md files
     stringr::str_subset(pattern = "file.path|fs\\:\\:path\\(|path_package|system.file", negate = TRUE) |> # Exclude fs::path() and file.path from search since handled differently.

R/link-elements.R R/markup.RR/link-elements.R renamed to R/markup.R

@@ -255,7 +255,8 @@ active_rs_doc_delete <- function() {
   if (isTRUE(will_delete_decision)) {
     cli::cli_inform(c(
       "v" = "Deleted the active document {.val {elems$rel_path}} because {reasons_deleting}.",
-      "i" = cli::col_grey("The deleted file {.path {elems$full_path}} contents are returned invisibly in case you need them.")
+      # FIXME (upstream) the color div doesn't go all the way r-lib/cli#694
+      "i" = paste(cli::col_grey("The deleted file"),  "{.path {elems$full_path}}", cli::col_grey("contents are returned invisibly in case you need them."))
     ))
     contents <- readLines(elems$full_path, encoding = "UTF-8")
     fs::file_delete(elems$full_path)

R/open.R

@@ -158,7 +158,7 @@ define_outline_criteria <- function(.data, print_todo) {
   )
   x <- dplyr::mutate(
     x,
-    before_and_after_empty = line_id == 1 | !nzchar(dplyr::lead(content, default = "")) & !nzchar(dplyr::lag(content)),
+    before_and_after_empty = line == 1 | !nzchar(dplyr::lead(content, default = "")) & !nzchar(dplyr::lag(content)),
     .by = file
   )
   x

R/outline-criteria.R

@@ -122,14 +122,14 @@ file_outline <- function(pattern = NULL,
     file_content <- rlang::set_names(path)
     # Not warn
     file_content <- purrr::map(file_content, function(x) readLines(fs::path_real(x), encoding = "UTF-8", warn = FALSE))
-    # Combine everything into a tibble that contains file, line_id, content
-    file_content <- purrr::map(file_content, function(x) tibble::enframe(x, name = "line_id", value = "content"))
+    # Combine everything into a tibble that contains file, line, content
+    file_content <- purrr::map(file_content, function(x) tibble::enframe(x, name = "line", value = "content"))
     file_content <- dplyr::bind_rows(file_content, .id = "file")
   } else {
     file_content <-
       purrr::map(
         .x = list("unsaved-doc.R" = rstudioapi::getSourceEditorContext()$contents),
-        .f = function(x) tibble::enframe(x, name = "line_id", value = "content")
+        .f = function(x) tibble::enframe(x, name = "line", value = "content")
       )
     file_content <- dplyr::bind_rows(file_content, .id = "file")
   }
@@ -365,7 +365,7 @@ print.outline_report <- function(x, ...) {
       link = list(rlang::set_names(
         link_rs_api,
         purrr::map_chr(
-          paste0("{.file ", file, ":", line_id, "}"),
+          paste0("{.file ", file, ":", line, "}"),
           cli::format_inline
         )
       )),
@@ -507,19 +507,19 @@ display_outline_element <- function(.data) {
   y <- dplyr::mutate(
     x,
     has_title_el =
-      ((line_id == 1 & !is_todo_fixme & !is_test_name & !is_snap_file) |
+      ((line == 1 & !is_todo_fixme & !is_test_name & !is_snap_file) |
         (is_doc_title & !is_subtitle & !is_snap_file & !is_second_level_heading_or_more)) & !is_news,
     .by = "file"
   )
   y <- withCallingHandlers(
     dplyr::mutate(y,
-      title_el_line = ifelse(has_title_el, line_id[
-        (line_id == 1 & !is_todo_fixme & !is_test_name & !is_snap_file) |
+      title_el_line = ifelse(has_title_el, line[
+        (line == 1 & !is_todo_fixme & !is_test_name & !is_snap_file) |
           (is_doc_title & !is_subtitle & !is_snap_file & !is_second_level_heading_or_more)
       ][1], # take  the first element to avoid problems (may be the reason why problems occur)
-      NA
+      NA_integer_
       ),
-      title_el = outline_el[line_id == title_el_line],
+      title_el = outline_el[line == title_el_line],
       .by = "file"
     ),
     error = function(e) {
@@ -529,15 +529,19 @@ display_outline_element <- function(.data) {
   )
   y <- dplyr::relocate(
     y,
-    "outline_el", "line_id", "title_el", "title_el_line", "has_title_el",
+    "outline_el", "line", "title_el", "title_el_line", "has_title_el",
     .after = "content"
   )
 
 
   y$outline_el <- ifelse(y$has_title_el, NA_character_, y$outline_el)
-  na_if0 <- function(x) {
+  na_if0 <- function(x, which) {
     if (length(x) == 0) {
-      x <- NA
+      if (which == "title") {
+        x <- NA_character_
+      } else {
+        x <- NA_integer_
+      }
     }
     if (length(x) != 1) {
       cli::cli_inform("{x} are detected as document title. Internal error")
@@ -547,8 +551,8 @@ display_outline_element <- function(.data) {
   if (!all(is.na(y$title_el))) {
     y <- dplyr::mutate(
       y,
-      title_el = na_if0(title_el[!is.na(title_el)]),
-      title_el_line = na_if0(title_el_line[!is.na(title_el_line)]),
+      title_el = na_if0(title_el[!is.na(title_el)], "title"),
+      title_el_line = na_if0(title_el_line[!is.na(title_el_line)], "line"),
       .by = "file"
     )
   }
@@ -591,7 +595,7 @@ construct_outline_link <- function(.data, is_saved_doc, dir_common, pattern) {
     as.character(trim_outline(.data$outline_el[cn], width - 8L)),
     "- {.run [Done{cli::symbol$tick}?](reuseme::complete_todo(",
     # Removed ending dot. (possibly will fail with older versions)
-    .data$line_id[cn], ", '", .data$file[cn], "', '",
+    .data$line[cn], ", '", .data$file[cn], "', '",
     # modify regex twice if needed (see below)
     stringr::str_sub(stringr::str_replace_all(.data$content[cn], "\\^|\\$|'|\\{|\\}|\\)|\\(|\\[\\]|\\+", "."), start = -15L), "'))}",
     .data$rs_version[cn]
@@ -613,7 +617,7 @@ construct_outline_link <- function(.data, is_saved_doc, dir_common, pattern) {
         # Removed ending dot. (possibly will fail with older versions)
 
         # modify regex twice if needed (see above)
-        line_id, ", '", file, "', '", stringr::str_sub(stringr::str_replace_all(content, "\\^|\\$|'|\\{|\\}|\\)|\\(|\\[\\]|\\+", "."), start = -15L), "'))}",
+        line, ", '", file, "', '", stringr::str_sub(stringr::str_replace_all(content, "\\^|\\$|'|\\{|\\}|\\)|\\(|\\[\\]|\\+", "."), start = -15L), "'))}",
         rs_version
       ),
       outline_el2
@@ -622,7 +626,7 @@ construct_outline_link <- function(.data, is_saved_doc, dir_common, pattern) {
   )
 
   .data <- dplyr::mutate(.data,
-    link = paste0(outline_el2, " {.path ", file, ":", line_id, "}"),
+    link = paste0(outline_el2, " {.path ", file, ":", line, "}"),
     # rstudioapi::documentOpen works in the visual mode!! but not fully.
     file_path = .data$file,
     is_saved_doc = .env$is_saved_doc,
@@ -642,23 +646,25 @@ construct_outline_link <- function(.data, is_saved_doc, dir_common, pattern) {
   }
 
   dplyr::mutate(.data,
-    # link_rs_api = paste0("{.run [", outline_el, "](reuseme::open_rs_doc('", file_path, "', line = ", line_id, "))}"),
+    # link_rs_api = paste0("{.run [", outline_el, "](reuseme::open_rs_doc('", file_path, "', line = ", line, "))}"),
     link_rs_api = dplyr::case_when(
       is.na(outline_el2) ~ NA_character_,
-      !is_saved_doc ~ paste0("line ", line_id, " -", outline_el2),
+      !is_saved_doc ~ paste0("line ", line, " -", outline_el2),
       rs_avail_file_link ~ paste0(
         "{cli::style_hyperlink(", style_fun, ', "',
-        paste0("file://", file_path), '", params = list(line = ', line_id, ", col = 1))} ", outline_el2
+        paste0("file://", file_path), '", params = list(line = ', line, ", col = 1))} ", outline_el2
       ),
-      .default = paste0(rs_version, "{.run [i](reuseme::open_rs_doc('", file_path, "', line = ", line_id, "))} ", outline_el2)
+      .default = paste0(rs_version, "{.run [i](reuseme::open_rs_doc('", file_path, "', line = ", line, "))} ", outline_el2)
     ),
     file_hl = dplyr::case_when(
       !is_saved_doc ~ file_path,
       rs_avail_file_link ~ paste0("{.href [", text_in_link, "](file://", file_path, ")}"),
       .default = paste0("{.run [", text_in_link, "](reuseme::open_rs_doc('", file_path, "'))}")
     ),
     rs_version = NULL,
-    outline_el2 = NULL
+    outline_el2 = NULL,
+    condition_to_truncate = NULL,
+    condition_to_truncate2 = NULL
   ) |>
     dplyr::filter(is.na(outline_el) | grepl(pattern, outline_el, ignore.case = TRUE))
 }

R/outline.R

@@ -75,6 +75,7 @@ rename_files2 <- function(old,
   }
 
   is_git <- !isFALSE(tryCatch(rprojroot::find_root_file(criterion = rprojroot::criteria$is_vcs_root), error = function(e) FALSE))
+  proj_name <- proj_get2()
   if (interactive() && !is_git && !identical(Sys.getenv("TESTTHAT"), "true")) {
     cli::cli_warn(c(
       "It is better to use this function in a version-controlled repository.",
@@ -91,7 +92,10 @@ rename_files2 <- function(old,
   related_files <- fs::dir_ls(regexp = paste0(basename_remove_ext(old), "\\."), recurse = TRUE)
   related_files <- fs::path_filter(related_files, "_snaps/|_book/|_files|_freeze|renv/", invert = TRUE)
   related_files <- setdiff(related_files, old)
+  # remove project name from conflicts.
+  related_files <- stringr::str_subset(related_files, proj_name, negate = TRUE)
   if (length(related_files) > 0) {
+    # maybe would need to normalize path.
     cli::cli_warn(c(
       "Other files have a similar pattern",
       "See {.file {related_files}}",
@@ -151,7 +155,7 @@ rename_files2 <- function(old,
     # check_referenced_files(path = ".", quiet = !verbose)
     if (interactive() && action != "test") {
       cli::cli_inform(c(
-        i = "Call {.run reuseme::check_referenced_files()} to see if dir contains non-existing files."
+        i = cli::col_grey("Call {.run reuseme::check_referenced_files()} to see if dir contains non-existing files.")
       ))
     }
     return(invisible(new))
@@ -358,7 +362,7 @@ hint_acceptable_renaming <- function(old, new, overwrite) {
       ))
       return(FALSE)
     }
-    # r-lib/cli#683
+    # Delete when fixed r-lib/cli#683
     old_chr <- as.character(old)
     new_chr <- as.character(new)
 

R/rename-files.R R/rename.RR/rename-files.R renamed to R/rename.R

@@ -66,7 +66,7 @@ use_todo <- function(todo, proj = proj_get2(), code = FALSE) {
 #' Function meant to be wrapped as `{.run}` hyperlinks with [file_outline()].
 #' It basically removes a line from a file.
 #'
-#' @param line_id The line number (a single integer)
+#' @param line The line number (a single integer)
 #' @param file Path to a file
 #' @param regexp A regexp to assess that the file content has not changed.
 #' @param rm_line A logical If `NULL` will remove the full line in the file
@@ -77,18 +77,18 @@ use_todo <- function(todo, proj = proj_get2(), code = FALSE) {
 #'   content invisibly.
 #' @export
 #' @keywords internal
-complete_todo <- function(line_id, file, regexp, rm_line = NULL) {
+complete_todo <- function(line, file, regexp, rm_line = NULL) {
   check_string(regexp)
-  check_number_whole(line_id)
-  line_id_original <- line_id
+  check_number_whole(line)
+  line_original <- line
   # to defer warning.
   if (interactive() && rstudioapi::isAvailable()) {
     rstudioapi::documentSaveAll()
   }
   warn_change_of_line <- FALSE
 
-  file_content <- readLines(file, encoding = "UTF-8")
-  line_content <- file_content[line_id]
+  file_content <- readLines(file, encoding = "UTF-8", warn = FALSE)
+  line_content <- file_content[line]
 
   # Special case for issues (probably need to opt out at some point)
   # patch that will likely not work for many cases.
@@ -105,8 +105,8 @@ complete_todo <- function(line_id, file, regexp, rm_line = NULL) {
     warn_change_of_line <- TRUE
 
     if (length(regexp_detection) == 1) {
-      line_id <- regexp_detection
-      line_content <- line_content <- file_content[line_id]
+      line <- regexp_detection
+      line_content <- line_content <- file_content[line]
       detect_regexp_in_line <- grepl(pattern = regexp, x = line_content)
     } else if (length(regexp_detection) > 1) {
       cli::cli_abort(c(
@@ -121,12 +121,12 @@ complete_todo <- function(line_id, file, regexp, rm_line = NULL) {
     }
   }
 
-  tag_type <- extract_tag_in_text(text = line_content, line_id)
+  tag_type <- extract_tag_in_text(text = line_content, line)
 
   if (warn_change_of_line) {
     cli::cli_warn(c(
       x = "Could not find {.arg regexp} as expected",
-      "Could not find {.val {regexp}} at line {line_id_original}.",
+      "Could not find {.val {regexp}} at line {line_original}.",
       i = "Has the file content changed since you ran this code?",
       # needs qty for cli pluralization, but no printing
       "`regexp` was detected in {cli::qty(length(regexp_detection))} line{?s} {regexp_detection}."
@@ -152,18 +152,18 @@ complete_todo <- function(line_id, file, regexp, rm_line = NULL) {
     regex_new <- cli::style_strikethrough(regex)
     line_content_show <- stringr::str_replace(line_content_show, regex, regex_new)
   }
-  file_line <- paste0(file, ":", line_id)
+  file_line <- paste0(file, ":", line)
   cli::cli_alert_success(
     "Removed {.code {line_content_show}} from {.file {file_line}}!"
   )
   # Rem
   line_content_new <- strip_todo_line(line_content, only_rm_tag = !rm_line)
 
   if (nzchar(line_content_new)) {
-    file_content[line_id] <- line_content_new
+    file_content[line] <- line_content_new
     file_content_new <- file_content
   } else {
-    file_content_new <- file_content[-line_id]
+    file_content_new <- file_content[-line]
     if (!rm_line) {
       # WIll remove this line eventually
       # remove line if it ends up empty. not supposed to happen