Cleaning up printing context

Author: belav

Src/CSharpier.Core/BasePrintingContext.cs

@@ -0,0 +1,18 @@
+using CSharpier.Core.Utilities;
+
+namespace CSharpier.Core;
+
+internal abstract class BasePrintingContext
+{
+    public required string LineEnding { get; init; }
+
+    private readonly Dictionary<string, int> groupNumberByValue = [];
+
+    public string GroupFor(string value)
+    {
+        var number = this.groupNumberByValue.GetValueOrDefault(value, 0) + 1;
+        this.groupNumberByValue[value] = number;
+
+        return value + " #" + number;
+    }
+}

Src/CSharpier.Core/CSharp/CSharpFormatter.cs

@@ -148,17 +148,7 @@ bool TryGetCompilationFailure(out CodeFormatterResult compilationResult)
         try
         {
             var lineEnding = PrinterOptions.GetLineEnding(syntaxTree.ToString(), printerOptions);
-            var printingContext = new PrintingContext
-            {
-                NormalizedXml = string.Empty,
-                Options = new PrintingContext.PrintingContextOptions
-                {
-                    LineEnding = lineEnding,
-                    IndentSize = printerOptions.IndentSize,
-                    UseTabs = printerOptions.UseTabs,
-                    XmlWhitespaceSensitivity = XmlWhitespaceSensitivity.Strict,
-                },
-            };
+            var printingContext = new CSharpPrintingContext { LineEnding = lineEnding };
             var document = Node.Print(rootNode, printingContext);
             var formattedCode = DocPrinter.DocPrinter.Print(document, printerOptions, lineEnding);
             var reorderedModifiers = printingContext.State.ReorderedModifiers;
@@ -176,17 +166,7 @@ bool TryGetCompilationFailure(out CodeFormatterResult compilationResult)
                     return result;
                 }
 
