Use primary constructors

Author: atifaziz

src/DocoptNet/CodeGeneration/CSharpSourceBuilder.cs

@@ -8,7 +8,7 @@ namespace DocoptNet.CodeGeneration
     using System.Diagnostics;
     using System.Text;
 
-    sealed class CSharpSourceBuilder :
+    sealed class CSharpSourceBuilder(StringBuilder sb) :
         CSharpSourceBuilder.IStatementFlow,
         CSharpSourceBuilder.IBlockFlow,
         CSharpSourceBuilder.IControlBlockFlow,
@@ -18,9 +18,8 @@ sealed class CSharpSourceBuilder :
         bool _skipNextNewLine;
 
         public CSharpSourceBuilder() : this(new()) { }
-        public CSharpSourceBuilder(StringBuilder sb) => StringBuilder = sb;
 
-        public StringBuilder StringBuilder { get; }
+        public StringBuilder StringBuilder { get; } = sb;
 
         public int Level { get; private set; }
         public bool IsNewLine { get; private set; } = true;

src/DocoptNet/CodeGeneration/SourceGenerator.cs

@@ -45,16 +45,10 @@ sealed class SyntaxReceiver : ISyntaxContextReceiver
 
             public List<(ClassDeclarationSyntax Class, AttributeData Attributes)> ClassAttributes { get; } = [];
 
-            sealed class ModelSymbols
+            sealed class ModelSymbols(SemanticModel model, INamedTypeSymbol attributeType)
             {
-                public ModelSymbols(SemanticModel model, INamedTypeSymbol attributeType)
-                {
-                    Model = model;
-                    AttributeType = attributeType;
-                }
-
-                public SemanticModel Model { get; }
-                public INamedTypeSymbol AttributeType { get; }
+                public SemanticModel Model { get; } = model;
+                public INamedTypeSymbol AttributeType { get; } = attributeType;
             }
 
             ModelSymbols GetModelSymbols(SemanticModel semanticModel)

src/DocoptNet/CodeGeneration/StringBuilderSourceText.cs

@@ -6,20 +6,15 @@ namespace DocoptNet.CodeGeneration
     using System.Text;
     using Microsoft.CodeAnalysis.Text;
 
-    sealed class StringBuilderSourceText : SourceText
+    sealed class StringBuilderSourceText(StringBuilder builder, Encoding? encoding = null) : SourceText
     {
-        readonly StringBuilder _builder;
+        public override Encoding? Encoding { get; } = encoding;
+        public override int Length => builder.Length;
+        public override char this[int position] => builder[position];
 
-        public StringBuilderSourceText(StringBuilder builder, Encoding? encoding = null) =>
-            (_builder, Encoding) = (builder, encoding);
-
-        public override Encoding? Encoding { get; }
-        public override int Length => _builder.Length;
-        public override char this[int position] => _builder[position];
-
-        public override string ToString(TextSpan span) => _builder.ToString(span.Start, span.Length);
+        public override string ToString(TextSpan span) => builder.ToString(span.Start, span.Length);
 
         public override void CopyTo(int sourceIndex, char[] destination, int destinationIndex, int count) =>
-            _builder.CopyTo(sourceIndex, destination, destinationIndex, count);
+            builder.CopyTo(sourceIndex, destination, destinationIndex, count);
     }
 }

src/DocoptNet/Docopt.cs

@@ -533,15 +533,9 @@ internal static string[] ParseSection(string name, string source)
         }
     }
 
-    partial class PrintExitEventArgs : EventArgs
+    partial class PrintExitEventArgs(string msg, int errorCode) : EventArgs
     {
-        public PrintExitEventArgs(string msg, int errorCode)
-        {
-            Message = msg;
-            ErrorCode = errorCode;
-        }
-
-        public string Message { get; set; }
-        public int ErrorCode { get; set; }
+        public string Message { get; set; } = msg;
+        public int ErrorCode { get; set; } = errorCode;
     }
 }

src/DocoptNet/Internals/BranchPatterns.cs

