From 0d8a85c3db523d577e08d827a34f6644d8ba85c5 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 30 Jul 2025 22:02:58 +0200 Subject: [PATCH] Fix warnings in CompareViewModel --- ILSpy/ViewModels/CompareViewModel.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ILSpy/ViewModels/CompareViewModel.cs b/ILSpy/ViewModels/CompareViewModel.cs index 529e04511..0ecd7200c 100644 --- a/ILSpy/ViewModels/CompareViewModel.cs +++ b/ILSpy/ViewModels/CompareViewModel.cs @@ -51,8 +51,6 @@ namespace ICSharpCode.ILSpy.ViewModels private readonly AssemblyTreeModel assemblyTreeModel; private LoadedAssembly leftAssembly; private LoadedAssembly rightAssembly; - [AllowNull] - private LoadedAssembly[] assemblies; private ComparisonEntryTreeNode root; private bool updating = false; private bool showIdentical; @@ -239,7 +237,12 @@ namespace ICSharpCode.ILSpy.ViewModels continue; yield return new { name = GetEntityText(item.Entity), - operation = item.Kind switch { DiffKind.Add => "added", DiffKind.Remove => "removed", DiffKind.Update => "changed" } + operation = item.Kind switch { + DiffKind.Add => "added", + DiffKind.Remove => "removed", + DiffKind.Update => "changed", + _ => throw new InvalidOperationException($"Unexpected DiffKind: {item.Kind}"), + } }; } } @@ -352,7 +355,7 @@ namespace ICSharpCode.ILSpy.ViewModels { if (!namespaceEntries.TryGetValue(typeDef.Namespace, out var nsEntry)) { - namespaceEntries[typeDef.Namespace] = nsEntry = new Entry { Parent = root, Signature = typeDef.Namespace, Entity = ResolveNamespace(typeDef.Namespace, typeDef.ParentModule)! }; + namespaceEntries[typeDef.Namespace] = nsEntry = new Entry { Parent = root, Signature = typeDef.Namespace, Entity = ResolveNamespace(typeDef.Namespace, typeDef.ParentModule!)! }; root.Children ??= new(); root.Children.Add(nsEntry); }