Simplify FrameData

https://referencesource.microsoft.com/#mscorlib/system/diagnostics/stackframe.cs,177
mausworks · Mar 5, 2018 · 4f74611 · 4f74611
1 parent 387b4c7
commit 4f74611
Showing 1 changed file with 4 additions and 23 deletions.
diff --git a/src/Pidget.Client/DataModels/FrameData.cs b/src/Pidget.Client/DataModels/FrameData.cs
@@ -7,8 +7,6 @@ namespace Pidget.Client.DataModels
 {
     public class FrameData
     {
-        private const string UnknownMemberReplacement = "(unknown)";
-
         [JsonProperty("abs_path")]
         public string AbsolutePath { get; set; }
 
@@ -45,20 +43,15 @@ public static FrameData FromStackFrame(StackFrame stackFrame)
                 LineNumber = GetLineNumber(stackFrame),
                 ColumnNumber = stackFrame.GetFileColumnNumber(),
                 InApp = IsInApp(method),
-                Module = GetModule(method),
-                Function = GetMethodName(method),
-                ContextLine = GetMethodSource(method)
+                Module = method.DeclaringType.FullName,
+                Function = method.Name,
+                ContextLine = method.ToString()
             };
         }
 
         private static bool IsInApp(MethodBase method)
         {
-            if (method == null)
-            {
-                return true;
-            }
-
-            var module = GetModule(method);
+            var module = method.DeclaringType.FullName;
 
             return !module.StartsWith("System.", StringComparison.Ordinal)
                 && !module.StartsWith("Microsoft.", StringComparison.Ordinal);
@@ -71,17 +64,5 @@ private static int GetLineNumber(StackFrame stackFrame)
             return lineNumber != 0 ? lineNumber
                 : stackFrame.GetILOffset();
         }
-
-        private static string GetMethodSource(MethodBase method)
-            => method?.ToString()
-            ?? UnknownMemberReplacement;
-
-        private static string GetMethodName(MethodBase method)
-            => method?.Name
-            ?? UnknownMemberReplacement;
-
-        private static string GetModule(MethodBase method)
-            => method?.DeclaringType.FullName
-            ?? UnknownMemberReplacement;
     }
 }