Extract values from static expressions (zspitz/ExpressionTreeToString#29)

zspitz · zspitz · commit ae482eaddcfa · 2020-07-19T04:37:36.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -266,3 +266,4 @@ _*
 # neither should the solution that references them
 /ExpressionTreeVisualizer.Dev.sln
 
+/PostBuild
diff --git a/Debuggee/Debuggee.csproj b/Debuggee/Debuggee.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0;netcoreapp2.0</TargetFrameworks>
-    <RootNamespace>ExpressionTreeVisualizer.Serialization</RootNamespace>
+    <RootNamespace>ExpressionTreeVisualizer.Debuggee</RootNamespace>
     <AssemblyName>ExpressionTreeVisualizer.Debuggee</AssemblyName>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
@@ -28,8 +28,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ZSpitz.Util" Version="0.0.27" />
-    <PackageReference Include="ExpressionTreeToString" Version="2.0.20" />
+    <PackageReference Include="ZSpitz.Util" Version="0.0.42" />
+    <PackageReference Include="ExpressionTreeToString" Version="2.0.27" />
     <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
       <Private>false</Private>
@@ -40,9 +40,7 @@
 
   <Target Name="CopyPackageAssembliesToSubFolder" AfterTargets="ResolveReferences">
     <ItemGroup>
-      <ReferenceCopyLocalPaths Condition=" '%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' "
-        Update="%(ReferenceCopyLocalPaths)"
-        DestinationSubDirectory="ExpressionTreeVisualizer\" />
+      <ReferenceCopyLocalPaths Condition=" '%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' " Update="%(ReferenceCopyLocalPaths)" DestinationSubDirectory="ExpressionTreeVisualizer\" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/Package/Package.csproj b/Package/Package.csproj
@@ -27,10 +27,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExpressionTreeToString" Version="2.0.20" />
+    <PackageReference Include="ExpressionTreeToString" Version="2.0.27" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
-    <PackageReference Include="ZSpitz.Util" Version="0.0.27" />
-    <PackageReference Include="ZSpitz.Util.Wpf" Version="0.0.27" />
+    <PackageReference Include="ZSpitz.Util" Version="0.0.42" />
+    <PackageReference Include="ZSpitz.Util.Wpf" Version="0.0.42" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="MultiSelectTreeView" Version="1.0.9" />
   </ItemGroup>
diff --git a/PostBuild/PostBuild.csproj b/PostBuild/PostBuild.csproj
diff --git a/Serialization/ExpressionNodeData.cs b/Serialization/ExpressionNodeData.cs
@@ -13,6 +13,7 @@
 using System.Collections;
 using ZSpitz.Util;
 using static ZSpitz.Util.Functions;
+using ExpressionTreeToString;
 
 namespace ExpressionTreeVisualizer.Serialization {
     [Serializable]
@@ -64,16 +65,18 @@ public class ExpressionNodeData {
         public string[] FactoryMethodNames => _factoryMethodNames;
 
 
-        internal ExpressionNodeData(object o, (string aggregatePath, string pathFromParent) path, VisualizerData visualizerData, Dictionary<string, (int start, int length)> pathSpans, bool isParameterDeclaration = false, PropertyInfo? pi = null, string? parentWatchExpression = null) :
+        internal ExpressionNodeData(object o, (string aggregatePath, string pathFromParent) path, VisualizerData visualizerData, ValueExtractor valueExtractor, Dictionary<string, (int start, int length)> pathSpans, bool isParameterDeclaration = false, PropertyInfo? pi = null, string? parentWatchExpression = null) :
             this(
                 o, path,
                 visualizerData.Config.Language,
+                valueExtractor,
                 pathSpans, isParameterDeclaration, pi, parentWatchExpression
             ) { }
 
         private ExpressionNodeData(
             object o, (string aggregatePath, string pathFromParent) path,
             string language,
+            ValueExtractor valueExtractor,
             Dictionary<string, (int start, int length)> pathSpans, bool isParameterDeclaration = false, PropertyInfo? pi = null, string? parentWatchExpression = null
         ) {
             var (aggregatePath, pathFromParent) = path;
@@ -107,32 +110,28 @@ private ExpressionNodeData(
                         Closure = expressionType.Name;
                     }
 
-                    object? value = null;
+                    var (evaluated, value) = valueExtractor.GetValue(expr);
+                    if (evaluated) {
+                        StringValue = StringValue(value!, language); // TODO value is allowed to be null
+                        EnableValueInNewWindow = value is { } && value.GetType().InheritsFromOrImplementsAny(NodeTypes);
+                    }
 
                     // fill StringValue and EndNodeType properties, for expressions
                     switch (expr) {
                         case ConstantExpression cexpr when !cexpr.Type.IsClosureClass():
-                            value = cexpr.Value;
                             EndNodeType = Constant;
                             break;
                         case ParameterExpression pexpr1:
                             EndNodeType = Parameter;
                             break;
                         case Expression e1 when expr.IsClosedVariable():
-                            value = expr.ExtractValue();
                             EndNodeType = ClosedVar;
                             break;
                         case DefaultExpression defexpr:
-                            value = defexpr.ExtractValue();
                             EndNodeType = Default;
                             break;
                     }
 
-                    if (value != null) {
-                        StringValue = StringValue(value, language);
-                        EnableValueInNewWindow = value.GetType().InheritsFromOrImplementsAny(NodeTypes);
-                    }
-
                     break;
                 case MemberBinding mbind:
                     NodeType = mbind.BindingType.ToString();
@@ -197,7 +196,7 @@ private ExpressionNodeData(
                 .Where(x => x.x != null)
                 .SelectT((relativePath, o1, prp) => new ExpressionNodeData(
                     o1, (FullPath ?? "", relativePath),
-                    language, pathSpans,
+                    language, valueExtractor, pathSpans,
                     false, prp, WatchExpressionFormatString))
                 .ToList();
 
diff --git a/Serialization/VisualizerData.cs b/Serialization/VisualizerData.cs
@@ -18,7 +18,9 @@ public VisualizerData(object o, Config? config = null) {
                 o = ((Expression)ResolvePath(o, Config.Path)).ExtractValue();
             }
             Source = WriterBase.Create(o, Config.Formatter, Config.Language, out var pathSpans).ToString();
-            Root = new ExpressionNodeData(o, ("", ""), this, pathSpans, false);
+
+            var valueExtractor = new ValueExtractor();
+            Root = new ExpressionNodeData(o, ("", ""), this, valueExtractor, pathSpans, false);
         }
     }
 }
diff --git a/Tests.Visualizer/Tests.csproj b/Tests.Visualizer/Tests.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExpressionTreeToString" Version="2.0.20" />
+    <PackageReference Include="ExpressionTreeToString" Version="2.0.27" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ExpressionTreeTestObjects" Version="1.0.2" />
+    <PackageReference Include="ExpressionTreeTestObjects" Version="1.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Visualizer/Visualizer.csproj b/Visualizer/Visualizer.csproj
@@ -16,12 +16,12 @@
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
       <Private>false</Private>
     </Reference>
-    <PackageReference Include="ExpressionTreeToString" Version="2.0.20" />
+    <PackageReference Include="ExpressionTreeToString" Version="2.0.27" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
     <PackageReference Include="MultiSelectTreeView" Version="1.0.9" />
-    <PackageReference Include="ZSpitz.Util" Version="0.0.27" />
-    <PackageReference Include="ZSpitz.Util.Wpf" Version="0.0.27" />
+    <PackageReference Include="ZSpitz.Util" Version="0.0.42" />
+    <PackageReference Include="ZSpitz.Util.Wpf" Version="0.0.42" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Octokit" Version="0.48.0" />
     <ProjectReference Include="..\Debuggee\Debuggee.csproj" />
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,7 +14,6 @@ only_commits:
     - Serialization/
     - UI/
     - Visualizer/
-    - Visualizer.Xaml/
     - appveyor.yml
 
 dotnet_csproj:

Original file line number	Diff line number	Diff line change
`@@ -266,3 +266,4 @@ _*`
`266`	`266`	`# neither should the solution that references them`
`267`	`267`	`/ExpressionTreeVisualizer.Dev.sln`
`268`	`268`
	`269`	`+/PostBuild`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ public VisualizerData(object o, Config? config = null) {`
`18`	`18`	`o = ((Expression)ResolvePath(o, Config.Path)).ExtractValue();`
`19`	`19`	`}`
`20`	`20`	`Source = WriterBase.Create(o, Config.Formatter, Config.Language, out var pathSpans).ToString();`
`21`		`- Root = new ExpressionNodeData(o, ("", ""), this, pathSpans, false);`
	`21`	`+`
	`22`	`+ var valueExtractor = new ValueExtractor();`
	`23`	`+ Root = new ExpressionNodeData(o, ("", ""), this, valueExtractor, pathSpans, false);`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`	`}`