switch to field keyword

Author: PawelGerr

samples/AspNetCore.Samples/Validation/MaybeBound.cs

@@ -9,14 +9,13 @@ namespace Thinktecture.Validation;
    where TKey : IParsable<TKey>
    where TValidationError : class, IValidationError<TValidationError>
 {
-   private readonly T? _value;
-   public T? Value => Error is null ? _value : throw new ValidationException(Error);
+   public T? Value => Error is null ? field : throw new ValidationException(Error);
 
    public string? Error { get; }
 
    private MaybeBound(T? value, string? error)
    {
-      _value = value;
+      Value = value;
       Error = error;
    }
 

samples/EntityFrameworkCore.Samples/Product.cs

@@ -16,8 +16,7 @@ public class Product
    public required DayMonth ScheduledDeliveryDate { get; set; }
    public required TextOrNumberSerializable TextOrNumber { get; set; }
 
-   private Boundary? _boundary;
-   public Boundary Boundary => _boundary ?? throw new InvalidOperationException("Boundary is not loaded.");
+   public Boundary Boundary => field ?? throw new InvalidOperationException("Boundary is not loaded.");
 
    [SetsRequiredMembers]
    private Product(
@@ -50,6 +49,6 @@ public Product(
       OpenEndDate endDate = default)
       : this(id, name, category, productType, endDate, scheduledDeliveryDate, textOrNumber)
    {
-      _boundary = boundary;
+      Boundary = boundary;
    }
 }

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Sources/EntityFrameworkCore/Infrastructure/ThinktectureDbContextOptionsExtension.cs

@@ -10,8 +10,7 @@ namespace Thinktecture.EntityFrameworkCore.Infrastructure;
 
 internal sealed class ThinktectureDbContextOptionsExtension : IDbContextOptionsExtension
 {
-   private DbContextOptionsExtensionInfo? _info;
-   public DbContextOptionsExtensionInfo Info => _info ??= new ThinktectureDbContextOptionsExtensionInfo(this);
+   public DbContextOptionsExtensionInfo Info => field ??= new ThinktectureDbContextOptionsExtensionInfo(this);
 
    public ThinktectureValueConverterSettings Settings { get; private set; }
 
@@ -59,8 +58,7 @@ private sealed class ThinktectureDbContextOptionsExtensionInfo : DbContextOption
       private readonly ThinktectureDbContextOptionsExtension _extension;
       public override bool IsDatabaseProvider => false;
 
-      private string? _logFragment;
-      public override string LogFragment => _logFragment ??= CreateLogFragment();
+      public override string LogFragment => field ??= CreateLogFragment();
 
       private string CreateLogFragment()
       {

src/Thinktecture.Runtime.Extensions.Swashbuckle/Swashbuckle/Internal/JsonSerializerOptionsResolver.cs

@@ -14,15 +14,13 @@ public class JsonSerializerOptionsResolver
 {
    private readonly IServiceProvider _serviceProvider;
 
-   private JsonSerializerOptions? _options;
-
    /// <summary>
    /// This is an internal API that supports the Thinktecture.Runtime.Extensions infrastructure and not subject to
    /// the same compatibility standards as public APIs. It may be changed or removed without notice in
    /// any release. You should only use it directly in your code with extreme caution and knowing that
    /// doing so can result in application failures when updating to a new Thinktecture.Runtime.Extensions release.
    /// </summary>
-   public JsonSerializerOptions JsonSerializerOptions => _options ??= ResolveOptions();
+   public JsonSerializerOptions JsonSerializerOptions => field ??= ResolveOptions();
 
    /// <summary>
    /// This is an internal API that supports the Thinktecture.Runtime.Extensions infrastructure and not subject to

src/Thinktecture.Runtime.Extensions/Collections/SingleItemEnumerator.cs

@@ -4,17 +4,15 @@ namespace Thinktecture.Collections;
 
 internal sealed class SingleItemEnumerator<T> : IEnumerator<T>
 {
-   private readonly T _item;
-
    private int _index;
 
-   public T Current => _index == 1 ? _item : default!;
+   public T Current => _index == 1 ? field : default!;
 
    object IEnumerator.Current => Current!;
 
    public SingleItemEnumerator(T item)
    {
-      _item = item;
+      Current = item;
    }
 
    public bool MoveNext()

src/Thinktecture.Runtime.Extensions/SmartEnumAttribute.cs

@@ -56,16 +56,14 @@ public sealed class SmartEnumAttribute<TKey> : Attribute
    /// </summary>
    public MemberKind KeyMemberKind { get; set; }
 
-   private string? _keyMemberName;
-
    /// <summary>
    /// The name of the key member.
    /// Default: <c>_key</c> if the key member is a private field; otherwise <c>Key</c>.
    /// </summary>
    public string KeyMemberName
    {
-      get => _keyMemberName ?? (KeyMemberAccessModifier == AccessModifier.Private && KeyMemberKind == MemberKind.Field ? "_key" : "Key");
-      set => _keyMemberName = value;
+      get => field ?? (KeyMemberAccessModifier == AccessModifier.Private && KeyMemberKind == MemberKind.Field ? "_key" : "Key");
+      set;
    }
 
    /// <summary>
@@ -116,8 +114,6 @@ public bool SkipISpanParsable
    /// </summary>
    public OperatorsGeneration ComparisonOperators { get; set; }
 
-   private OperatorsGeneration _equalityComparisonOperators;
-
    /// <summary>
    /// Indication whether and how the generator should generate the implementation of <see cref="IEqualityOperators{TSelf,TOther,TResult}"/>.
    ///
@@ -126,8 +122,8 @@ public bool SkipISpanParsable
    /// </summary>
    public OperatorsGeneration EqualityComparisonOperators
    {
-      get => ComparisonOperators > _equalityComparisonOperators ? ComparisonOperators : _equalityComparisonOperators;
-      set => _equalityComparisonOperators = value;
+      get => ComparisonOperators > field ? ComparisonOperators : field;
+      set;
    }
 
    /// <summary>

src/Thinktecture.Runtime.Extensions/ValueObjectAttribute.cs

@@ -26,16 +26,14 @@ public sealed class ValueObjectAttribute<TKey> : ValueObjectAttributeBase
    /// </summary>
    public MemberKind KeyMemberKind { get; set; }
 
-   private string? _keyMemberName;
-
    /// <summary>
    /// The name of the key member.
    /// Default: <c>_value</c> if the key member is a private field; otherwise <c>Value</c>.
    /// </summary>
    public string KeyMemberName
    {
-      get => _keyMemberName ?? (KeyMemberAccessModifier == AccessModifier.Private && KeyMemberKind == MemberKind.Field ? "_value" : "Value");
-      set => _keyMemberName = value;
+      get => field ?? (KeyMemberAccessModifier == AccessModifier.Private && KeyMemberKind == MemberKind.Field ? "_value" : "Value");
+      set;
    }
 
    /// <summary>
@@ -46,8 +44,6 @@ public string KeyMemberName
    /// </summary>
    public bool SkipKeyMember { get; set; }
 
-   private bool _nullInFactoryMethodsYieldsNull;
-
    /// <summary>
    /// By default, providing <c>null</c> to methods "Create", "Validate" and "TryCreate" is not allowed.
    /// If this property is set to <c>true</c>, then providing a <c>null</c> will return <c>null</c>.
@@ -60,8 +56,8 @@ public string KeyMemberName
    /// </remarks>
    public bool NullInFactoryMethodsYieldsNull
    {
-      get => _nullInFactoryMethodsYieldsNull || EmptyStringInFactoryMethodsYieldsNull;
-      set => _nullInFactoryMethodsYieldsNull = value;
+      get => field || EmptyStringInFactoryMethodsYieldsNull;
+      set;
    }
 
    /// <summary>
@@ -157,8 +153,6 @@ public bool SkipISpanParsable
    /// </remarks>
    public OperatorsGeneration DivisionOperators { get; set; }
 
-   private OperatorsGeneration _comparisonOperators;
-
    /// <summary>
    /// Indication whether and how the generator should generate the implementation of <see cref="IComparisonOperators{TSelf,TOther,TResult}"/>.
    ///
@@ -172,12 +166,10 @@ public bool SkipISpanParsable
    /// </remarks>
    public OperatorsGeneration ComparisonOperators
    {
-      get => SkipEqualityComparison ? OperatorsGeneration.None : _comparisonOperators;
-      set => _comparisonOperators = value;
+      get => SkipEqualityComparison ? OperatorsGeneration.None : field;
+      set;
    }
 
-   private OperatorsGeneration _equalityComparisonOperators;
-
    /// <summary>
    /// Indication whether and how the generator should generate the implementation of <see cref="IEqualityOperators{TSelf,TOther,TResult}"/>.
    /// </summary>
@@ -193,11 +185,11 @@ public OperatorsGeneration EqualityComparisonOperators
          if (SkipEqualityComparison)
             return OperatorsGeneration.None;
 
-         return ComparisonOperators > _equalityComparisonOperators
+         return ComparisonOperators > field
                    ? ComparisonOperators
-                   : _equalityComparisonOperators;
+                   : field;
       }
-      set => _equalityComparisonOperators = value;
+      set;
    }
 
    /// <summary>

src/Thinktecture.Runtime.Extensions/ValueObjectAttributeBase.cs

@@ -16,26 +16,22 @@ public abstract class ValueObjectAttributeBase : Attribute
    /// </summary>
    public AccessModifier ConstructorAccessModifier { get; set; }
 
-   private string? _createFactoryMethodName;
-
    /// <summary>
    /// The name of the factory method "Create".
    /// </summary>
    public string CreateFactoryMethodName
    {
-      get => _createFactoryMethodName ?? "Create";
-      set => _createFactoryMethodName = String.IsNullOrWhiteSpace(value) ? null : value.Trim();
+      get => field ?? "Create";
+      set => field = String.IsNullOrWhiteSpace(value) ? null : value.Trim();
    }
 
-   private string? _tryCreateFactoryMethodName;
-
    /// <summary>
    /// The name of the factory method "TryCreate".
    /// </summary>
    public string TryCreateFactoryMethodName
    {
-      get => _tryCreateFactoryMethodName ?? "TryCreate";
-      set => _tryCreateFactoryMethodName = String.IsNullOrWhiteSpace(value) ? null : value.Trim();
+      get => field ?? "TryCreate";
+      set => field = String.IsNullOrWhiteSpace(value) ? null : value.Trim();
    }
 
    /// <summary>
@@ -52,8 +48,6 @@ public string TryCreateFactoryMethodName
    /// </summary>
    public bool AllowDefaultStructs { get; set; }
 
-   private string? _defaultInstancePropertyName;
-
    /// <summary>
    /// The name of the static property containing the <c>default</c> instance of the struct.
    /// Default name is "Empty" (analogous to <c>Guid.Empty</c>).
@@ -63,8 +57,8 @@ public string TryCreateFactoryMethodName
    /// </summary>
    public string DefaultInstancePropertyName
    {
-      get => _defaultInstancePropertyName ?? "Empty";
-      set => _defaultInstancePropertyName = value;
+      get => field ?? "Empty";
+      set;
    }
 
    /// <summary>