fix many code warnings and suggestions

Author: LeftofZen

.editorconfig

@@ -11,6 +11,16 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
 dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_return = true:suggestion
 
 # C# files
 [*.csproj]
@@ -426,3 +436,4 @@ dotnet_diagnostic.SA1633.severity = none
 dotnet_diagnostic.RCS1217.severity = none
 
 dotnet_diagnostic.RS0030.severity = error
+csharp_style_prefer_primary_constructors = true:suggestion

AvaGui/Models/DatFileType.cs

@@ -0,0 +1,15 @@
+namespace AvaGui.Models
+{
+	public enum DatFileType
+	{
+		Object,
+		Scenario,
+		SaveGame,
+		Tutorial,
+		G1,
+		Music,
+		SoundEffect, // css*.dat
+		Language,
+		Scores,
+	}
+}

AvaGui/Models/FileSystemItemGroup.cs

@@ -21,5 +21,4 @@ public record FileSystemItemGroup(string Path, ObjectType ObjectType, Observable
 
 	public record FileSystemVehicleGroup(string Path, VehicleType VehicleType, ObservableCollection<FileSystemItemBase> SubNodes)
 		: FileSystemItemBase(Path, VehicleType.ToString(), SubNodes);
-
 }

AvaGui/Models/IUiObject.cs

@@ -1,7 +1,7 @@
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace AvaGui.Models
 {
 	[TypeConverter(typeof(ExpandableObjectConverter))]
-	public interface IUiObject { }
+	public interface IUiObject;
 }

AvaGui/Models/IndexObjectHeader.cs

@@ -1,6 +1,5 @@
 using OpenLoco.ObjectEditor.Data;
 using OpenLoco.ObjectEditor.Objects;
