Fix missing context menu items

zspitz · Jul 6, 2021 · b1fdac1 · b1fdac1
1 parent a124a0c
commit b1fdac1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Serialization/ExpressionNodeData.cs b/Serialization/ExpressionNodeData.cs
@@ -79,11 +79,12 @@ private ExpressionNodeData(
         ) {
             var (aggregatePath, pathFromParent) = path;
             PathFromParent = pathFromParent;
-            if (aggregatePath.IsNullOrWhitespace() || pathFromParent.IsNullOrWhitespace()) {
-                FullPath = aggregatePath + pathFromParent;
-            } else {
-                FullPath = $"{aggregatePath}.{pathFromParent}";
-            }
+
+            var separator = 
+                aggregatePath is null or "" || pathFromParent is null or "" ? 
+                    "" : 
+                    ".";
+            FullPath = aggregatePath + separator + pathFromParent;
 
             switch (o) {
                 case Expression expr:

diff --git a/UI/ViewModels/VisualizerDataViewModel.cs b/UI/ViewModels/VisualizerDataViewModel.cs
@@ -38,7 +38,7 @@ public VisualizerDataViewModel(VisualizerData model, ICommand? openInNewWindow=n
                         )
                     )
                     .SelectMany(x => x.Item2.Select(y => (x.endNodeType, y)))
-                    .ToLookup(x => x.endNodeType, x => x.Item2);
+                    .ToLookup(x => x.endNodeType, x => x.y);
 
             Constants = grouped[Constant].ToList();
             Parameters = grouped[Parameter].ToList();

diff --git a/UI/VisualizerDataControl.xaml.cs b/UI/VisualizerDataControl.xaml.cs
@@ -42,7 +42,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
                 var (@namespace, typename, propertyname) = node.Model.ParentProperty.Value;
                 listData.Add(
                     $"Property: {typename}.{propertyname}",
-                    $"{BaseUrl}{new[] { @namespace, typename, propertyname }.Joined(".")}"
+                    $"{baseUrl}{new[] { @namespace, typename, propertyname }.Joined(".")}"
                 );
             }
 
@@ -52,7 +52,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
                 foreach (var (@namespace, typename, membername) in node.Model.NodeTypesParts) {
                     listData.Add(
                         $"Node type: {typename}.{membername}",
-                        $"{BaseUrl}{new[] { @namespace, typename }.Joined(".")}#{new[] { @namespace.Replace(".", "_"), typename, membername }.Joined("_")}"
+                        $"{baseUrl}{new[] { @namespace, typename }.Joined(".")}#{new[] { @namespace.Replace(".", "_"), typename, membername }.Joined("_")}"
                     );
                 }
             }
@@ -62,7 +62,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
             if (node.Model.BaseTypes is { }) {
                 node.Model.BaseTypes.SelectT((@namespace, typename) => (
                     $"Base type: {typename}",
-                    $"{BaseUrl}{@namespace}.{typename.Replace("~", "-")}"
+                    $"{baseUrl}{@namespace}.{typename.Replace("~", "-")}"
                 )).AddRangeTo(listData);
             }
 
@@ -71,7 +71,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
             if (node.Model.FactoryMethodNames is { }) {
                 node.Model.FactoryMethodNames.Select(methodName => (
                     $"Factory method: {methodName}",
-                    $"{BaseUrl}system.linq.expressions.expression.{methodName}"
+                    $"{baseUrl}system.linq.expressions.expression.{methodName}"
                 )).AddRangeTo(listData);
             }
 
@@ -82,7 +82,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
             foreach (var (header, url) in listData) {
                 if (header == "---") {
                     menu.Items.Add(new Separator());
-                    return;
+                    continue;
                 }
 
                 var mi = new MenuItem() {
@@ -98,6 +98,6 @@ void addSeparator() {
             }
         }
 
-        private const string BaseUrl = "https://docs.microsoft.com/dotnet/api/";
+        private const string baseUrl = "https://docs.microsoft.com/dotnet/api/";
     }
 }