Merge branch 'main' into badsyntax/diagnostics

belav · Nov 20, 2024 · 78147bd · 78147bd
2 parents f4ccac0 + 88e3d9b
commit 78147bd
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 95 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.29.2",
+      "version": "0.30.1",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-# 0.30.0
+# 0.30.1
+## What's Changed
+Revert tool command back to `dotnet-csharpier`, it was supposed to be changed to `csharpier` for 1.0.0
+
+# 0.30.0
 ## Breaking Changes
 The CSharpier dotnet tool no longer supports net6 & net7.
 ## What's Changed

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0.0-bookworm-slim-amd64 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-bookworm-slim-amd64 AS base
 WORKDIR /app
 ENV ASPNETCORE_URLS=http://+:80
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim-amd64 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0.100-bookworm-slim-amd64 AS build
 
 RUN set -uex \
     && apt-get update \

diff --git a/Nuget/Build.props b/Nuget/Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.30.0</Version>
+    <Version>0.30.1</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/belav/csharpier</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/Src/CSharpier.Cli/CSharpier.Cli.csproj b/Src/CSharpier.Cli/CSharpier.Cli.csproj
@@ -6,7 +6,6 @@
     <AssemblyName>dotnet-csharpier</AssemblyName>
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <PackAsTool>true</PackAsTool>
-    <ToolCommandName>csharpier</ToolCommandName>
     <AssemblyOriginatorKeyFile>../../Nuget/csharpier.snk</AssemblyOriginatorKeyFile>
     <RollForward>Major</RollForward>
     <SignAssembly>True</SignAssembly>

diff --git a/Src/CSharpier.Cli/EditorConfig/ConfigFileParser.cs b/Src/CSharpier.Cli/EditorConfig/ConfigFileParser.cs
@@ -12,16 +12,15 @@ internal static class ConfigFileParser
     // "Comment: starts with a ; or a #."
     private static readonly Regex CommentRegex = new("^[;#].*$");
 
