Makes use of more c# features

Author: Aaron Dandy

WeCantSpell.Hunspell/AffixCollection.cs

@@ -306,10 +306,7 @@ static void cleanTree(EntryTreeNode[] allNodes)
                         nptr = nptr.Next;
                     }
 
-                    if (mptr is not null)
-                    {
-                        mptr.NextNotEqual = null;
-                    }
+                    mptr?.NextNotEqual = null;
                 }
             }
         }
@@ -321,7 +318,7 @@ internal GroupBuilder(BuilderBase parent, FlagValue aFlag)
             {
                 _parent = parent;
                 AFlag = aFlag;
-                _entries = new();
+                _entries = [];
             }
 
             private readonly BuilderBase _parent;

WeCantSpell.Hunspell/AffixConfig.Builder.cs

@@ -6,10 +6,6 @@
 
 namespace WeCantSpell.Hunspell;
 
-#pragma warning disable IDE0079 // Remove unnecessary suppression
-#pragma warning disable IDE0305 // Simplify collection initialization
-#pragma warning disable IDE0028 // Simplify collection initialization
-
 public partial class AffixConfig
 {
     [DebuggerDisplay("Prefixes = {Prefixes}, Suffixes = {Suffixes}")]
@@ -211,7 +207,7 @@ public Builder()
         /// <seealso cref="AffixConfig.Replacements"/>
         public IList<SingleReplacement> Replacements => ReplacementsBuilder;
 
-        internal ArrayBuilder<SingleReplacement> ReplacementsBuilder = new();
+        internal ArrayBuilder<SingleReplacement> ReplacementsBuilder = [];
 
         /// <summary>
         /// Suffixes attached to root words to make other words.
@@ -231,23 +227,23 @@ public Builder()
         /// <seealso cref="AffixConfig.AliasF"/>
         public IList<FlagSet> AliasF => AliasFBuilder;
 
-        internal ArrayBuilder<FlagSet> AliasFBuilder = new();
+        internal ArrayBuilder<FlagSet> AliasFBuilder = [];
 
         /// <summary>
         /// Values used for morphological alias compression.
         /// </summary>
         /// <seealso cref="AffixConfig.AliasM"/>
         public IList<MorphSet> AliasM => AliasMBuilder;
 
-        internal ArrayBuilder<MorphSet> AliasMBuilder = new();
+        internal ArrayBuilder<MorphSet> AliasMBuilder = [];
 
         /// <summary>
         /// Defines custom compound patterns with a regex-like syntax.
         /// </summary>
         /// <seealso cref="AffixConfig.CompoundRules"/>
         public IList<CompoundRule> CompoundRules => CompoundRulesBuilder;
 
-        internal ArrayBuilder<CompoundRule> CompoundRulesBuilder = new();
+        internal ArrayBuilder<CompoundRule> CompoundRulesBuilder = [];
 
         /// <summary>
         /// Forbid compounding, if the first word in the compound ends with endchars, and
@@ -256,47 +252,47 @@ public Builder()
         /// <seealso cref="AffixConfig.CompoundPatterns"/>
         public IList<PatternEntry> CompoundPatterns => CompoundPatternsBuilder;
 
-        internal ArrayBuilder<PatternEntry> CompoundPatternsBuilder = new();
+        internal ArrayBuilder<PatternEntry> CompoundPatternsBuilder = [];
 
         /// <summary>
         /// Defines new break points for breaking words and checking word parts separately.
         /// </summary>
         /// <seealso cref="AffixConfig.BreakPoints"/>
         public IList<string> BreakPoints => BreakPointsBuilder;
 
-        internal ArrayBuilder<string> BreakPointsBuilder = new();
+        internal ArrayBuilder<string> BreakPointsBuilder = [];
 
         /// <summary>
         /// Input conversion entries.
         /// </summary>
         /// <seealso cref="AffixConfig.InputConversions"/>
         public IDictionary<string, MultiReplacementEntry> InputConversions => InputConversionsBuilder;
 
-        internal TextDictionary<MultiReplacementEntry> InputConversionsBuilder = new();
+        internal TextDictionary<MultiReplacementEntry> InputConversionsBuilder = [];
 
         /// <summary>
         /// Output conversion entries.
         /// </summary>
         /// <seealso cref="AffixConfig.OutputConversions"/>
         public IDictionary<string, MultiReplacementEntry> OutputConversions => OutputConversionsBuilder;
 
-        internal TextDictionary<MultiReplacementEntry> OutputConversionsBuilder = new();
+        internal TextDictionary<MultiReplacementEntry> OutputConversionsBuilder = [];
 
         /// <summary>
         /// Mappings between related characters.
         /// </summary>
         /// <seealso cref="AffixConfig.RelatedCharacterMap"/>
         public IList<MapEntry> RelatedCharacterMap => RelatedCharacterMapBuilder;
 
-        internal ArrayBuilder<MapEntry> RelatedCharacterMapBuilder = new();
+        internal ArrayBuilder<MapEntry> RelatedCharacterMapBuilder = [];
 
         /// <summary>
         /// Phonetic transcription entries.
         /// </summary>
         /// <seealso cref="AffixConfig.Phone"/>
         public IList<PhoneticEntry> Phone => PhoneBuilder;
 
-        internal ArrayBuilder<PhoneticEntry> PhoneBuilder = new();
+        internal ArrayBuilder<PhoneticEntry> PhoneBuilder = [];
 
         /// <summary>
         /// Maximum syllable number, that may be in a
@@ -433,11 +429,11 @@ private AffixConfig BuildOrExtract(bool extract)
                 config.InputConversions = InputConversionsBuilder.HasItems
                     ? MultiReplacementTable.TakeDictionary(InputConversionsBuilder)
                     : MultiReplacementTable.Empty;
-                InputConversionsBuilder = new();
+                InputConversionsBuilder = [];
                 config.OutputConversions = OutputConversionsBuilder.HasItems
                     ? MultiReplacementTable.TakeDictionary(OutputConversionsBuilder)
                     : MultiReplacementTable.Empty;
-                OutputConversionsBuilder = new();
+                OutputConversionsBuilder = [];
             }
             else
             {
@@ -480,7 +476,7 @@ private AffixConfig BuildOrExtract(bool extract)
             config.Flags_ForbiddenWord_NoSuggest = FlagSet.Create(config.ForbiddenWord, config.NoSuggest);
             config.Flags_ForbiddenWord_NoSuggest_SubStandard = config.Flags_ForbiddenWord_NoSuggest.Union(config.SubStandard);
 
-            config.Warnings = Warnings.ToArray();
+            config.Warnings = [.. Warnings];
 
             return config;
         }

