From 4602497166d34900ba487aeee9d1e59d35a00292 Mon Sep 17 00:00:00 2001
From: Katy Coe <djkaty@start.no>
Date: Thu, 7 Nov 2019 02:31:47 +0100
Subject: [PATCH] Model: Move parameter string generation to ParameterInfo

---
 Il2CppInspector/Reflection/MethodBase.cs    | 5 +----
 Il2CppInspector/Reflection/ParameterInfo.cs | 8 ++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Il2CppInspector/Reflection/MethodBase.cs b/Il2CppInspector/Reflection/MethodBase.cs
index 34a4216..0114d95 100644
--- a/Il2CppInspector/Reflection/MethodBase.cs
+++ b/Il2CppInspector/Reflection/MethodBase.cs
@@ -159,10 +159,7 @@ namespace Il2CppInspector.Reflection
         }
 
         // Get C# syntax-friendly list of parameters
-        public string GetParametersString() =>
-            string.Join(", ", DeclaredParameters.Select(p => $"{p.CustomAttributes.ToString(inline: true).Replace("[ParamArray]", "params")}"
-                                                                        + $"{p.GetModifierString()}{p.ParameterType.CSharpName} {p.Name}"
-                                                                        + (p.HasDefaultValue? " = " + p.DefaultValue.ToCSharpValue() : "")));
+        public string GetParametersString() => string.Join(", ", DeclaredParameters.Select(p => p.GetParameterString()));
 
         public string GetTypeParametersString() => GenericTypeParameters == null? "" :
             "<" + string.Join(", ", GenericTypeParameters.Select(p => p.CSharpName)) + ">";
diff --git a/Il2CppInspector/Reflection/ParameterInfo.cs b/Il2CppInspector/Reflection/ParameterInfo.cs
index 83e6180..ae34e76 100644
--- a/Il2CppInspector/Reflection/ParameterInfo.cs
+++ b/Il2CppInspector/Reflection/ParameterInfo.cs
@@ -91,5 +91,13 @@ namespace Il2CppInspector.Reflection
               (IsIn ? "in " : "")
             + (IsByRef? "ref " : "")
             + (IsOut? "out " : "");
+
+        public string GetParameterString() => IsRetval? null :
+            $"{CustomAttributes.ToString(inline: true).Replace("[ParamArray]", "params")}"
+            + $"{GetModifierString()}{ParameterType.CSharpName} {Name}"
+            + (HasDefaultValue ? " = " + DefaultValue.ToCSharpValue() : "");
+
+        public string GetReturnParameterString() => !IsRetval? null :
+            $"{GetModifierString()}{ParameterType.CSharpName}";
     }
 }
\ No newline at end of file