fix: Properly detect unstaged files in Git and respect user's choice in the interactive menu

Author: etiennebacher

NEWS.md

@@ -1,3 +1,13 @@
+# flir (0.4.1)
+
+## Bug fixes
+
+* Changes were still directly applied to files that are unstaged
+  in Git while there should have been a warning. This is now fixed.
+  
+* Properly skip changes in the user picks "No" in the menu about 
+  modifying unstaged files in Git.
+
 # flir (0.4.0)
 
 ## Breaking changes

R/fix.R

@@ -68,12 +68,17 @@ fix <- function(
 
   if (uses_git()) {
     unstaged_files <- unlist(git2r::status()$unstaged)
+    unstaged_files <- fs::path_abs(unstaged_files)
     if (any(r_files %in% unstaged_files)) {
       if (interactive()) {
-        utils::menu(
+        choice <- utils::menu(
           title = "It is recommended to commit or discard all modified files before running `fix()`. Do you want to apply fixes anyway?",
           choices = c("Yes", "No")
         )
+        if (choice == 2) {
+          cli::cli_inform(c(i = "No changes applied."))
+          return(invisible())
+        }
       } else if (isFALSE(force)) {
         stop(
           "It is recommended to commit or discard all modified files before running `fix()`. Therefore, this operation is not allowed by default in

inst/cache_file_state.rds

@@ -39,7 +39,7 @@ test_that("rep_len_linter blocks simple disallowed usages", {
 
 test_that("vectorized lints work", {
   linter <- rep_len_linter()
-  lint_msg <- rex::rex("Use rep_len(x, n) instead of rep(x, length.out = n).")
+  lint_msg <- "Use rep_len(x, n) instead of rep(x, length.out = n)."
 
   expect_equal(
     nrow(