@@ -13,7 +13,9 @@ namespace DocoptNet.Internals
     /// </summary>
     abstract partial class BranchPattern : Pattern
     {
+#pragma warning disable IDE0290 // Use primary constructor (protected)
         protected BranchPattern(params Pattern[] children)
+#pragma warning restore IDE0290 // Use primary constructor
         {
             if (children == null) throw new ArgumentNullException(nameof(children));
             Children = children;
@@ -106,31 +108,16 @@ public Pattern FixRepeatingArguments()
         }
     }
 
-    class Required : BranchPattern
-    {
-        public Required(params Pattern[] patterns) : base(patterns) { }
-    }
+    class Required(params Pattern[] patterns) : BranchPattern(patterns);
 
-    class Optional : BranchPattern
-    {
-        public Optional(params Pattern[] patterns) : base(patterns) { }
-    }
+    class Optional(params Pattern[] patterns) : BranchPattern(patterns);
 
     // Marker/placeholder for [options] shortcut.
-    class OptionsShortcut : Optional
-    {
-        // TODO consider single pattern
-        public OptionsShortcut(params Pattern[] patterns) : base(patterns) { }
-    }
+    // TODO consider single pattern
+    class OptionsShortcut(params Pattern[] patterns) : Optional(patterns);
 
-    partial class Either : BranchPattern
-    {
-        public Either(params Pattern[] patterns) : base(patterns) { }
-    }
+    partial class Either(params Pattern[] patterns) : BranchPattern(patterns);
 
-    class OneOrMore : BranchPattern
-    {
-        // TODO consider single pattern
-        public OneOrMore(params Pattern[] patterns) : base(patterns) { }
-    }
+    // TODO consider single pattern
+    class OneOrMore(params Pattern[] patterns) : BranchPattern(patterns);
 }

src/DocoptNet/Internals/Command.cs

@@ -3,9 +3,6 @@
 
 namespace DocoptNet.Internals
 {
-    sealed class Command : LeafPattern
-    {
-        public Command(string name, bool value = false) :
-            base(name, value ? ArgValue.True : ArgValue.False) { }
-    }
+    sealed class Command(string name, bool value = false)
+        : LeafPattern(name, value ? ArgValue.True : ArgValue.False);
 }

src/DocoptNet/Internals/LeafPattern.cs

