Adding csproj formatting

.editorconfig

@@ -4,3 +4,5 @@ indent_style = space
 
 [*.{cs,vb}]
 dotnet_diagnostic.RS0041.severity = warning
+dotnet_diagnostic.IDE0065.severity = warning
+csharp_using_directive_placement = outside_namespace

.gitignore

@@ -47,7 +47,6 @@ build
 publish
 
 *.doctree.txt
-*.actual.cst
 *.actual.test
 *.vsix
 /.husky/pre-commit

CHANGELOG.md

@@ -1097,7 +1097,7 @@ host.AddSection(
     tags: Tags.SamplesUsed,
     tasks:
     [
-    // TODO: Add any used third party instruments below as you discover them.
+    // TO-DO: Add any used third party instruments below as you discover them.
     ]
 );
 
@@ -1107,7 +1107,7 @@ host.AddSection(
     tags: Tags.SamplesUsed,
     tasks:
     [
-        // TODO: Add any used third party instruments below as you discover them.
+        // TO-DO: Add any used third party instruments below as you discover them.
     ]
 );
 ```

CSharpier.sln.DotSettings

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Concated/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=csharpier/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=csharpierignore/@EntryIndexedValue">True</s:Boolean>

Directory.Build.props

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <!-- this is the warning generators get when they fail to generate a source file this makes sure the error for it failing is obvious -->
-    <WarningsAsErrors>CS8032</WarningsAsErrors>
+    <WarningsAsErrors>CS8032;CS8033;</WarningsAsErrors>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 </Project>

Shell/UpdateCSharpierRepos.psm1

@@ -46,24 +46,20 @@ function CSH-UpdateCSharpierRepos()
     Set-Location $destination
     & git checkout main
 
-    Get-ChildItem $tempLocation | Copy-Item -Destination $destination -Filter *.cs -Recurse -Force
+    $extensions = (".csproj", ".props", ".targets", ".xml", ".config", ".cs")
+
+    foreach ($extension in $extensions)
+    {
+        Get-ChildItem $tempLocation | Copy-Item -Destination $destination -Filter "*$extension" -Recurse -Force    
+    }
 
+    return
+
     $items = Get-ChildItem -Recurse C:\projects\csharpier-repos -File
     $count = 0
     foreach ($item in $items)
     {
-        if ($item.Name -eq ".git")
-        {
-            Remove-Item -Force -Recurse $item.FullName
-        }
-        elseif ($item.Extension -ne ".cs")
-        {
-            if ($item.Name -ne ".csharpierignore")
-            {
-                Remove-Item $item.FullName
-            }
-        }
-        else
+        if ($item.Extension -eq ".cs")
         {
             # we don't really need all of these files, let's just cut out every other one
             if ($count % 2 -eq 0)
@@ -74,15 +70,6 @@ function CSH-UpdateCSharpierRepos()
         }
     }
 
-    $items = Get-ChildItem C:\projects\csharpier-repos -Directory -Recurse
-    foreach ($item in $items)
-    {
-        if ($item.Name -eq ".git")
-        {
-            Remove-Item -Force -Recurse $item.FullName
-        }
-    }
-
     Set-Location $destination
 
     & git add .

Src/CSharpier.Benchmarks/Program.cs

@@ -2,18 +2,20 @@
 using System.Threading;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Running;
+using Microsoft.CodeAnalysis;
 
 namespace CSharpier.Benchmarks;
 
-using Microsoft.CodeAnalysis;
-
 [MemoryDiagnoser]
 public class Benchmarks
 {
     [Benchmark]
     public void Default_CodeFormatter()
     {
-        CSharpFormatter.FormatAsync(this.largeCode, new PrinterOptions()).GetAwaiter().GetResult();
+        CSharpFormatter
+            .FormatAsync(this.largeCode, new PrinterOptions(Formatter.CSharp))
+            .GetAwaiter()
+            .GetResult();
     }
 
     [Benchmark]

Src/CSharpier.Cli.Tests/CliTests.cs

@@ -1,13 +1,11 @@
-namespace CSharpier.Cli.Tests;
-
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
 using FluentAssertions;
 using NUnit.Framework;
 
+namespace CSharpier.Cli.Tests;
+
 // these tests are kind of nice as c# because they run in the same place.
 // except the one test that has issues with console input redirection
 // they used to be powershell, but doing the multiple file thing didn't work

Src/CSharpier.Cli.Tests/EditorConfig/SectionTests.cs

@@ -1,10 +1,10 @@
-namespace CSharpier.Cli.Tests.EditorConfig;
-
 using CSharpier.Cli.EditorConfig;
 using FluentAssertions;
 using IniParser.Model;
 using NUnit.Framework;
 
+namespace CSharpier.Cli.Tests.EditorConfig;
+
 [TestFixture]
 public class SectionTests
 {

Src/CSharpier.Cli.Tests/ServerTests.cs

@@ -1,14 +1,13 @@
-namespace CSharpier.Cli.Tests;
-
 using System.Diagnostics;
 using System.Net.Http.Json;
-using System.Text;
 using CliWrap;
 using CliWrap.EventStream;
 using CSharpier.Cli.Server;
 using FluentAssertions;
 using NUnit.Framework;
 
+namespace CSharpier.Cli.Tests;
+
 [TestFixture]
 public class ServerTests
 {
@@ -79,7 +78,8 @@ public void RunTwo()
 
         async Task NewFunction()
         {
-            var command = Cli.Wrap("dotnet")
+            var command = CliWrap
+                .Cli.Wrap("dotnet")
                 .WithArguments(path + " --server")
                 .WithValidation(CommandResultValidation.None);
 

Src/CSharpier.Cli/CommandLineFormatter.cs

@@ -3,12 +3,11 @@
 using System.Text;
 using CSharpier.Cli.Options;
 using CSharpier.Utilities;
+using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 
 namespace CSharpier.Cli;
 
-using Microsoft.CodeAnalysis;
-
 internal static class CommandLineFormatter
 {
     public static async Task<int> Format(
@@ -380,18 +379,13 @@ CancellationToken cancellationToken
 
         cancellationToken.ThrowIfCancellationRequested();
 
-        CodeFormatterResult codeFormattingResult;
-
-        var sourceCodeKind = Path.GetExtension(fileToFormatInfo.Path).EqualsIgnoreCase(".csx")
-            ? SourceCodeKind.Script
-            : SourceCodeKind.Regular;
+        CodeFormatterResult? codeFormattingResult;
 
         try
         {
-            codeFormattingResult = await CSharpFormatter.FormatAsync(
+            codeFormattingResult = await CodeFormatter.FormatAsync(
                 fileToFormatInfo.FileContents,
                 printerOptions,
-                sourceCodeKind,
                 cancellationToken
             );
         }
@@ -436,34 +430,44 @@ CancellationToken cancellationToken
 
         if (!commandLineOptions.Fast)
         {
-            var syntaxNodeComparer = new SyntaxNodeComparer(
-                fileToFormatInfo.FileContents,
-                codeFormattingResult.Code,
-                codeFormattingResult.ReorderedModifiers,
-                codeFormattingResult.ReorderedUsingsWithDisabledText,
-                sourceCodeKind,
-                cancellationToken
-            );
-
-            try
+            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
+                    );
+                }
             }
         }
 

Src/CSharpier.Cli/CommandLineOptions.cs

@@ -1,9 +1,8 @@
 using System.CommandLine;
+using Microsoft.Extensions.Logging;
 
 namespace CSharpier.Cli;
 
-using Microsoft.Extensions.Logging;
-
 internal class CommandLineOptions
 {
     public string[] DirectoryOrFilePaths { get; init; } = Array.Empty<string>();

Src/CSharpier.Cli/EditorConfig/EditorConfigSections.cs

@@ -16,14 +16,18 @@ internal class EditorConfigSections
 
         var formatter =
             resolvedConfiguration.Formatter
-            ?? (filePath.EndsWith(".cs") || filePath.EndsWith(".csx") ? "csharp" : null);
+            ?? (
+                filePath.EndsWith(".cs") ? "CSharp"
+                : filePath.EndsWith(".csx") ? "CSharpScript"
+                : null
+            );
 
-        if (formatter == null)
+        if (!Enum.TryParse<Formatter>(formatter, ignoreCase: true, out var parsedFormatter))
         {
             return null;
         }
 
-        var printerOptions = new PrinterOptions { Formatter = formatter };
+        var printerOptions = new PrinterOptions(parsedFormatter);
 
         if (resolvedConfiguration.MaxLineLength is { } maxLineLength)
         {

Src/CSharpier.Cli/EditorConfig/GlobMatcher.cs

@@ -5,9 +5,6 @@
  * From https://github.com/SLaks/Minimatch
  */
 
-#nullable disable
-
-namespace CSharpier.Cli.EditorConfig;
 
 using System;
 using System.Collections.Generic;
@@ -16,6 +13,10 @@ namespace CSharpier.Cli.EditorConfig;
 using System.Text;
 using System.Text.RegularExpressions;
 
+#nullable disable
+
+namespace CSharpier.Cli.EditorConfig;
+
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
 ///<summary>Contains options that control how Minimatch matches strings.</summary>

Src/CSharpier.Cli/EditorConfig/Section.cs

@@ -1,7 +1,7 @@
-namespace CSharpier.Cli.EditorConfig;
-
 using IniParser.Model;
 
+namespace CSharpier.Cli.EditorConfig;
+
 internal class Section
 {
     private readonly GlobMatcher matcher;

Src/CSharpier.Cli/FormattingCache.cs

@@ -3,12 +3,11 @@
 using System.IO.Hashing;
 using System.Text;
 using System.Text.Json;
+using CSharpier.Cli.Options;
 using CSharpier.Utilities;
 
 namespace CSharpier.Cli;
 
-using CSharpier.Cli.Options;
-
 internal interface IFormattingCache
 {
     Task ResolveAsync(CancellationToken cancellationToken);

Src/CSharpier.Cli/Options/CaseInsensitiveEnumConverter.cs

@@ -1,8 +1,8 @@
-namespace CSharpier.Cli.Options;
-
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+namespace CSharpier.Cli.Options;
+
 internal class CaseInsensitiveEnumConverter<TEnum> : JsonConverter<TEnum>
     where TEnum : struct
 {

Src/CSharpier.Cli/Options/ConfigFileParser.cs

@@ -1,11 +1,11 @@
-namespace CSharpier.Cli.Options;
-
 using System.IO.Abstractions;
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
+namespace CSharpier.Cli.Options;
+
 internal static class ConfigFileParser
 {
     private static readonly string[] validExtensions = { ".csharpierrc", ".json", ".yml", ".yaml" };