From 2fd16dd04d6d7bcc358de044c8858e8ff21d855a Mon Sep 17 00:00:00 2001 From: Yu Leng Date: Mon, 20 Oct 2025 15:00:22 +0800 Subject: [PATCH] Fix all StyleCop (SA) code style issues in PowerDisplay module This commit resolves all 120+ StyleCop analyzer violations in the PowerDisplay module: - SA1413: Add trailing commas in multi-line initializers (19 instances) - SA1516: Add blank lines between elements (multiple instances) - SA1518: Add newline at end of files (multiple instances) - SA1211: Fix using alias directive ordering (3 instances) - SA1513: Add blank line after closing brace (multiple instances) - SA1505: Remove blank line after opening brace - SA1028: Remove trailing whitespace (multiple instances) - SA1307: Add SuppressMessage for native structure fields - SA1025: Remove multiple whitespace characters - SA1507: Remove multiple consecutive blank lines All changes are formatting-only and do not affect functionality. Build now completes successfully with zero StyleCop errors. --- .../Core/Utils/ColorTemperatureConverter.cs | 2 +- .../PowerDisplay/Helpers/MonitorStateManager.cs | 6 +++--- .../PowerDisplay/Helpers/TrayIconHelper.cs | 2 +- .../PowerDisplay/Native/DDC/DdcCiNative.cs | 2 +- .../Native/DDC/MonitorDiscoveryHelper.cs | 2 +- .../PowerDisplay/Native/WMI/WmiController.cs | 2 +- .../PowerDisplay/PowerDisplayXAML/App.xaml.cs | 12 ++++++------ .../PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs | 2 +- .../PowerDisplay/ViewModels/MainViewModel.cs | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/modules/powerdisplay/PowerDisplay/Core/Utils/ColorTemperatureConverter.cs b/src/modules/powerdisplay/PowerDisplay/Core/Utils/ColorTemperatureConverter.cs index 16e2cc5ff6..bf0123a4fc 100644 --- a/src/modules/powerdisplay/PowerDisplay/Core/Utils/ColorTemperatureConverter.cs +++ b/src/modules/powerdisplay/PowerDisplay/Core/Utils/ColorTemperatureConverter.cs @@ -82,7 +82,7 @@ namespace PowerDisplay.Core.Utils < 3500 => "Warm", < 5500 => "Neutral", < 7500 => "Cool", - _ => "Very Cool" + _ => "Very Cool", }; } } diff --git a/src/modules/powerdisplay/PowerDisplay/Helpers/MonitorStateManager.cs b/src/modules/powerdisplay/PowerDisplay/Helpers/MonitorStateManager.cs index 9c9f857397..93772670bb 100644 --- a/src/modules/powerdisplay/PowerDisplay/Helpers/MonitorStateManager.cs +++ b/src/modules/powerdisplay/PowerDisplay/Helpers/MonitorStateManager.cs @@ -184,7 +184,7 @@ namespace PowerDisplay.Helpers Brightness = entry.Brightness, ColorTemperature = entry.ColorTemperature, Contrast = entry.Contrast, - Volume = entry.Volume + Volume = entry.Volume, }; } } @@ -215,7 +215,7 @@ namespace PowerDisplay.Helpers // Build state file var stateFile = new MonitorStateFile { - LastUpdated = DateTime.Now + LastUpdated = DateTime.Now, }; var now = DateTime.Now; @@ -233,7 +233,7 @@ namespace PowerDisplay.Helpers ColorTemperature = state.ColorTemperature, Contrast = state.Contrast, Volume = state.Volume, - LastUpdated = now + LastUpdated = now, }; } } diff --git a/src/modules/powerdisplay/PowerDisplay/Helpers/TrayIconHelper.cs b/src/modules/powerdisplay/PowerDisplay/Helpers/TrayIconHelper.cs index 85feae5def..361ac4add4 100644 --- a/src/modules/powerdisplay/PowerDisplay/Helpers/TrayIconHelper.cs +++ b/src/modules/powerdisplay/PowerDisplay/Helpers/TrayIconHelper.cs @@ -151,7 +151,7 @@ namespace PowerDisplay.Helpers { CbSize = (uint)sizeof(NOTIFYICONDATA), HWnd = _messageWindowHandle, - UID = 1 + UID = 1, }; Shell_NotifyIcon(NimDelete, ref tempData); diff --git a/src/modules/powerdisplay/PowerDisplay/Native/DDC/DdcCiNative.cs b/src/modules/powerdisplay/PowerDisplay/Native/DDC/DdcCiNative.cs index 110ca69b23..5eb6b9148e 100644 --- a/src/modules/powerdisplay/PowerDisplay/Native/DDC/DdcCiNative.cs +++ b/src/modules/powerdisplay/PowerDisplay/Native/DDC/DdcCiNative.cs @@ -374,7 +374,7 @@ namespace PowerDisplay.Native.DDC FriendlyName = friendlyName ?? string.Empty, HardwareId = hardwareId ?? string.Empty, AdapterId = path.TargetInfo.AdapterId, - TargetId = path.TargetInfo.Id + TargetId = path.TargetInfo.Id, }; } } diff --git a/src/modules/powerdisplay/PowerDisplay/Native/DDC/MonitorDiscoveryHelper.cs b/src/modules/powerdisplay/PowerDisplay/Native/DDC/MonitorDiscoveryHelper.cs index e9bbb3c510..46411bffee 100644 --- a/src/modules/powerdisplay/PowerDisplay/Native/DDC/MonitorDiscoveryHelper.cs +++ b/src/modules/powerdisplay/PowerDisplay/Native/DDC/MonitorDiscoveryHelper.cs @@ -185,7 +185,7 @@ namespace PowerDisplay.Native.DDC Capabilities = MonitorCapabilities.Brightness | MonitorCapabilities.DdcCi, ConnectionType = "External", CommunicationMethod = "DDC/CI", - Manufacturer = ExtractManufacturer(name) + Manufacturer = ExtractManufacturer(name), }; // Check contrast support diff --git a/src/modules/powerdisplay/PowerDisplay/Native/WMI/WmiController.cs b/src/modules/powerdisplay/PowerDisplay/Native/WMI/WmiController.cs index a9cc36ba71..20241d9ee1 100644 --- a/src/modules/powerdisplay/PowerDisplay/Native/WMI/WmiController.cs +++ b/src/modules/powerdisplay/PowerDisplay/Native/WMI/WmiController.cs @@ -218,7 +218,7 @@ namespace PowerDisplay.Native.WMI ConnectionType = "Internal", CommunicationMethod = "WMI", Manufacturer = "Internal", - SupportsColorTemperature = false // Internal monitors don't support DDC/CI color temperature + SupportsColorTemperature = false, // Internal monitors don't support DDC/CI color temperature }; monitors.Add(monitor); diff --git a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/App.xaml.cs b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/App.xaml.cs index e7401c75b2..aa681d45f8 100644 --- a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/App.xaml.cs +++ b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/App.xaml.cs @@ -225,7 +225,7 @@ namespace PowerDisplay _messageReceiverThread = new Thread(MessageReceiverThreadProc) { IsBackground = true, - Name = "PowerDisplay IPC Receiver" + Name = "PowerDisplay IPC Receiver", }; _messageReceiverThread.Start(); } @@ -367,14 +367,14 @@ namespace PowerDisplay { Text = "PowerDisplay Startup Failed", FontSize = 20, - FontWeight = Microsoft.UI.Text.FontWeights.SemiBold + FontWeight = Microsoft.UI.Text.FontWeights.SemiBold, }); panel.Children.Add(new TextBlock { Text = $"Error: {ex.Message}", FontSize = 14, - TextWrapping = TextWrapping.Wrap + TextWrapping = TextWrapping.Wrap, }); panel.Children.Add(new TextBlock @@ -383,14 +383,14 @@ namespace PowerDisplay FontSize = 12, TextWrapping = TextWrapping.Wrap, Foreground = new SolidColorBrush(Microsoft.UI.Colors.Gray), - Margin = new Thickness(0, 10, 0, 0) + Margin = new Thickness(0, 10, 0, 0), }); var closeButton = new Button { Content = "Close", HorizontalAlignment = HorizontalAlignment.Right, - Margin = new Thickness(0, 10, 0, 0) + Margin = new Thickness(0, 10, 0, 0), }; closeButton.Click += (_, _) => errorWindow.Close(); panel.Children.Add(closeButton); @@ -400,7 +400,7 @@ namespace PowerDisplay Content = panel, VerticalScrollBarVisibility = ScrollBarVisibility.Auto, MaxHeight = 600, - MaxWidth = 800 + MaxWidth = 800, }; errorWindow.Activate(); diff --git a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs index 53a73f6843..2a6ebbe0de 100644 --- a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs +++ b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs @@ -483,7 +483,7 @@ namespace PowerDisplay Title = "Monitor Detection Test", Content = "Starting monitor detection...", CloseButtonText = "Close", - XamlRoot = this.Content.XamlRoot + XamlRoot = this.Content.XamlRoot, }; _ = dlg.ShowAsync(); diff --git a/src/modules/powerdisplay/PowerDisplay/ViewModels/MainViewModel.cs b/src/modules/powerdisplay/PowerDisplay/ViewModels/MainViewModel.cs index 434af1d967..06adf9cc10 100644 --- a/src/modules/powerdisplay/PowerDisplay/ViewModels/MainViewModel.cs +++ b/src/modules/powerdisplay/PowerDisplay/ViewModels/MainViewModel.cs @@ -333,7 +333,7 @@ public partial class MainViewModel : INotifyPropertyChanged, IDisposable _settingsWatcher = new FileSystemWatcher(directory, fileName) { NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.CreationTime, - EnableRaisingEvents = true + EnableRaisingEvents = true, }; _settingsWatcher.Changed += OnSettingsFileChanged; @@ -688,7 +688,7 @@ public partial class MainViewModel : INotifyPropertyChanged, IDisposable CommunicationMethod = GetCommunicationMethodString(vm.Type), MonitorType = vm.Type.ToString(), CurrentBrightness = vm.Brightness, - ColorTemperature = vm.ColorTemperature + ColorTemperature = vm.ColorTemperature, }; monitorsData.Add(monitorData); @@ -718,7 +718,7 @@ public partial class MainViewModel : INotifyPropertyChanged, IDisposable { MonitorType.External => "DDC/CI", MonitorType.Internal => "WMI", - _ => "Unknown" + _ => "Unknown", }; }