mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-19 22:37:58 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Switch to use ArgumentNullException.ThrowIfNull

Browse Source
This commit is contained in:
Jeremy Sinclair 2023-08-16 12:45:55 -04:00
parent f2680f051e
commit 132a6cc489
81 changed files with 137 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/MouseUtils/MouseJumpUI/Helpers/LayoutHelper.cs
View File

@ -16,10 +16,7 @@ internal static class LayoutHelper
public static LayoutInfo CalculateLayoutInfo(
LayoutConfig layoutConfig)
{
if (layoutConfig is null)
{
throw new ArgumentNullException(nameof(layoutConfig));
}
ArgumentNullException.ThrowIfNull(layoutConfig);
var builder = new LayoutInfo.Builder
{

10
src/modules/awake/Awake/Core/ExtensionMethods.cs
View File

@ -11,15 +11,9 @@ namespace Awake.Core
{
public static void AddRange<T>(this ICollection<T> target, IEnumerable<T> source)
{
if (target == null)
{
throw new ArgumentNullException(nameof(target));
}
ArgumentNullException.ThrowIfNull(target);
if (source == null)
{
throw new ArgumentNullException(nameof(source));
}
ArgumentNullException.ThrowIfNull(source);
foreach (var element in source)
{

5
src/modules/colorPicker/ColorPickerUI/Common/RangeObservableCollection.cs
View File

@ -28,10 +28,7 @@ namespace ColorPicker.Common
public void AddRange(IEnumerable<T> list)
{
if (list == null)
{
throw new ArgumentNullException(nameof(list));
}
ArgumentNullException.ThrowIfNull(list);
_suppressNotification = true;

5
src/modules/fancyzones/editor/FancyZonesEditor/Utils/RelayCommand.cs
View File

@ -20,10 +20,7 @@ namespace FancyZonesEditor.Utils
public RelayCommand(Action<object> execute, Predicate<object> canExecute)
{
if (execute == null)
{
throw new ArgumentNullException(nameof(execute));
}
ArgumentNullException.ThrowIfNull(execute);
_execute = execute;
_canExecute = canExecute;

5
src/modules/fancyzones/editor/FancyZonesEditor/Utils/RelayCommand`1.cs
View File

@ -20,10 +20,7 @@ namespace FancyZonesEditor.Utils
public RelayCommand(Action<T> execute, Predicate<T> canExecute)
{
if (execute == null)
{
throw new ArgumentNullException(nameof(execute));
}
ArgumentNullException.ThrowIfNull(execute);
_execute = execute;
_canExecute = canExecute;

10
src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Main.cs
View File

@ -27,10 +27,7 @@ namespace Community.PowerToys.Run.Plugin.UnitConverter
public void Init(PluginInitContext context)
{
if (context == null)
{
throw new ArgumentNullException(paramName: nameof(context));
}
ArgumentNullException.ThrowIfNull(context);
_context = context;
_context.API.ThemeChanged += OnThemeChanged;
@ -39,10 +36,7 @@ namespace Community.PowerToys.Run.Plugin.UnitConverter
public List<Result> Query(Query query)
{
if (query == null)
{
throw new ArgumentNullException(paramName: nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
// Parse
ConvertModel convertModel = InputInterpreter.Parse(query);

5
src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Main.cs
View File

@ -85,10 +85,7 @@ namespace Community.PowerToys.Run.Plugin.ValueGenerator
public List<Result> Query(Query query)
{
if (query == null)
{
throw new ArgumentNullException(paramName: nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
var results = new List<Result>();
try

5
src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Main.cs
View File

@ -53,10 +53,7 @@ namespace Community.PowerToys.Run.Plugin.WebSearch
public List<Result> Query(Query query)
{
if (query is null)
{
throw new ArgumentNullException(nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
var results = new List<Result>();

5
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/EnvironmentVariableProcessor.cs
View File

@ -23,10 +23,7 @@ namespace Microsoft.Plugin.Folder
public IEnumerable<IItemResult> Results(string actionKeyword, string search)
{
if (search == null)
{
throw new ArgumentNullException(nameof(search));
}
ArgumentNullException.ThrowIfNull(search);
if (!_environmentHelper.IsEnvironmentVariable(search))
{

10
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Main.cs
View File

@ -56,10 +56,7 @@ namespace Microsoft.Plugin.Folder
public List<Result> Query(Query query)
{
if (query == null)
{
throw new ArgumentNullException(paramName: nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
var expandedName = FolderHelper.Expand(query.Search);
@ -80,10 +77,7 @@ namespace Microsoft.Plugin.Folder
public static IEnumerable<Result> GetFolderPluginResults(Query query)
{
if (query == null)
{
throw new ArgumentNullException(paramName: nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
var expandedName = FolderHelper.Expand(query.Search);

5
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/EnvironmentHelper.cs
View File

@ -11,10 +11,7 @@ namespace Microsoft.Plugin.Folder.Sources
{
public bool IsEnvironmentVariable(string search)
{
if (search == null)
{
throw new ArgumentNullException(paramName: nameof(search));
}
ArgumentNullException.ThrowIfNull(search);
return search.StartsWith('%');
}

15
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/FolderHelper.cs
View File

@ -23,10 +23,7 @@ namespace Microsoft.Plugin.Folder.Sources
public IEnumerable<FolderLink> GetUserFolderResults(string query)
{
if (query == null)
{
throw new ArgumentNullException(paramName: nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
// Using OrdinalIgnoreCase since this is internal
return _folderLinks.FolderLinks()
@ -35,10 +32,7 @@ namespace Microsoft.Plugin.Folder.Sources
public bool IsDriveOrSharedFolder(string search)
{
if (search == null)
{
throw new ArgumentNullException(nameof(search));
}
ArgumentNullException.ThrowIfNull(search);
// Using Ordinal this is internal and we're comparing symbols
if (search.StartsWith(@"\\", StringComparison.Ordinal))
@ -79,10 +73,7 @@ namespace Microsoft.Plugin.Folder.Sources
public static string Expand(string search)
{
if (search == null)
{
throw new ArgumentNullException(nameof(search));
}
ArgumentNullException.ThrowIfNull(search);
search = Environment.ExpandEnvironmentVariables(search);

5
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryEnvironmentVariable.cs
View File

@ -24,10 +24,7 @@ namespace Microsoft.Plugin.Folder.Sources
public IEnumerable<IItemResult> Query(string querySearch)
{
if (querySearch == null)
{
throw new ArgumentNullException(nameof(querySearch));
}
ArgumentNullException.ThrowIfNull(querySearch);
return GetEnvironmentVariables(querySearch)
.OrderBy(v => v.Title)

5
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryInternalDirectory.cs
View File

@ -84,10 +84,7 @@ namespace Microsoft.Plugin.Folder.Sources
public IEnumerable<IItemResult> Query(string search)
{
if (search == null)
{
throw new ArgumentNullException(nameof(search));
}
ArgumentNullException.ThrowIfNull(search);
var processed = Process(search);

10
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/ShellAction.cs
View File

@ -14,20 +14,14 @@ namespace Microsoft.Plugin.Folder.Sources
{
public bool Execute(string sanitizedPath, IPublicAPI contextApi)
{
if (contextApi == null)
{
throw new ArgumentNullException(nameof(contextApi));
}
ArgumentNullException.ThrowIfNull(contextApi);
return OpenFileOrFolder(sanitizedPath, contextApi);
}
public bool ExecuteSanitized(string search, IPublicAPI contextApi)
{
if (contextApi == null)
{
throw new ArgumentNullException(nameof(contextApi));
}
ArgumentNullException.ThrowIfNull(contextApi);
return Execute(SanitizedPath(search), contextApi);
}

25
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs
View File

@ -25,10 +25,7 @@ namespace Microsoft.Plugin.Indexer.SearchHelper
public List<SearchResult> ExecuteQuery(ISearchQueryHelper queryHelper, string keyword)
{
if (queryHelper == null)
{
throw new ArgumentNullException(paramName: nameof(queryHelper));
}
ArgumentNullException.ThrowIfNull(queryHelper);
List<SearchResult> results = new List<SearchResult>();
@ -70,15 +67,9 @@ namespace Microsoft.Plugin.Indexer.SearchHelper
public static void ModifyQueryHelper(ref ISearchQueryHelper queryHelper, string pattern)
{
if (pattern == null)
{
throw new ArgumentNullException(paramName: nameof(pattern));
}
ArgumentNullException.ThrowIfNull(pattern);
if (queryHelper == null)
{
throw new ArgumentNullException(paramName: nameof(queryHelper));
}
ArgumentNullException.ThrowIfNull(queryHelper);
// convert file pattern if it is not '*'. Don't create restriction for '*' as it includes all files.
if (pattern != "*")
@ -101,10 +92,7 @@ namespace Microsoft.Plugin.Indexer.SearchHelper
public static void InitQueryHelper(out ISearchQueryHelper queryHelper, ISearchManager manager, int maxCount, bool displayHiddenFiles)
{
if (manager == null)
{
throw new ArgumentNullException(nameof(manager));
}
ArgumentNullException.ThrowIfNull(manager);
// SystemIndex catalog is the default catalog in Windows
ISearchCatalogManager catalogManager = manager.GetCatalog("SystemIndex");
@ -136,10 +124,7 @@ namespace Microsoft.Plugin.Indexer.SearchHelper
public IEnumerable<SearchResult> Search(string keyword, ISearchManager manager, string pattern = "*", int maxCount = 30)
{
if (manager == null)
{
throw new ArgumentNullException(nameof(manager));
}
ArgumentNullException.ThrowIfNull(manager);
ISearchQueryHelper queryHelper;
InitQueryHelper(out queryHelper, manager, maxCount, DisplayHiddenFiles);

15
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs
View File

@ -155,10 +155,7 @@ namespace Microsoft.Plugin.Program
public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
{
if (selectedResult == null)
{
throw new ArgumentNullException(nameof(selectedResult));
}
ArgumentNullException.ThrowIfNull(selectedResult);
var menuOptions = new List<ContextMenuResult>();
if (selectedResult.ContextData is IProgram program)
@ -173,15 +170,9 @@ namespace Microsoft.Plugin.Program
{
try
{
if (runProcess == null)
{
throw new ArgumentNullException(nameof(runProcess));
}
ArgumentNullException.ThrowIfNull(runProcess);
if (info == null)
{
throw new ArgumentNullException(nameof(info));
}
ArgumentNullException.ThrowIfNull(info);
runProcess(info);
}

5
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/PackageWrapper.cs
View File

@ -44,10 +44,7 @@ namespace Microsoft.Plugin.Program.Programs
public static PackageWrapper GetWrapperFromPackage(Package package)
{
if (package == null)
{
throw new ArgumentNullException(nameof(package));
}
ArgumentNullException.ThrowIfNull(package);
string path;
try

5
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs
View File

@ -47,10 +47,7 @@ namespace Microsoft.Plugin.Program.Programs
public UWP(IPackage package)
{
if (package == null)
{
throw new ArgumentNullException(nameof(package));
}
ArgumentNullException.ThrowIfNull(package);
Name = package.Name;
FullName = package.FullName;

15
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs
View File

@ -91,10 +91,7 @@ namespace Microsoft.Plugin.Program.Programs
public Result Result(string query, string queryArguments, IPublicAPI api)
{
if (api == null)
{
throw new ArgumentNullException(nameof(api));
}
ArgumentNullException.ThrowIfNull(api);
var score = Score(query);
if (score <= 0)
@ -130,10 +127,7 @@ namespace Microsoft.Plugin.Program.Programs
public List<ContextMenuResult> ContextMenus(string queryArguments, IPublicAPI api)
{
if (api == null)
{
throw new ArgumentNullException(nameof(api));
}
ArgumentNullException.ThrowIfNull(api);
var contextMenus = new List<ContextMenuResult>();
@ -229,10 +223,7 @@ namespace Microsoft.Plugin.Program.Programs
public UWPApplication(IAppxManifestApplication manifestApp, UWP package)
{
if (manifestApp == null)
{
throw new ArgumentNullException(nameof(manifestApp));
}
ArgumentNullException.ThrowIfNull(manifestApp);
var hr = manifestApp.GetAppUserModelId(out var tmpUserModelId);
UserModelId = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpUserModelId);

25
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs
View File

@ -205,10 +205,7 @@ namespace Microsoft.Plugin.Program.Programs
public Result Result(string query, string queryArguments, IPublicAPI api)
{
if (api == null)
{
throw new ArgumentNullException(nameof(api));
}
ArgumentNullException.ThrowIfNull(api);
var score = Score(query);
if (score <= 0)
@ -274,10 +271,7 @@ namespace Microsoft.Plugin.Program.Programs
public List<ContextMenuResult> ContextMenus(string queryArguments, IPublicAPI api)
{
if (api == null)
{
throw new ArgumentNullException(nameof(api));
}
ArgumentNullException.ThrowIfNull(api);
var contextMenus = new List<ContextMenuResult>();
@ -605,10 +599,7 @@ namespace Microsoft.Plugin.Program.Programs
// Function to get the application type, given the path to the application
public static ApplicationType GetAppTypeFromPath(string path)
{
if (path == null)
{
throw new ArgumentNullException(nameof(path));
}
ArgumentNullException.ThrowIfNull(path);
string extension = Extension(path);
@ -640,10 +631,7 @@ namespace Microsoft.Plugin.Program.Programs
// Function to get the Win32 application, given the path to the application
public static Win32Program GetAppFromPath(string path)
{
if (path == null)
{
throw new ArgumentNullException(nameof(path));
}
ArgumentNullException.ThrowIfNull(path);
Win32Program app;
switch (GetAppTypeFromPath(path))
@ -985,10 +973,7 @@ namespace Microsoft.Plugin.Program.Programs
public static IList<Win32Program> All(ProgramPluginSettings settings)
{
if (settings == null)
{
throw new ArgumentNullException(nameof(settings));
}
ArgumentNullException.ThrowIfNull(settings);
try
{

5
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/EventHandler.cs
View File

@ -14,10 +14,7 @@ namespace Microsoft.Plugin.Program.Storage
// On the first occurrence of a different file path, the existing app path is to be returned without removing any more elements from the queue.
public static async Task<string> GetAppPathFromQueueAsync(ConcurrentQueue<string> eventHandlingQueue, int dequeueDelay)
{
if (eventHandlingQueue == null)
{
throw new ArgumentNullException(nameof(eventHandlingQueue));
}
ArgumentNullException.ThrowIfNull(eventHandlingQueue);
string previousAppPath = string.Empty;

5
src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs
View File

@ -52,10 +52,7 @@ namespace Microsoft.Plugin.Shell
public List<Result> Query(Query query)
{
if (query == null)
{
throw new ArgumentNullException(nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
List<Result> results = new List<Result>();
string cmd = query.Search;

20
src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/FuzzyMatching.cs
View File

@ -26,15 +26,9 @@ namespace Microsoft.Plugin.WindowWalker.Components
/// <returns>returns the index location of each of the letters of the matches</returns>
internal static List<int> FindBestFuzzyMatch(string text, string searchText)
{
if (searchText == null)
{
throw new ArgumentNullException(nameof(searchText));
}
ArgumentNullException.ThrowIfNull(searchText);
if (text == null)
{
throw new ArgumentNullException(nameof(text));
}
ArgumentNullException.ThrowIfNull(text);
// Using CurrentCulture since this is user facing
searchText = searchText.ToLower(CultureInfo.CurrentCulture);
@ -86,10 +80,7 @@ namespace Microsoft.Plugin.WindowWalker.Components
/// <returns>a list of the possible combinations that match the search text</returns>
internal static List<List<int>> GetAllMatchIndexes(bool[,] matches)
{
if (matches == null)
{
throw new ArgumentNullException(nameof(matches));
}
ArgumentNullException.ThrowIfNull(matches);
List<List<int>> results = new List<List<int>>();
@ -127,10 +118,7 @@ namespace Microsoft.Plugin.WindowWalker.Components
/// <returns>an integer representing the score</returns>
internal static int CalculateScoreForMatches(List<int> matches)
{
if (matches == null)
{
throw new ArgumentNullException(nameof(matches));
}
ArgumentNullException.ThrowIfNull(matches);
var score = 0;

5
src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs
View File

@ -33,10 +33,7 @@ namespace Microsoft.Plugin.WindowWalker
public List<Result> Query(Query query)
{
if (query == null)
{
throw new ArgumentNullException(nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
_cancellationTokenSource?.Cancel();
_cancellationTokenSource?.Dispose();

5
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs
View File

@ -57,10 +57,7 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator
CultureInfo inputCulture = _inputUseEnglishFormat ? new CultureInfo("en-us") : CultureInfo.CurrentCulture;
CultureInfo outputCulture = _outputUseEnglishFormat ? new CultureInfo("en-us") : CultureInfo.CurrentCulture;
if (query == null)
{
throw new ArgumentNullException(paramName: nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
// Happens if the user has only typed the action key so far
if (string.IsNullOrEmpty(query.Search))

10
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/NumberTranslator.cs
View File

@ -36,15 +36,9 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator
/// <returns>Number translator for target culture</returns>
public static NumberTranslator Create(CultureInfo sourceCulture, CultureInfo targetCulture)
{
if (sourceCulture == null)
{
throw new ArgumentNullException(paramName: nameof(sourceCulture));
}
ArgumentNullException.ThrowIfNull(sourceCulture);
if (targetCulture == null)
{
throw new ArgumentNullException(paramName: nameof(targetCulture));
}
ArgumentNullException.ThrowIfNull(targetCulture);
return new NumberTranslator(sourceCulture, targetCulture);
}

15
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Helpers/ServiceHelper.cs
View File

@ -80,15 +80,9 @@ namespace Microsoft.PowerToys.Run.Plugin.Service.Helpers
public static void ChangeStatus(ServiceResult serviceResult, Action action, IPublicAPI contextAPI)
{
if (serviceResult == null)
{
throw new ArgumentNullException(nameof(serviceResult));
}
ArgumentNullException.ThrowIfNull(serviceResult);
if (contextAPI == null)
{
throw new ArgumentNullException(nameof(contextAPI));
}
ArgumentNullException.ThrowIfNull(contextAPI);
try
{
@ -141,10 +135,7 @@ namespace Microsoft.PowerToys.Run.Plugin.Service.Helpers
private static string GetResultSubTitle(ServiceController serviceController)
{
if (serviceController == null)
{
throw new ArgumentNullException(nameof(serviceController));
}
ArgumentNullException.ThrowIfNull(serviceController);
return $"{Resources.wox_plugin_service_status}: {GetLocalizedStatus(serviceController.Status)} - {Resources.wox_plugin_service_startup}: {GetLocalizedStartType(serviceController.StartType, serviceController.ServiceName)} - {Resources.wox_plugin_service_name}: {serviceController.ServiceName}";
}

5
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/ServiceResult.cs
View File

@ -19,10 +19,7 @@ namespace Microsoft.PowerToys.Run.Plugin.Service
public ServiceResult(ServiceController serviceController)
{
if (serviceController == null)
{
throw new ArgumentNullException(nameof(serviceController));
}
ArgumentNullException.ThrowIfNull(serviceController);
ServiceName = serviceController.ServiceName;
DisplayName = serviceController.DisplayName;

5
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Main.cs
View File

@ -63,10 +63,7 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeDate
public List<Result> Query(Query query)
{
if (query == null)
{
throw new ArgumentNullException(paramName: nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
return SearchController.ExecuteSearch(query, IconTheme);
}

5
src/modules/launcher/PowerLauncher/Helper/DragDataObject.cs
View File

@ -25,10 +25,7 @@ namespace PowerLauncher.Helper
public static void SetDragImage(this IDataObject dataObject, IntPtr hBitmap, int width, int height)
{
if (dataObject == null)
{
throw new ArgumentNullException(nameof(dataObject));
}
ArgumentNullException.ThrowIfNull(dataObject);
IDragSourceHelper dragDropHelper = (IDragSourceHelper)new DragDropHelper();
ShDragImage dragImage = new ShDragImage

10
src/modules/launcher/PowerLauncher/Helper/FontHelper.cs
View File

@ -75,10 +75,7 @@ namespace PowerLauncher.Helper
public static FamilyTypeface ChooseRegularFamilyTypeface(this FontFamily family)
{
if (family == null)
{
throw new ArgumentNullException(nameof(family));
}
ArgumentNullException.ThrowIfNull(family);
return family.FamilyTypefaces.OrderBy(o =>
{
@ -90,10 +87,7 @@ namespace PowerLauncher.Helper
public static FamilyTypeface ConvertFromInvariantStringsOrNormal(this FontFamily family, string style, string weight, string stretch)
{
if (family == null)
{
throw new ArgumentNullException(nameof(family));
}
ArgumentNullException.ThrowIfNull(family);
var styleObj = GetFontStyleFromInvariantStringOrNormal(style);
var weightObj = GetFontWeightFromInvariantStringOrNormal(weight);

15
src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs
View File

@ -165,10 +165,7 @@ namespace PowerLauncher.Plugin
public static List<Result> QueryForPlugin(PluginPair pair, Query query, bool delayedExecution = false)
{
if (pair == null)
{
throw new ArgumentNullException(nameof(pair));
}
ArgumentNullException.ThrowIfNull(pair);
if (!pair.IsPluginInitialized)
{
@ -249,15 +246,9 @@ namespace PowerLauncher.Plugin
public static void UpdatePluginMetadata(List<Result> results, PluginMetadata metadata, Query query)
{
if (results == null)
{
throw new ArgumentNullException(nameof(results));
}
ArgumentNullException.ThrowIfNull(results);
if (metadata == null)
{
throw new ArgumentNullException(nameof(metadata));
}
ArgumentNullException.ThrowIfNull(metadata);
foreach (var r in results)
{

5
src/modules/launcher/PowerLauncher/Plugin/QueryBuilder.cs
View File

@ -12,10 +12,7 @@ namespace PowerLauncher.Plugin
{
public static Dictionary<PluginPair, Query> Build(string text)
{
if (text == null)
{
throw new ArgumentNullException(nameof(text));
}
ArgumentNullException.ThrowIfNull(text);
text = text.Trim();
int longestActionKeywordLength = 0;

10
src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
View File

@ -1003,15 +1003,9 @@ namespace PowerLauncher.ViewModel
/// </summary>
public void UpdateResultView(List<Result> list, string originQuery, CancellationToken ct)
{
if (list == null)
{
throw new ArgumentNullException(nameof(list));
}
ArgumentNullException.ThrowIfNull(list);
if (originQuery == null)
{
throw new ArgumentNullException(nameof(originQuery));
}
ArgumentNullException.ThrowIfNull(originQuery);
foreach (var result in list)
{

5
src/modules/launcher/PowerLauncher/ViewModel/ResultsViewModel.cs
View File

@ -263,10 +263,7 @@ namespace PowerLauncher.ViewModel
/// </summary>
public void AddResults(List<Result> newRawResults, CancellationToken ct)
{
if (newRawResults == null)
{
throw new ArgumentNullException(nameof(newRawResults));
}
ArgumentNullException.ThrowIfNull(newRawResults);
List<ResultViewModel> newResults = new List<ResultViewModel>(newRawResults.Count);
foreach (Result r in newRawResults)

10
src/modules/launcher/Wox.Infrastructure/FuzzyMatcher.cs
View File

@ -20,20 +20,14 @@ namespace Wox.Infrastructure
public static FuzzyMatcher Create(string query)
{
if (query == null)
{
throw new ArgumentNullException(nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
return new FuzzyMatcher(query, new MatchOption());
}
public static FuzzyMatcher Create(string query, MatchOption opt)
{
if (query == null)
{
throw new ArgumentNullException(nameof(query));
}
ArgumentNullException.ThrowIfNull(query);
return new FuzzyMatcher(query, opt);
}

15
src/modules/launcher/Wox.Infrastructure/Stopwatch.cs
View File

@ -19,10 +19,7 @@ namespace Wox.Infrastructure
/// </summary>
public static long Debug(string message, Action action)
{
if (action == null)
{
throw new ArgumentNullException(nameof(action));
}
ArgumentNullException.ThrowIfNull(action);
var stopWatch = new System.Diagnostics.Stopwatch();
stopWatch.Start();
@ -36,10 +33,7 @@ namespace Wox.Infrastructure
public static long Normal(string message, Action action)
{
if (action == null)
{
throw new ArgumentNullException(nameof(action));
}
ArgumentNullException.ThrowIfNull(action);
var stopWatch = new System.Diagnostics.Stopwatch();
stopWatch.Start();
@ -53,10 +47,7 @@ namespace Wox.Infrastructure
public static void StartCount(string name, Action action)
{
if (action == null)
{
throw new ArgumentNullException(nameof(action));
}
ArgumentNullException.ThrowIfNull(action);
var stopWatch = new System.Diagnostics.Stopwatch();
stopWatch.Start();

5
src/modules/launcher/Wox.Infrastructure/Storage/StoragePowerToysVersionInfo.cs
View File

@ -105,10 +105,7 @@ namespace Wox.Infrastructure.Storage
public StoragePowerToysVersionInfo(string associatedFilePath, int type)
{
if (associatedFilePath == null)
{
throw new ArgumentNullException(nameof(associatedFilePath));
}
ArgumentNullException.ThrowIfNull(associatedFilePath);
FilePath = GetFilePath(associatedFilePath, type);

5
src/modules/launcher/Wox.Infrastructure/StringMatcher.cs
View File

@ -90,10 +90,7 @@ namespace Wox.Infrastructure
return new MatchResult(false, UserSettingSearchPrecision);
}
if (opt == null)
{
throw new ArgumentNullException(nameof(opt));
}
ArgumentNullException.ThrowIfNull(opt);
query = query.Trim();

5
src/modules/launcher/Wox.Plugin/AllowedLanguage.cs
View File

@ -21,10 +21,7 @@ namespace Wox.Plugin
public static bool IsAllowed(string language)
{
if (language == null)
{
throw new ArgumentNullException(nameof(language));
}
ArgumentNullException.ThrowIfNull(language);
// Using InvariantCulture since this is a command line arg
return language.ToUpper(CultureInfo.InvariantCulture) == CSharp.ToUpper(CultureInfo.InvariantCulture)

5
src/modules/launcher/Wox.Plugin/Common/ShellCommand.cs
View File

@ -18,10 +18,7 @@ namespace Wox.Plugin.Common
public static Process RunAsDifferentUser(ProcessStartInfo processStartInfo)
{
if (processStartInfo == null)
{
throw new ArgumentNullException(nameof(processStartInfo));
}
ArgumentNullException.ThrowIfNull(processStartInfo);
processStartInfo.Verb = "RunAsUser";
var process = Process.Start(processStartInfo);

25
src/modules/launcher/Wox.Plugin/Logger/Log.cs
View File

@ -77,50 +77,35 @@ namespace Wox.Plugin.Logger
public static void Info(string message, Type fullClassName, [CallerMemberName] string methodName = "", [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0)
{
if (fullClassName == null)
{
throw new ArgumentNullException(nameof(fullClassName));
}
ArgumentNullException.ThrowIfNull(fullClassName);
LogInternal(LogLevel.Info, message, fullClassName, methodName, sourceFilePath, sourceLineNumber);
}
public static void Debug(string message, Type fullClassName, [CallerMemberName] string methodName = "", [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0)
{
if (fullClassName == null)
{
throw new ArgumentNullException(nameof(fullClassName));
}
ArgumentNullException.ThrowIfNull(fullClassName);
LogInternal(LogLevel.Debug, message, fullClassName, methodName, sourceFilePath, sourceLineNumber);
}
public static void Warn(string message, Type fullClassName, [CallerMemberName] string methodName = "", [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0)
{
if (fullClassName == null)
{
throw new ArgumentNullException(nameof(fullClassName));
}
ArgumentNullException.ThrowIfNull(fullClassName);
LogInternal(LogLevel.Warn, message, fullClassName, methodName, sourceFilePath, sourceLineNumber);
}
public static void Error(string message, Type fullClassName, [CallerMemberName] string methodName = "", [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0)
{
if (fullClassName == null)
{
throw new ArgumentNullException(nameof(fullClassName));
}
ArgumentNullException.ThrowIfNull(fullClassName);
LogInternal(LogLevel.Error, message, fullClassName, methodName, sourceFilePath, sourceLineNumber);
}
public static void Exception(string message, System.Exception ex, Type fullClassName, [CallerMemberName] string methodName = "", [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0)
{
if (fullClassName == null)
{
throw new ArgumentNullException(nameof(fullClassName));
}
ArgumentNullException.ThrowIfNull(fullClassName);
LogInternalException(message, ex, fullClassName, methodName, sourceFilePath, sourceLineNumber);
}

5
src/modules/launcher/Wox.Plugin/Result.cs
View File

@ -33,10 +33,7 @@ namespace Wox.Plugin
set
{
if (value == null)
{
throw new ArgumentNullException(nameof(value));
}
ArgumentNullException.ThrowIfNull(value);
// Using Ordinal since this is used internally
_title = value.Replace("\n", " ", StringComparison.Ordinal);

15
src/modules/launcher/Wox.Plugin/UserSelectedRecord.cs
View File

@ -34,20 +34,14 @@ namespace Wox.Plugin
public void Remove(Result result)
{
if (result == null)
{
throw new ArgumentNullException(nameof(result));
}
ArgumentNullException.ThrowIfNull(result);
Records.Remove(result.ToString());
}
public void Add(Result result)
{
if (result == null)
{
throw new ArgumentNullException(nameof(result));
}
ArgumentNullException.ThrowIfNull(result);
var key = result.ToString();
if (Records.TryGetValue(key, out var value))
@ -81,10 +75,7 @@ namespace Wox.Plugin
public UserSelectedRecordItem GetSelectedData(Result result)
{
if (result == null)
{
throw new ArgumentNullException(nameof(result));
}
ArgumentNullException.ThrowIfNull(result);
if (result != null && Records.TryGetValue(result.ToString(), out var value))
{

5
src/modules/previewpane/STATestMethodAttribute.cs
View File

@ -24,10 +24,7 @@ namespace Microsoft.PowerToys.STATestExtension
public override TestResult[] Execute(ITestMethod testMethod)
{
if (testMethod == null)
{
throw new ArgumentNullException(nameof(testMethod));
}
ArgumentNullException.ThrowIfNull(testMethod);
if (Thread.CurrentThread.GetApartmentState() == ApartmentState.STA)
{

5
src/settings-ui/Settings.UI.Library/AppSpecificKeysDataModel.cs
View File

@ -25,10 +25,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
public bool Compare(AppSpecificKeysDataModel arg)
{
if (arg == null)
{
throw new ArgumentNullException(nameof(arg));
}
ArgumentNullException.ThrowIfNull(arg);
// Using Ordinal comparison for internal text
return OriginalKeys.Equals(arg.OriginalKeys, StringComparison.Ordinal) &&

5
src/settings-ui/Settings.UI.Library/ColorPickerSettings.cs
View File

@ -34,10 +34,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
WriteIndented = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/ColorPickerSettingsVersion1.cs
View File

@ -31,10 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
WriteIndented = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/FileLocksmithSettings.cs
View File

@ -25,10 +25,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
public FileLocksmithSettings(FileLocksmithLocalProperties localProperties)
{
if (localProperties == null)
{
throw new ArgumentNullException(nameof(localProperties));
}
ArgumentNullException.ThrowIfNull(localProperties);
Properties = new FileLocksmithProperties();
Properties.ExtendedContextMenuOnly.Value = localProperties.ExtendedContextMenuOnly;

5
src/settings-ui/Settings.UI.Library/HostsSettings.cs
View File

@ -31,10 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
WriteIndented = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/ImageSize.cs
View File

@ -225,10 +225,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
public void Update(ImageSize modifiedSize)
{
if (modifiedSize == null)
{
throw new ArgumentNullException(nameof(modifiedSize));
}
ArgumentNullException.ThrowIfNull(modifiedSize);
Id = modifiedSize.Id;
Name = modifiedSize.Name;

5
src/settings-ui/Settings.UI.Library/MouseWithoutBordersSettings.cs
View File

@ -98,10 +98,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
IncludeFields = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/PastePlainSettings.cs
View File

@ -31,10 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
WriteIndented = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/PeekSettings.cs
View File

@ -42,10 +42,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
WriteIndented = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/PowerLauncherSettings.cs
View File

@ -35,10 +35,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
WriteIndented = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/PowerOcrSettings.cs
View File

@ -31,10 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
WriteIndented = true,
};
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}

5
src/settings-ui/Settings.UI.Library/PowerRenameSettings.cs
View File

@ -24,10 +24,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
public PowerRenameSettings(PowerRenameLocalProperties localProperties)
{
if (localProperties == null)
{
throw new ArgumentNullException(nameof(localProperties));
}
ArgumentNullException.ThrowIfNull(localProperties);
Properties = new PowerRenameProperties();
Properties.PersistState.Value = localProperties.PersistState;

10
src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
View File

@ -858,10 +858,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
/// </summary>
private static JsonArray GetPTRunIgnoredSettings(JsonNode backupRetoreSettings)
{
if (backupRetoreSettings == null)
{
throw new ArgumentNullException(nameof(backupRetoreSettings));
}
ArgumentNullException.ThrowIfNull(backupRetoreSettings);
if (backupRetoreSettings["IgnoredPTRunSettings"] != null)
{
@ -876,10 +873,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
/// </summary>
private static string[] GetIgnoredSettings(JsonNode backupRetoreSettings, string settingFileKey)
{
if (backupRetoreSettings == null)
{
throw new ArgumentNullException(nameof(backupRetoreSettings));
}
ArgumentNullException.ThrowIfNull(backupRetoreSettings);
if (settingFileKey.StartsWith("\\", StringComparison.OrdinalIgnoreCase))
{

5
src/settings-ui/Settings.UI.Library/Utilities/Helper.cs
View File

@ -118,10 +118,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
{
throw new ArgumentNullException(nameof(version1));
}
else if (version2 == null)
{
throw new ArgumentNullException(nameof(version2));
}
else ArgumentNullException.ThrowIfNull(version2);
var v1 = version1.Substring(1).Split('.').Select(int.Parse).ToArray();
var v2 = version2.Substring(1).Split('.').Select(int.Parse).ToArray();

10
src/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs
View File

@ -86,10 +86,7 @@ namespace Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility
public static void VerifyModuleIOProviderWasRead(Mock<IFile> provider, string module, int expectedCallCount)
{
if (provider == null)
{
throw new ArgumentNullException(nameof(provider));
}
ArgumentNullException.ThrowIfNull(provider);
Expression<Func<string, bool>> filterExpression = ModuleFilterExpression(module);
@ -110,10 +107,7 @@ namespace Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility
public static void VerifyGeneralSettingsIOProviderWasRead(Mock<IFile> provider, int expectedCallCount)
{
if (provider == null)
{
throw new ArgumentNullException(nameof(provider));
}
ArgumentNullException.ThrowIfNull(provider);
IIOProviderMocks.VerifyIOReadWithStubFile(provider, SettingsFilterExpression, expectedCallCount);
}

15
src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs
View File

@ -26,28 +26,19 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public AlwaysOnTopViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, ISettingsRepository<AlwaysOnTopSettings> moduleSettingsRepository, Func<string, int> ipcMSGCallBackFunc)
{
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
SettingsUtils = settingsUtils;
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
InitializeEnabledValue();
// To obtain the settings configurations of AlwaysOnTop.
if (moduleSettingsRepository == null)
{
throw new ArgumentNullException(nameof(moduleSettingsRepository));
}
ArgumentNullException.ThrowIfNull(moduleSettingsRepository);
Settings = moduleSettingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs
View File

@ -49,10 +49,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
Func<string, int> ipcMSGCallBackFunc)
{
// Obtain the general PowerToy settings configurations
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

15
src/settings-ui/Settings.UI/ViewModels/FancyZonesViewModel.cs
View File

@ -46,27 +46,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public FancyZonesViewModel(SettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, ISettingsRepository<FancyZonesSettings> moduleSettingsRepository, Func<string, int> ipcMSGCallBackFunc, string configFileSubfolder = "")
{
if (settingsUtils == null)
{
throw new ArgumentNullException(nameof(settingsUtils));
}
ArgumentNullException.ThrowIfNull(settingsUtils);
SettingsUtils = settingsUtils;
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
settingsConfigFileFolder = configFileSubfolder;
// To obtain the settings configurations of Fancy zones.
if (moduleSettingsRepository == null)
{
throw new ArgumentNullException(nameof(moduleSettingsRepository));
}
ArgumentNullException.ThrowIfNull(moduleSettingsRepository);
Settings = moduleSettingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/FileLocksmithViewModel.cs
View File

@ -29,10 +29,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
View File

@ -83,10 +83,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
ResourceLoader = resourceLoader;
// To obtain the general settings configuration of PowerToys if it exists, else to create a new file and return the default configurations.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
UpdatingSettingsConfig = UpdatingSettings.LoadSettings();

5
src/settings-ui/Settings.UI/ViewModels/ImageResizerViewModel.cs
View File

@ -32,10 +32,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
// To obtain the general settings configurations of PowerToys.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/KeyboardManagerViewModel.cs
View File

@ -55,10 +55,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public KeyboardManagerViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, Func<string, int> ipcMSGCallBackFunc, Func<List<KeysDataModel>, int> filterRemapKeysList)
{
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

10
src/settings-ui/Settings.UI/ViewModels/MeasureToolViewModel.cs
View File

@ -29,19 +29,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
SettingsUtils = settingsUtils;
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
InitializeEnabledValue();
if (measureToolSettingsRepository == null)
{
throw new ArgumentNullException(nameof(measureToolSettingsRepository));
}
ArgumentNullException.ThrowIfNull(measureToolSettingsRepository);
Settings = measureToolSettingsRepository.SettingsConfig;

25
src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs
View File

@ -31,10 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
SettingsUtils = settingsUtils;
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
@ -42,10 +39,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
// To obtain the find my mouse settings, if the file exists.
// If not, to create a file with the default settings and to return the default configurations.
if (findMyMouseSettingsRepository == null)
{
throw new ArgumentNullException(nameof(findMyMouseSettingsRepository));
}
ArgumentNullException.ThrowIfNull(findMyMouseSettingsRepository);
FindMyMouseSettingsConfig = findMyMouseSettingsRepository.SettingsConfig;
_findMyMouseActivationMethod = FindMyMouseSettingsConfig.Properties.ActivationMethod.Value;
@ -64,10 +58,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_findMyMouseExcludedApps = FindMyMouseSettingsConfig.Properties.ExcludedApps.Value;
_findMyMouseShakingMinimumDistance = FindMyMouseSettingsConfig.Properties.ShakingMinimumDistance.Value;
if (mouseHighlighterSettingsRepository == null)
{
throw new ArgumentNullException(nameof(mouseHighlighterSettingsRepository));
}
ArgumentNullException.ThrowIfNull(mouseHighlighterSettingsRepository);
MouseHighlighterSettingsConfig = mouseHighlighterSettingsRepository.SettingsConfig;
string leftClickColor = MouseHighlighterSettingsConfig.Properties.LeftButtonClickColor.Value;
@ -84,18 +75,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_highlightFadeDurationMs = MouseHighlighterSettingsConfig.Properties.HighlightFadeDurationMs.Value;
_highlighterAutoActivate = MouseHighlighterSettingsConfig.Properties.AutoActivate.Value;
if (mouseJumpSettingsRepository == null)
{
throw new ArgumentNullException(nameof(mouseJumpSettingsRepository));
}
ArgumentNullException.ThrowIfNull(mouseJumpSettingsRepository);
MouseJumpSettingsConfig = mouseJumpSettingsRepository.SettingsConfig;
MouseJumpSettingsConfig.Properties.ThumbnailSize.PropertyChanged += MouseJumpThumbnailSizePropertyChanged;
if (mousePointerCrosshairsSettingsRepository == null)
{
throw new ArgumentNullException(nameof(mousePointerCrosshairsSettingsRepository));
}
ArgumentNullException.ThrowIfNull(mousePointerCrosshairsSettingsRepository);
MousePointerCrosshairsSettingsConfig = mousePointerCrosshairsSettingsRepository.SettingsConfig;

10
src/settings-ui/Settings.UI/ViewModels/MouseWithoutBordersViewModel.cs
View File

@ -379,10 +379,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_uiDispatcherQueue = uiDispatcherQueue;
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
@ -470,10 +467,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
private void LoadViewModelFromSettings(MouseWithoutBordersSettings moduleSettings)
{
if (moduleSettings == null)
{
throw new ArgumentNullException(nameof(moduleSettings));
}
ArgumentNullException.ThrowIfNull(moduleSettings);
Settings = moduleSettings;
/* TODO: Error handling */

15
src/settings-ui/Settings.UI/ViewModels/PastePlainViewModel.cs
View File

@ -41,25 +41,16 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
Func<string, int> ipcMSGCallBackFunc)
{
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
// To obtain the settings configurations of Fancy zones.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
if (pastePlainSettingsRepository == null)
{
throw new ArgumentNullException(nameof(pastePlainSettingsRepository));
}
ArgumentNullException.ThrowIfNull(pastePlainSettingsRepository);
_pastePlainSettings = pastePlainSettingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/PeekViewModel.cs
View File

@ -29,10 +29,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public PeekViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, Func<string, int> ipcMSGCallBackFunc)
{
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
View File

@ -73,10 +73,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public PowerAccentViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, Func<string, int> ipcMSGCallBackFunc)
{
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
GeneralSettingsConfig = settingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/PowerLauncherViewModel.cs
View File

@ -56,10 +56,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
this.isDark = isDark;
// To obtain the general Settings configurations of PowerToys
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

15
src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
View File

@ -73,25 +73,16 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
Func<string, int> ipcMSGCallBackFunc)
{
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
// To obtain the settings configurations of Fancy zones.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
if (powerOcrsettingsRepository == null)
{
throw new ArgumentNullException(nameof(powerOcrsettingsRepository));
}
ArgumentNullException.ThrowIfNull(powerOcrsettingsRepository);
_powerOcrSettings = powerOcrsettingsRepository.SettingsConfig;

10
src/settings-ui/Settings.UI/ViewModels/PowerPreviewViewModel.cs
View File

@ -30,19 +30,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_settingsConfigFileFolder = configFileSubfolder;
// To obtain the general Settings configurations of PowerToys
if (generalSettingsRepository == null)
{
throw new ArgumentNullException(nameof(generalSettingsRepository));
}
ArgumentNullException.ThrowIfNull(generalSettingsRepository);
GeneralSettingsConfig = generalSettingsRepository.SettingsConfig;
// To obtain the PowerPreview settings if it exists.
// If the file does not exist, to create a new one and return the default settings configurations.
if (moduleSettingsRepository == null)
{
throw new ArgumentNullException(nameof(moduleSettingsRepository));
}
ArgumentNullException.ThrowIfNull(moduleSettingsRepository);
Settings = moduleSettingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/PowerRenameViewModel.cs
View File

@ -33,10 +33,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_settingsConfigFileFolder = configFileSubfolder;
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

5
src/settings-ui/Settings.UI/ViewModels/RegistryPreviewViewModel.cs
View File

@ -22,10 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public RegistryPreviewViewModel(ISettingsRepository<GeneralSettings> settingsRepository, ISettingsRepository<RegistryPreviewSettings> registryPreviewSettingsRepository, Func<string, int> ipcMSGCallBackFunc)
{
// To obtain the general settings configurations of PowerToys Settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;

10
src/settings-ui/Settings.UI/ViewModels/ShortcutGuideViewModel.cs
View File

@ -34,19 +34,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_settingsConfigFileFolder = configFileSubfolder;
// To obtain the general PowerToys settings.
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
// To obtain the shortcut guide settings, if the file exists.
// If not, to create a file with the default settings and to return the default configurations.
if (moduleSettingsRepository == null)
{
throw new ArgumentNullException(nameof(moduleSettingsRepository));
}
ArgumentNullException.ThrowIfNull(moduleSettingsRepository);
Settings = moduleSettingsRepository.SettingsConfig;

10
src/settings-ui/Settings.UI/ViewModels/VideoConferenceViewModel.cs
View File

@ -44,10 +44,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
PickFileDialog = pickFileDialog;
if (settingsRepository == null)
{
throw new ArgumentNullException(nameof(settingsRepository));
}
ArgumentNullException.ThrowIfNull(settingsRepository);
GeneralSettingsConfig = settingsRepository.SettingsConfig;
@ -57,10 +54,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_settingsConfigFileFolder = configFileSubfolder;
if (videoConferenceSettingsRepository == null)
{
throw new ArgumentNullException(nameof(videoConferenceSettingsRepository));
}
ArgumentNullException.ThrowIfNull(videoConferenceSettingsRepository);
Settings = videoConferenceSettingsRepository.SettingsConfig;