Supporting c# 12

.github/workflows/format_repositories.yml

@@ -14,7 +14,7 @@ jobs:
           path: csharpier
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.0.100'
+          dotnet-version: '7.0.304'
       - uses: actions/checkout@v2
         with:
           repository: belav/csharpier-repos

.github/workflows/publish_nuget.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: |
-            7.0.100
+            7.0.304
             6.0.300
       - run: dotnet test Src/CSharpier.Tests/CSharpier.Tests.csproj
   publish-nuget:
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: |
-            7.0.100
+            7.0.304
             6.0.300
       - name: Publish CSharpier.Core library on version change
         uses: alirezanet/publish-nuget@v3.0.4

.github/workflows/validate_pull_request.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: | 
-            7.0.100
+            7.0.304
             6.0.300
       - run: |
           dotnet build CSharpier.sln -c release
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: |
-            7.0.100
+            7.0.304
             6.0.300
       - run: |
           dotnet tool restore
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: |
-            7.0.100
+            7.0.304
             6.0.300
       - run: |
           dotnet build Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj

Directory.Packages.props

@@ -10,22 +10,22 @@
     <PackageVersion Include="FluentAssertions" Version="5.10.3" />
     <PackageVersion Include="Ignore" Version="0.1.42" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.6.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageVersion Include="NUnit" Version="3.12.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.0.0" />
     <PackageVersion Include="PolySharp" Version="1.13.1" />
-    <PackageVersion Include="Scriban" Version="4.0.1" />
+    <PackageVersion Include="Scriban" Version="5.7.0" />
     <PackageVersion Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
     <PackageVersion Include="System.IO.Abstractions" Version="13.2.29" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="13.2.29" />
     <PackageVersion Include="System.IO.Hashing" Version="7.0.0-preview.7.22375.6" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <PackageVersion Include="System.Text.Json" Version="7.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="YamlDotNet" Version="11.1.1" />

Dockerfile

@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0.100 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0.304 AS build
 
 RUN apt-get update  && \
   apt-get install curl gnupg -yq && \

Src/CSharpier.FakeGenerators/CSharpier.FakeGenerators.csproj

@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
 </Project>

Src/CSharpier.Generators/CSharpier.Generators.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <PackageScribanIncludeSource>true</PackageScribanIncludeSource>
     <LangVersion>10</LangVersion>
     <NoWarn>SYSLIB0013</NoWarn>

Src/CSharpier.Tests.Generators/CSharpier.Tests.Generators.csproj

@@ -2,14 +2,15 @@
   <PropertyGroup>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <PackageScribanIncludeSource>true</PackageScribanIncludeSource>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <NoWarn>SYSLIB0013</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common"/>
-    <PackageReference Include="Scriban" IncludeAssets="Build"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" />
+    <PackageReference Include="Scriban" IncludeAssets="Build" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="@(None -&gt; WithMetadataValue('Extension', '.sbntxt'))"/>
+    <EmbeddedResource Include="@(None -&gt; WithMetadataValue('Extension', '.sbntxt'))" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\CSharpier.Generators\TemplatedGenerator.cs">

Src/CSharpier.Tests/FormattingTests/TestFiles/cs/ClassDeclarations.test

@@ -59,3 +59,17 @@ public class IdentityDbContext<TUser, TRole, TKey>
     where TKey : IEquatable<TKey> { }
 
 file class FileScopedType { }
+
+public class NamedItem(string name)
+{
+    public string Name => name;
+}
+
+public class NamedItem2(
+    string name1________________________________,
+    string name2________________________________
+)
+{
+    public string Name1 => name1;
+    public string Name2 => name1;
+}

Src/CSharpier.Tests/FormattingTests/TestFiles/cs/UsingDirectives.test

@@ -11,6 +11,7 @@ static // static trailing
 Third;
 
 using M = System.Math;
+using Point = (int x, int y);
 
 using static System.Math;
 

Src/CSharpier/CSharpier.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../Nuget/Build.props"/>
+  <Import Project="../../Nuget/Build.props" />
   <PropertyGroup>
     <PackageId>CSharpier.Core</PackageId>
     <TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>

Src/CSharpier/SyntaxNodeComparer.generated.cs