WeCantSpell.Hunspell/AffixConfig.cs

@@ -6,9 +6,6 @@
 
 namespace WeCantSpell.Hunspell;
 
-#pragma warning disable IDE0079 // Remove unnecessary suppression
-#pragma warning disable IDE0301 // Simplify collection initialization
-
 [DebuggerDisplay("Prefixes = {Prefixes}, Suffixes = {Suffixes}")]
 public sealed partial class AffixConfig
 {
@@ -21,8 +18,6 @@ private AffixConfig()
     {
     }
 
-    private AffixConfigOptions _options;
-
     /// <summary>
     /// The flag type.
     /// </summary>
@@ -40,25 +35,25 @@ private AffixConfig()
     /// </summary>
     public AffixConfigOptions Options
     {
-        get => _options;
+        get => field;
         private set
         {
-            _options = value;
-            ComplexPrefixes = _options.HasFlagEx(AffixConfigOptions.ComplexPrefixes);
-            CompoundMoreSuffixes = _options.HasFlagEx(AffixConfigOptions.CompoundMoreSuffixes);
-            CheckCompoundDup = _options.HasFlagEx(AffixConfigOptions.CheckCompoundDup);
-            CheckCompoundRep = _options.HasFlagEx(AffixConfigOptions.CheckCompoundRep);
-            CheckCompoundTriple = _options.HasFlagEx(AffixConfigOptions.CheckCompoundTriple);
-            SimplifiedTriple = _options.HasFlagEx(AffixConfigOptions.SimplifiedTriple);
-            CheckCompoundCase = _options.HasFlagEx(AffixConfigOptions.CheckCompoundCase);
-            CheckNum = _options.HasFlagEx(AffixConfigOptions.CheckNum);
-            OnlyMaxDiff = _options.HasFlagEx(AffixConfigOptions.OnlyMaxDiff);
-            NoSplitSuggestions = _options.HasFlagEx(AffixConfigOptions.NoSplitSuggestions);
-            FullStrip = _options.HasFlagEx(AffixConfigOptions.FullStrip);
-            SuggestWithDots = _options.HasFlagEx(AffixConfigOptions.SuggestWithDots);
-            ForbidWarn = _options.HasFlagEx(AffixConfigOptions.ForbidWarn);
-            CheckSharps = _options.HasFlagEx(AffixConfigOptions.CheckSharps);
-            SimplifiedCompound = _options.HasFlagEx(AffixConfigOptions.SimplifiedCompound);
+            field = value;
+            ComplexPrefixes = field.HasFlagEx(AffixConfigOptions.ComplexPrefixes);
+            CompoundMoreSuffixes = field.HasFlagEx(AffixConfigOptions.CompoundMoreSuffixes);
+            CheckCompoundDup = field.HasFlagEx(AffixConfigOptions.CheckCompoundDup);
+            CheckCompoundRep = field.HasFlagEx(AffixConfigOptions.CheckCompoundRep);
+            CheckCompoundTriple = field.HasFlagEx(AffixConfigOptions.CheckCompoundTriple);
+            SimplifiedTriple = field.HasFlagEx(AffixConfigOptions.SimplifiedTriple);
+            CheckCompoundCase = field.HasFlagEx(AffixConfigOptions.CheckCompoundCase);
+            CheckNum = field.HasFlagEx(AffixConfigOptions.CheckNum);
+            OnlyMaxDiff = field.HasFlagEx(AffixConfigOptions.OnlyMaxDiff);
+            NoSplitSuggestions = field.HasFlagEx(AffixConfigOptions.NoSplitSuggestions);
+            FullStrip = field.HasFlagEx(AffixConfigOptions.FullStrip);
+            SuggestWithDots = field.HasFlagEx(AffixConfigOptions.SuggestWithDots);
+            ForbidWarn = field.HasFlagEx(AffixConfigOptions.ForbidWarn);
+            CheckSharps = field.HasFlagEx(AffixConfigOptions.CheckSharps);
+            SimplifiedCompound = field.HasFlagEx(AffixConfigOptions.SimplifiedCompound);
         }
     }
 

WeCantSpell.Hunspell/AffixGroup.cs

@@ -2,15 +2,14 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 
 namespace WeCantSpell.Hunspell;
 
 [DebuggerDisplay("AFlag = {AFlag}, Options = {Options}, Count = {Count}")]
 public sealed class AffixGroup<TAffixEntry> : IReadOnlyList<TAffixEntry> where TAffixEntry : AffixEntry
 {
     public static AffixGroup<TAffixEntry> Create(FlagValue aFlag, AffixEntryOptions options, IEnumerable<TAffixEntry> entries) =>
-        CreateUsingArray(aFlag, options, entries.ToArray());
+        CreateUsingArray(aFlag, options, [.. entries]);
 
     internal static AffixGroup<TAffixEntry> CreateUsingArray(FlagValue aFlag, AffixEntryOptions options, TAffixEntry[] entries) =>
         new(aFlag, options, entries);

WeCantSpell.Hunspell/AffixReader.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -690,7 +689,7 @@ private bool TryParseConv(ReadOnlySpan<char> parameterText, EntryListType entryL
             }
         }
 
-        entries ??= new();
+        entries ??= [];
 
         var pattern1 = ReadOnlySpan<char>.Empty;
         var pattern2 = ReadOnlySpan<char>.Empty;

WeCantSpell.Hunspell/AliasCollection.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace WeCantSpell.Hunspell;
 
@@ -17,7 +16,7 @@ public static AliasCollection<TEntry> Craete(IEnumerable<TEntry> entries)
         ExceptionEx.ThrowIfArgumentNull(entries, nameof(entries));
 #endif
 
-        return new(entries.ToArray());
+        return new([.. entries]);
     }
 
     internal AliasCollection(TEntry[] entries)

