From 4371011a207baad6e5df31c8f5fda65dd737e1e5 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 21 Mar 2025 16:58:38 +0500
Subject: [PATCH] Added LogToDelegate and LogToTextWriter APIs (#18472)

* Added LogToDelegate and LogToTextWriter APIs

* typos
---
 .../{TraceLogSink.cs => StringLogSink.cs}     | 11 +++---
 src/Avalonia.Controls/LoggingExtensions.cs    | 36 +++++++++++++++++--
 2 files changed, 40 insertions(+), 7 deletions(-)
 rename src/Avalonia.Base/Logging/{TraceLogSink.cs => StringLogSink.cs} (91%)

diff --git a/src/Avalonia.Base/Logging/TraceLogSink.cs b/src/Avalonia.Base/Logging/StringLogSink.cs
similarity index 91%
rename from src/Avalonia.Base/Logging/TraceLogSink.cs
rename to src/Avalonia.Base/Logging/StringLogSink.cs
index a77b5d66da..f135c0cd9f 100644
--- a/src/Avalonia.Base/Logging/TraceLogSink.cs
+++ b/src/Avalonia.Base/Logging/StringLogSink.cs
@@ -6,15 +6,18 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Logging
 {
-    internal class TraceLogSink : ILogSink
+    internal class StringLogSink : ILogSink
     {
+        private readonly Action<string> _logger;
         private readonly LogEventLevel _level;
         private readonly IList<string>? _areas;
 
-        public TraceLogSink(
+        public StringLogSink(
+            Action<string> logger,
             LogEventLevel minimumLevel,
             IList<string>? areas = null)
         {
+            _logger = logger;
             _level = minimumLevel;
             _areas = areas?.Count > 0 ? areas : null;
         }
@@ -28,7 +31,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Trace.WriteLine(Format<object, object, object>(area, messageTemplate, source, null));
+                _logger(Format<object, object, object>(area, messageTemplate, source, null));
             }
         }
 
@@ -36,7 +39,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Trace.WriteLine(Format(area, messageTemplate, source, propertyValues));
+                _logger(Format(area, messageTemplate, source, propertyValues));
             }
         }
 
diff --git a/src/Avalonia.Controls/LoggingExtensions.cs b/src/Avalonia.Controls/LoggingExtensions.cs
index f909ba8714..819f4a4b89 100644
--- a/src/Avalonia.Controls/LoggingExtensions.cs
+++ b/src/Avalonia.Controls/LoggingExtensions.cs
@@ -1,4 +1,7 @@
-using Avalonia.Controls;
+#define TRACE
+using System;
+using System.Diagnostics;
+using System.IO;
 using Avalonia.Logging;
 
 namespace Avalonia
@@ -12,12 +15,39 @@ namespace Avalonia
         /// <param name="level">The minimum level to log.</param>
         /// <param name="areas">The areas to log. Valid values are listed in <see cref="LogArea"/>.</param>
         /// <returns>The app builder instance.</returns>
-        public static AppBuilder LogToTrace(
+        public static AppBuilder LogToTrace(this AppBuilder builder,
+            LogEventLevel level = LogEventLevel.Warning, params string[] areas) =>
+            LogToDelegate(builder, s => Trace.WriteLine(s), level, areas);
+
+
+        /// <summary>
+        /// Logs Avalonia events to a TextWriter
+        /// </summary>
+        /// <param name="builder">The app builder instance.</param>
+        /// <param name="writer">The TextWriter that's used for log events.</param>
+        /// <param name="level">The minimum level to log.</param>
+        /// <param name="areas">The areas to log. Valid values are listed in <see cref="LogArea"/>.</param>
+        /// <returns>The app builder instance.</returns>
+        public static AppBuilder LogToTextWriter(this AppBuilder builder, TextWriter writer,
+            LogEventLevel level = LogEventLevel.Warning, params string[] areas) =>
+            LogToDelegate(builder, TextWriter.Synchronized(writer).WriteLine, level, areas);
+        
+        
+        /// <summary>
+        /// Logs Avalonia events to a custom delegate
+        /// </summary>
+        /// <param name="builder">The app builder instance.</param>
+        /// <param name="logCallback">The callback that's used for log events.</param>
+        /// <param name="level">The minimum level to log.</param>
+        /// <param name="areas">The areas to log. Valid values are listed in <see cref="LogArea"/>.</param>
+        /// <returns>The app builder instance.</returns>
+        public static AppBuilder LogToDelegate(
             this AppBuilder builder,
+            Action<string> logCallback,
             LogEventLevel level = LogEventLevel.Warning,
             params string[] areas)
         {
-            Logger.Sink = new TraceLogSink(level, areas);
+            Logger.Sink = new StringLogSink(logCallback, level, areas);
             return builder;
         }
     }