From 6312e594a7fbf0d1a68f6f0c67ea8d7dac65c05d Mon Sep 17 00:00:00 2001 From: apmoskevitz Date: Mon, 23 Sep 2024 18:27:28 -0400 Subject: [PATCH] fix build errors from merge --- ILSpy/App.xaml.cs | 8 ++-- ILSpy/AssemblyTree/AssemblyTreeModel.cs | 52 +++++++++++----------- ILSpy/ContextMenuEntry.cs | 2 +- ILSpy/Docking/DockWorkspace.cs | 2 +- ILSpy/MainWindow.xaml.cs | 1 - ILSpy/Options/DisplaySettingsPanel.xaml.cs | 4 +- ILSpy/Options/OptionsDialog.xaml.cs | 2 +- ILSpy/SessionSettings.cs | 6 +-- ILSpy/Views/DebugSteps.xaml.cs | 4 +- 9 files changed, 38 insertions(+), 43 deletions(-) diff --git a/ILSpy/App.xaml.cs b/ILSpy/App.xaml.cs index a5027f08e..5494bd85d 100644 --- a/ILSpy/App.xaml.cs +++ b/ILSpy/App.xaml.cs @@ -18,13 +18,14 @@ using System; using System.Collections.Generic; -using System.ComponentModel.Composition.Hosting; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; using System.Reflection; using System.Runtime.Loader; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Windows; using System.Windows.Documents; @@ -33,8 +34,8 @@ using System.Windows.Threading; using ICSharpCode.ILSpy.AppEnv; using ICSharpCode.ILSpy.AssemblyTree; +using ICSharpCode.ILSpy.Themes; using ICSharpCode.ILSpyX.Analyzers; -using ICSharpCode.ILSpyX.Settings; using ICSharpCode.ILSpyX.TreeView; using Medo.Application; @@ -43,9 +44,6 @@ using Microsoft.VisualStudio.Composition; using TomsToolbox.Composition; using TomsToolbox.Wpf.Composition; -using ICSharpCode.ILSpy.Themes; -using System.Globalization; -using System.Threading; using TomsToolbox.Wpf.Styles; namespace ICSharpCode.ILSpy diff --git a/ILSpy/AssemblyTree/AssemblyTreeModel.cs b/ILSpy/AssemblyTree/AssemblyTreeModel.cs index 1c6903a55..2e3f1a5d4 100644 --- a/ILSpy/AssemblyTree/AssemblyTreeModel.cs +++ b/ILSpy/AssemblyTree/AssemblyTreeModel.cs @@ -16,40 +16,38 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -using System.Collections.Generic; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.ComponentModel; using System.ComponentModel.Composition; using System.IO; +using System.Linq; +using System.Reflection.Metadata; +using System.Reflection.Metadata.Ecma335; +using System.Text; using System.Threading.Tasks; +using System.Windows; using System.Windows.Input; +using System.Windows.Navigation; using System.Windows.Threading; +using ICSharpCode.Decompiler; +using ICSharpCode.Decompiler.Documentation; +using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.TypeSystem; +using ICSharpCode.Decompiler.TypeSystem.Implementation; +using ICSharpCode.ILSpy.AppEnv; using ICSharpCode.ILSpy.Docking; using ICSharpCode.ILSpy.Properties; +using ICSharpCode.ILSpy.Search; using ICSharpCode.ILSpy.TextView; using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.ILSpy.ViewModels; using ICSharpCode.ILSpyX; using ICSharpCode.ILSpyX.Settings; using ICSharpCode.ILSpyX.TreeView; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Linq; -using ICSharpCode.Decompiler.Metadata; - -using System.Reflection.Metadata.Ecma335; -using System.Windows; -using ICSharpCode.Decompiler.Documentation; -using ICSharpCode.Decompiler.TypeSystem.Implementation; -using System.Reflection.Metadata; -using System.Text; -using System.Windows.Navigation; - -using ICSharpCode.ILSpy.AppEnv; -using ICSharpCode.ILSpy.Search; -using ICSharpCode.Decompiler; using TomsToolbox.Essentials; using TomsToolbox.Wpf; @@ -121,8 +119,8 @@ namespace ICSharpCode.ILSpy.AssemblyTree set => SetProperty(ref root, value); } - private SharpTreeNode selectedItem; - public SharpTreeNode SelectedItem { + private SharpTreeNode? selectedItem; + public SharpTreeNode? SelectedItem { get => selectedItem; set => SetProperty(ref selectedItem, value); } @@ -145,7 +143,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree /// Called on startup or when passed arguments via WndProc from a second instance. /// In the format case, spySettings is non-null; in the latter it is null. /// - public void HandleCommandLineArgumentsAfterShowList(CommandLineArguments args, ISettingsProvider spySettings = null) + public void HandleCommandLineArgumentsAfterShowList(CommandLineArguments args, ISettingsProvider? spySettings = null) { var sessionSettings = SettingsService.Instance.SessionSettings; @@ -432,7 +430,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree #endif } - void assemblyList_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) + void assemblyList_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) { if (e.Action == NotifyCollectionChangedAction.Reset) { @@ -595,7 +593,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree } } - private void JumpToReference(object sender, NavigateToReferenceEventArgs e) + private void JumpToReference(object? sender, NavigateToReferenceEventArgs e) { JumpToReferenceAsync(e.Reference, e.InNewTabPage).HandleExceptions(); } @@ -655,11 +653,11 @@ namespace ICSharpCode.ILSpy.AssemblyTree #endregion - public void LoadAssemblies(IEnumerable fileNames, List loadedAssemblies = null, bool focusNode = true) + public void LoadAssemblies(IEnumerable fileNames, List? loadedAssemblies = null, bool focusNode = true) { using (Keyboard.FocusedElement.PreserveFocus(!focusNode)) { - AssemblyTreeNode lastNode = null; + AssemblyTreeNode? lastNode = null; foreach (string file in fileNames) { @@ -717,7 +715,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree return; - void ContextMenuClosed(object sender, EventArgs e) + void ContextMenuClosed(object? sender, EventArgs e) { ContextMenuProvider.ContextMenuClosed -= ContextMenuClosed; @@ -730,7 +728,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree } } - private void DecompileSelectedNodes(DecompilerTextViewState newState = null) + private void DecompileSelectedNodes(DecompilerTextViewState? newState = null) { var activeTabPage = DockWorkspace.Instance.ActiveTabPage; @@ -882,7 +880,7 @@ namespace ICSharpCode.ILSpy.AssemblyTree private class AssemblyComparer : IComparer { public static readonly AssemblyComparer Instance = new(); - int IComparer.Compare(LoadedAssembly x, LoadedAssembly y) + int IComparer.Compare(LoadedAssembly? x, LoadedAssembly? y) { return string.Compare(x?.ShortName, y?.ShortName, StringComparison.CurrentCulture); } diff --git a/ILSpy/ContextMenuEntry.cs b/ILSpy/ContextMenuEntry.cs index f4a96d187..ce581f6e2 100644 --- a/ILSpy/ContextMenuEntry.cs +++ b/ILSpy/ContextMenuEntry.cs @@ -90,7 +90,7 @@ namespace ICSharpCode.ILSpy /// public DependencyObject OriginalSource { get; private set; } - public static TextViewContext Create(ContextMenuEventArgs eventArgs, SharpTreeView?? treeView = null, DecompilerTextView textView = null, ListBox? listBox = null, DataGrid? dataGrid = null) + public static TextViewContext Create(ContextMenuEventArgs eventArgs, SharpTreeView? treeView = null, DecompilerTextView? textView = null, ListBox? listBox = null, DataGrid? dataGrid = null) { ReferenceSegment? reference; diff --git a/ILSpy/Docking/DockWorkspace.cs b/ILSpy/Docking/DockWorkspace.cs index 2b1765b3d..7a7251d1e 100644 --- a/ILSpy/Docking/DockWorkspace.cs +++ b/ILSpy/Docking/DockWorkspace.cs @@ -110,7 +110,7 @@ namespace ICSharpCode.ILSpy.Docking } } - public void AddTabPage(TabPageModel tabPage = null) + public void AddTabPage(TabPageModel? tabPage = null) { tabPages.Add(tabPage ?? new TabPageModel()); } diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs index f3668f6f0..eb0b2288f 100644 --- a/ILSpy/MainWindow.xaml.cs +++ b/ILSpy/MainWindow.xaml.cs @@ -29,7 +29,6 @@ using System.Windows.Media; using AvalonDock.Layout.Serialization; using ICSharpCode.ILSpy.AssemblyTree; -using ICSharpCode.ILSpy.Docking; using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.ILSpy.Updates; using ICSharpCode.ILSpyX.FileLoaders; diff --git a/ILSpy/Options/DisplaySettingsPanel.xaml.cs b/ILSpy/Options/DisplaySettingsPanel.xaml.cs index 3b51a16ba..66c965b2a 100644 --- a/ILSpy/Options/DisplaySettingsPanel.xaml.cs +++ b/ILSpy/Options/DisplaySettingsPanel.xaml.cs @@ -69,7 +69,7 @@ namespace ICSharpCode.ILSpy.Options public sealed class FontSizeConverter : ValueConverter { - protected override object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + protected override object Convert(object value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture) { if (value is double d) { @@ -79,7 +79,7 @@ namespace ICSharpCode.ILSpy.Options return DependencyProperty.UnsetValue; } - protected override object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + protected override object ConvertBack(object value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture) { if (value is not string s) return DependencyProperty.UnsetValue; diff --git a/ILSpy/Options/OptionsDialog.xaml.cs b/ILSpy/Options/OptionsDialog.xaml.cs index 783488175..79323e5b8 100644 --- a/ILSpy/Options/OptionsDialog.xaml.cs +++ b/ILSpy/Options/OptionsDialog.xaml.cs @@ -69,7 +69,7 @@ namespace ICSharpCode.ILSpy.Options this.assemblyTreeModel = assemblyTreeModel; } - public override void Execute(object parameter) + public override void Execute(object? parameter) { OptionsDialog dlg = new() { Owner = MainWindow.Instance, diff --git a/ILSpy/SessionSettings.cs b/ILSpy/SessionSettings.cs index ddd9f7826..e76544b19 100644 --- a/ILSpy/SessionSettings.cs +++ b/ILSpy/SessionSettings.cs @@ -180,14 +180,14 @@ namespace ICSharpCode.ILSpy return c.ConvertToInvariantString(obj); } - public event PropertyChangedEventHandler PropertyChanged; + public event PropertyChangedEventHandler? PropertyChanged; - private void OnPropertyChanged([CallerMemberName] string propertyName = null) + private void OnPropertyChanged([CallerMemberName] string? propertyName = null) { PropertyChanged?.Invoke(this, new(propertyName)); } - private bool SetProperty(ref T field, T value, [CallerMemberName] string propertyName = null) + private bool SetProperty(ref T field, T value, [CallerMemberName] string? propertyName = null) { if (EqualityComparer.Default.Equals(field, value)) return false; diff --git a/ILSpy/Views/DebugSteps.xaml.cs b/ILSpy/Views/DebugSteps.xaml.cs index b7336a43b..42cb93f95 100644 --- a/ILSpy/Views/DebugSteps.xaml.cs +++ b/ILSpy/Views/DebugSteps.xaml.cs @@ -52,7 +52,7 @@ namespace ICSharpCode.ILSpy DecompileAsync(lastSelectedStep); } - private void SelectionChanged(object sender, EventArgs e) + private void SelectionChanged(object? sender, EventArgs e) { Dispatcher.Invoke(() => { tree.ItemsSource = null; @@ -60,7 +60,7 @@ namespace ICSharpCode.ILSpy }); } - private void Settings_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + private void Settings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e) { #if DEBUG if (sender is not LanguageSettings)