@@ -1023,6 +1023,8 @@ private CompareResult CompareClassDeclarationSyntax(ClassDeclarationSyntax origi
             if (result.IsInvalid) return result;
             result = this.Compare(originalNode.OpenBraceToken, formattedNode.OpenBraceToken, originalNode, formattedNode);
             if (result.IsInvalid) return result;
+            originalStack.Push((originalNode.ParameterList, originalNode));
+            formattedStack.Push((formattedNode.ParameterList, formattedNode));
             result = this.Compare(originalNode.SemicolonToken, formattedNode.SemicolonToken, originalNode, formattedNode);
             if (result.IsInvalid) return result;
             originalStack.Push((originalNode.TypeParameterList, originalNode));
@@ -2130,6 +2132,8 @@ private CompareResult CompareInterfaceDeclarationSyntax(InterfaceDeclarationSynt
             if (result.IsInvalid) return result;
             result = this.Compare(originalNode.OpenBraceToken, formattedNode.OpenBraceToken, originalNode, formattedNode);
             if (result.IsInvalid) return result;
+            originalStack.Push((originalNode.ParameterList, originalNode));
+            formattedStack.Push((formattedNode.ParameterList, formattedNode));
             result = this.Compare(originalNode.SemicolonToken, formattedNode.SemicolonToken, originalNode, formattedNode);
             if (result.IsInvalid) return result;
             originalStack.Push((originalNode.TypeParameterList, originalNode));
@@ -3325,6 +3329,8 @@ private CompareResult CompareStructDeclarationSyntax(StructDeclarationSyntax ori
             if (result.IsInvalid) return result;
             result = this.Compare(originalNode.OpenBraceToken, formattedNode.OpenBraceToken, originalNode, formattedNode);
             if (result.IsInvalid) return result;
+            originalStack.Push((originalNode.ParameterList, originalNode));
+            formattedStack.Push((formattedNode.ParameterList, formattedNode));
             result = this.Compare(originalNode.SemicolonToken, formattedNode.SemicolonToken, originalNode, formattedNode);
             if (result.IsInvalid) return result;
             originalStack.Push((originalNode.TypeParameterList, originalNode));
@@ -3641,10 +3647,14 @@ private CompareResult CompareUsingDirectiveSyntax(UsingDirectiveSyntax originalN
             if (originalNode.IsMissing != formattedNode.IsMissing) return NotEqual(originalNode, formattedNode);
             originalStack.Push((originalNode.Name, originalNode));
             formattedStack.Push((formattedNode.Name, formattedNode));
+            originalStack.Push((originalNode.NamespaceOrType, originalNode));
+            formattedStack.Push((formattedNode.NamespaceOrType, formattedNode));
             result = this.Compare(originalNode.SemicolonToken, formattedNode.SemicolonToken, originalNode, formattedNode);
             if (result.IsInvalid) return result;
             result = this.Compare(originalNode.StaticKeyword, formattedNode.StaticKeyword, originalNode, formattedNode);
             if (result.IsInvalid) return result;
+            result = this.Compare(originalNode.UnsafeKeyword, formattedNode.UnsafeKeyword, originalNode, formattedNode);
+            if (result.IsInvalid) return result;
             result = this.Compare(originalNode.UsingKeyword, formattedNode.UsingKeyword, originalNode, formattedNode);
             if (result.IsInvalid) return result;
             return Equal;

Src/CSharpier/SyntaxNodeJsonWriter.generated.cs

@@ -1505,6 +1505,12 @@ public static void WriteClassDeclarationSyntax(StringBuilder builder, ClassDecla
                 WriteSyntaxToken(openBraceTokenBuilder, syntaxNode.OpenBraceToken);
                 properties.Add($"\"openBraceToken\":{openBraceTokenBuilder.ToString()}");
             }
+            if (syntaxNode.ParameterList != default(ParameterListSyntax))
+            {
+                var parameterListBuilder = new StringBuilder();
+                WriteParameterListSyntax(parameterListBuilder, syntaxNode.ParameterList);
+                properties.Add($"\"parameterList\":{parameterListBuilder.ToString()}");
+            }
             if (syntaxNode.SemicolonToken != default(SyntaxToken))
             {
                 var semicolonTokenBuilder = new StringBuilder();
@@ -4400,6 +4406,12 @@ public static void WriteInterfaceDeclarationSyntax(StringBuilder builder, Interf
                 WriteSyntaxToken(openBraceTokenBuilder, syntaxNode.OpenBraceToken);
                 properties.Add($"\"openBraceToken\":{openBraceTokenBuilder.ToString()}");
             }
+            if (syntaxNode.ParameterList != default(ParameterListSyntax))
+            {
+                var parameterListBuilder = new StringBuilder();
+                WriteParameterListSyntax(parameterListBuilder, syntaxNode.ParameterList);
+                properties.Add($"\"parameterList\":{parameterListBuilder.ToString()}");
+            }
             if (syntaxNode.SemicolonToken != default(SyntaxToken))
             {
                 var semicolonTokenBuilder = new StringBuilder();
@@ -7465,6 +7477,12 @@ public static void WriteStructDeclarationSyntax(StringBuilder builder, StructDec
                 WriteSyntaxToken(openBraceTokenBuilder, syntaxNode.OpenBraceToken);
                 properties.Add($"\"openBraceToken\":{openBraceTokenBuilder.ToString()}");
             }
+            if (syntaxNode.ParameterList != default(ParameterListSyntax))
+            {
+                var parameterListBuilder = new StringBuilder();
+                WriteParameterListSyntax(parameterListBuilder, syntaxNode.ParameterList);
+                properties.Add($"\"parameterList\":{parameterListBuilder.ToString()}");
+            }
             if (syntaxNode.SemicolonToken != default(SyntaxToken))
             {
                 var semicolonTokenBuilder = new StringBuilder();
@@ -8251,6 +8269,12 @@ public static void WriteUsingDirectiveSyntax(StringBuilder builder, UsingDirecti
                 WriteSyntaxNode(nameBuilder, syntaxNode.Name);
                 properties.Add($"\"name\":{nameBuilder.ToString()}");
             }
+            if (syntaxNode.NamespaceOrType != default(TypeSyntax))
+            {
+                var namespaceOrTypeBuilder = new StringBuilder();
+                WriteSyntaxNode(namespaceOrTypeBuilder, syntaxNode.NamespaceOrType);
+                properties.Add($"\"namespaceOrType\":{namespaceOrTypeBuilder.ToString()}");
+            }
             if (syntaxNode.SemicolonToken != default(SyntaxToken))
             {
                 var semicolonTokenBuilder = new StringBuilder();
@@ -8263,6 +8287,12 @@ public static void WriteUsingDirectiveSyntax(StringBuilder builder, UsingDirecti
                 WriteSyntaxToken(staticKeywordBuilder, syntaxNode.StaticKeyword);
                 properties.Add($"\"staticKeyword\":{staticKeywordBuilder.ToString()}");
             }
+            if (syntaxNode.UnsafeKeyword != default(SyntaxToken))
+            {
+                var unsafeKeywordBuilder = new StringBuilder();
+                WriteSyntaxToken(unsafeKeywordBuilder, syntaxNode.UnsafeKeyword);
+                properties.Add($"\"unsafeKeyword\":{unsafeKeywordBuilder.ToString()}");
+            }
             if (syntaxNode.UsingKeyword != default(SyntaxToken))
             {
                 var usingKeywordBuilder = new StringBuilder();

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/BaseTypeDeclaration.cs

@@ -30,6 +30,7 @@ public static Doc Print(BaseTypeDeclarationSyntax node, FormattingContext contex
             if (node is ClassDeclarationSyntax classDeclarationSyntax)
             {
                 keyword = classDeclarationSyntax.Keyword;
+                parameterList = classDeclarationSyntax.ParameterList;
             }
             else if (node is StructDeclarationSyntax structDeclarationSyntax)
             {

Src/CSharpier/SyntaxPrinter/SyntaxNodePrinters/UsingDirective.cs

@@ -14,7 +14,7 @@ public static Doc Print(
             Token.PrintWithSuffix(node.UsingKeyword, " ", context),
             Token.PrintWithSuffix(node.StaticKeyword, " ", context),
             node.Alias == null ? Doc.Null : NameEquals.Print(node.Alias, context),
-            Node.Print(node.Name, context),
+            Node.Print(node.NamespaceOrType, context),
             Token.Print(node.SemicolonToken, context)
         );
     }

Src/SyntaxFinder/SyntaxFinder.csproj

@@ -3,6 +3,6 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "7.0.304",
     "rollForward": "latestFeature"
   }
 }