From b256e525867235d7fd3ebdd3231873bbf0d08d90 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Fri, 25 Aug 2023 17:39:54 +0200
Subject: [PATCH] AK: Make Formatter for NonnullOwnPtr<T> format the T

This mirrors the behavior of NonnullRefPtr<T>. If you want to format
the pointer address, call .ptr() on it.
---
 AK/NonnullOwnPtr.h             |  9 +++++++++
 Tests/AK/TestNonnullOwnPtr.cpp | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/AK/NonnullOwnPtr.h b/AK/NonnullOwnPtr.h
index 8dd798c22d..843faa4f20 100644
--- a/AK/NonnullOwnPtr.h
+++ b/AK/NonnullOwnPtr.h
@@ -196,7 +196,16 @@ inline void swap(NonnullOwnPtr<T>& a, NonnullOwnPtr<U>& b)
     a.swap(b);
 }
 
+template<Formattable T>
+struct Formatter<NonnullOwnPtr<T>> : Formatter<T> {
+    ErrorOr<void> format(FormatBuilder& builder, NonnullOwnPtr<T> const& value)
+    {
+        return Formatter<T>::format(builder, *value);
+    }
+};
+
 template<typename T>
+requires(!HasFormatter<T>)
 struct Formatter<NonnullOwnPtr<T>> : Formatter<T const*> {
     ErrorOr<void> format(FormatBuilder& builder, NonnullOwnPtr<T> const& value)
     {
diff --git a/Tests/AK/TestNonnullOwnPtr.cpp b/Tests/AK/TestNonnullOwnPtr.cpp
index e67c4dde20..233c65fa6e 100644
--- a/Tests/AK/TestNonnullOwnPtr.cpp
+++ b/Tests/AK/TestNonnullOwnPtr.cpp
@@ -9,6 +9,7 @@
 #include <AK/DeprecatedString.h>
 #include <AK/NonnullOwnPtr.h>
 #include <AK/OwnPtr.h>
+#include <AK/String.h>
 
 TEST_CASE(destroy_self_owning_object)
 {
@@ -32,3 +33,19 @@ TEST_CASE(destroy_self_owning_object)
     object_ptr->inner = make<SelfOwning::Inner>(object.release_nonnull());
     object_ptr->inner = nullptr;
 }
+
+struct Foo { };
+
+template<>
+struct AK::Formatter<Foo> : Formatter<StringView> {
+    ErrorOr<void> format(FormatBuilder& builder, Foo const&)
+    {
+        return Formatter<StringView>::format(builder, ":^)"sv);
+    }
+};
+
+TEST_CASE(formatter)
+{
+    auto foo = make<Foo>();
+    EXPECT_EQ(MUST(String::formatted("{}", foo)), ":^)"sv);
+}