fixing warnings

Author: belav

Shell/BuildProject.psm1

@@ -1,10 +1,14 @@
-function CSH-BuildProject
-{
+function CSH-BuildProject {
+    param (
+        [switch]$doNotExit = $false
+    )
+    
+    
     $repositoryRoot = Join-Path $PSScriptRoot ".."
     $csProjectPath = Join-Path $repositoryRoot "Src/CSharpier.Cli/CSharpier.Cli.csproj"
 
     & dotnet build $csProjectPath -c release
-    if ($lastExitCode -gt 0) {
+    if ($lastExitCode -gt 0 -and -not $doNotExit) {
         exit $lastExitCode;
     }
 }

Shell/ReviewBranch.psm1

@@ -61,7 +61,7 @@ function CSH-ReviewBranch {
 
     $formatArgument = "."
     if ($onlyXml) {
-        $formatArgument = "**/*.{config,csproj,props,slnx,targets,xaml,xml}"
+        $formatArgument = "**/*.config **/*.csproj **/*.props **/*.slnx **/*.targets **/*.xaml **/*.xml"
     }
 
     if ($firstRun) {
@@ -74,7 +74,11 @@ function CSH-ReviewBranch {
 #            return
 #        }
 
-        CSH-BuildProject
+        CSH-BuildProject -doNotExit
+
+        if ($lastExitCode -gt 0) {
+            return
+        }
 
         Set-Location $pathToTestingRepo
 

Src/CSharpier.Core/Xml/RawAttribute.cs

@@ -4,4 +4,4 @@ internal class RawAttribute
 {
     public required string Name { get; set; }
     public required string Value { get; set; }
-}
+}

Src/CSharpier.Core/Xml/RawNode.cs

@@ -8,12 +8,12 @@ internal class RawNode
     public RawNode? Parent { get; set; }
     public RawNode? PreviousNode { get; set; }
     public RawNode? NextNode { get; set; }
-    public required string? Name { get; set; }
+    public required string Name { get; set; }
     public required XmlNodeType NodeType { get; set; }
     public required bool IsEmpty { get; set; }
     public required RawAttribute[] Attributes { get; set; }
-    public List<RawNode> Nodes { get; set; } = new();
-    public string? Value { get; set; }
+    public List<RawNode> Nodes { get; set; } = [];
+    public string Value { get; set; } = string.Empty;
 
     public bool IsTextLike()
     {

Src/CSharpier.Core/Xml/RawNodePrinters/Element.cs

@@ -7,7 +7,7 @@ namespace CSharpier.Core.Xml.RawNodePrinters;
 
 internal static class Element
 {
-    internal static Doc Print(RawNode rawNode, XmlPrintingContext context)
+    internal static Doc Print(RawNode rawNode, PrintingContext context)
     {
         var shouldHugContent = false;
         var attrGroupId = context.GroupFor("element-attr-group-id");

Src/CSharpier.Core/Xml/RawNodePrinters/ElementChildren.cs

@@ -1,12 +1,13 @@
 using System.Xml;
+using CSharpier.Core.CSharp.SyntaxPrinter;
 using CSharpier.Core.DocTypes;
 using CSharpier.Core.Utilities;
 
 namespace CSharpier.Core.Xml.RawNodePrinters;
 
 internal static class ElementChildren
 {
-    public static Doc Print(RawNode node, XmlPrintingContext context)
+    public static Doc Print(RawNode node, PrintingContext context)
     {
         var groupIds = new List<string>();
         foreach (var _ in node.Nodes)
@@ -80,7 +81,7 @@ public static Doc Print(RawNode node, XmlPrintingContext context)
         return Doc.Concat(ref result);
     }
 
-    public static Doc PrintChild(RawNode child, XmlPrintingContext context)
+    public static Doc PrintChild(RawNode child, PrintingContext context)
     {
         // should we try to support csharpier-ignore some day?
         // if (HasPrettierIgnore(child))

Src/CSharpier.Core/Xml/RawNodePrinters/Node.cs

@@ -9,7 +9,7 @@ namespace CSharpier.Core.Xml.RawNodePrinters;
 
 internal static class Node
 {
-    internal static Doc Print(RawNode node, XmlPrintingContext context)
+    internal static Doc Print(RawNode node, PrintingContext context)
     {
         if (node.NodeType == XmlNodeType.XmlDeclaration)
         {

Src/CSharpier.Core/Xml/RawNodePrinters/Tag.cs

@@ -86,7 +86,7 @@ public static Doc PrintClosingTagStart(RawNode rawNode, PrintingContext context)
 
     public static Doc PrintClosingTagStartMarker(RawNode rawNode, PrintingContext context)
     {
-        return $"</{GetPrefixedElementName(rawNode, context)}";
+        return $"</{rawNode.Name}";
     }
 
     public static Doc PrintClosingTagEnd(RawNode rawNode, PrintingContext context)
@@ -121,22 +121,7 @@ private static Doc PrintOpeningTagStartMarker(RawNode rawNode, PrintingContext c
             return "<" + rawNode.Name;
         }
 
-        return $"<{GetPrefixedElementName(rawNode, context)}";
-    }
-
-    private static string GetPrefixedElementName(RawNode rawNode, PrintingContext context)
-    {
-        return rawNode.Name;
-        // var prefix = element.GetPrefixOfNamespace(element.Name.Namespace);
-        // if (
-        //     string.IsNullOrEmpty(prefix)
-        //     || !context.Mapping[element].Name.StartsWith(prefix, StringComparison.Ordinal)
-        // )
-        // {
-        //     return element.Name.LocalName;
-        // }
-        //
-        // return $"{prefix}:{element.Name.LocalName}";
+        return $"<{rawNode.Name}";
     }
 
     private static bool NeedsToBorrowNextOpeningTagStartMarker(RawNode rawNode)

Src/CSharpier.Core/Xml/RawNodeReader.cs

@@ -82,19 +82,21 @@ XmlReader xmlReader
         return elements;
     }
 
-    private static string? GetValue(XmlReader xmlReader, string lineEnding)
+    private static string GetValue(XmlReader xmlReader, string lineEnding)
     {
         var normalizedTextValue = NewlineRegex
 #if !NETSTANDARD2_0
             ()
 #endif
         .Replace(xmlReader.Value, lineEnding);
 
-        return xmlReader.NodeType is XmlNodeType.Text ? normalizedTextValue
-            : xmlReader.NodeType is XmlNodeType.Comment ? $"<!--{normalizedTextValue}-->"
-            : xmlReader.NodeType is XmlNodeType.CDATA ? $"<![CDATA[{normalizedTextValue}]]>"
-            : xmlReader.NodeType is XmlNodeType.ProcessingInstruction
-                ? $"<?{xmlReader.Name} {normalizedTextValue}?>"
-            : null;
+        return xmlReader.NodeType switch
+        {
+            XmlNodeType.Text => normalizedTextValue,
+            XmlNodeType.Comment => $"<!--{normalizedTextValue}-->",
+            XmlNodeType.CDATA => $"<![CDATA[{normalizedTextValue}]]>",
+            XmlNodeType.ProcessingInstruction => $"<?{xmlReader.Name} {normalizedTextValue}?>",
+            _ => string.Empty,
+        };
     }
 }

Src/CSharpier.Core/Xml/XmlFormatter.cs

@@ -26,7 +26,7 @@ internal static CodeFormatterResult Format(string xml, PrinterOptions printerOpt
 
             var lineEnding = PrinterOptions.GetLineEnding(xml, printerOptions);
             var elements = RawNodeReader.ReadAllNodes(xml, lineEnding, xmlReader);
-            var printingContext = new XmlPrintingContext
+            var printingContext = new PrintingContext
             {
                 Options = new PrintingContext.PrintingContextOptions
                 {
@@ -63,48 +63,4 @@ internal static CodeFormatterResult Format(string xml, PrinterOptions printerOpt
             };
         }
     }
-
-    private static readonly JsonSerializerOptions XmlFormatterJsonSerializerOptions = new()
-    {
-        ReferenceHandler = ReferenceHandler.Preserve,
-    };
-
-    private static void CreateMapping(
-        XNode? xNode,
-        XmlNode? xmlNode,
-        Dictionary<XNode, XmlNode> mapping
-    )
-    {
-        if (xNode == null || xmlNode == null)
-        {
-            return;
-        }
-
-        mapping[xNode] = xmlNode;
-
-        if (xNode is not XContainer xContainer)
-        {
-            return;
-        }
-
-        var index = 0;
-        if (xmlNode.ChildNodes[0] is XmlDeclaration)
-        {
-            index++;
-        }
-        foreach (var xChild in xContainer.Nodes())
-        {
-            if (index > xmlNode.ChildNodes.Count)
-            {
-                break;
-            }
-
-            CreateMapping(xChild, xmlNode.ChildNodes[index], mapping);
-
-            index++;
-        }
-    }
 }
-
-// TODO 1679 kill this
-internal class XmlPrintingContext : PrintingContext { }