Skip to content

Commit b1fdac1

Browse files
committed
Fix missing context menu items
1 parent a124a0c commit b1fdac1

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

Serialization/ExpressionNodeData.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,12 @@ private ExpressionNodeData(
7979
) {
8080
var (aggregatePath, pathFromParent) = path;
8181
PathFromParent = pathFromParent;
82-
if (aggregatePath.IsNullOrWhitespace() || pathFromParent.IsNullOrWhitespace()) {
83-
FullPath = aggregatePath + pathFromParent;
84-
} else {
85-
FullPath = $"{aggregatePath}.{pathFromParent}";
86-
}
82+
83+
var separator =
84+
aggregatePath is null or "" || pathFromParent is null or "" ?
85+
"" :
86+
".";
87+
FullPath = aggregatePath + separator + pathFromParent;
8788

8889
switch (o) {
8990
case Expression expr:

UI/ViewModels/VisualizerDataViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public VisualizerDataViewModel(VisualizerData model, ICommand? openInNewWindow=n
3838
)
3939
)
4040
.SelectMany(x => x.Item2.Select(y => (x.endNodeType, y)))
41-
.ToLookup(x => x.endNodeType, x => x.Item2);
41+
.ToLookup(x => x.endNodeType, x => x.y);
4242

4343
Constants = grouped[Constant].ToList();
4444
Parameters = grouped[Parameter].ToList();

UI/VisualizerDataControl.xaml.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
4242
var (@namespace, typename, propertyname) = node.Model.ParentProperty.Value;
4343
listData.Add(
4444
$"Property: {typename}.{propertyname}",
45-
$"{BaseUrl}{new[] { @namespace, typename, propertyname }.Joined(".")}"
45+
$"{baseUrl}{new[] { @namespace, typename, propertyname }.Joined(".")}"
4646
);
4747
}
4848

@@ -52,7 +52,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
5252
foreach (var (@namespace, typename, membername) in node.Model.NodeTypesParts) {
5353
listData.Add(
5454
$"Node type: {typename}.{membername}",
55-
$"{BaseUrl}{new[] { @namespace, typename }.Joined(".")}#{new[] { @namespace.Replace(".", "_"), typename, membername }.Joined("_")}"
55+
$"{baseUrl}{new[] { @namespace, typename }.Joined(".")}#{new[] { @namespace.Replace(".", "_"), typename, membername }.Joined("_")}"
5656
);
5757
}
5858
}
@@ -62,7 +62,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
6262
if (node.Model.BaseTypes is { }) {
6363
node.Model.BaseTypes.SelectT((@namespace, typename) => (
6464
$"Base type: {typename}",
65-
$"{BaseUrl}{@namespace}.{typename.Replace("~", "-")}"
65+
$"{baseUrl}{@namespace}.{typename.Replace("~", "-")}"
6666
)).AddRangeTo(listData);
6767
}
6868

@@ -71,7 +71,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
7171
if (node.Model.FactoryMethodNames is { }) {
7272
node.Model.FactoryMethodNames.Select(methodName => (
7373
$"Factory method: {methodName}",
74-
$"{BaseUrl}system.linq.expressions.expression.{methodName}"
74+
$"{baseUrl}system.linq.expressions.expression.{methodName}"
7575
)).AddRangeTo(listData);
7676
}
7777

@@ -82,7 +82,7 @@ private void HelpContextMenu_Loaded(object sender, RoutedEventArgs e) {
8282
foreach (var (header, url) in listData) {
8383
if (header == "---") {
8484
menu.Items.Add(new Separator());
85-
return;
85+
continue;
8686
}
8787

8888
var mi = new MenuItem() {
@@ -98,6 +98,6 @@ void addSeparator() {
9898
}
9999
}
100100

101-
private const string BaseUrl = "https://docs.microsoft.com/dotnet/api/";
101+
private const string baseUrl = "https://docs.microsoft.com/dotnet/api/";
102102
}
103103
}

0 commit comments

Comments
 (0)