Use ArgumentNullException.ThrowIfNull part 2 (PowerShell#19258)

CarloToso · web-flow · commit 8d8f45e3dfd1 · 2023-03-02T22:29:46.000+05:00
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/ListOrganizer.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/ListOrganizer.cs
@@ -42,21 +42,15 @@ protected override void OnKeyDown(KeyEventArgs e)
 
         partial void OnSelectItemExecutedImplementation(ExecutedRoutedEventArgs e)
         {
-            if (e.Parameter == null)
-            {
-                throw new ArgumentException("e.Parameter is null", "e");
-            }
+            ArgumentNullException.ThrowIfNull(e.Parameter);
 
             this.RaiseEvent(new DataRoutedEventArgs<object>(e.Parameter, ItemSelectedEvent));
             this.picker.IsOpen = false;
         }
 
         partial void OnDeleteItemExecutedImplementation(ExecutedRoutedEventArgs e)
         {
-            if (e.Parameter == null)
-            {
-                throw new ArgumentException("e.Parameter is null", "e");
-            }
+            ArgumentNullException.ThrowIfNull(e.Parameter);
 
             this.RaiseEvent(new DataRoutedEventArgs<object>(e.Parameter, ItemDeletedEvent));
         }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertyValueSelectorFilterRule.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/PropertyValueSelectorFilterRule.cs
@@ -76,10 +76,7 @@ public PropertyValueSelectorFilterRule(string propertyName, string propertyDispl
 
             foreach (FilterRule rule in rules)
             {
-                if (rule == null)
-                {
-                    throw new ArgumentException("A value within rules is null", "rules");
-                }
+                ArgumentNullException.ThrowIfNull(rule);
 
                 this.AvailableRules.AvailableValues.Add(rule);
             }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanel.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRulePanel.cs
@@ -230,10 +230,7 @@ partial void OnAddRulesExecutedImplementation(ExecutedRoutedEventArgs e)
         {
             Debug.Assert(e != null, "not null");
 
-            if (e.Parameter == null)
-            {
-                throw new ArgumentException("e.Parameter is null.", "e");
-            }
+            ArgumentNullException.ThrowIfNull(e.Parameter);
 
             List<FilterRulePanelItem> itemsToAdd = new List<FilterRulePanelItem>();
 
@@ -265,10 +262,7 @@ partial void OnRemoveRuleExecutedImplementation(ExecutedRoutedEventArgs e)
         {
             Debug.Assert(e != null, "not null");
 
-            if (e.Parameter == null)
-            {
-                throw new ArgumentException("e.Parameter is null.", "e");
-            }
+            ArgumentNullException.ThrowIfNull(e.Parameter);
 
             FilterRulePanelItem item = e.Parameter as FilterRulePanelItem;
             if (item == null)
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleToDisplayNameConverter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleToDisplayNameConverter.cs
@@ -41,10 +41,7 @@ public object Convert(object value, Type targetType, object parameter, System.Gl
             }
 
             FilterRule rule = value as FilterRule;
-            if (rule == null)
-            {
-                throw new ArgumentException("value of type FilterRule expected.", "value");
-            }
+            ArgumentNullException.ThrowIfNull(rule);
 
             return rule.DisplayName;
         }
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/PropertyValueGetter.cs b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/PropertyValueGetter.cs
@@ -43,11 +43,7 @@ public virtual bool TryGetPropertyValue(string propertyName, object value, out o
         {
             propertyValue = null;
 
-            if (string.IsNullOrEmpty(propertyName))
-            {
-                throw new ArgumentException("propertyName is empty", "propertyName");
-            }
-
+            ArgumentNullException.ThrowIfNullOrEmpty(propertyName);
             ArgumentNullException.ThrowIfNull(value);
 
             PropertyDescriptor descriptor = this.GetPropertyDescriptor(propertyName, value);
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/managementlist.cs b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/managementlist.cs
@@ -340,10 +340,7 @@ private StateDescriptor<ManagementList> DoesViewAlreadyExist(string viewName)
 
         private void ViewManager_ItemSelected(object sender, DataRoutedEventArgs<object> e)
         {
-            if (e.Data == null)
-            {
-                throw new ArgumentException("e.Data is null", "e");
-            }
+            ArgumentNullException.ThrowIfNull(e.Data);
 
             StateDescriptor<ManagementList> sd = (StateDescriptor<ManagementList>)e.Data;
             sd.RestoreState(this);
@@ -353,10 +350,7 @@ private void ViewManager_ItemSelected(object sender, DataRoutedEventArgs<object>
 
         private void ViewManager_ItemDeleted(object sender, DataRoutedEventArgs<object> e)
         {
-            if (e.Data == null)
-            {
-                throw new ArgumentException("e.Data is null", "e");
-            }
+            ArgumentNullException.ThrowIfNull(e.Data);
 
             StateDescriptor<ManagementList> sd = (StateDescriptor<ManagementList>)e.Data;
             this.Views.Remove(sd);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs
@@ -29,10 +29,7 @@ internal sealed class PropVariant : IDisposable
         /// </summary>
         internal PropVariant(string value)
         {
-            if (value == null)
-            {
-                throw new ArgumentException("PropVariantNullString", nameof(value));
-            }
+            ArgumentNullException.ThrowIfNull(value);
 
 #pragma warning disable CS0618 // Type or member is obsolete (might get deprecated in future versions
             _valueType = (ushort)VarEnum.VT_LPWSTR;
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProviderTraceListener.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProviderTraceListener.cs
@@ -44,7 +44,9 @@ public string Delimiter
                 ArgumentNullException.ThrowIfNull(value, nameof(Delimiter));
 
                 if (value.Length == 0)
+                {
                     throw new ArgumentException(DotNetEventingStrings.Argument_NeedNonemptyDelimiter);
+                }
 
                 _delimiter = value;
             }
@@ -74,7 +76,9 @@ public EventProviderTraceListener(string providerId, string name, string delimit
             ArgumentNullException.ThrowIfNull(delimiter);
 
             if (delimiter.Length == 0)
+            {
                 throw new ArgumentException(DotNetEventingStrings.Argument_NeedNonemptyDelimiter);
+            }
 
             _delimiter = delimiter;
             InitProvider(providerId);
diff --git a/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs b/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
@@ -413,8 +413,7 @@ internal static List<string> GetSuggestion(HistoryInfo lastHistory, object lastE
                     {
                         suggestion["Enabled"] = false;
 
-                        throw new ArgumentException(
-                            SuggestionStrings.RuleMustBeScriptBlock, "Rule");
+                        throw new ArgumentException(SuggestionStrings.RuleMustBeScriptBlock, "Rule");
                     }
 
                     try
@@ -482,9 +481,7 @@ internal static List<string> GetSuggestion(HistoryInfo lastHistory, object lastE
                     {
                         suggestion["Enabled"] = false;
 
-                        throw new ArgumentException(
-                            SuggestionStrings.InvalidMatchType,
-                            "MatchType");
+                        throw new ArgumentException(SuggestionStrings.InvalidMatchType, "MatchType");
                     }
 
                     // If the text matches, evaluate the suggestion
diff --git a/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs b/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
@@ -369,7 +369,11 @@ internal void DisableFlowControlForPendingCmdletActionsQueue()
         internal void AddChildJobWithoutBlocking(StartableJob childJob, ChildJobFlags flags, Action jobEnqueuedAction = null)
         {
             ArgumentNullException.ThrowIfNull(childJob);
-            if (childJob.JobStateInfo.State != JobState.NotStarted) throw new ArgumentException(RemotingErrorIdStrings.ThrottlingJobChildAlreadyRunning, nameof(childJob));
+            if (childJob.JobStateInfo.State != JobState.NotStarted) 
+            {
+                throw new ArgumentException(RemotingErrorIdStrings.ThrottlingJobChildAlreadyRunning, nameof(childJob));
+            }
+
             this.AssertNotDisposed();
 
             JobStateInfo newJobStateInfo = null;
diff --git a/src/System.Management.Automation/engine/runtime/MutableTuple.cs b/src/System.Management.Automation/engine/runtime/MutableTuple.cs
@@ -365,7 +365,10 @@ internal static IEnumerable<PropertyInfo> GetAccessProperties(Type tupleType, in
         {
             // ContractUtils.RequiresNotNull(tupleType, "tupleType");
 
-            if (index < 0 || index >= size) throw new ArgumentException("index");
+            if (index < 0 || index >= size)
+            {
+                throw new ArgumentException("index");
+            }
 
             foreach (int curIndex in GetAccessPath(size, index))
             {
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -7673,8 +7673,7 @@ public static string GetTarget(PSObject instance)
             {
                 if (!fileSysInfo.Exists)
                 {
-                    throw new ArgumentException(
-                        StringUtil.Format(SessionStateStrings.PathNotFound, fileSysInfo.FullName));
+                    throw new ArgumentException(StringUtil.Format(SessionStateStrings.PathNotFound, fileSysInfo.FullName));
                 }
 
                 return fileSysInfo.LinkTarget;
diff --git a/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs b/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
@@ -560,7 +560,9 @@ public void DeleteSubKey(string subkey, bool throwOnMissingSubKey)
             else
             { // there is no key which also means there is no subkey
                 if (throwOnMissingSubKey)
+                {
                     throw new ArgumentException(RegistryProviderStrings.ArgumentException_RegSubKeyAbsent);
+                }
             }
         }
 
@@ -1396,7 +1398,9 @@ public unsafe void SetValue(string name, object value, RegistryValueKind valueKi
             }
 
             if (!Enum.IsDefined(typeof(RegistryValueKind), valueKind))
+            {
                 throw new ArgumentException(RegistryProviderStrings.Arg_RegBadKeyKind);
+            }
 
             EnsureWriteable();
 
@@ -2037,14 +2041,18 @@ private static void ValidateKeyName(string name)
             while (nextSlash != -1)
             {
                 if ((nextSlash - current) > MaxKeyLength)
+                {
                     throw new ArgumentException(RegistryProviderStrings.Arg_RegKeyStrLenBug);
+                }
 
                 current = nextSlash + 1;
                 nextSlash = name.IndexOf('\\', current);
             }
 
             if ((name.Length - current) > MaxKeyLength)
+            {
                 throw new ArgumentException(RegistryProviderStrings.Arg_RegKeyStrLenBug);
+            }
         }
 
         private static void ValidateKeyMode(RegistryKeyPermissionCheck mode)
diff --git a/test/perf/dotnet-tools/ResultsComparer/Program.cs b/test/perf/dotnet-tools/ResultsComparer/Program.cs
@@ -149,7 +149,9 @@ private static void PrintTable((string id, Benchmark baseResult, Benchmark diffR
             var diffFiles = GetFilesToParse(args.DiffPath);
 
             if (!baseFiles.Any() || !diffFiles.Any())
+            {
                 throw new ArgumentException($"Provided paths contained no {FullBdnJsonFileExtension} files.");
+            }
 
             var baseResults = baseFiles.Select(ReadFromFile);
             var diffResults = diffFiles.Select(ReadFromFile);

Original file line number	Diff line number	Diff line change
`@@ -42,21 +42,15 @@ protected override void OnKeyDown(KeyEventArgs e)`
`42`	`42`
`43`	`43`	`partial void OnSelectItemExecutedImplementation(ExecutedRoutedEventArgs e)`
`44`	`44`	`{`
`45`		`- if (e.Parameter == null)`
`46`		`- {`
`47`		`- throw new ArgumentException("e.Parameter is null", "e");`
`48`		`- }`
	`45`	`+ ArgumentNullException.ThrowIfNull(e.Parameter);`
`49`	`46`
`50`	`47`	`this.RaiseEvent(new DataRoutedEventArgs<object>(e.Parameter, ItemSelectedEvent));`
`51`	`48`	`this.picker.IsOpen = false;`
`52`	`49`	`}`
`53`	`50`
`54`	`51`	`partial void OnDeleteItemExecutedImplementation(ExecutedRoutedEventArgs e)`
`55`	`52`	`{`
`56`		`- if (e.Parameter == null)`
`57`		`- {`
`58`		`- throw new ArgumentException("e.Parameter is null", "e");`
`59`		`- }`
	`53`	`+ ArgumentNullException.ThrowIfNull(e.Parameter);`
`60`	`54`
`61`	`55`	`this.RaiseEvent(new DataRoutedEventArgs<object>(e.Parameter, ItemDeletedEvent));`
`62`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,7 @@ public PropertyValueSelectorFilterRule(string propertyName, string propertyDispl`
`76`	`76`
`77`	`77`	`foreach (FilterRule rule in rules)`
`78`	`78`	`{`
`79`		`- if (rule == null)`
`80`		`- {`
`81`		`- throw new ArgumentException("A value within rules is null", "rules");`
`82`		`- }`
	`79`	`+ ArgumentNullException.ThrowIfNull(rule);`
`83`	`80`
`84`	`81`	`this.AvailableRules.AvailableValues.Add(rule);`
`85`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,7 @@ public object Convert(object value, Type targetType, object parameter, System.Gl`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`FilterRule rule = value as FilterRule;`
`44`		`- if (rule == null)`
`45`		`- {`
`46`		`- throw new ArgumentException("value of type FilterRule expected.", "value");`
`47`		`- }`
	`44`	`+ ArgumentNullException.ThrowIfNull(rule);`
`48`	`45`
`49`	`46`	`return rule.DisplayName;`
`50`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -413,8 +413,7 @@ internal static List<string> GetSuggestion(HistoryInfo lastHistory, object lastE`
`413`	`413`	`{`
`414`	`414`	`suggestion["Enabled"] = false;`
`415`	`415`
`416`		`- throw new ArgumentException(`
`417`		`- SuggestionStrings.RuleMustBeScriptBlock, "Rule");`
	`416`	`+ throw new ArgumentException(SuggestionStrings.RuleMustBeScriptBlock, "Rule");`
`418`	`417`	`}`
`419`	`418`
`420`	`419`	`try`
`@@ -482,9 +481,7 @@ internal static List<string> GetSuggestion(HistoryInfo lastHistory, object lastE`
`482`	`481`	`{`
`483`	`482`	`suggestion["Enabled"] = false;`
`484`	`483`
`485`		`- throw new ArgumentException(`
`486`		`- SuggestionStrings.InvalidMatchType,`
`487`		`- "MatchType");`
	`484`	`+ throw new ArgumentException(SuggestionStrings.InvalidMatchType, "MatchType");`
`488`	`485`	`}`
`489`	`486`
`490`	`487`	`// If the text matches, evaluate the suggestion`