Fixes #82

Author: zspitz

…Shared/Util/Extensions/CallSiteBinder.cs Shared/Util/Extensions/CallSiteBinder.csVisualizer.Shared/Util/Extensions/CallSiteBinder.cs renamed to Shared/Util/Extensions/CallSiteBinder.cs Visualizer.Shared/Util/Extensions/CallSiteBinder.cs renamed to Shared/Util/Extensions/CallSiteBinder.cs

@@ -2,7 +2,7 @@
 using System.Dynamic;
 using System.Runtime.CompilerServices;
 
-namespace ExpressionTreeVisualizer.Util {
+namespace ExpressionToString.Util {
     public static class CallSiteBinderExtensions {
         public static string BinderType(this CallSiteBinder callSiteBinder) {
             switch (callSiteBinder) {

Shared/Util/Extensions/IEnumerableTuple.cs

@@ -19,5 +19,6 @@ public static IEnumerable<TResult> SelectT<T1, T2, TResult>(this IEnumerable<Val
             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));
+        public static IEnumerable<(T1, T2)> WhereT<T1, T2>(this IEnumerable<(T1, T2)> src, Func<T1, T2, bool> predicate) => src.Where(x => predicate(x.Item1, x.Item2));
     }
 }

Tests.DotNetCore/Tests.DotNetCore.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="Pather.CSharp" Version="2.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

Visualizer.Shared/Visualizer.Shared.projitems

@@ -11,7 +11,6 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Converters.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ExpressionRootPrompt.xaml.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Util\Extensions\CallSiteBinder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Util\Extensions\DependencyObject.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Util\Extensions\MultiSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Util\Extensions\MultiSelectTreeView.cs" />

Visualizer.Shared/VisualizerData.cs

@@ -10,10 +10,10 @@
 using static ExpressionToString.FormatterNames;
 using System.Collections;
 using System.Runtime.CompilerServices;
-using ExpressionTreeVisualizer.Util;
 using static ExpressionToString.Globals;
 using System.Reflection;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
 namespace ExpressionTreeVisualizer {
     [Serializable]
@@ -284,8 +284,8 @@ internal ExpressionNodeData(object o, (string aggregatePath, string pathFromPare
                         return new[] { (prp.Name, prp.GetValue(o), prp) };
                     }
                 })
-                .Where(x => x.Item2 != null)
-                .Select(x => new ExpressionNodeData(x.Item2, (FullPath ?? "", x.Item1), visualizerData, false, x.Item3, WatchExpressionFormatString))
+                .Where(x => x.x != null)
+                .SelectT((relativePath, o1, prp) => new ExpressionNodeData(o1, (FullPath ?? "", relativePath), visualizerData, false, prp, WatchExpressionFormatString))
                 .ToList();
 
             // populate URLs
@@ -350,11 +350,29 @@ public void ClearSelection() {
     }
 
     [Serializable]
+    [SuppressMessage("", "IDE0032", Justification = "https://github.com/dotnet/core/issues/2981")]
     public struct EndNodeData {
-        public string Closure { get; set; }
-        public string Name { get; set; }
-        public string Type { get; set; }
-        public string Value { get; set; }
+        private string _closure;
+        private string _name;
+        private string _type;
+        private string _value;
+
+        public string Closure {
+            get => _closure;
+            set => _closure = value;
+        }
+        public string Name {
+            get => _name;
+            set => _name = value;
+        }
+        public string Type {
+            get => _type;
+            set => _type = value;
+        }
+        public string Value {
+            get => _value;
+            set => _value = value;
+        }
     }
 
     public enum EndNodeTypes {