-    private static readonly IniParserConfiguration Configuration =
-        new()
-        {
-            CommentRegex = CommentRegex,
-            AllowDuplicateKeys = true,
-            AllowDuplicateSections = true,
-            OverrideDuplicateKeys = true,
-            SkipInvalidLines = true,
-            ThrowExceptionsOnError = false,
-        };
+    private static readonly IniParserConfiguration Configuration = new()
+    {
+        CommentRegex = CommentRegex,
+        AllowDuplicateKeys = true,
+        AllowDuplicateSections = true,
+        OverrideDuplicateKeys = true,
+        SkipInvalidLines = true,
+        ThrowExceptionsOnError = false,
+    };
 
     public static ConfigFile Parse(string filePath, IFileSystem fileSystem)
     {

diff --git a/Src/CSharpier.Cli/EditorConfig/Globber.cs b/Src/CSharpier.Cli/EditorConfig/Globber.cs
@@ -2,14 +2,13 @@ namespace CSharpier.Cli.EditorConfig;
 
 internal static class Globber
 {
-    private static readonly GlobMatcherOptions globOptions =
-        new()
-        {
-            MatchBase = true,
-            Dot = true,
-            AllowWindowsPaths = true,
-            AllowSingleBraceSets = true,
-        };
+    private static readonly GlobMatcherOptions globOptions = new()
+    {
+        MatchBase = true,
+        Dot = true,
+        AllowWindowsPaths = true,
+        AllowSingleBraceSets = true,
+    };
 
     public static GlobMatcher Create(string files, string directory)
     {

diff --git a/Src/CSharpier.FakeGenerators/Ignored.cs b/Src/CSharpier.FakeGenerators/Ignored.cs
@@ -23,24 +23,22 @@ public static class Ignored
 
     public static readonly Type[] Types = { typeof(TextSpan), typeof(SyntaxTree) };
 
-    public static readonly Dictionary<Type, string[]> PropertiesByType =
-        new()
-        {
-            { typeof(PropertyDeclarationSyntax), new[] { "semicolon" } },
-            { typeof(IndexerDeclarationSyntax), new[] { "semicolon" } },
-            { typeof(SyntaxTrivia), new[] { "token" } },
-            { typeof(SyntaxToken), new[] { "value", "valueText" } },
-            { typeof(ParameterSyntax), new[] { "exclamationExclamationToken" } },
-        };
+    public static readonly Dictionary<Type, string[]> PropertiesByType = new()
+    {
+        { typeof(PropertyDeclarationSyntax), new[] { "semicolon" } },
+        { typeof(IndexerDeclarationSyntax), new[] { "semicolon" } },
+        { typeof(SyntaxTrivia), new[] { "token" } },
+        { typeof(SyntaxToken), new[] { "value", "valueText" } },
+        { typeof(ParameterSyntax), new[] { "exclamationExclamationToken" } },
+    };
 
-    public static readonly HashSet<string> UnsupportedNodes =
-        new()
-        {
-            // if new versions of c# add node types, we need to ignore them in the generators
-            // until codeAnalysis + sdks are updated
-            // global.json doesn't seem to always be respected for builds (namely VS but rider started having the same problem)
-            // which causes the generators to generate code for the new node types
-            // but then the build fails because those types don't exist in the packages the actual project references
-            // "ListPatternSyntax", "SlicePatternSyntax"
-        };
+    public static readonly HashSet<string> UnsupportedNodes = new()
+    {
+        // if new versions of c# add node types, we need to ignore them in the generators
+        // until codeAnalysis + sdks are updated
+        // global.json doesn't seem to always be respected for builds (namely VS but rider started having the same problem)
+        // which causes the generators to generate code for the new node types
+        // but then the build fails because those types don't exist in the packages the actual project references
+        // "ListPatternSyntax", "SlicePatternSyntax"
+    };
 }
diff --git a/Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets b/Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets
@@ -4,6 +4,8 @@
     <CSharpier_FrameworkVersion Condition="'$(CSharpier_FrameworkVersion)' == '' and $([MSBuild]::VersionGreaterThanOrEquals($(NETCoreSdkVersion), '8.0'))">net8.0</CSharpier_FrameworkVersion>
     <CSharpier_FrameworkVersion Condition="'$(CSharpier_FrameworkVersion)' == ''" Label="Fallback">net8.0</CSharpier_FrameworkVersion>
     <CSharpierDllPath>$(MSBuildThisFileDirectory)../tools/csharpier/$(CSharpier_FrameworkVersion)/dotnet-csharpier.dll</CSharpierDllPath>
+    <CSharpier_dotnet_Path Condition="'$(CSharpier_dotnet_Path)' == ''">$(DOTNET_HOST_PATH)</CSharpier_dotnet_Path>
+    <CSharpier_dotnet_Path Condition="'$(CSharpier_dotnet_Path)' == ''">dotnet</CSharpier_dotnet_Path>
     <CSharpierArgs Condition="'$(CSharpier_Check)' == 'true'">$(CSharpierArgs) --check</CSharpierArgs>
     <CSharpierArgs Condition="'$(CSharpier_LogLevel)' != ''">$(CSharpierArgs) --loglevel $(CSharpier_LogLevel)</CSharpierArgs>
     <FirstTargetFramework Condition=" '$(TargetFrameworks)' == '' ">$(TargetFramework)</FirstTargetFramework>
@@ -23,7 +25,7 @@
       StdOutEncoding="utf-8"
       StdErrEncoding="utf-8"
       IgnoreExitCode="true"
-      Command="dotnet &quot;$(CSharpierDllPath)&quot; $(CSharpierArgs) --no-msbuild-check --compilation-errors-as-warnings &quot;$(MSBuildProjectDirectory)&quot; &gt; $(NullOutput) " />
+      Command="&quot;$(CSharpier_dotnet_Path)&quot; exec &quot;$(CSharpierDllPath)&quot; $(CSharpierArgs) --no-msbuild-check --compilation-errors-as-warnings &quot;$(MSBuildProjectDirectory)&quot; &gt; $(NullOutput) " />
   </Target>
 
   <!-- getting this to run a single time for projects that target multiple frameworks requires all of this

diff --git a/Src/CSharpier.Tests/MissingTypeChecker.cs b/Src/CSharpier.Tests/MissingTypeChecker.cs
@@ -70,49 +70,48 @@ public void Ensure_There_Are_No_Missing_Types()
         missingTypes.Should().BeEmpty();
     }
 
-    private readonly HashSet<string> ignored =
-        new()
-        {
-            "AccessorDeclarationSyntax",
-            "AccessorListSyntax",
-            "AttributeArgumentListSyntax",
-            "AttributeArgumentSyntax",
-            "AttributeSyntax",
-            "AttributeTargetSpecifierSyntax",
-            "BaseListSyntax",
-            "CatchDeclarationSyntax",
-            "CatchFilterClauseSyntax",
-            "ConstructorInitializerSyntax",
-            "ConversionOperatorMemberCrefSyntax",
-            "CrefBracketedParameterListSyntax",
-            "CrefParameterListSyntax",
-            "CrefParameterSyntax",
-            "ExplicitInterfaceSpecifierSyntax",
-            "FunctionPointerCallingConventionSyntax",
-            "FunctionPointerParameterListSyntax",
-            "FunctionPointerParameterSyntax",
-            "FunctionPointerUnmanagedCallingConventionListSyntax",
-            "FunctionPointerUnmanagedCallingConventionSyntax",
-            "IndexerMemberCrefSyntax",
-            "InterpolationAlignmentClauseSyntax",
-            "InterpolationFormatClauseSyntax",
-            "JoinIntoClauseSyntax",
-            "LineDirectivePositionSyntax",
-            "NameMemberCrefSyntax",
-            "OperatorMemberCrefSyntax",
-            "OrderingSyntax",
-            "PositionalPatternClauseSyntax",
-            "PropertyPatternClauseSyntax",
-            "QualifiedCrefSyntax",
-            "SubpatternSyntax",
-            "SwitchExpressionArmSyntax",
-            "TypeCrefSyntax",
-            "XmlCrefAttributeSyntax",
-            "XmlElementEndTagSyntax",
-            "XmlElementStartTagSyntax",
-            "XmlNameAttributeSyntax",
-            "XmlNameSyntax",
-            "XmlPrefixSyntax",
-            "XmlTextAttributeSyntax",
-        };
+    private readonly HashSet<string> ignored = new()
+    {
+        "AccessorDeclarationSyntax",
+        "AccessorListSyntax",
+        "AttributeArgumentListSyntax",
+        "AttributeArgumentSyntax",
+        "AttributeSyntax",
+        "AttributeTargetSpecifierSyntax",
+        "BaseListSyntax",
+        "CatchDeclarationSyntax",
+        "CatchFilterClauseSyntax",
+        "ConstructorInitializerSyntax",
+        "ConversionOperatorMemberCrefSyntax",
+        "CrefBracketedParameterListSyntax",
+        "CrefParameterListSyntax",
+        "CrefParameterSyntax",
+        "ExplicitInterfaceSpecifierSyntax",
+        "FunctionPointerCallingConventionSyntax",
+        "FunctionPointerParameterListSyntax",
+        "FunctionPointerParameterSyntax",
+        "FunctionPointerUnmanagedCallingConventionListSyntax",
+        "FunctionPointerUnmanagedCallingConventionSyntax",
+        "IndexerMemberCrefSyntax",
+        "InterpolationAlignmentClauseSyntax",
+        "InterpolationFormatClauseSyntax",
+        "JoinIntoClauseSyntax",
+        "LineDirectivePositionSyntax",
+        "NameMemberCrefSyntax",
+        "OperatorMemberCrefSyntax",
+        "OrderingSyntax",
+        "PositionalPatternClauseSyntax",
+        "PropertyPatternClauseSyntax",
+        "QualifiedCrefSyntax",
+        "SubpatternSyntax",
+        "SwitchExpressionArmSyntax",
+        "TypeCrefSyntax",
+        "XmlCrefAttributeSyntax",
+        "XmlElementEndTagSyntax",
+        "XmlElementStartTagSyntax",
+        "XmlNameAttributeSyntax",
+        "XmlNameSyntax",
+        "XmlPrefixSyntax",
+        "XmlTextAttributeSyntax",
+    };
 }
diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierOptions.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierOptions.cs
@@ -55,8 +55,10 @@ protected void LoadFrom(CSharpierOptions newInstance)
             this.DisableCSharpierServer = newInstance.DisableCSharpierServer;
         }
 
-        private static readonly AsyncLazy<CSharpierOptions> liveModel =
-            new(CreateAsync, ThreadHelper.JoinableTaskFactory);
+        private static readonly AsyncLazy<CSharpierOptions> liveModel = new(
+            CreateAsync,
+            ThreadHelper.JoinableTaskFactory
+        );
 
         private static FileSystemWatcher _hotReloadWatcher;
 

diff --git a/Src/CSharpier/DocTypes/Doc.cs b/Src/CSharpier/DocTypes/Doc.cs
@@ -29,8 +29,10 @@ public static implicit operator Doc(string value)
 
     public static readonly HardLine HardLineIfNoPreviousLine = new(true);
 
-    public static readonly HardLine HardLineIfNoPreviousLineSkipBreakIfFirstInGroup =
-        new(true, true);
+    public static readonly HardLine HardLineIfNoPreviousLineSkipBreakIfFirstInGroup = new(
+        true,
+        true
+    );
 
     public static readonly LiteralLine LiteralLine = new();
 

diff --git a/Src/CSharpier/Formatters/CSharp/PreprocessorSymbols.cs b/Src/CSharpier/Formatters/CSharp/PreprocessorSymbols.cs
@@ -4,8 +4,10 @@ internal class PreprocessorSymbols : CSharpSyntaxWalker
 {
     private readonly List<string[]> symbolSets = new();
     private readonly HashSet<string> squashedSymbolSets = new();
-    private SymbolContext CurrentContext =
-        new() { ParentContext = new SymbolContext { ParentContext = null! } };
+    private SymbolContext CurrentContext = new()
+    {
+        ParentContext = new SymbolContext { ParentContext = null! },
+    };
 
     private PreprocessorSymbols()
         : base(SyntaxWalkerDepth.Trivia) { }