Fix for issue fmtlib#3319

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
phprus · Mar 4, 2023 · 8123afe · 8123afe
1 parent e0748e6
commit 8123afe
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/include/fmt/std.h b/include/fmt/std.h
@@ -77,6 +77,11 @@ inline void write_escaped_path<std::filesystem::path::value_type>(
 template <typename Char>
 struct formatter<std::filesystem::path, Char>
     : formatter<basic_string_view<Char>> {
+  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+    auto out = formatter<basic_string_view<Char>>::parse(ctx);
+    this->set_debug_format(false);
+    return out;
+  }
   template <typename FormatContext>
   auto format(const std::filesystem::path& p, FormatContext& ctx) const ->
       typename FormatContext::iterator {

diff --git a/test/std-test.cc b/test/std-test.cc
@@ -21,6 +21,8 @@ TEST(std_test, path) {
   EXPECT_EQ(fmt::format("{:8}", std::filesystem::path("foo")), "\"foo\"   ");
   EXPECT_EQ(fmt::format("{}", std::filesystem::path("foo\"bar.txt")),
             "\"foo\\\"bar.txt\"");
+  EXPECT_EQ(fmt::format("{:?}", std::filesystem::path("foo\"bar.txt")),
+            "\"foo\\\"bar.txt\"");
 
 #  ifdef _WIN32
   // File.txt in Russian.
@@ -46,6 +48,25 @@ TEST(ranges_std_test, format_vector_path) {
 #endif
 }
 
+TEST(ranges_std_test, format_quote_path) {
+  // Test quote problem described in #3319.
+#ifdef __cpp_lib_filesystem
+  auto vec =
+      std::vector<std::filesystem::path>{"path1/file1.txt", "path2/file2.txt"};
+  EXPECT_EQ(fmt::format("{}", vec),
+            "[\"path1/file1.txt\", \"path2/file2.txt\"]");
+#  ifdef __cpp_lib_optional
+  auto o = std::optional<std::filesystem::path>("path/file.txt");
+  EXPECT_EQ(fmt::format("{}", o), "optional(\"path/file.txt\")");
+  EXPECT_EQ(fmt::format("{:?}", o), "optional(\"path/file.txt\")");
+#  endif
+#  ifdef __cpp_lib_variant
+  auto v = std::variant<std::filesystem::path, int>("path/file.txt");
+  EXPECT_EQ(fmt::format("{}", v), "variant(\"path/file.txt\")");
+#  endif
+#endif
+}
+
 TEST(std_test, thread_id) {
   EXPECT_FALSE(fmt::format("{}", std::this_thread::get_id()).empty());
 }