Issue Accenture#3 - Fix renaming of delegate functions

ASkyeye · Nov 26, 2022 · 4f79f36 · 4f79f36
1 parent 7edc9e5
commit 4f79f36
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/Codecepticon/Codecepticon.csproj b/Codecepticon/Codecepticon.csproj
@@ -9,7 +9,7 @@
 	<LangVersion>9.0</LangVersion>
 	<PackageId>Codecepticon</PackageId>
 	<Title>Codecepticon</Title>
-	<Version>1.0.1</Version>
+	<Version>1.0.2</Version>
 	<Authors>Pavel Tsakalidis</Authors>
 	<Company>Accenture Security</Company>
 	<Product>Codecepticon</Product>

diff --git a/Codecepticon/Modules/CSharp/DataCollector.cs b/Codecepticon/Modules/CSharp/DataCollector.cs
@@ -282,6 +282,18 @@ public static async Task CollectFunctions(Solution solution, string projectName,
                 }
                 AllFunctions.Add(name);
             }
+
+            // Also collect Delegate function declarations.
+            var delegateMethods = syntaxTree.GetRoot().DescendantNodes().OfType<DelegateDeclarationSyntax>();
+            foreach (var m in delegateMethods)
+            {
+                string name = m.Identifier.ToString();
+                if (AllFunctions.Contains(name))
+                {
+                    continue;
+                }
+                AllFunctions.Add(name);
+            }
         }
 
         public static async Task FilterCollectedData()

diff --git a/Codecepticon/Modules/CSharp/DataRenamer.cs b/Codecepticon/Modules/CSharp/DataRenamer.cs
@@ -110,6 +110,21 @@ public async Task<Solution> RenameFunctions(Solution solution, string projectNam
                 solution = await RenameCode<MethodDeclarationSyntax>(solution, projectName, documentName, name, DataCollector.Mapping.Functions[name]);
             }
 
+            // Rename delegates.
+            var delegateMethods = syntaxTree.GetRoot().DescendantNodes().OfType<DelegateDeclarationSyntax>();
+            foreach(var m in delegateMethods)
+            {
+                string name = m.Identifier.ToString();
+                if (!DataCollector.Mapping.Functions.ContainsKey(name))
+                {
+                    Logger.Debug($"Delegate Function does not exist in mapping: {name}");
+
+                    continue;
+                }
+
+                solution = await RenameCode<DelegateDeclarationSyntax>(solution, projectName, documentName, name, DataCollector.Mapping.Functions[name]);
+            }
+
             return solution;
         }
 

diff --git a/Codecepticon/Modules/CSharp/SyntaxTreeHelper.cs b/Codecepticon/Modules/CSharp/SyntaxTreeHelper.cs
@@ -215,6 +215,10 @@ public async Task<Solution> RenameCode<T>(Solution solution, string projectName,
             {
                 node = ((IEnumerable<ClassDeclarationSyntax>)nodes).FirstOrDefault(s => s.Identifier.ToString() == existingName);
             }
+            else if (typeof(T) == typeof(DelegateDeclarationSyntax))
+            {
+                node = ((IEnumerable<DelegateDeclarationSyntax>)nodes).FirstOrDefault(s => s.Identifier.ToString() == existingName);
+            }
             else if (typeof(T) == typeof(MethodDeclarationSyntax))
             {
                 node = ((IEnumerable<MethodDeclarationSyntax>)nodes).FirstOrDefault(s => s.Identifier.ToString() == existingName);

diff --git a/Codecepticon/Properties/launchSettings.json b/Codecepticon/Properties/launchSettings.json
@@ -1,8 +1,7 @@
 {
   "profiles": {
     "Codecepticon": {
-      "commandName": "Project",
-      "commandLineArgs": "--config C:\\data\\tmp\\seatbelt.xml"
+      "commandName": "Project"
     }
   }
 }