From 0d3aa3a187aa2f47ef6c0c9260bb830604046876 Mon Sep 17 00:00:00 2001
From: CleanCodeDeveloper
 <16760760+CleanCodeDeveloper@users.noreply.github.com>
Date: Thu, 10 Mar 2022 17:00:28 +0100
Subject: [PATCH] [PTRun][WindowsSettings] Enable analyzer and fix warnings
 (#16942)

---
 .../Helper/JsonSettingsListHelper.cs                  |  2 +-
 .../Helper/TranslationHelper.cs                       | 11 ++++++-----
 .../Main.cs                                           |  2 +-
 ...rosoft.PowerToys.Run.Plugin.WindowsSettings.csproj |  2 ++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs
index a9aea3566a..a8fbc84233 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs
@@ -40,7 +40,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                 using var stream = assembly.GetManifestResourceStream(resourceName);
                 if (stream is null)
                 {
-                    throw new Exception("stream is null");
+                    throw new ArgumentNullException(nameof(stream), "stream is null");
                 }
 
                 var options = new JsonSerializerOptions();
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs
index e7beed3dda..5042bc897a 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Helper/TranslationHelper.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Globalization;
 using System.Linq;
 using Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties;
 using Wox.Plugin.Logger;
@@ -31,7 +32,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                 // Translate Name
                 if (!string.IsNullOrWhiteSpace(settings.Name))
                 {
-                    var name = Resources.ResourceManager.GetString(settings.Name);
+                    var name = Resources.ResourceManager.GetString(settings.Name, CultureInfo.CurrentUICulture);
                     if (string.IsNullOrEmpty(name))
                     {
                         Log.Warn($"Resource string for [{settings.Name}] not found", typeof(TranslationHelper));
@@ -43,7 +44,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                 // Translate Type (App)
                 if (!string.IsNullOrWhiteSpace(settings.Type))
                 {
-                    var type = Resources.ResourceManager.GetString(settings.Type);
+                    var type = Resources.ResourceManager.GetString(settings.Type, CultureInfo.CurrentUICulture);
                     if (string.IsNullOrEmpty(type))
                     {
                         Log.Warn($"Resource string for [{settings.Type}] not found", typeof(TranslationHelper));
@@ -64,7 +65,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                             continue;
                         }
 
-                        var translatedArea = Resources.ResourceManager.GetString(area);
+                        var translatedArea = Resources.ResourceManager.GetString(area, CultureInfo.CurrentUICulture);
                         if (string.IsNullOrEmpty(translatedArea))
                         {
                             Log.Warn($"Resource string for [{area}] not found", typeof(TranslationHelper));
@@ -88,7 +89,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                             continue;
                         }
 
-                        var translatedAltName = Resources.ResourceManager.GetString(altName);
+                        var translatedAltName = Resources.ResourceManager.GetString(altName, CultureInfo.CurrentUICulture);
                         if (string.IsNullOrEmpty(translatedAltName))
                         {
                             Log.Warn($"Resource string for [{altName}] not found", typeof(TranslationHelper));
@@ -103,7 +104,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Helper
                 // Translate Note
                 if (!string.IsNullOrWhiteSpace(settings.Note))
                 {
-                    var note = Resources.ResourceManager.GetString(settings.Note);
+                    var note = Resources.ResourceManager.GetString(settings.Note, CultureInfo.CurrentUICulture);
                     if (string.IsNullOrEmpty(note))
                     {
                         Log.Warn($"Resource string for [{settings.Note}] not found", typeof(TranslationHelper));
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs
index 827dd00ec9..6d7bef456a 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Main.cs
@@ -134,7 +134,7 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings
 
                         // Search for Area only on queries with action char.
                         if (area.Contains(query.Search.Replace(":", string.Empty), StringComparison.CurrentCultureIgnoreCase)
-                        && query.Search.EndsWith(":"))
+                        && query.Search.EndsWith(":", StringComparison.CurrentCultureIgnoreCase))
                         {
                             return true;
                         }
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj
index 0c8a2ca916..0f4d6d844f 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj
@@ -15,6 +15,8 @@
     <UseWindowsForms>true</UseWindowsForms>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Nullable>enable</Nullable>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisMode>Recommended</AnalysisMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">