Use CallerArgumentExpressionAttribute in throw helpers (#1788)

Author: IliaBrahinets

src/Magick.NET.Core/Magick.NET.Core.csproj

@@ -21,6 +21,7 @@
     <Compile Include="../Shared/MemberNotNullAttribute.cs" Link="Helpers/MemberNotNullAttribute.cs" />
     <Compile Include="../Shared/NotNullAttribute.cs" Link="Helpers/NotNullAttribute.cs" />
     <Compile Include="../Shared/Throw.cs" Link="Helpers/Throw.cs" />
+    <Compile Include="../Shared/CallerArgumentExpressionAttribute.cs" Link="Helpers/CallerArgumentExpressionAttribute.cs" />
     <Compile Include="../Shared/TypeHelper.cs" Link="Helpers/TypeHelper.cs" />
   </ItemGroup>
 

src/Magick.NET.Core/Profiles/8Bim/EightBimProfile.cs

@@ -59,7 +59,7 @@ public EightBimProfile(Stream stream)
     public EightBimProfile(IMagickImage image, byte[] data)
       : base("8bim", data)
     {
-        Throw.IfNull(nameof(image), image);
+        Throw.IfNull(image);
 
         _width = image.Width;
         _height = image.Height;

src/Magick.NET.Core/Profiles/8Bim/EightBimValue.cs

@@ -100,7 +100,7 @@ public override string ToString()
     /// <returns>A string that represents the current value with the specified encoding.</returns>
     public string ToString(Encoding encoding)
     {
-        Throw.IfNull(nameof(encoding), encoding);
+        Throw.IfNull(encoding);
 
         return encoding.GetString(_data);
     }

src/Magick.NET.Core/Profiles/EndianReader.cs

@@ -11,7 +11,7 @@ internal sealed class EndianReader
 
     public EndianReader(byte[] data)
     {
-        Throw.IfNullOrEmpty(nameof(data), data);
+        Throw.IfNullOrEmpty(data);
 
         _data = data;
         Index = 0;

src/Magick.NET.Core/Profiles/Exif/ExifProfile.cs

@@ -173,7 +173,7 @@ public void Rewrite()
     /// <typeparam name="TValueType">The data type of the tag.</typeparam>
     public void SetValue<TValueType>(ExifTag<TValueType> tag, TValueType value)
     {
-        Throw.IfNull(nameof(value), value);
+        Throw.IfNull(value);
 
         InitializeValues();
         foreach (var exifValue in _data.Values)

src/Magick.NET.Core/Profiles/ImageProfile.cs

@@ -20,8 +20,8 @@ public partial class ImageProfile : IImageProfile
     /// <param name="data">A byte array containing the profile.</param>
     public ImageProfile(string name, byte[] data)
     {
-        Throw.IfNullOrEmpty(nameof(name), name);
-        Throw.IfNull(nameof(data), data);
+        Throw.IfNullOrEmpty(name);
+        Throw.IfNull(data);
 
         Name = name;
         _data = Copy(data);
@@ -34,7 +34,7 @@ public ImageProfile(string name, byte[] data)
     /// <param name="stream">A stream containing the profile.</param>
     public ImageProfile(string name, Stream stream)
     {
-        Throw.IfNullOrEmpty(nameof(name), name);
+        Throw.IfNullOrEmpty(name);
 
         Name = name;
 
@@ -49,8 +49,8 @@ public ImageProfile(string name, Stream stream)
     /// <param name="fileName">The fully qualified name of the profile file, or the relative profile file name.</param>
     public ImageProfile(string name, string fileName)
     {
-        Throw.IfNullOrEmpty(nameof(name), name);
-        Throw.IfNullOrEmpty(nameof(fileName), fileName);
+        Throw.IfNullOrEmpty(name);
+        Throw.IfNullOrEmpty(fileName);
 
         Name = name;
 
@@ -64,7 +64,7 @@ public ImageProfile(string name, string fileName)
     /// <param name="name">The name of the profile.</param>
     protected ImageProfile(string name)
     {
-        Throw.IfNullOrEmpty(nameof(name), name);
+        Throw.IfNullOrEmpty(name);
         Name = name;
     }
 

src/Magick.NET.Core/Profiles/Iptc/IptcValue.cs

@@ -16,7 +16,7 @@ public sealed class IptcValue : IIptcValue
 
     internal IptcValue(IptcTag tag, byte[] value)
     {
-        Throw.IfNull(nameof(value), value);
+        Throw.IfNull(value);
 
         Tag = tag;
         _data = value;

src/Magick.NET.Core/Profiles/Xmp/XmpProfile.cs

@@ -31,7 +31,7 @@ public XmpProfile(byte[] data)
     public XmpProfile(IXPathNavigable document)
       : base("xmp")
     {
-        Throw.IfNull(nameof(document), document);
+        Throw.IfNull(document);
 
         var navigator = document.CreateNavigator();
         if (navigator is not null)
@@ -51,7 +51,7 @@ public XmpProfile(IXPathNavigable document)
     public XmpProfile(XDocument document)
       : base("xmp")
     {
-        Throw.IfNull(nameof(document), document);
+        Throw.IfNull(document);
 
         using var memStream = new MemoryStream();
         using var writer = CreateXmlWriter(memStream);
@@ -151,7 +151,7 @@ private static XmlWriter CreateXmlWriter(MemoryStream memStream)
 
     private static byte[] CheckTrailingNULL(byte[] data)
     {
-        Throw.IfNull(nameof(data), data);
+        Throw.IfNull(data);
 
         var length = data.Length;
 

src/Magick.NET.Core/Types/Density.cs

@@ -163,10 +163,10 @@ private static string ToString(double x, double y, DensityUnit units)
 
     private void Initialize(string value)
     {
-        Throw.IfNullOrEmpty(nameof(value), value);
+        Throw.IfNullOrEmpty(value);
 
         var values = value.Split(' ');
-        Throw.IfTrue(nameof(value), values.Length > 2, "Invalid density specified.");
+        Throw.IfTrue(values.Length > 2, nameof(value), "Invalid density specified.");
 
         if (values.Length == 2)
         {
@@ -179,15 +179,15 @@ private void Initialize(string value)
         }
 
         var xyValues = values[0].Split('x');
-        Throw.IfTrue(nameof(value), xyValues.Length > 2, "Invalid density specified.");
+        Throw.IfTrue(xyValues.Length > 2, nameof(value), "Invalid density specified.");
 
-        Throw.IfFalse(nameof(value), double.TryParse(xyValues[0], NumberStyles.Number, CultureInfo.InvariantCulture, out var x), "Invalid density specified.");
+        Throw.IfFalse(double.TryParse(xyValues[0], NumberStyles.Number, CultureInfo.InvariantCulture, out var x), nameof(value), "Invalid density specified.");
 
         double y;
         if (xyValues.Length == 1)
             y = x;
         else
-            Throw.IfFalse(nameof(value), double.TryParse(xyValues[1], NumberStyles.Number, CultureInfo.InvariantCulture, out y), "Invalid density specified.");
+            Throw.IfFalse(double.TryParse(xyValues[1], NumberStyles.Number, CultureInfo.InvariantCulture, out y), nameof(value), "Invalid density specified.");
 
         X = x;
         Y = y;

src/Magick.NET.Core/Types/PointD.cs

@@ -39,7 +39,7 @@ public PointD(double x, double y)
     public PointD(string value)
       : this()
     {
-        Throw.IfNullOrEmpty(nameof(value), value);
+        Throw.IfNullOrEmpty(value);
 
         Initialize(value);
     }
@@ -108,13 +108,13 @@ public override string ToString()
     private void Initialize(string value)
     {
         var values = value.Split('x');
-        Throw.IfTrue(nameof(value), values.Length > 2, "Invalid point specified.");
+        Throw.IfTrue(values.Length > 2, nameof(value), "Invalid point specified.");
 
-        Throw.IfFalse(nameof(value), double.TryParse(values[0], NumberStyles.Number, CultureInfo.InvariantCulture, out var x), "Invalid point specified.");
+        Throw.IfFalse(double.TryParse(values[0], NumberStyles.Number, CultureInfo.InvariantCulture, out var x), nameof(value), "Invalid point specified.");
 
         double y;
         if (values.Length == 2)
-            Throw.IfFalse(nameof(value), double.TryParse(values[1], NumberStyles.Number, CultureInfo.InvariantCulture, out y), "Invalid point specified.");
+            Throw.IfFalse(double.TryParse(values[1], NumberStyles.Number, CultureInfo.InvariantCulture, out y), nameof(value), "Invalid point specified.");
         else
             y = x;
 

src/Magick.NET.SystemDrawing/IMagickImageCollectionExtensions.cs

@@ -22,7 +22,7 @@ public static class IMagickImageCollectionExtensions
     public static Bitmap ToBitmap<TQuantumType>(this IMagickImageCollection<TQuantumType> self)
         where TQuantumType : struct, IConvertible
     {
-        Throw.IfNull(nameof(self), self);
+        Throw.IfNull(self);
 
         if (self.Count == 1)
             return self[0].ToBitmap();
@@ -41,8 +41,8 @@ public static Bitmap ToBitmap<TQuantumType>(this IMagickImageCollection<TQuantum
     public static Bitmap ToBitmap<TQuantumType>(this IMagickImageCollection<TQuantumType> self, ImageFormat imageFormat)
         where TQuantumType : struct, IConvertible
     {
-        Throw.IfNull(nameof(self), self);
-        Throw.IfNull(nameof(imageFormat), imageFormat);
+        Throw.IfNull(self);
+        Throw.IfNull(imageFormat);
 
         var format = imageFormat.ToMagickFormat();
 

src/Magick.NET.SystemDrawing/IMagickImageExtentions.cs

@@ -24,8 +24,8 @@ public static partial class IMagickImageExtentions
     public static void Read<TQuantumType>(this IMagickImage<TQuantumType> self, Bitmap bitmap)
         where TQuantumType : struct, IConvertible
     {
-        Throw.IfNull(nameof(self), self);
-        Throw.IfNull(nameof(bitmap), bitmap);
+        Throw.IfNull(self);
+        Throw.IfNull(bitmap);
 
         using var memStream = new MemoryStream();
         if (IsSupportedImageFormat(bitmap.RawFormat))
@@ -84,7 +84,7 @@ public static Bitmap ToBitmapWithDensity<TQuantumType>(this IMagickImage<TQuantu
     private static Bitmap ToBitmap<TQuantumType>(this IMagickImage<TQuantumType> self, bool withDensity)
         where TQuantumType : struct, IConvertible
     {
-        Throw.IfNull(nameof(self), self);
+        Throw.IfNull(self);
 
         var image = self;
 
@@ -133,8 +133,8 @@ private static Bitmap ToBitmap<TQuantumType>(this IMagickImage<TQuantumType> sel
     private static Bitmap ToBitmap<TQuantumType>(IMagickImage<TQuantumType> self, ImageFormat imageFormat, bool withDensity)
         where TQuantumType : struct, IConvertible
     {
-        Throw.IfNull(nameof(self), self);
-        Throw.IfNull(nameof(imageFormat), imageFormat);
+        Throw.IfNull(self);
+        Throw.IfNull(imageFormat);
 
         var format = imageFormat.ToMagickFormat();
 

src/Magick.NET.SystemDrawing/IMagickImageFactoryExtensions.cs

@@ -22,7 +22,7 @@ public static class IMagickImageFactoryExtensions
     public static IMagickImage<TQuantumType> Create<TQuantumType>(this IMagickImageFactory<TQuantumType> self, Bitmap bitmap)
         where TQuantumType : struct, IConvertible
     {
-        Throw.IfNull(nameof(self), self);
+        Throw.IfNull(self);
 
         var image = self.Create();
         image.Read(bitmap);

src/Magick.NET.SystemDrawing/Magick.NET.SystemDrawing.csproj

@@ -26,6 +26,7 @@
   <ItemGroup>
     <Compile Include="../Shared/NotNullAttribute.cs" Link="Helpers/NotNullAttribute.cs" />
     <Compile Include="../Shared/Throw.cs" Link="Helpers/Throw.cs" />
+    <Compile Include="../Shared/CallerArgumentExpressionAttribute.cs" Link="Helpers/CallerArgumentExpressionAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Magick.NET.SystemWindowsMedia/IMagickImageExtentions.cs

@@ -35,7 +35,7 @@ public static BitmapSource ToBitmapSourceWithDensity<TQuantumType>(this IMagickI
     private static BitmapSource ToBitmapSource<TQuantumType>(this IMagickImage<TQuantumType> self, bool useDensity)
         where TQuantumType : struct, IConvertible
     {
-        Throw.IfNull(nameof(self), self);
+        Throw.IfNull(self);
 
         var image = self;
 

src/Magick.NET.SystemWindowsMedia/Magick.NET.SystemWindowsMedia.csproj

@@ -19,6 +19,7 @@
   <ItemGroup>
     <Compile Include="../Shared/NotNullAttribute.cs" Link="Helpers/NotNullAttribute.cs" />
     <Compile Include="../Shared/Throw.cs" Link="Helpers/Throw.cs" />
+    <Compile Include="../Shared/CallerArgumentExpressionAttribute.cs" Link="Helpers/CallerArgumentExpressionAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Magick.NET/Colors/ColorBase.cs

@@ -26,7 +26,7 @@ public abstract class ColorBase : IEquatable<ColorBase?>, IComparable<ColorBase?
     /// <param name="color">The color to use.</param>
     protected ColorBase(IMagickColor<QuantumType> color)
     {
-        Throw.IfNull(nameof(color), color);
+        Throw.IfNull(color);
 
         Color = color;
     }

src/Magick.NET/Colors/ColorCMYK.cs

@@ -163,7 +163,7 @@ public QuantumType Y
 
     private static IMagickColor<QuantumType> CreateColor(string color)
     {
-        Throw.IfNullOrEmpty(nameof(color), color);
+        Throw.IfNullOrEmpty(color);
 
         if (color[0] == '#')
         {

src/Magick.NET/Colors/ColorGray.cs

@@ -27,7 +27,7 @@ public sealed class ColorGray : ColorBase
     public ColorGray(double shade)
       : base(new MagickColor(0, 0, 0))
     {
-        Throw.IfTrue(nameof(shade), shade < 0.0 || shade > 1.0, "Invalid shade specified");
+        Throw.IfTrue(shade < 0.0 || shade > 1.0, nameof(shade), "Invalid shade specified");
 
         _shade = shade;
     }

src/Magick.NET/Colors/MagickColor.cs

@@ -34,7 +34,7 @@ public MagickColor()
     /// <param name="color">The color to use.</param>
     public MagickColor(IMagickColor<QuantumType> color)
     {
-        Throw.IfNull(nameof(color), color);
+        Throw.IfNull(color);
 
         R = color.R;
         G = color.G;
@@ -119,7 +119,7 @@ public MagickColor(QuantumType cyan, QuantumType magenta, QuantumType yellow, Qu
     /// For example: #F000, #FF000000, #FFFF000000000000.</param>
     public MagickColor(string color)
     {
-        Throw.IfNullOrEmpty(nameof(color), color);
+        Throw.IfNullOrEmpty(color);
 
         if (color.Equals("transparent", StringComparison.OrdinalIgnoreCase))
         {
@@ -134,7 +134,7 @@ public MagickColor(string color)
         }
 
         using var instance = NativeMagickColor.Create();
-        Throw.IfFalse(nameof(color), instance.Initialize(color), "Invalid color specified");
+        Throw.IfFalse(instance.Initialize(color), nameof(color), "Invalid color specified");
         Initialize(instance);
     }
 

src/Magick.NET/Defines/MagickDefine.cs

@@ -111,8 +111,8 @@ public MagickDefine(MagickFormat format, string name, long value)
     /// <param name="value">The value of the define.</param>
     public MagickDefine(MagickFormat format, string name, string value)
     {
-        Throw.IfNullOrEmpty(nameof(name), name);
-        Throw.IfNullOrEmpty(nameof(value), value);
+        Throw.IfNullOrEmpty(name);
+        Throw.IfNullOrEmpty(value);
 
         Format = format;
         Name = name;

src/Magick.NET/Drawing/Coordinates/DrawableCoordinates.cs

@@ -13,7 +13,7 @@ internal abstract class DrawableCoordinates<TCoordinateType> : IReadOnlyList<TCo
 
     protected DrawableCoordinates(IEnumerable<TCoordinateType> coordinates, int minCount)
     {
-        Throw.IfNull(nameof(coordinates), coordinates);
+        Throw.IfNull(coordinates);
 
         _coordinates = DrawableCoordinates<TCoordinateType>.CheckCoordinates(new List<TCoordinateType>(coordinates), minCount);
     }

src/Magick.NET/Drawing/DrawableBorderColor.cs

@@ -24,7 +24,7 @@ public sealed partial class DrawableBorderColor : IDrawableBorderColor<QuantumTy
     /// <param name="color">The color of the border.</param>
     public DrawableBorderColor(IMagickColor<QuantumType> color)
     {
-        Throw.IfNull(nameof(color), color);
+        Throw.IfNull(color);
 
         Color = color;
     }

src/Magick.NET/Drawing/DrawableClipPath.cs

@@ -15,7 +15,7 @@ public sealed class DrawableClipPath : IDrawableClipPath, IDrawingWand
     /// <param name="clipPath">The ID of the clip path.</param>
     public DrawableClipPath(string clipPath)
     {
-        Throw.IfNullOrEmpty(nameof(clipPath), clipPath);
+        Throw.IfNullOrEmpty(clipPath);
 
         ClipPath = clipPath;
     }

src/Magick.NET/Drawing/DrawableComposite.cs

@@ -56,7 +56,7 @@ public DrawableComposite(double x, double y, double width, double height, Compos
 
     private DrawableComposite(IMagickImage<QuantumType> image)
     {
-        Throw.IfNull(nameof(image), image);
+        Throw.IfNull(image);
 
         Image = image;
     }

src/Magick.NET/Drawing/DrawableFillColor.cs

@@ -24,7 +24,7 @@ public sealed partial class DrawableFillColor : IDrawableFillColor<QuantumType>,
     /// <param name="color">The color to use.</param>
     public DrawableFillColor(IMagickColor<QuantumType> color)
     {
-        Throw.IfNull(nameof(color), color);
+        Throw.IfNull(color);
 
         Color = color;
     }

src/Magick.NET/Drawing/DrawableFont.cs

@@ -30,7 +30,7 @@ public DrawableFont(string family)
     /// <param name="stretch">The font stretching type.</param>
     public DrawableFont(string family, FontStyleType style, FontWeight weight, FontStretch stretch)
     {
-        Throw.IfNullOrEmpty(nameof(family), family);
+        Throw.IfNullOrEmpty(family);
 
         Family = family;
         Style = style;

src/Magick.NET/Drawing/DrawableStrokeColor.cs

@@ -24,7 +24,7 @@ public sealed partial class DrawableStrokeColor : IDrawableStrokeColor<QuantumTy
     /// <param name="color">The color to use.</param>
     public DrawableStrokeColor(IMagickColor<QuantumType> color)
     {
-        Throw.IfNull(nameof(color), color);
+        Throw.IfNull(color);
 
         Color = color;
     }

src/Magick.NET/Drawing/DrawableText.cs

@@ -16,7 +16,7 @@ public sealed class DrawableText : IDrawableText, IDrawingWand
     /// <param name="value">The text to draw.</param>
     public DrawableText(double x, double y, string value)
     {
-        Throw.IfNullOrEmpty(nameof(value), value);
+        Throw.IfNullOrEmpty(value);
 
         X = x;
         Y = y;