Fixes #77

Author: zspitz

Shared/Util/Extensions/ICollectionT.cs

@@ -8,5 +8,6 @@ public static class ICollectionTExtensions {
         public static void AddRange<T>(this ICollection<T> dest, IEnumerable<T> toAdd) => toAdd.ForEach(x => dest.Add(x));
 
         public static void Add<T1, T2>(this ICollection<ValueTuple<T1, T2>> lst, T1 t1, T2 t2) => lst.Add((t1, t2));
+        public static void Add<T1, T2, T3>(this ICollection<ValueTuple<T1, T2, T3>> lst, T1 t1, T2 t2, T3 t3) => lst.Add((t1, t2, t3));
     }
 }

Shared/Util/Extensions/IEnumerableTuple.cs

@@ -17,5 +17,7 @@ public static string Joined<T1, T2>(this IEnumerable<(T1, T2)> src, string delim
         public static IEnumerable<T2> Item2s<T1, T2>(this IEnumerable<(T1, T2)> src) => src.Select(x => x.Item2);
         public static IEnumerable<TResult> SelectT<T1, T2, TResult>(this IEnumerable<ValueTuple<T1, T2>> src, Func<T1, T2, TResult> selector) =>
             src.Select(x => selector(x.Item1, x.Item2));
+        public static IEnumerable<TResult> SelectT<T1, T2, T3, TResult>(this IEnumerable<ValueTuple<T1, T2, T3>> src, Func<T1, T2, T3, TResult> selector) =>
+            src.Select(x => selector(x.Item1, x.Item2, x.Item3));
     }
 }

Visualizer.Shared/VisualizerData.cs

@@ -138,7 +138,7 @@ public class ExpressionNodeData : INotifyPropertyChanged {
         public string PathFromParent { get; set; } = "";
         public string FullPath { get; set; } = "";
         public (string @namespace, string typename, string propertyname)? ParentProperty { get; set; }
-        public (string @namespace, string enumTypename, string membername)? NodeTypeParts { get; set; }
+        public List<(string @namespace, string enumTypename, string membername)> NodeTypesParts { get; set; }
 
         private List<(string @namespace, string typename)> _baseTypes;
         public List<(string @namespace, string typename)> BaseTypes => _baseTypes;
@@ -173,7 +173,14 @@ internal ExpressionNodeData(object o, (string aggregatePath, string pathFromPare
             switch (o) {
                 case Expression expr:
                     NodeType = expr.NodeType.ToString();
-                    NodeTypeParts = (typeof(ExpressionType).Namespace, nameof(ExpressionType), NodeType);
+                    NodeTypesParts = new List<(string @namespace, string enumTypename, string membername)> {
+                        (typeof(ExpressionType).Namespace, nameof(ExpressionType), NodeType)
+                    };
+                    if (expr is GotoExpression gexpr) {
+                        NodeTypesParts.Add(
+                            typeof(GotoExpressionKind).Namespace, nameof(GotoExpressionKind), gexpr.Kind.ToString()
+                        );
+                    }
                     ReflectionTypeName = expr.Type.FriendlyName(language);
                     IsDeclaration = isParameterDeclaration;
 
@@ -227,7 +234,9 @@ internal ExpressionNodeData(object o, (string aggregatePath, string pathFromPare
                     break;
                 case MemberBinding mbind:
                     NodeType = mbind.BindingType.ToString();
-                    NodeTypeParts = (typeof(MemberBindingType).Namespace, nameof(MemberBindingType), NodeType);
+                    NodeTypesParts = new List<(string @namespace, string enumTypename, string membername)> {
+                        (typeof(MemberBindingType).Namespace, nameof(MemberBindingType), NodeType)
+                    };    
                     Name = mbind.Member.Name;
                     break;
                 case CallSiteBinder callSiteBinder:

Visualizer.Shared/VisualizerDataControl.xaml.cs

@@ -147,12 +147,13 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
 
             addSeparator();
 
-            if (node.NodeTypeParts.HasValue) {
-                var (@namespace, typename, membername) = node.NodeTypeParts.Value;
-                listData.Add(
-                    $"Node type: {typename}.{membername}",
-                    $"{BaseUrl}{new[] { @namespace, typename }.Joined(".")}#{new[] { @namespace.Replace(".", "_"), typename, membername }.Joined("_")}"
-                );
+            if (node.NodeTypesParts != null) {
+                foreach (var (@namespace, typename, membername) in node.NodeTypesParts) {
+                    listData.Add(
+                        $"Node type: {typename}.{membername}",
+                        $"{BaseUrl}{new[] { @namespace, typename }.Joined(".")}#{new[] { @namespace.Replace(".", "_"), typename, membername }.Joined("_")}"
+                    );
+                }
             }
 
             addSeparator();