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

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>

Scripts/UpdateCSharpierRepos.ps1

@@ -0,0 +1,68 @@
+$repositories = @()
+$repositories += "https://github.com/dotnet/aspnetcore.git"
+$repositories += "https://github.com/aspnet/AspNetWebStack.git"
+$repositories += "https://github.com/AutoMapper/AutoMapper.git"
+$repositories += "https://github.com/castleproject/Core.git"
+$repositories += "https://github.com/dotnet/command-line-api.git"
+$repositories += "https://github.com/dotnet/format.git"
+$repositories += "https://github.com/dotnet/efcore.git"
+$repositories += "https://github.com/moq/moq4.git"
+$repositories += "https://github.com/JamesNK/Newtonsoft.Json.git"
+$repositories += "https://github.com/dotnet/roslyn.git"
+$repositories += "https://github.com/dotnet/runtime.git"
+$repositories += "https://github.com/mono/mono.git"
+$repositories += "https://github.com/increase-POS/Res-Server.git"
+
+$tempLocation = "c:\temp\UpdateRepos"
+
+if (-not (Test-Path $tempLocation)) {
+    New-Item $tempLocation -Force -ItemType Directory
+}
+
+Set-Location $tempLocation
+
+$ErrorActionPreference = "Continue"
+
+foreach ($repository in $repositories) {
+    $repoFolder = $tempLocation + "/" + (Split-Path $repositories -Leaf).Replace(".git", "")
+    if (Test-Path $repoFolder) {
+        Set-Location $repoFolder
+        & git pull origin
+        Set-Location $tempLocation
+    }
+    else {
+        & git clone $repository
+    }
+}
+
+$destination = "C:\projects\csharpier-repos\"
+Set-Location $destination
+& git checkout main
+
+Get-ChildItem $tempLocation | Copy-Item -Destination $destination -Recurse -Force
+
+$extensions = (".cs", ".csproj", ".props", ".targets")
+
+$items = Get-ChildItem -Recurse C:\projects\csharpier-repos -File
+foreach ($item in $items) {
+    if ($item.Name -eq ".git") {
+        Remove-Item -Force -Recurse $item.FullName
+    }
+
+    if (-not ($extensions.Contains($item.Extension)) -and  $item.Name -ne ".csharpierignore") {
+        Remove-Item $item.FullName
+    }
+}
+
+$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 .
+& git commit -m "Updating repos"
+& git push origin

Src/CSharpier.Benchmarks/Program.cs

@@ -2,11 +2,10 @@
 using System.Threading;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Running;
+using Microsoft.CodeAnalysis;
 
 namespace CSharpier.Benchmarks;
 
-using Microsoft.CodeAnalysis;
-
 [MemoryDiagnoser]
 public class Benchmarks
 {

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(
@@ -177,9 +176,9 @@ CancellationToken cancellationToken
                 cancellationToken
             );
 
-            var originalDirectoryOrFile = commandLineOptions
-                .OriginalDirectoryOrFilePaths[x]
-                .Replace("\\", "/");
+            var originalDirectoryOrFile = commandLineOptions.OriginalDirectoryOrFilePaths[
+                x
+            ].Replace("\\", "/");
 
             var formattingCache = await FormattingCacheFactory.InitializeAsync(
                 commandLineOptions,
@@ -255,12 +254,8 @@ 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("\\", "/");
@@ -380,18 +375,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
             );
         }
@@ -434,8 +424,17 @@ CancellationToken cancellationToken
             return;
         }
 
-        if (!commandLineOptions.Fast)
+        // TODO xml implement this stuff - maybe new PR?
+        // https://github.com/belav/csharpier/pull/858#issuecomment-1487385384
+        // TODO xml review this https://github.com/belav/csharpier-repos/pull/67
+        // TODO xml what about allowing lines between elements?
+        if (!commandLineOptions.Fast && fileToFormatInfo.Path.EndsWithIgnoreCase(".cs"))
         {
+            // TODO xml 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,

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 { Formatter = 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" };