Add nullability annotations to some tree nodes.

siegfriedpammer · siegfriedpammer · commit 7e8b0500cee6 · 2025-10-09T08:38:40.000+02:00
diff --git a/ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs b/ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs
@@ -21,21 +21,21 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-#nullable disable
-
 using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 namespace ICSharpCode.ILSpyX.TreeView
 {
 	public partial class SharpTreeNode : INotifyPropertyChanged
 	{
+		[AllowNull]
 		protected static ITreeNodeImagesProvider ImagesProvider { get; private set; }
 		public static void SetImagesProvider(ITreeNodeImagesProvider provider) => ImagesProvider = provider;
 
-		SharpTreeNodeCollection modelChildren;
-		internal SharpTreeNode modelParent;
+		SharpTreeNodeCollection? modelChildren;
+		internal SharpTreeNode? modelParent;
 		bool isVisible = true;
 
 		void UpdateIsVisible(bool parentIsVisible, bool updateFlattener)
@@ -53,7 +53,7 @@ void UpdateIsVisible(bool parentIsVisible, bool updateFlattener)
 					node = node.listParent;
 				}
 				// Remember the removed nodes:
-				List<SharpTreeNode> removedNodes = null;
+				List<SharpTreeNode>? removedNodes = null;
 				if (updateFlattener && !newIsVisible)
 				{
 					removedNodes = VisibleDescendantsAndSelf().ToList();
@@ -118,19 +118,19 @@ public SharpTreeNodeCollection Children {
 			}
 		}
 
-		public SharpTreeNode Parent {
+		public SharpTreeNode? Parent {
 			get { return modelParent; }
 		}
 
-		public virtual object Text {
+		public virtual object? Text {
 			get { return null; }
 		}
 
-		public virtual object Icon {
+		public virtual object? Icon {
 			get { return null; }
 		}
 
-		public virtual object ToolTip {
+		public virtual object? ToolTip {
 			get { return null; }
 		}
 
@@ -199,7 +199,7 @@ public virtual void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
 					while (removeEnd.modelChildren != null && removeEnd.modelChildren.Count > 0)
 						removeEnd = removeEnd.modelChildren.Last();
 
-					List<SharpTreeNode> removedNodes = null;
+					List<SharpTreeNode>? removedNodes = null;
 					int visibleIndexOfRemoval = 0;
 					if (node.isVisible)
 					{
@@ -221,11 +221,11 @@ public virtual void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
 			}
 			if (e.NewItems != null)
 			{
-				SharpTreeNode insertionPos;
+				SharpTreeNode? insertionPos;
 				if (e.NewStartingIndex == 0)
 					insertionPos = null;
 				else
-					insertionPos = modelChildren[e.NewStartingIndex - 1];
+					insertionPos = modelChildren?[e.NewStartingIndex - 1];
 
 				foreach (SharpTreeNode node in e.NewItems)
 				{
@@ -260,7 +260,7 @@ public virtual void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
 
 		#region Expanding / LazyLoading
 
-		public virtual object ExpandedIcon {
+		public virtual object? ExpandedIcon {
 			get { return Icon; }
 		}
 
@@ -371,13 +371,13 @@ public IEnumerable<SharpTreeNode> VisibleDescendantsAndSelf()
 
 		public IEnumerable<SharpTreeNode> Ancestors()
 		{
-			for (SharpTreeNode n = this.Parent; n != null; n = n.Parent)
+			for (SharpTreeNode? n = this.Parent; n != null; n = n.Parent)
 				yield return n;
 		}
 
 		public IEnumerable<SharpTreeNode> AncestorsAndSelf()
 		{
-			for (SharpTreeNode n = this; n != null; n = n.Parent)
+			for (SharpTreeNode? n = this; n != null; n = n.Parent)
 				yield return n;
 		}
 
@@ -402,7 +402,7 @@ public bool IsEditing {
 			}
 		}
 
-		public virtual string LoadEditText()
+		public virtual string? LoadEditText()
 		{
 			return null;
 		}
@@ -699,7 +699,7 @@ void RaiseIsLastChangedIfNeeded(NotifyCollectionChangedEventArgs e)
 
 		#region INotifyPropertyChanged Members
 
-		public event PropertyChangedEventHandler PropertyChanged;
+		public event PropertyChangedEventHandler? PropertyChanged;
 
 		public void RaisePropertyChanged(string name)
 		{
@@ -725,10 +725,10 @@ public virtual void ActivateItemSecondary(IPlatformRoutedEventArgs e)
 		{
 		}
 
-		public override string ToString()
+		public override string? ToString()
 		{
 			// used for keyboard navigation
-			object text = this.Text;
+			object? text = this.Text;
 			return text != null ? text.ToString() : string.Empty;
 		}
 	}
diff --git a/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs b/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs
@@ -35,7 +35,7 @@ namespace ICSharpCode.ILSpy.Analyzers
 	/// </summary>
 	public abstract class AnalyzerEntityTreeNode : AnalyzerTreeNode, IMemberTreeNode
 	{
-		public abstract IEntity Member { get; }
+		public abstract IEntity? Member { get; }
 
 		public IEntity? SourceMember { get; protected set; }
 
@@ -65,13 +65,12 @@ public override bool HandleAssemblyListChanged(ICollection<LoadedAssembly> remov
 			}
 			foreach (LoadedAssembly asm in removedAssemblies)
 			{
-				if (this.Member.ParentModule.MetadataFile == asm.GetMetadataFileOrNull())
+				if (this.Member.ParentModule!.MetadataFile == asm.GetMetadataFileOrNull())
 					return false; // remove this node
 			}
 			this.Children.RemoveAll(
 				delegate (SharpTreeNode n) {
-					AnalyzerTreeNode an = n as AnalyzerTreeNode;
-					return an == null || !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);
+					return n is not AnalyzerTreeNode an || !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);
 				});
 			return true;
 		}
diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedEventTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedEventTreeNode.cs
@@ -17,6 +17,8 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy.TreeNodes;
@@ -57,17 +59,18 @@ protected override void LoadChildren()
 			foreach (var lazy in Analyzers)
 			{
 				var analyzer = lazy.Value;
+				Debug.Assert(analyzer != null);
 				if (analyzer.Show(analyzedEvent))
 				{
 					this.Children.Add(new AnalyzerSearchTreeNode(analyzedEvent, analyzer, lazy.Metadata?.Header));
 				}
 			}
 		}
 
-		bool TryFindBackingField(IEvent analyzedEvent, out IField backingField)
+		bool TryFindBackingField(IEvent analyzedEvent, [NotNullWhen(true)] out IField? backingField)
 		{
 			backingField = null;
-			foreach (var field in analyzedEvent.DeclaringTypeDefinition.GetFields(options: GetMemberOptions.IgnoreInheritedMembers))
+			foreach (var field in analyzedEvent.DeclaringTypeDefinition?.GetFields(options: GetMemberOptions.IgnoreInheritedMembers) ?? [])
 			{
 				if (field.Name == analyzedEvent.Name && field.Accessibility == Decompiler.TypeSystem.Accessibility.Private)
 				{
diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedFieldTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedFieldTreeNode.cs
@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Diagnostics;
 
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy.TreeNodes;
@@ -45,6 +46,7 @@ protected override void LoadChildren()
 			foreach (var lazy in Analyzers)
 			{
 				var analyzer = lazy.Value;
+				Debug.Assert(analyzer != null);
 				if (analyzer.Show(analyzedField))
 				{
 					this.Children.Add(new AnalyzerSearchTreeNode(analyzedField, analyzer, lazy.Metadata?.Header));
diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedMethodTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedMethodTreeNode.cs
@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Diagnostics;
 
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy.TreeNodes;
@@ -47,9 +48,10 @@ protected override void LoadChildren()
 			foreach (var lazy in Analyzers)
 			{
 				var analyzer = lazy.Value;
+				Debug.Assert(analyzer != null);
 				if (analyzer.Show(analyzedMethod))
 				{
-					this.Children.Add(new AnalyzerSearchTreeNode(analyzedMethod, analyzer, lazy.Metadata.Header));
+					this.Children.Add(new AnalyzerSearchTreeNode(analyzedMethod, analyzer, lazy.Metadata!.Header));
 				}
 			}
 		}
diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Windows;
 
 using ICSharpCode.Decompiler.TypeSystem;
@@ -44,16 +45,17 @@ public AnalyzedModuleTreeNode(IModule analyzedModule, IEntity? source)
 
 		public override object Text => analyzedModule.AssemblyName;
 
-		public override object ToolTip => analyzedModule.MetadataFile?.FileName;
+		public override object? ToolTip => analyzedModule.MetadataFile?.FileName;
 
 		protected override void LoadChildren()
 		{
 			foreach (var lazy in Analyzers)
 			{
 				var analyzer = lazy.Value;
+				Debug.Assert(analyzer != null);
 				if (analyzer.Show(analyzedModule))
 				{
-					this.Children.Add(new AnalyzerSearchTreeNode(analyzedModule, analyzer, lazy.Metadata.Header));
+					this.Children.Add(new AnalyzerSearchTreeNode(analyzedModule, analyzer, lazy.Metadata!.Header));
 				}
 			}
 		}
@@ -69,7 +71,7 @@ public override void ActivateItem(IPlatformRoutedEventArgs e)
 			MessageBus.Send(this, new NavigateToReferenceEventArgs(analyzedModule.MetadataFile));
 		}
 
-		public override IEntity Member => null;
+		public override IEntity? Member => null;
 
 		public override bool HandleAssemblyListChanged(ICollection<LoadedAssembly> removedAssemblies, ICollection<LoadedAssembly> addedAssemblies)
 		{
@@ -84,8 +86,7 @@ public override bool HandleAssemblyListChanged(ICollection<LoadedAssembly> remov
 			}
 			this.Children.RemoveAll(
 				delegate (SharpTreeNode n) {
-					AnalyzerTreeNode an = n as AnalyzerTreeNode;
-					return an == null || !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);
+					return n is not AnalyzerTreeNode an || !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);
 				});
 			return true;
 		}
diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedPropertyTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedPropertyTreeNode.cs
@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Diagnostics;
 
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy.TreeNodes;
@@ -53,9 +54,10 @@ protected override void LoadChildren()
 			foreach (var lazy in Analyzers)
 			{
 				var analyzer = lazy.Value;
+				Debug.Assert(analyzer != null);
 				if (analyzer.Show(analyzedProperty))
 				{
-					this.Children.Add(new AnalyzerSearchTreeNode(analyzedProperty, analyzer, lazy.Metadata.Header));
+					this.Children.Add(new AnalyzerSearchTreeNode(analyzedProperty, analyzer, lazy.Metadata!.Header));
 				}
 			}
 		}
diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedTypeTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedTypeTreeNode.cs
@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Diagnostics;
 
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy.TreeNodes;
@@ -45,9 +46,10 @@ protected override void LoadChildren()
 			foreach (var lazy in Analyzers)
 			{
 				var analyzer = lazy.Value;
+				Debug.Assert(analyzer != null);
 				if (analyzer.Show(analyzedType))
 				{
-					this.Children.Add(new AnalyzerSearchTreeNode(analyzedType, analyzer, lazy.Metadata.Header));
+					this.Children.Add(new AnalyzerSearchTreeNode(analyzedType, analyzer, lazy.Metadata!.Header));
 				}
 			}
 		}
diff --git a/ILSpy/AssemblyTree/AssemblyTreeModel.cs b/ILSpy/AssemblyTree/AssemblyTreeModel.cs
@@ -602,7 +602,7 @@ public void SelectNodes(IEnumerable<SharpTreeNode> nodes)
 			List<string> path = new List<string>();
 			while (node.Parent != null)
 			{
-				path.Add(node.ToString());
+				path.Add(node.ToString()!);
 				node = node.Parent;
 			}
 			path.Reverse();
diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs
@@ -1100,7 +1100,11 @@ public void SaveToDisk(ILSpy.Language language, IEnumerable<ILSpyTreeNode> treeN
 			SaveFileDialog dlg = new SaveFileDialog();
 			dlg.DefaultExt = language.FileExtension;
 			dlg.Filter = language.Name + "|*" + language.FileExtension + Properties.Resources.AllFiles;
-			dlg.FileName = WholeProjectDecompiler.CleanUpFileName(treeNodes.First().Text.ToString(), language.FileExtension);
+			string? nodeText = treeNodes.First().Text?.ToString();
+			if (!string.IsNullOrWhiteSpace(nodeText))
+			{
+				dlg.FileName = WholeProjectDecompiler.CleanUpFileName(nodeText, language.FileExtension);
+			}
 			if (dlg.ShowDialog() == true)
 			{
 				SaveToDisk(new DecompilationContext(language, treeNodes.ToArray(), options), dlg.FileName);

Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,21 @@`
`21`	`21`	`using System.Collections.Specialized;`
`22`	`22`	`using System.ComponentModel;`
`23`	`23`	`using System.Diagnostics;`
	`24`	`+using System.Diagnostics.CodeAnalysis;`
`24`	`25`	`using System.Linq;`
`25`	`26`
`26`		`-#nullable disable`
`27`		`-`
`28`	`27`	`using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;`
`29`	`28`
`30`	`29`	`namespace ICSharpCode.ILSpyX.TreeView`
`31`	`30`	`{`
`32`	`31`	`public partial class SharpTreeNode : INotifyPropertyChanged`
`33`	`32`	`{`
	`33`	`+ [AllowNull]`
`34`	`34`	`protected static ITreeNodeImagesProvider ImagesProvider { get; private set; }`
`35`	`35`	`public static void SetImagesProvider(ITreeNodeImagesProvider provider) => ImagesProvider = provider;`
`36`	`36`
`37`		`- SharpTreeNodeCollection modelChildren;`
`38`		`- internal SharpTreeNode modelParent;`
	`37`	`+ SharpTreeNodeCollection? modelChildren;`
	`38`	`+ internal SharpTreeNode? modelParent;`
`39`	`39`	`bool isVisible = true;`
`40`	`40`
`41`	`41`	`void UpdateIsVisible(bool parentIsVisible, bool updateFlattener)`
`@@ -53,7 +53,7 @@ void UpdateIsVisible(bool parentIsVisible, bool updateFlattener)`
`53`	`53`	`node = node.listParent;`
`54`	`54`	`}`
`55`	`55`	`// Remember the removed nodes:`
`56`		`- List<SharpTreeNode> removedNodes = null;`
	`56`	`+ List<SharpTreeNode>? removedNodes = null;`
`57`	`57`	`if (updateFlattener && !newIsVisible)`
`58`	`58`	`{`
`59`	`59`	`removedNodes = VisibleDescendantsAndSelf().ToList();`
`@@ -118,19 +118,19 @@ public SharpTreeNodeCollection Children {`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`- public SharpTreeNode Parent {`
	`121`	`+ public SharpTreeNode? Parent {`
`122`	`122`	`get { return modelParent; }`
`123`	`123`	`}`
`124`	`124`
`125`		`- public virtual object Text {`
	`125`	`+ public virtual object? Text {`
`126`	`126`	`get { return null; }`
`127`	`127`	`}`
`128`	`128`
`129`		`- public virtual object Icon {`
	`129`	`+ public virtual object? Icon {`
`130`	`130`	`get { return null; }`
`131`	`131`	`}`
`132`	`132`
`133`		`- public virtual object ToolTip {`
	`133`	`+ public virtual object? ToolTip {`
`134`	`134`	`get { return null; }`
`135`	`135`	`}`
`136`	`136`
`@@ -199,7 +199,7 @@ public virtual void OnChildrenChanged(NotifyCollectionChangedEventArgs e)`
`199`	`199`	`while (removeEnd.modelChildren != null && removeEnd.modelChildren.Count > 0)`
`200`	`200`	`removeEnd = removeEnd.modelChildren.Last();`
`201`	`201`
`202`		`- List<SharpTreeNode> removedNodes = null;`
	`202`	`+ List<SharpTreeNode>? removedNodes = null;`
`203`	`203`	`int visibleIndexOfRemoval = 0;`
`204`	`204`	`if (node.isVisible)`
`205`	`205`	`{`
`@@ -221,11 +221,11 @@ public virtual void OnChildrenChanged(NotifyCollectionChangedEventArgs e)`
`221`	`221`	`}`
`222`	`222`	`if (e.NewItems != null)`
`223`	`223`	`{`
`224`		`- SharpTreeNode insertionPos;`
	`224`	`+ SharpTreeNode? insertionPos;`
`225`	`225`	`if (e.NewStartingIndex == 0)`
`226`	`226`	`insertionPos = null;`
`227`	`227`	`else`
`228`		`- insertionPos = modelChildren[e.NewStartingIndex - 1];`
	`228`	`+ insertionPos = modelChildren?[e.NewStartingIndex - 1];`
`229`	`229`
`230`	`230`	`foreach (SharpTreeNode node in e.NewItems)`
`231`	`231`	`{`
`@@ -260,7 +260,7 @@ public virtual void OnChildrenChanged(NotifyCollectionChangedEventArgs e)`
`260`	`260`
`261`	`261`	`#region Expanding / LazyLoading`
`262`	`262`
`263`		`- public virtual object ExpandedIcon {`
	`263`	`+ public virtual object? ExpandedIcon {`
`264`	`264`	`get { return Icon; }`
`265`	`265`	`}`
`266`	`266`
`@@ -371,13 +371,13 @@ public IEnumerable<SharpTreeNode> VisibleDescendantsAndSelf()`
`371`	`371`
`372`	`372`	`public IEnumerable<SharpTreeNode> Ancestors()`
`373`	`373`	`{`
`374`		`- for (SharpTreeNode n = this.Parent; n != null; n = n.Parent)`
	`374`	`+ for (SharpTreeNode? n = this.Parent; n != null; n = n.Parent)`
`375`	`375`	`yield return n;`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`public IEnumerable<SharpTreeNode> AncestorsAndSelf()`
`379`	`379`	`{`
`380`		`- for (SharpTreeNode n = this; n != null; n = n.Parent)`
	`380`	`+ for (SharpTreeNode? n = this; n != null; n = n.Parent)`
`381`	`381`	`yield return n;`
`382`	`382`	`}`
`383`	`383`
`@@ -402,7 +402,7 @@ public bool IsEditing {`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`
`405`		`- public virtual string LoadEditText()`
	`405`	`+ public virtual string? LoadEditText()`
`406`	`406`	`{`
`407`	`407`	`return null;`
`408`	`408`	`}`
`@@ -699,7 +699,7 @@ void RaiseIsLastChangedIfNeeded(NotifyCollectionChangedEventArgs e)`
`699`	`699`
`700`	`700`	`#region INotifyPropertyChanged Members`
`701`	`701`
`702`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`702`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`703`	`703`
`704`	`704`	`public void RaisePropertyChanged(string name)`
`705`	`705`	`{`
`@@ -725,10 +725,10 @@ public virtual void ActivateItemSecondary(IPlatformRoutedEventArgs e)`
`725`	`725`	`{`
`726`	`726`	`}`
`727`	`727`
`728`		`- public override string ToString()`
	`728`	`+ public override string? ToString()`
`729`	`729`	`{`
`730`	`730`	`// used for keyboard navigation`
`731`		`- object text = this.Text;`
	`731`	`+ object? text = this.Text;`
`732`	`732`	`return text != null ? text.ToString() : string.Empty;`
`733`	`733`	`}`
`734`	`734`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ namespace ICSharpCode.ILSpy.Analyzers`
`35`	`35`	`/// </summary>`
`36`	`36`	`public abstract class AnalyzerEntityTreeNode : AnalyzerTreeNode, IMemberTreeNode`
`37`	`37`	`{`
`38`		`- public abstract IEntity Member { get; }`
	`38`	`+ public abstract IEntity? Member { get; }`
`39`	`39`
`40`	`40`	`public IEntity? SourceMember { get; protected set; }`
`41`	`41`
`@@ -65,13 +65,12 @@ public override bool HandleAssemblyListChanged(ICollection<LoadedAssembly> remov`
`65`	`65`	`}`
`66`	`66`	`foreach (LoadedAssembly asm in removedAssemblies)`
`67`	`67`	`{`
`68`		`- if (this.Member.ParentModule.MetadataFile == asm.GetMetadataFileOrNull())`
	`68`	`+ if (this.Member.ParentModule!.MetadataFile == asm.GetMetadataFileOrNull())`
`69`	`69`	`return false; // remove this node`
`70`	`70`	`}`
`71`	`71`	`this.Children.RemoveAll(`
`72`	`72`	`delegate (SharpTreeNode n) {`
`73`		`- AnalyzerTreeNode an = n as AnalyzerTreeNode;`
`74`		`- return an == null \|\| !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);`
	`73`	`+ return n is not AnalyzerTreeNode an \|\| !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);`
`75`	`74`	`});`
`76`	`75`	`return true;`
`77`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`// DEALINGS IN THE SOFTWARE.`
`18`	`18`
`19`	`19`	`using System;`
	`20`	`+using System.Diagnostics;`
	`21`	`+using System.Diagnostics.CodeAnalysis;`
`20`	`22`
`21`	`23`	`using ICSharpCode.Decompiler.TypeSystem;`
`22`	`24`	`using ICSharpCode.ILSpy.TreeNodes;`
`@@ -57,17 +59,18 @@ protected override void LoadChildren()`
`57`	`59`	`foreach (var lazy in Analyzers)`
`58`	`60`	`{`
`59`	`61`	`var analyzer = lazy.Value;`
	`62`	`+ Debug.Assert(analyzer != null);`
`60`	`63`	`if (analyzer.Show(analyzedEvent))`
`61`	`64`	`{`
`62`	`65`	`this.Children.Add(new AnalyzerSearchTreeNode(analyzedEvent, analyzer, lazy.Metadata?.Header));`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`	`}`
`66`	`69`
`67`		`- bool TryFindBackingField(IEvent analyzedEvent, out IField backingField)`
	`70`	`+ bool TryFindBackingField(IEvent analyzedEvent, [NotNullWhen(true)] out IField? backingField)`
`68`	`71`	`{`
`69`	`72`	`backingField = null;`
`70`		`- foreach (var field in analyzedEvent.DeclaringTypeDefinition.GetFields(options: GetMemberOptions.IgnoreInheritedMembers))`
	`73`	`+ foreach (var field in analyzedEvent.DeclaringTypeDefinition?.GetFields(options: GetMemberOptions.IgnoreInheritedMembers) ?? [])`
`71`	`74`	`{`
`72`	`75`	`if (field.Name == analyzedEvent.Name && field.Accessibility == Decompiler.TypeSystem.Accessibility.Private)`
`73`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`// DEALINGS IN THE SOFTWARE.`
`18`	`18`
`19`	`19`	`using System;`
	`20`	`+using System.Diagnostics;`
`20`	`21`
`21`	`22`	`using ICSharpCode.Decompiler.TypeSystem;`
`22`	`23`	`using ICSharpCode.ILSpy.TreeNodes;`
`@@ -45,6 +46,7 @@ protected override void LoadChildren()`
`45`	`46`	`foreach (var lazy in Analyzers)`
`46`	`47`	`{`
`47`	`48`	`var analyzer = lazy.Value;`
	`49`	`+ Debug.Assert(analyzer != null);`
`48`	`50`	`if (analyzer.Show(analyzedField))`
`49`	`51`	`{`
`50`	`52`	`this.Children.Add(new AnalyzerSearchTreeNode(analyzedField, analyzer, lazy.Metadata?.Header));`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`using System;`
`20`	`20`	`using System.Collections.Generic;`
	`21`	`+using System.Diagnostics;`
`21`	`22`	`using System.Windows;`
`22`	`23`
`23`	`24`	`using ICSharpCode.Decompiler.TypeSystem;`
`@@ -44,16 +45,17 @@ public AnalyzedModuleTreeNode(IModule analyzedModule, IEntity? source)`
`44`	`45`
`45`	`46`	`public override object Text => analyzedModule.AssemblyName;`
`46`	`47`
`47`		`- public override object ToolTip => analyzedModule.MetadataFile?.FileName;`
	`48`	`+ public override object? ToolTip => analyzedModule.MetadataFile?.FileName;`
`48`	`49`
`49`	`50`	`protected override void LoadChildren()`
`50`	`51`	`{`
`51`	`52`	`foreach (var lazy in Analyzers)`
`52`	`53`	`{`
`53`	`54`	`var analyzer = lazy.Value;`
	`55`	`+ Debug.Assert(analyzer != null);`
`54`	`56`	`if (analyzer.Show(analyzedModule))`
`55`	`57`	`{`
`56`		`- this.Children.Add(new AnalyzerSearchTreeNode(analyzedModule, analyzer, lazy.Metadata.Header));`
	`58`	`+ this.Children.Add(new AnalyzerSearchTreeNode(analyzedModule, analyzer, lazy.Metadata!.Header));`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`	`}`
`@@ -69,7 +71,7 @@ public override void ActivateItem(IPlatformRoutedEventArgs e)`
`69`	`71`	`MessageBus.Send(this, new NavigateToReferenceEventArgs(analyzedModule.MetadataFile));`
`70`	`72`	`}`
`71`	`73`
`72`		`- public override IEntity Member => null;`
	`74`	`+ public override IEntity? Member => null;`
`73`	`75`
`74`	`76`	`public override bool HandleAssemblyListChanged(ICollection<LoadedAssembly> removedAssemblies, ICollection<LoadedAssembly> addedAssemblies)`
`75`	`77`	`{`
`@@ -84,8 +86,7 @@ public override bool HandleAssemblyListChanged(ICollection<LoadedAssembly> remov`
`84`	`86`	`}`
`85`	`87`	`this.Children.RemoveAll(`
`86`	`88`	`delegate (SharpTreeNode n) {`
`87`		`- AnalyzerTreeNode an = n as AnalyzerTreeNode;`
`88`		`- return an == null \|\| !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);`
	`89`	`+ return n is not AnalyzerTreeNode an \|\| !an.HandleAssemblyListChanged(removedAssemblies, addedAssemblies);`
`89`	`90`	`});`
`90`	`91`	`return true;`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ public void SelectNodes(IEnumerable<SharpTreeNode> nodes)`
`602`	`602`	`List<string> path = new List<string>();`
`603`	`603`	`while (node.Parent != null)`
`604`	`604`	`{`
`605`		`- path.Add(node.ToString());`
	`605`	`+ path.Add(node.ToString()!);`
`606`	`606`	`node = node.Parent;`
`607`	`607`	`}`
`608`	`608`	`path.Reverse();`