Fixing more issues

belav · Nov 11, 2024 · 968cef9 · 968cef9
1 parent 6264407
commit 968cef9
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 191 deletions.
diff --git a/Src/CSharpier.Cli/CommandLineFormatter.cs b/Src/CSharpier.Cli/CommandLineFormatter.cs
@@ -176,9 +176,9 @@ CancellationToken cancellationToken
                 cancellationToken
             );
 
-            var originalDirectoryOrFile = commandLineOptions.OriginalDirectoryOrFilePaths[
-                x
-            ].Replace("\\", "/");
+            var originalDirectoryOrFile = commandLineOptions
+                .OriginalDirectoryOrFilePaths[x]
+                .Replace("\\", "/");
 
             var formattingCache = await FormattingCacheFactory.InitializeAsync(
                 commandLineOptions,
@@ -254,8 +254,12 @@ await FormatPhysicalFile(
                     return 1;
                 }
 
-                var tasks = fileSystem.Directory
-                    .EnumerateFiles(directoryOrFilePath, "*.*", SearchOption.AllDirectories)
+                var tasks = fileSystem
+                    .Directory.EnumerateFiles(
+                        directoryOrFilePath,
+                        "*.*",
+                        SearchOption.AllDirectories
+                    )
                     .Select(o =>
                     {
                         var normalizedPath = o.Replace("\\", "/");
@@ -423,45 +427,47 @@ CancellationToken cancellationToken
             fileIssueLogger.WriteError(codeFormattingResult.FailureMessage);
             return;
         }
-
-        // TODO #819 review this https://github.com/belav/csharpier-repos/pull/67
-        // TODO #819 what about allowing lines between elements? new issue?
-
-        if (!commandLineOptions.Fast && fileToFormatInfo.Path.EndsWithIgnoreCase(".cs"))
-        {
-            // TODO #819 the thing above should do this if we are using the csharp formatter
-            var sourceCodeKind = Path.GetExtension(fileToFormatInfo.Path).EqualsIgnoreCase(".csx")
-                ? SourceCodeKind.Script
-                : SourceCodeKind.Regular;
-
-            var syntaxNodeComparer = new SyntaxNodeComparer(
-                fileToFormatInfo.FileContents,
-                codeFormattingResult.Code,
-                codeFormattingResult.ReorderedModifiers,
-                codeFormattingResult.ReorderedUsingsWithDisabledText,
-                sourceCodeKind,
-                cancellationToken
-            );
 
-            try
+        if (!commandLineOptions.Fast)
+        {
+            if (printerOptions.Formatter is Formatter.CSharp or Formatter.CSharpScript)
             {
-                var failure = await syntaxNodeComparer.CompareSourceAsync(cancellationToken);
-                if (!string.IsNullOrEmpty(failure))
+                var sourceCodeKind =
+                    printerOptions.Formatter is Formatter.CSharpScript
+                        ? SourceCodeKind.Script
+                        : SourceCodeKind.Regular;
+
+                var syntaxNodeComparer = new SyntaxNodeComparer(
+                    fileToFormatInfo.FileContents,
+                    codeFormattingResult.Code,
+                    codeFormattingResult.ReorderedModifiers,
+                    codeFormattingResult.ReorderedUsingsWithDisabledText,
+                    sourceCodeKind,
+                    cancellationToken
+                );
+
+                try
+                {
+                    var failure = await syntaxNodeComparer.CompareSourceAsync(cancellationToken);
+                    if (!string.IsNullOrEmpty(failure))
+                    {
+                        Interlocked.Increment(
+                            ref commandLineFormatterResult.FailedSyntaxTreeValidation
+                        );
+                        fileIssueLogger.WriteError($"Failed syntax tree validation.\n{failure}");
+                    }
+                }
+                catch (Exception ex)
                 {
                     Interlocked.Increment(
-                        ref commandLineFormatterResult.FailedSyntaxTreeValidation
+                        ref commandLineFormatterResult.ExceptionsValidatingSource
                     );
-                    fileIssueLogger.WriteError($"Failed syntax tree validation.\n{failure}");
-                }
-            }
-            catch (Exception ex)
-            {
-                Interlocked.Increment(ref commandLineFormatterResult.ExceptionsValidatingSource);
 
-                fileIssueLogger.WriteError(
-                    "Failed with exception during syntax tree validation.",
-                    ex
-                );
+                    fileIssueLogger.WriteError(
+                        "Failed with exception during syntax tree validation.",
+                        ex
+                    );
+                }
             }
         }
 

diff --git a/Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs b/Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs
@@ -6,9 +6,7 @@ namespace CSharpier.Cli.Options;
 internal class ConfigurationFileOptions
 {
     public int PrintWidth { get; init; } = 100;
-
-    // TODO #819 how do we get this to default to 2 for xml?
-    public int TabWidth { get; init; } = 4;
+    public int? TabWidth { get; init; }
     public bool UseTabs { get; init; }
 
     [JsonConverter(typeof(CaseInsensitiveEnumConverter<EndOfLine>))]
@@ -42,14 +40,12 @@ out var parsedFormatter
             };
         }
 
-        // TODO #819 we need a default one for xml as well
-        if (filePath.EndsWith(".cs") || filePath.EndsWith(".csx"))
+        var formatter = PrinterOptions.GetFormatter(filePath);
+        if (formatter != Formatter.Unknown)
         {
-            return new PrinterOptions(
-                filePath.EndsWith(".cs") ? Formatter.CSharp : Formatter.CSharpScript
-            )
+            return new PrinterOptions(formatter)
             {
-                IndentSize = this.TabWidth,
+                IndentSize = this.TabWidth ?? (formatter == Formatter.XML ? 2 : 4),
                 UseTabs = this.UseTabs,
                 Width = this.PrintWidth,
                 EndOfLine = this.EndOfLine,

diff --git a/Src/CSharpier.Cli/Options/OptionsProvider.cs b/Src/CSharpier.Cli/Options/OptionsProvider.cs
@@ -110,28 +110,8 @@ public static async Task<OptionsProvider> Create(
             return resolvedEditorConfig.ConvertToPrinterOptions(filePath);
         }
 
-        if (filePath.EndsWith(".cs"))
-        {
-            return new PrinterOptions(Formatter.CSharp);
-        }
-
-        if (filePath.EndsWith(".csx"))
-        {
-            return new PrinterOptions(Formatter.CSharpScript);
-        }
-
-        if (
-            filePath.EndsWith(".csproj")
-            || filePath.EndsWith(".props")
-            || filePath.EndsWith(".targets")
-            || filePath.EndsWith(".xml")
-            || filePath.EndsWith(".config")
-        )
-        {
-            return new PrinterOptions(Formatter.XML);
-        }
-
-        return null;
+        var formatter = PrinterOptions.GetFormatter(filePath);
+        return formatter != Formatter.Unknown ? new PrinterOptions(formatter) : null;
     }
 
     public bool IsIgnored(string actualFilePath)

diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/xml/XmlDocumentType.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/xml/XmlDocumentType.test
@@ -0,0 +1,6 @@
+<!-- ====================================================================== -->
+<!-- This XML is a description of the Common Language Infrastructure (CLI) library. -->
+<!-- This file is a normative part of Partition IV of the following standards: ISO/IEC 23271 and ECMA 335 -->
+<!-- ====================================================================== -->
+<!DOCTYPE Libraries SYSTEM "CLILibraryTypes.dtd">
+<root></root>
diff --git a/Src/CSharpier.Tests/Samples/AllInOne.test b/Src/CSharpier.Tests/Samples/AllInOne.test
@@ -1 +1 @@
-Doc.HardLineIfNoPreviousLine
+
diff --git a/Src/CSharpier.Tests/Samples/Scratch.test b/Src/CSharpier.Tests/Samples/Scratch.test
@@ -1 +1 @@
-Doc.HardLineIfNoPreviousLine
+
diff --git a/Src/CSharpier/Formatters/Xml/XmlFormatter.cs b/Src/CSharpier/Formatters/Xml/XmlFormatter.cs
@@ -12,8 +12,17 @@ internal static CodeFormatterResult Format(string xml, PrinterOptions printerOpt
         var xmlDocument = new XmlDocument();
         xmlDocument.LoadXml(xml);
 
+        // TODO #819 Error ./efcore/eng/sdl-tsa-vars.config - Threw exception while formatting.
+        // Data at the root level is invalid. Line 1, position 1.
+        // not all configs are xml, should we try to detect that?
+
+        // TODO #819 review this https://github.com/belav/csharpier-repos/pull/67
+
         /* TODO #819 all of these things
 
+XmlDocumentType
+https://github.com/belav/csharpier-repos/blob/main/mono/mcs/tools/mdoc/Test/TestEcmaDocs.xml
+
 still getting this
 warning: in the working copy of 'runtime/src/tests/Common/mergedrunner.targets', LF will be replaced by CRLF the next time Git touches it
 

diff --git a/Src/CSharpier/Formatters/Xml/XmlNodePrinters/Attribute.cs b/Src/CSharpier/Formatters/Xml/XmlNodePrinters/Attribute.cs
@@ -42,18 +42,6 @@ public static Doc Print(XmlElement node, PrintingContext context)
             node.Attributes.Count == 1
             && !node.Attributes[0].Value.Contains('\n')
             && (node.ChildNodes.Cast<XmlNode>().Any(o => o is XmlElement) || node.IsEmpty);
-        // node.type === "element" &&
-        // node.fullName === "script" &&
-        // node.attrs.length === 1 &&
-        // node.attrs[0].fullName === "src" &&
-        // node.children.length === 0;
-
-        // TODO #819 probably attribute per line if there are more than x attributes
-        // const shouldPrintAttributePerLine =
-        //     options.singleAttributePerLine &&
-        //     node.attrs.length > 1 &&
-        //     !isVueSfcBlock(node, options);
-        // const attributeLine = shouldPrintAttributePerLine ? hardline : line;
         var attributeLine = Doc.Line;
 
         var parts = new List<Doc>

diff --git a/Src/CSharpier/Formatters/Xml/XmlNodePrinters/Node.cs b/Src/CSharpier/Formatters/Xml/XmlNodePrinters/Node.cs
@@ -1,4 +1,5 @@
 using System.Xml;
+using System.Xml.Linq;
 using CSharpier.SyntaxPrinter;
 
 namespace CSharpier.Formatters.Xml.XmlNodePrinters;
@@ -25,6 +26,11 @@ internal static Doc Print(XmlNode xmlNode, PrintingContext context)
             return xmlDeclaration.OuterXml;
         }
 
+        if (xmlNode is XmlDocumentType xmlDocumentType)
+        {
+            return xmlDocumentType.OuterXml.Replace("[]", string.Empty);
+        }
+
         if (xmlNode is XmlElement xmlElement)
         {
             return Element.Print(xmlElement, context);
@@ -35,7 +41,7 @@ internal static Doc Print(XmlNode xmlNode, PrintingContext context)
             List<Doc> doc =
             [
                 Tag.PrintOpeningTagPrefix(xmlText),
-                .. Utils.GetTextValueParts(xmlText),
+                .. GetTextValueParts(xmlText),
                 Tag.PrintClosingTagSuffix(xmlText),
             ];
 
@@ -46,15 +52,6 @@ .. Utils.GetTextValueParts(xmlText),
             }
 
             return Doc.Concat(doc);
-
-            // var printed = CleanDoc(doc);
-            //
-            //
-            // // if (Array.isArray(printed)) {
-            // //     return fill(printed);
-            // // }
-            //
-            // return printed;
         }
 
         if (xmlNode is XmlComment)
@@ -69,4 +66,14 @@ .. Utils.GetTextValueParts(xmlText),
 
         throw new Exception("Need to handle + " + xmlNode);
     }
+
+    private static IEnumerable<Doc> GetTextValueParts(XmlText xmlText)
+    {
+        if (xmlText.Value is null)
+        {
+            yield break;
+        }
+
+        yield return new XElement("EncodeText", xmlText.Value).LastNode!.ToString();
+    }
 }
diff --git a/Src/CSharpier/Formatters/Xml/XmlNodePrinters/Utils.cs b/Src/CSharpier/Formatters/Xml/XmlNodePrinters/Utils.cs