WeCantSpell.Hunspell/BreakSet.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 
 namespace WeCantSpell.Hunspell;
 
@@ -19,7 +18,7 @@ public static BreakSet Create(IEnumerable<string> entries)
         ExceptionEx.ThrowIfArgumentNull(entries, nameof(entries));
 #endif
 
-        return new(entries.ToArray());
+        return new([.. entries]);
     }
 
     internal BreakSet(string[] entries)

WeCantSpell.Hunspell/CharacterCondition.cs

@@ -23,7 +23,7 @@ static string buildCharString(ReadOnlySpan<char> chars)
         {
             if (chars.Length <= 4)
             {
-                Span<char> buffer = (stackalloc char[4]).Slice(0, chars.Length);
+                var buffer = (stackalloc char[4]).Slice(0, chars.Length);
                 chars.CopyTo(buffer);
                 buffer.Sort();
                 MemoryEx.RemoveAdjacentDuplicates(ref buffer);

WeCantSpell.Hunspell/CharacterConditionGroup.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace WeCantSpell.Hunspell;
 
@@ -25,7 +24,7 @@ public static CharacterConditionGroup Create(IEnumerable<CharacterCondition> con
         ExceptionEx.ThrowIfArgumentNull(conditions, nameof(conditions));
 #endif
 
-        return new(conditions.ToArray());
+        return new([.. conditions]);
     }
 
     public static CharacterConditionGroup Parse(string text)
@@ -148,7 +147,7 @@ public CharacterCondition this[int index]
 
     public bool MatchesAnySingleCharacter => _items is { Length: 1 } && _items[0].MatchesAnySingleCharacter;
 
-    public string GetEncoded() => string.Concat(RawArray.Select(static c => c.GetEncoded()));
+    public string GetEncoded() => string.Concat(Array.ConvertAll(RawArray, static c => c.GetEncoded()));
 
     public override string ToString() => GetEncoded();
 

WeCantSpell.Hunspell/CompoundRule.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 
 namespace WeCantSpell.Hunspell;
 
@@ -19,7 +18,7 @@ public static CompoundRule Create(IEnumerable<FlagValue> values)
         ExceptionEx.ThrowIfArgumentNull(values, nameof(values));
 #endif
 
-        return new(values.ToArray());
+        return new([.. values]);
     }
 
     internal CompoundRule(FlagValue[] items)