From 14f790396a9923befb565d96a26adc40c9798097 Mon Sep 17 00:00:00 2001
From: Ani <115020168+drawbyperpetual@users.noreply.github.com>
Date: Fri, 15 Nov 2024 03:26:19 +0100
Subject: [PATCH] Fixed name of method in managed logging

---
 src/common/ManagedCommon/Logger.cs | 42 +++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/common/ManagedCommon/Logger.cs b/src/common/ManagedCommon/Logger.cs
index 367480d293..7224f2c7dc 100644
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 using PowerToys.Interop;
 
@@ -52,16 +53,18 @@ namespace ManagedCommon
             Trace.AutoFlush = true;
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogError(string message)
         {
             Log(message, Error);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogError(string message, Exception ex)
         {
             if (ex == null)
             {
-                LogError(message);
+                Log(message, Error);
             }
             else
             {
@@ -84,26 +87,31 @@ namespace ManagedCommon
             }
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogWarning(string message)
         {
             Log(message, Warning);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogInfo(string message)
         {
             Log(message, Info);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogDebug(string message)
         {
             Log(message, Debug);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         public static void LogTrace()
         {
             Log(string.Empty, TraceFlag);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void Log(string message, string type)
         {
             Trace.WriteLine("[" + DateTime.Now.TimeOfDay + "] [" + type + "] " + GetCallerInfo());
@@ -116,13 +124,39 @@ namespace ManagedCommon
             Trace.Unindent();
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
         private static string GetCallerInfo()
         {
             StackTrace stackTrace = new();
 
-            var methodName = stackTrace.GetFrame(3)?.GetMethod();
-            var className = methodName?.DeclaringType.Name;
-            return className + "::" + methodName?.Name;
+            var callerMethod = GetCallerMethod(stackTrace);
+
+            return $"{callerMethod?.DeclaringType?.Name}::{callerMethod.Name}";
+        }
+
+        private static MethodBase GetCallerMethod(StackTrace stackTrace)
+        {
+            const int topFrame = 3;
+
+            var topMethod = stackTrace.GetFrame(topFrame)?.GetMethod();
+
+            if (topMethod?.Name == nameof(IAsyncStateMachine.MoveNext) && typeof(IAsyncStateMachine).IsAssignableFrom(topMethod?.DeclaringType))
+            {
+                // Async method; return actual method as determined by heuristic:
+                // "Nearest method on stack to async state-machine's MoveNext() in same namespace but in a different type".
+                // There are tighter ways of determining the actual method, but this is good enough and probably faster.
+                for (int deepFrame = topFrame + 1; deepFrame < stackTrace.FrameCount; deepFrame++)
+                {
+                    var deepMethod = stackTrace.GetFrame(deepFrame)?.GetMethod();
+
+                    if (deepMethod?.DeclaringType != topMethod?.DeclaringType && deepMethod?.DeclaringType?.Namespace == topMethod?.DeclaringType?.Namespace)
+                    {
+                        return deepMethod;
+                    }
+                }
+            }
+
+            return topMethod;
         }
     }
 }