Refactor code duplication in ConnectionIdRewritePass

ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs

@@ -162,17 +162,7 @@ namespace ILSpy.BamlDecompiler.Rewrite
 			{
 				foreach (var section in ilSwitch.Sections)
 				{
-					var field = FindField(section.Body);
+					Add(section.Labels, section.Body);
-					if (!(field is null))
-					{
-						fieldAssignments.Add((section.Labels, field));
-					}
-					events.Clear();
-					FindEvents(section.Body, events);
-					if (events.Count > 0)
-					{
-						eventMappings.Add((section.Labels, events.ToArray()));
-					}
 				}
 			}
 			else
@@ -189,17 +179,22 @@ namespace ILSpy.BamlDecompiler.Rewrite
 						? ifInst.FalseInst
 						: ifInst.TrueInst;
 
-					var field = FindField(inst);
+					Add(new LongSet(id), inst);
-					if (!(field is null))
+				}
-					{
+			}
-						fieldAssignments.Add((new LongSet(id), field));
+
-					}
+			void Add(LongSet ids, ILInstruction inst)
-					events.Clear();
+			{
-					FindEvents(inst, events);
+				var field = FindField(inst);
-					if (events.Count > 0)
+				if (!(field is null))
-					{
+				{
-						eventMappings.Add((new LongSet(id), events.ToArray()));
+					fieldAssignments.Add((ids, field));
-					}
+				}
+				events.Clear();
+				FindEvents(inst, events);
+				if (events.Count > 0)
+				{
+					eventMappings.Add((ids, events.ToArray()));
 				}
 			}
 		}