Code Quality: Use newer syntaxes for ArgumentException handling (#17258)

corvinsz · web-flow · commit 6b8a578ead1b · 2025-07-09T22:49:41.000-04:00
diff --git a/src/Files.App/Extensions/EnumExtensions.cs b/src/Files.App/Extensions/EnumExtensions.cs
@@ -15,7 +15,7 @@ public static TEnum GetEnum<TEnum>(string text) where TEnum : struct
 				throw new InvalidOperationException("Generic parameter 'TEnum' must be an enum.");
 			}
 
-			return (TEnum)Enum.Parse(typeof(TEnum), text);
+			return Enum.Parse<TEnum>(text);
 		}
 	}
 }
diff --git a/src/Files.App/Helpers/WMI/ManagementEventWatcher.cs b/src/Files.App/Helpers/WMI/ManagementEventWatcher.cs
@@ -51,10 +51,7 @@ public ManagementEventWatcher(WqlEventQuery query)
 		{
 			string queryExpression = query.QueryExpression;
 
-			if (string.IsNullOrWhiteSpace(queryExpression))
-			{
-				throw new ArgumentNullException(nameof(queryExpression));
-			}
+			ArgumentNullException.ThrowIfNullOrWhiteSpace(queryExpression);
 
 			_nameSpace = DefaultNameSpace;
 			_queryDialect = DefaultQueryDialect;
@@ -70,10 +67,7 @@ public ManagementEventWatcher(WqlEventQuery query)
 		/// <param name="queryExpression"></param>
 		public ManagementEventWatcher(string queryDialect, string queryExpression)
 		{
-			if (string.IsNullOrWhiteSpace(queryExpression))
-			{
-				throw new ArgumentNullException(nameof(queryExpression));
-			}
+			ArgumentNullException.ThrowIfNullOrWhiteSpace(queryExpression);
 
 			_nameSpace = DefaultNameSpace;
 			_queryDialect = queryDialect ?? DefaultQueryDialect;
@@ -90,10 +84,7 @@ public ManagementEventWatcher(string queryDialect, string queryExpression)
 		/// <param name="queryExpression"></param>
 		public ManagementEventWatcher(string nameSpace, string queryDialect, string queryExpression)
 		{
-			if (string.IsNullOrWhiteSpace(queryExpression))
-			{
-				throw new ArgumentNullException(nameof(queryExpression));
-			}
+			ArgumentNullException.ThrowIfNullOrWhiteSpace(queryExpression);
 
 			_nameSpace = nameSpace ?? DefaultNameSpace;
 			_queryDialect = queryDialect ?? DefaultQueryDialect;
@@ -111,10 +102,7 @@ public ManagementEventWatcher(string nameSpace, string queryDialect, string quer
 		/// <param name="queryExpression"></param>
 		public ManagementEventWatcher(string computerName, string nameSpace, string queryDialect, string queryExpression)
 		{
-			if (string.IsNullOrWhiteSpace(queryExpression))
-			{
-				throw new ArgumentNullException(nameof(queryExpression));
-			}
+			ArgumentNullException.ThrowIfNullOrWhiteSpace(queryExpression);
 
 			_computerName = computerName;
 			_nameSpace = nameSpace ?? DefaultNameSpace;
@@ -160,10 +148,7 @@ public void Start()
 		{
 			lock (_myLock)
 			{
-				if (_isDisposed)
-				{
-					throw new ObjectDisposedException(nameof(ManagementEventWatcher));
-				}
+				ObjectDisposedException.ThrowIf(_isDisposed, this);
 
 				if (_cimWatcherStatus != CimWatcherStatus.Default && _cimWatcherStatus != CimWatcherStatus.Stopped)
 				{
@@ -180,10 +165,7 @@ public void Stop()
 		{
 			lock (_myLock)
 			{
-				if (_isDisposed)
-				{
-					throw new ObjectDisposedException(nameof(ManagementEventWatcher));
-				}
+				ObjectDisposedException.ThrowIf(_isDisposed, this);
 
 				if (_cimWatcherStatus != CimWatcherStatus.Started)
 				{
diff --git a/src/Files.App/Services/App/AppUpdateSideloadService.cs b/src/Files.App/Services/App/AppUpdateSideloadService.cs
@@ -87,8 +87,7 @@ public async Task CheckForUpdatesAsync()
 				XmlSerializer xml = new XmlSerializer(typeof(AppInstaller));
 				var appInstaller = (AppInstaller?)xml.Deserialize(stream);
 
-				if (appInstaller is null)
-					throw new ArgumentNullException(nameof(appInstaller));
+				ArgumentNullException.ThrowIfNull(appInstaller);
 
 				var remoteVersion = new Version(appInstaller.Version);
 
diff --git a/src/Files.App/Utils/Serialization/Implementation/DefaultSettingsSerializer.cs b/src/Files.App/Utils/Serialization/Implementation/DefaultSettingsSerializer.cs
@@ -36,14 +36,14 @@ public bool CreateFile(string path)
 		/// <exception cref="ArgumentNullException"></exception>
 		public string ReadFromFile()
 		{
-			_ = _filePath ?? throw new ArgumentNullException(nameof(_filePath));
+			ArgumentNullException.ThrowIfNull(_filePath);
 
 			return ReadStringFromFile(_filePath);
 		}
 
 		public bool WriteToFile(string? text)
 		{
-			_ = _filePath ?? throw new ArgumentNullException(nameof(_filePath));
+			ArgumentNullException.ThrowIfNull(_filePath);
 
 			return WriteStringToFile(_filePath, text);
 		}
diff --git a/src/Files.App/Utils/Shell/ShellLibraryFolders.cs b/src/Files.App/Utils/Shell/ShellLibraryFolders.cs
@@ -38,8 +38,7 @@ bool ICollection<ShellItem>.IsReadOnly
 		/// <exception cref="ArgumentNullException">location</exception>
 		public void Add(ShellItem location)
 		{
-			if (location is null)
-				throw new ArgumentNullException(nameof(location));
+			ArgumentNullException.ThrowIfNull(location);
 
 			_lib.AddFolder(location.IShellItem);
 		}
@@ -52,8 +51,7 @@ public void Add(ShellItem location)
 		/// <exception cref="ArgumentNullException">location</exception>
 		public bool Remove(ShellItem location)
 		{
-			if (location is null)
-				throw new ArgumentNullException(nameof(location));
+			ArgumentNullException.ThrowIfNull(location);
 
 			try
 			{
diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs
@@ -47,10 +47,7 @@ public ZipStorageFolder(string path, string containerPath, ArchiveFileInfo entry
 			=> DateCreated = entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;
 		public ZipStorageFolder(BaseStorageFile backingFile)
 		{
-			if (string.IsNullOrEmpty(backingFile.Path))
-			{
-				throw new ArgumentException("Backing file Path cannot be null");
-			}
+			ArgumentException.ThrowIfNullOrEmpty(backingFile.Path);
 			Name = IO.Path.GetFileName(backingFile.Path.TrimEnd('\\', '/'));
 			Path = backingFile.Path;
 			this.containerPath = backingFile.Path;
diff --git a/src/Files.Shared/Extensions/StringExtensions.cs b/src/Files.Shared/Extensions/StringExtensions.cs
@@ -13,14 +13,8 @@ public static class StringExtensions
 		/// <returns>The substring.</returns>
 		public static string Left(this string value, int length)
 		{
-			if (value is null)
-			{
-				throw new ArgumentNullException(nameof(value));
-			}
-			if (length < 0)
-			{
-				throw new ArgumentOutOfRangeException(nameof(length), length, "Length is less than zero");
-			}
+			ArgumentNullException.ThrowIfNull(value);
+			ArgumentOutOfRangeException.ThrowIfLessThan(length, 0);
 
 			return length > value.Length ? value : value.Substring(0, length);
 		}
@@ -31,16 +25,10 @@ public static string Left(this string value, int length)
 		/// <returns>The substring.</returns>
 		public static string Right(this string value, int length)
 		{
-			if (value is null)
-			{
-				throw new ArgumentNullException(nameof(value));
-			}
-			if (length < 0)
-			{
-				throw new ArgumentOutOfRangeException(nameof(length), length, "Length is less than zero");
-			}
+			ArgumentNullException.ThrowIfNull(value);
+			ArgumentOutOfRangeException.ThrowIfLessThan(length, 0);
 
-			return length > value.Length ? value : value.Substring(value.Length - length);
+			return length > value.Length ? value : value[^length..];
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static TEnum GetEnum<TEnum>(string text) where TEnum : struct`
`15`	`15`	`throw new InvalidOperationException("Generic parameter 'TEnum' must be an enum.");`
`16`	`16`	`}`
`17`	`17`
`18`		`- return (TEnum)Enum.Parse(typeof(TEnum), text);`
	`18`	`+ return Enum.Parse<TEnum>(text);`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,14 @@ public bool CreateFile(string path)`
`36`	`36`	`/// <exception cref="ArgumentNullException"></exception>`
`37`	`37`	`public string ReadFromFile()`
`38`	`38`	`{`
`39`		`- _ = _filePath ?? throw new ArgumentNullException(nameof(_filePath));`
	`39`	`+ ArgumentNullException.ThrowIfNull(_filePath);`
`40`	`40`
`41`	`41`	`return ReadStringFromFile(_filePath);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public bool WriteToFile(string? text)`
`45`	`45`	`{`
`46`		`- _ = _filePath ?? throw new ArgumentNullException(nameof(_filePath));`
	`46`	`+ ArgumentNullException.ThrowIfNull(_filePath);`
`47`	`47`
`48`	`48`	`return WriteStringToFile(_filePath, text);`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ bool ICollection<ShellItem>.IsReadOnly`
`38`	`38`	`/// <exception cref="ArgumentNullException">location</exception>`
`39`	`39`	`public void Add(ShellItem location)`
`40`	`40`	`{`
`41`		`- if (location is null)`
`42`		`- throw new ArgumentNullException(nameof(location));`
	`41`	`+ ArgumentNullException.ThrowIfNull(location);`
`43`	`42`
`44`	`43`	`_lib.AddFolder(location.IShellItem);`
`45`	`44`	`}`
`@@ -52,8 +51,7 @@ public void Add(ShellItem location)`
`52`	`51`	`/// <exception cref="ArgumentNullException">location</exception>`
`53`	`52`	`public bool Remove(ShellItem location)`
`54`	`53`	`{`
`55`		`- if (location is null)`
`56`		`- throw new ArgumentNullException(nameof(location));`
	`54`	`+ ArgumentNullException.ThrowIfNull(location);`
`57`	`55`
`58`	`56`	`try`
`59`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,8 @@ public static class StringExtensions`
`13`	`13`	`/// <returns>The substring.</returns>`
`14`	`14`	`public static string Left(this string value, int length)`
`15`	`15`	`{`
`16`		`- if (value is null)`
`17`		`- {`
`18`		`- throw new ArgumentNullException(nameof(value));`
`19`		`- }`
`20`		`- if (length < 0)`
`21`		`- {`
`22`		`- throw new ArgumentOutOfRangeException(nameof(length), length, "Length is less than zero");`
`23`		`- }`
	`16`	`+ ArgumentNullException.ThrowIfNull(value);`
	`17`	`+ ArgumentOutOfRangeException.ThrowIfLessThan(length, 0);`
`24`	`18`
`25`	`19`	`return length > value.Length ? value : value.Substring(0, length);`
`26`	`20`	`}`
`@@ -31,16 +25,10 @@ public static string Left(this string value, int length)`
`31`	`25`	`/// <returns>The substring.</returns>`
`32`	`26`	`public static string Right(this string value, int length)`
`33`	`27`	`{`
`34`		`- if (value is null)`
`35`		`- {`
`36`		`- throw new ArgumentNullException(nameof(value));`
`37`		`- }`
`38`		`- if (length < 0)`
`39`		`- {`
`40`		`- throw new ArgumentOutOfRangeException(nameof(length), length, "Length is less than zero");`
`41`		`- }`
	`28`	`+ ArgumentNullException.ThrowIfNull(value);`
	`29`	`+ ArgumentOutOfRangeException.ThrowIfLessThan(length, 0);`
`42`	`30`
`43`		`- return length > value.Length ? value : value.Substring(value.Length - length);`
	`31`	`+ return length > value.Length ? value : value[^length..];`
`44`	`32`	`}`
`45`	`33`	`}`
`46`	`34`	`}`