Merge pull request #452 from IndrajeetPatil/b382-path-ext

`path_ext()` returns correct extension if multiple dots present
r-lib · Apr 27, 2024 · 342ac30 · 342ac30
2 parents db53761 + 6285343
commit 342ac30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # fs (development version)
 
+* `path_ext()` returns extension when multiple dots are present in file name (@IndrajeetPatil, #452).
+
 # fs 1.6.4
 
 * No changes.

diff --git a/R/path.R b/R/path.R
@@ -359,7 +359,7 @@ path_ext <- function(path) {
     return(character())
   }
 
-  res <- captures(path_file(path), regexpr("(?<!^|[.]|/)[.]([^.]+)$", path_file(path), perl = TRUE))[[1]]
+  res <- captures(path_file(path), regexpr("(?<!^|[.]|/)[.]+([^.]+)$", path_file(path), perl = TRUE))[[1]]
   res[!is.na(path) & is.na(res)] <- ""
   res
 }

diff --git a/tests/testthat/test-path.R b/tests/testthat/test-path.R
@@ -261,6 +261,8 @@ describe("path_ext", {
     expect_equal(path_ext(".cshrc"), "")
     expect_equal(path_ext("...manydots"), "")
     expect_equal(path_ext("...manydots.ext"), "ext")
+    expect_equal(path_ext("manydots..."), "")
+    expect_equal(path_ext("manydots...ext"), "ext")
     expect_equal(path_ext("."), "")
     expect_equal(path_ext(".."), "")
     expect_equal(path_ext("........"), "")