style: prefer var when type is obvious and use expression bodies

- Sweep explicit-type local declarations to var where the right-hand
  side already shows the type (casts, factory calls, LINQ results).
- Make MainWindow.SaveWindowState's bounds explicit Rect (the ternary
  hides the type at the declaration site).
- Convert one-liner relay-command and helper methods to expression
  bodies for consistency.
- Tighten ExtractCommand's argv loop using the null-coalescing
  assignment operator.

Bumps ReScene.Lib submodule for the matching style pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: NeWbY100

ReScene.Cli/Commands/ExtractCommand.cs

@@ -29,9 +29,9 @@ public static int Run(string[] args)
             {
                 outDir = args[++i];
             }
-            else if (srrPath is null)
+            else
             {
-                srrPath = args[i];
+                srrPath ??= args[i];
             }
         }
 
@@ -50,12 +50,12 @@ public static int Run(string[] args)
         try
         {
             Directory.CreateDirectory(outDir);
-            SRRFile srr = SRRFile.Load(srrPath);
+            var srr = SRRFile.Load(srrPath);
 
             using FileStream input = File.OpenRead(srrPath);
             byte[] buffer = new byte[CopyBufferSize];
 
-            foreach (var stored in srr.StoredFiles)
+            foreach (SrrStoredFileBlock stored in srr.StoredFiles)
             {
                 string outPath = ResolveSafeOutputPath(outDir, stored.FileName);
                 Directory.CreateDirectory(Path.GetDirectoryName(outPath)!);

ReScene.Cli/Commands/InspectCommand.cs

@@ -34,7 +34,7 @@ public static int Run(string[] args)
 
         try
         {
-            SRRFile srr = SRRFile.Load(path);
+            var srr = SRRFile.Load(path);
 
             List<(long Offset, string Type, long Size, string Name)> rows = [];
 
@@ -68,7 +68,7 @@ public static int Run(string[] args)
             Console.WriteLine($"{"Offset",-12} {"Type",-20} {"Size",10}  Name");
             Console.WriteLine(new string('-', 60));
 
-            foreach (var row in rows)
+            foreach ((long Offset, string Type, long Size, string Name) row in rows)
             {
                 PrintRow(row.Offset, row.Type, row.Size, row.Name);
             }
@@ -82,8 +82,5 @@ public static int Run(string[] args)
         }
     }
 
-    private static void PrintRow(long offset, string type, long size, string name)
-    {
-        Console.WriteLine($"0x{offset:X8}   {type,-20} {size,10:N0}  {name}");
-    }
+    private static void PrintRow(long offset, string type, long size, string name) => Console.WriteLine($"0x{offset:X8}   {type,-20} {size,10:N0}  {name}");
 }

ReScene.Lib

@@ -38,7 +38,7 @@ public Task ExportSelectedAsync(string outputPath, TreeNodeViewModel node, IEnum
     /// <inheritdoc />
     public Task ExportTreeAsync(string outputPath, IEnumerable<TreeNodeViewModel> roots, CancellationToken ct = default)
     {
-        List<PropertyExportNode> list = roots.Select(r => ToExport(r, includeChildren: true)).ToList();
+        var list = roots.Select(r => ToExport(r, includeChildren: true)).ToList();
         string json = JsonSerializer.Serialize(list, _options);
         return File.WriteAllTextAsync(outputPath, json, ct);
     }

ReScene.NET/Services/PropertyExportService.cs

@@ -632,16 +632,10 @@ private async Task RenameStoredFileAsync()
     }
 
     [RelayCommand(CanExecute = nameof(CanMoveStoredFileUp))]
-    private async Task MoveStoredFileUpAsync()
-    {
-        await MoveStoredFileByOffsetAsync(-1);
-    }
+    private async Task MoveStoredFileUpAsync() => await MoveStoredFileByOffsetAsync(-1);
 
     [RelayCommand(CanExecute = nameof(CanMoveStoredFileDown))]
-    private async Task MoveStoredFileDownAsync()
-    {
-        await MoveStoredFileByOffsetAsync(+1);
-    }
+    private async Task MoveStoredFileDownAsync() => await MoveStoredFileByOffsetAsync(+1);
 
     private bool CanVerifyIntegrity() => IsSrrFileLoaded();
 
@@ -682,16 +676,10 @@ private async Task VerifyIntegrityAsync()
     }
 
     [RelayCommand]
-    private void DismissVerifyResult()
-    {
-        IsVerifyResultVisible = false;
-    }
+    private void DismissVerifyResult() => IsVerifyResultVisible = false;
 
     [RelayCommand]
-    private void ShowHexSearch()
-    {
-        IsHexSearchVisible = true;
-    }
+    private void ShowHexSearch() => IsHexSearchVisible = true;
 
     [RelayCommand]
     private void HideHexSearch()
@@ -701,16 +689,10 @@ private void HideHexSearch()
     }
 
     [RelayCommand(CanExecute = nameof(CanRunHexSearch))]
-    private void FindNext()
-    {
-        RunHexSearch(forward: true);
-    }
+    private void FindNext() => RunHexSearch(forward: true);
 
     [RelayCommand(CanExecute = nameof(CanRunHexSearch))]
-    private void FindPrevious()
-    {
-        RunHexSearch(forward: false);
-    }
+    private void FindPrevious() => RunHexSearch(forward: false);
 
     private void BuildTree()
     {
@@ -1061,7 +1043,7 @@ private void RunHexSearch(bool forward)
             return;
         }
 
-        HexSearchPattern? pattern = HexSearchPattern.TryParse(HexSearchText, HexSearchAsHex);
+        var pattern = HexSearchPattern.TryParse(HexSearchText, HexSearchAsHex);
 
         if (pattern is null)
         {
@@ -1101,7 +1083,7 @@ private void RunLiveHexSearch()
             return;
         }
 
-        HexSearchPattern? pattern = HexSearchPattern.TryParse(HexSearchText, HexSearchAsHex);
+        var pattern = HexSearchPattern.TryParse(HexSearchText, HexSearchAsHex);
 
         if (pattern is null)
         {

ReScene.NET/ViewModels/InspectorViewModel.cs

@@ -8,8 +8,5 @@ public abstract class ViewModelBase : ObservableObject
     /// <summary>
     /// Appends a timestamped log entry to the specified collection.
     /// </summary>
-    protected static void AppendLogEntry(ObservableCollection<string> entries, string message)
-    {
-        entries.Add($"{DateTime.Now:HH:mm:ss} {message}");
-    }
+    protected static void AppendLogEntry(ObservableCollection<string> entries, string message) => entries.Add($"{DateTime.Now:HH:mm:ss} {message}");
 }

ReScene.NET/ViewModels/ViewModelBase.cs

@@ -164,7 +164,7 @@ private void RestoreWindowState()
     private void SaveWindowState()
     {
         // Use RestoreBounds for position/size when maximized
-        var bounds = WindowState == System.Windows.WindowState.Maximized
+        Rect bounds = WindowState == System.Windows.WindowState.Maximized
             ? RestoreBounds
             : new Rect(Left, Top, Width, Height);