-                var formattingContext2 = new PrintingContext
-                {
-                    NormalizedXml = string.Empty,
-                    Options = new PrintingContext.PrintingContextOptions
-                    {
-                        LineEnding = lineEnding,
-                        IndentSize = printerOptions.IndentSize,
-                        UseTabs = printerOptions.UseTabs,
-                        XmlWhitespaceSensitivity = XmlWhitespaceSensitivity.Strict,
-                    },
-                };
+                var formattingContext2 = new CSharpPrintingContext { LineEnding = lineEnding };
                 document = Node.Print(
                     await syntaxTree.GetRootAsync(cancellationToken),
                     formattingContext2

Src/CSharpier.Core/CSharp/SyntaxPrinter/ArgumentListLikeSyntax.cs

@@ -12,7 +12,7 @@ public static Doc Print(
         SyntaxToken openParenToken,
         SeparatedSyntaxList<ArgumentSyntax> arguments,
         SyntaxToken closeParenToken,
-        PrintingContext context
+        CSharpPrintingContext context
     )
     {
         Doc? args;

Src/CSharpier.Core/CSharp/SyntaxPrinter/ArgumentListWithTrailingLambda.cs

@@ -10,7 +10,7 @@ internal static class ArgumentListWithTrailingLambda
     public static Doc Print(
         SeparatedSyntaxList<ArgumentSyntax> arguments,
         LambdaExpressionSyntax lastLambda,
-        PrintingContext context
+        CSharpPrintingContext context
     )
     {
         var chop = Doc.Concat(

Src/CSharpier.Core/CSharp/SyntaxPrinter/AttributeLists.cs

@@ -11,7 +11,7 @@ internal static class AttributeLists
     public static Doc Print(
         SyntaxNode node,
         SyntaxList<AttributeListSyntax> attributeLists,
-        PrintingContext context
+        CSharpPrintingContext context
     )
     {
         if (attributeLists.Count == 0)

…/CSharp/SyntaxPrinter/PrintingContext.cs …p/SyntaxPrinter/CSharpPrintingContext.csSrc/CSharpier.Core/CSharp/SyntaxPrinter/PrintingContext.cs renamed to Src/CSharpier.Core/CSharp/SyntaxPrinter/CSharpPrintingContext.cs Src/CSharpier.Core/CSharp/SyntaxPrinter/PrintingContext.cs renamed to Src/CSharpier.Core/CSharp/SyntaxPrinter/CSharpPrintingContext.cs

@@ -1,45 +1,24 @@
 using CSharpier.Core.DocTypes;
-using CSharpier.Core.Utilities;
 using Microsoft.CodeAnalysis;
 
 namespace CSharpier.Core.CSharp.SyntaxPrinter;
 
-internal class PrintingContext
+internal class CSharpPrintingContext : BasePrintingContext
 {
-    public required string NormalizedXml { get; init; }
-    public required PrintingContextOptions Options { get; init; }
     public PrintingContextState State { get; } = new();
 
-    private readonly Dictionary<string, int> groupNumberByValue = [];
-
-    public string GroupFor(string value)
-    {
-        var number = this.groupNumberByValue.GetValueOrDefault(value, 0) + 1;
-        this.groupNumberByValue[value] = number;
-
-        return value + " #" + number;
-    }
-
-    public PrintingContext WithSkipNextLeadingTrivia()
+    public CSharpPrintingContext WithSkipNextLeadingTrivia()
     {
         this.State.SkipNextLeadingTrivia = true;
         return this;
     }
 
-    public PrintingContext WithTrailingComma(SyntaxTrivia syntaxTrivia, Doc doc)
+    public CSharpPrintingContext WithTrailingComma(SyntaxTrivia syntaxTrivia, Doc doc)
     {
         this.State.TrailingComma = new TrailingCommaContext(syntaxTrivia, doc);
         return this;
     }
 
-    public class PrintingContextOptions
-    {
-        public required string LineEnding { get; init; }
-        public required int IndentSize { get; init; }
-        public required bool UseTabs { get; init; }
-        public required XmlWhitespaceSensitivity XmlWhitespaceSensitivity { get; init; }
-    }
-
     public class PrintingContextState
     {
         public int PrintingDepth { get; set; }

Src/CSharpier.Core/CSharp/SyntaxPrinter/CSharpierIgnore.cs

@@ -81,7 +81,7 @@ or SyntaxKind.SwitchSection
     [SkipLocalsInit]
     public static List<Doc> PrintNodesRespectingRangeIgnore<T>(
         SyntaxList<T> list,
-        PrintingContext context
+        CSharpPrintingContext context
     )
         where T : SyntaxNode
     {
@@ -137,14 +137,14 @@ firstUnformattedNode is StatementSyntax statementSyntax
         return statements;
     }
 
-    public static string PrintWithoutFormatting(SyntaxNode syntaxNode, PrintingContext context)
+    public static string PrintWithoutFormatting(SyntaxNode syntaxNode, CSharpPrintingContext context)
     {
         return PrintWithoutFormatting(syntaxNode.GetText().ToString(), context);
     }
 
-    public static string PrintWithoutFormatting(string code, PrintingContext context)
+    public static string PrintWithoutFormatting(string code, CSharpPrintingContext context)
     {
         // trim trailing whitespace + replace only existing line endings
-        return WhiteSpaceLineEndingsRegex.Replace(code, context.Options.LineEnding);
+        return WhiteSpaceLineEndingsRegex.Replace(code, context.LineEnding);
     }
 }

Src/CSharpier.Core/CSharp/SyntaxPrinter/ConstraintClauses.cs

@@ -9,7 +9,7 @@ internal static class ConstraintClauses
 {
     public static Doc Print(
         SyntaxList<TypeParameterConstraintClauseSyntax> constraintClauses,
-        PrintingContext context
+        CSharpPrintingContext context
     )
     {
         if (constraintClauses.Count == 0)

Src/CSharpier.Core/CSharp/SyntaxPrinter/MembersWithForcedLines.cs

@@ -15,7 +15,7 @@ internal static class MembersWithForcedLines
     public static List<Doc> Print<T>(
         CSharpSyntaxNode node,
         IReadOnlyList<T> members,
-        PrintingContext context,
+        CSharpPrintingContext context,
         bool skipFirstHardLine = false
     )
         where T : MemberDeclarationSyntax

Src/CSharpier.Core/CSharp/SyntaxPrinter/Modifiers.cs

@@ -44,7 +44,7 @@ private static int GetIndex(string? value)
 
     private static readonly DefaultOrder Comparer = new();
 
-    public static Doc Print(SyntaxTokenList modifiers, PrintingContext context)
+    public static Doc Print(SyntaxTokenList modifiers, CSharpPrintingContext context)
     {
         if (modifiers.Count == 0)
         {
@@ -54,7 +54,7 @@ public static Doc Print(SyntaxTokenList modifiers, PrintingContext context)
         return Doc.Group(Doc.Join(" ", modifiers.Select(o => Token.Print(o, context))), " ");
     }
 
-    public static Doc PrintSorted(SyntaxTokenList modifiers, PrintingContext context)
+    public static Doc PrintSorted(SyntaxTokenList modifiers, CSharpPrintingContext context)
     {
         return PrintWithSortedModifiers(
             modifiers,
@@ -66,7 +66,7 @@ public static Doc PrintSorted(SyntaxTokenList modifiers, PrintingContext context
 
     public static Doc PrintSorterWithoutLeadingTrivia(
         SyntaxTokenList modifiers,
-        PrintingContext context
+        CSharpPrintingContext context
     )
     {
         return PrintWithSortedModifiers(
@@ -90,7 +90,7 @@ PrintingContext context
 
     private static Doc PrintWithSortedModifiers(
         in SyntaxTokenList modifiers,
-        PrintingContext context,
+        CSharpPrintingContext context,
         Func<IReadOnlyList<SyntaxToken>, Doc> print
     )
     {