@@ -12,7 +12,9 @@ namespace DocoptNet.Internals
     /// </summary>
     abstract partial class LeafPattern : Pattern
     {
+#pragma warning disable IDE0290 // Use primary constructor (protected)
         protected LeafPattern(string name, ArgValue value = default)
+#pragma warning restore IDE0290 // Use primary constructor
         {
             Name = name;
             Value = value;

src/DocoptNet/Internals/MatchResult.cs

@@ -3,18 +3,13 @@
 
 namespace DocoptNet.Internals
 {
-    readonly partial struct MatchResult
+    readonly partial struct MatchResult(bool matched,
+                                        ReadOnlyList<LeafPattern> left,
+                                        ReadOnlyList<LeafPattern> collected)
     {
-        public readonly bool Matched;
-        public readonly ReadOnlyList<LeafPattern> Left;
-        public readonly ReadOnlyList<LeafPattern> Collected;
-
-        public MatchResult(bool matched, ReadOnlyList<LeafPattern> left, ReadOnlyList<LeafPattern> collected)
-        {
-            Matched = matched;
-            Left = left;
-            Collected = collected;
-        }
+        public readonly bool Matched = matched;
+        public readonly ReadOnlyList<LeafPattern> Left = left;
+        public readonly ReadOnlyList<LeafPattern> Collected = collected;
 
         public override bool Equals(object? obj)
         {

src/DocoptNet/Internals/PatternMatcher.cs

@@ -93,25 +93,18 @@ public bool Fold(MatchResult match)
         public MatchResult Result => _result ?? new MatchResult(true, Left, Collected);
     }
 
-    partial struct EitherMatcher : IBranchPatternMatcher
+    partial struct EitherMatcher(int count, Leaves left, Leaves collected) :
+        IBranchPatternMatcher
     {
-        readonly int _count;
         int _i;
-        MatchResult _match;
-
-        public EitherMatcher(int count, Leaves left, Leaves collected) : this()
-        {
-            _count = count;
-            (Left, Collected) = (left, collected);
-            _match = new MatchResult(false, left, collected);
-        }
+        MatchResult _match = new(false, left, collected);
 
         public int Index => _i - 1;
 
-        public bool Next() => BranchPatternMatcher.Next(ref _i, _count);
+        public bool Next() => BranchPatternMatcher.Next(ref _i, count);
 
-        public Leaves Left { get; }
-        public Leaves Collected { get; }
+        public Leaves Left { get; } = left;
+        public Leaves Collected { get; } = collected;
 
         public bool Match(LeafPatternMatcher matcher, string name, ArgValueKind kind) =>
             Fold(matcher.Match(Left, Collected, name, kind));
@@ -131,20 +124,17 @@ public bool Fold(MatchResult match)
         public MatchResult Result => _match;
     }
 
-    partial struct OptionalMatcher : IBranchPatternMatcher
+    partial struct OptionalMatcher(int count, Leaves left, Leaves collected) :
+        IBranchPatternMatcher
     {
-        readonly int _count;
         int _i;
 
-        public OptionalMatcher(int count, Leaves left, Leaves collected) : this() =>
-            (_count, Left, Collected) = (count, left, collected);
-
         public int Index => _i - 1;
 
-        public bool Next() => BranchPatternMatcher.Next(ref _i, _count);
+        public bool Next() => BranchPatternMatcher.Next(ref _i, count);
 
-        public Leaves Left { get; private set; }
-        public Leaves Collected { get; private set; }
+        public Leaves Left { get; private set; } = left;
+        public Leaves Collected { get; private set; } = collected;
 
         public bool Match(LeafPatternMatcher matcher, string name, ArgValueKind kind) =>
             Fold(matcher.Match(Left, Collected, name, kind));
@@ -163,23 +153,23 @@ public bool Fold(MatchResult match)
         public MatchResult Result => new(true, Left, Collected);
     }
 
-    partial struct OneOrMoreMatcher : IBranchPatternMatcher
+    partial struct OneOrMoreMatcher(
+#pragma warning disable CS9113 // Parameter is unread.
+                                    int count,
+#pragma warning restore CS9113 // Parameter is unread.
+                                    Leaves left,
+                                    Leaves collected) :
+        IBranchPatternMatcher
     {
-        readonly Leaves _initLeft, _initCollected;
+        readonly Leaves _initLeft = left, _initCollected = collected;
         int _times;
         Leaves? _lastLeft;
 
-        public OneOrMoreMatcher(int count, Leaves left, Leaves collected) : this()
-        {
-            Left = _initLeft = left;
-            Collected = _initCollected = collected;
-        }
-
         public int Index => 0;
         public bool Next() => true;
 
-        public Leaves Left { get; private set; }
-        public Leaves Collected { get; private set; }
+        public Leaves Left { get; private set; } = left;
+        public Leaves Collected { get; private set; } = collected;
 
         public bool Match(LeafPatternMatcher matcher, string name, ArgValueKind kind) =>
             Fold(matcher.Match(Left, Collected, name, kind));

src/DocoptNet/Internals/ReadOnlyList.cs

@@ -22,10 +22,10 @@ static class ReadOnlyList
     /// read-write <seealso cref="IList{T}"/> is not changed.
     /// </remarks>
 
-    readonly partial struct ReadOnlyList<T> : IReadOnlyList<T>
+    readonly partial struct ReadOnlyList<T>(IList<T> list) : IReadOnlyList<T>
     {
-        public ReadOnlyList(IList<T> list) => List = list;
-        IList<T> List => field ?? Array.Empty<T>();
+        IList<T> List { get => field ?? Array.Empty<T>(); } = list;
+
         public int Count => List.Count;
         public T this[int index] => List[index];
         public IEnumerator<T> GetEnumerator() => List.GetEnumerator();