-using System;
 
 namespace AvaGui.Models
 {

AvaGui/Models/LanguageTranslation.cs

@@ -1,29 +1,15 @@
 using OpenLoco.ObjectEditor.Data;
 using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
 
 namespace AvaGui.Models
 {
-	public class LanguageTranslation : ReactiveObject
+	public class LanguageTranslation(LanguageId language, string translation) : ReactiveObject
 	{
-		public LanguageTranslation(LanguageId language, string translation)
-		{
-			_language = language;
-			_translation = translation;
-		}
+		[Reactive]
+		public LanguageId Language { get; set; } = language;
 
-		private LanguageId _language;
-		public LanguageId Language
-		{
-			get => _language;
-			set => _ = this.RaiseAndSetIfChanged(ref _language, value);
-		}
-
-		private string _translation;
-
-		public string Translation
-		{
-			get => _translation;
-			set => _ = this.RaiseAndSetIfChanged(ref _translation, value);
-		}
+		[Reactive]
+		public string Translation { get; set; } = translation;
 	}
 }

AvaGui/Models/ObjectEditorModel.cs

@@ -16,24 +16,9 @@
 using OpenLoco.ObjectEditor.Data;
 using OpenLoco.ObjectEditor;
 using System.Collections.ObjectModel;
-using ReactiveUI;
-using System.Reflection;
 
 namespace AvaGui.Models
 {
-	public enum DatFileType
-	{
-		Object,
-		Scenario,
-		SaveGame,
-		Tutorial,
-		G1,
-		Music,
-		SoundEffect, // css*.dat
-		Language,
-		Scores,
-	}
-
 	public class ObjectEditorModel
 	{
 		public EditorSettings Settings { get; private set; }
@@ -48,23 +33,23 @@ public class ObjectEditorModel
 
 		public G1Dat? G1 { get; set; }
 
-		public Dictionary<string, byte[]> Music { get; set; } = [];
+		public Dictionary<string, byte[]> Music { get; } = [];
 
-		public Dictionary<string, byte[]> MiscellaneousTracks { get; set; } = [];
+		public Dictionary<string, byte[]> MiscellaneousTracks { get; } = [];
 
-		public Dictionary<string, byte[]> SoundEffects { get; set; } = [];
+		public Dictionary<string, byte[]> SoundEffects { get; } = [];
 
-		public Dictionary<string, byte[]> Tutorials { get; set; } = [];
+		public Dictionary<string, byte[]> Tutorials { get; } = [];
 
-		public Collection<string> MiscFiles { get; set; } = [];
+		public Collection<string> MiscFiles { get; } = [];
 
 		public const string ApplicationName = "OpenLoco Object Editor";
 
 		public static string SettingsPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ApplicationName);
 
 		public static string SettingsFile => Path.Combine(SettingsPath, "settings.json");
 
-		public ObservableCollection<LogLine> LoggerObservableLogs = new();
+		public ObservableCollection<LogLine> LoggerObservableLogs = [];
 
 		public ObjectEditorModel()
 		{
@@ -187,20 +172,9 @@ void CreateIndex(string[] allFiles, IProgress<float>? progress)
 			sw.Start();
 
 			var fileCount = allFiles.Length;
-			var parallelise = true; // todo: remove this or make a user setting
 
-			if (parallelise)
-			{
-				_ = Parallel.ForEach(allFiles, new ParallelOptions() { MaxDegreeOfParallelism = 16 }, (filename)
-					=> count = LoadAndIndexFile(count, filename));
-			}
-			else
-			{
-				foreach (var filename in allFiles)
-				{
-					count = LoadAndIndexFile(count, filename);
-				}
-			}
+			_ = Parallel.ForEach(allFiles, new ParallelOptions() { MaxDegreeOfParallelism = 16 }, (filename)
+				=> count = LoadAndIndexFile(count, filename));
 
 			HeaderIndex = ccHeaderIndex.OrderBy(kvp => kvp.Key).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
 
@@ -294,7 +268,7 @@ void LoadKnownData(HashSet<string> allFilesInDir, HashSet<string> knownFilenames
 			LoadKnownData(allDataFiles, [OriginalDataFiles.SoundEffect], SoundEffects);
 			LoadKnownData(allDataFiles, OriginalDataFiles.Tutorials, Tutorials);
 
-			MiscFiles = [.. allDataFiles];
+			//MiscFiles = [.. allDataFiles];
 
 			// load G1 only for now since we need it for palette
 			G1 = SawyerStreamReader.LoadG1(Settings.GetDataFullPath(Settings.G1DatFileName));

AvaGui/Models/ObjectTypeToMaterialIconConverter.cs

@@ -9,7 +9,7 @@ namespace AvaGui.Models
 {
 	public class ObjectTypeToMaterialIconConverter : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
 		{
 			if (Enum.TryParse<DatFileType>(value as string, out var datType) && DatTypeMapping.TryGetValue(datType, out var datIcon))
 			{
@@ -37,7 +37,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
 			=> throw new NotImplementedException();
 
-		public static Dictionary<ObjectType, string> ObjectMapping = new Dictionary<ObjectType, string>()
+		static readonly Dictionary<ObjectType, string> ObjectMapping = new()
 		{
 			{ ObjectType.InterfaceSkin, "Monitor" },
 			{ ObjectType.Sound, "Speaker" },
@@ -75,7 +75,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 			{ ObjectType.ScenarioText, "ScriptText" },
 		};
 
-		public static Dictionary<VehicleType, string> VehicleMapping = new Dictionary<VehicleType, string>()
+		static readonly Dictionary<VehicleType, string> VehicleMapping = new()
 		{
 			{ VehicleType.Train, "Train" },
 			{ VehicleType.Bus, "Bus" },
@@ -85,14 +85,14 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 			{ VehicleType.Ship, "Sailboat" },
 		};
 
-		public static Dictionary<SourceGame, string> SourceGameMapping = new Dictionary<SourceGame, string>()
+		static readonly Dictionary<SourceGame, string> SourceGameMapping = new()
 		{
 			{ SourceGame.Custom, "AccountEdit" },
 			{ SourceGame.DataFile, "File" },
 			{ SourceGame.Vanilla, "AccountTieHat" },
 		};
 
-		public static Dictionary<DatFileType, string> DatTypeMapping = new Dictionary<DatFileType, string>()
+		static readonly Dictionary<DatFileType, string> DatTypeMapping = new()
 		{
 			{ DatFileType.Object, "Apps" },
 			{ DatFileType.Scenario, "MapClock" },

AvaGui/Models/UiG1.cs

@@ -16,10 +16,7 @@ public List<G1Element32> G1Elements
 			set
 			{
 				G1.G1Elements.Clear();
-				foreach (var x in value)
-				{
-					G1.G1Elements.Add(x);
-				}
+				G1.G1Elements.AddRange(value);
 			}
 		}
 	}

AvaGui/Models/UiSoundObjectList.cs

@@ -7,6 +7,6 @@ namespace AvaGui.Models
 	public class UiSoundObjectList : IUiObject
 	{
 		public string FileName { get; set; }
-		public List<UiSoundObject> Audio { get; set; } = [];
+		public List<UiSoundObject> Audio { get; } = [];
 	}
 }