wip

meziantou · Nov 13, 2024 · a3a2b81 · a3a2b81
1 parent 823451f
commit a3a2b81
Show file tree

Hide file tree

Showing 26 changed files with 41 additions and 154 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -39,11 +39,15 @@ indent_size = 2
 insert_final_newline = true
 
 [*.cs]
+dotnet_diagnostic.IDE0058.severity = none
+dotnet_diagnostic.IDE0303.severity = none
+dotnet_diagnostic.CA1508.severity = none
+dotnet_diagnostic.CA2000.severity = none
 dotnet_diagnostic.RS1041.severity = none
 dotnet_diagnostic.RS2008.severity = none
-dotnet_diagnostic.CA1508.severity = none
-dotnet_diagnostic.IDE0303.severity = none
 
 [src/ListDotNetTypes/*.cs]
 dotnet_diagnostic.CA2007.severity = none
-dotnet_diagnostic.MA0004.severity = none
+dotnet_diagnostic.MA0004.severity = none
+
+
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Meziantou.DotNet.CodingStandard" Version="1.0.139">
+    <PackageReference Include="Meziantou.DotNet.CodingStandard" Version="1.0.142">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/src/ListDotNetTypes/ListDotNetTypes.csproj b/src/ListDotNetTypes/ListDotNetTypes.csproj
@@ -9,8 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.Protocol" Version="6.11.1" />
-    <PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
+    <PackageReference Include="NuGet.Protocol" Version="6.12.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ListDotNetTypes/Program.cs b/src/ListDotNetTypes/Program.cs
@@ -27,7 +27,9 @@
         Console.WriteLine(packageName + "@" + latestVersion);
 
         using var packageStream = new MemoryStream();
-        await resource.CopyNupkgToStreamAsync(packageName, latestVersion, packageStream, cache, NullLogger.Instance, CancellationToken.None);
+        if (!await resource.CopyNupkgToStreamAsync(packageName, latestVersion, packageStream, cache, NullLogger.Instance, CancellationToken.None))
+            throw new InvalidOperationException("Cannot copy NuGet package");
+
         packageStream.Seek(0, SeekOrigin.Begin);
 
         using var zipArchive = new ZipArchive(packageStream, ZipArchiveMode.Read);

diff --git a/src/Meziantou.Analyzer.Annotations/RequireNamedArgumentAttribute.cs b/src/Meziantou.Analyzer.Annotations/RequireNamedArgumentAttribute.cs
@@ -1,7 +1,6 @@
 #pragma warning disable CS1591
 #pragma warning disable IDE0060
 #pragma warning disable CA1019
-#nullable disable
 
 namespace Meziantou.Analyzer.Annotations;
 

diff --git a/src/Meziantou.Analyzer.Annotations/StructuredLogFieldAttribute.cs b/src/Meziantou.Analyzer.Annotations/StructuredLogFieldAttribute.cs
@@ -2,7 +2,6 @@
 #pragma warning disable IDE0060
 #pragma warning disable IDE0290
 #pragma warning disable CA1019
-#nullable disable
 
 namespace Meziantou.Analyzer.Annotations;
 

diff --git a/src/Meziantou.Analyzer.CodeFixers/Internals/DocumentBasedFixAllProvider.cs b/src/Meziantou.Analyzer.CodeFixers/Internals/DocumentBasedFixAllProvider.cs
diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/AvoidUsingRedundantElseFixAllProvider.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/AvoidUsingRedundantElseFixAllProvider.cs
@@ -9,16 +9,14 @@ internal sealed class AvoidUsingRedundantElseFixAllProvider : DocumentBasedFixAl
 {
     public static AvoidUsingRedundantElseFixAllProvider Instance { get; } = new AvoidUsingRedundantElseFixAllProvider();
 
-    protected override string CodeActionTitle => "Remove redundant else";
+    protected override string GetFixAllTitle(FixAllContext fixAllContext) => "Remove redundant else";
 
-    /// <inheritdoc/>
-    protected override async Task<SyntaxNode?> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
+    protected override async Task<Document?> FixAllAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
     {
         if (diagnostics.IsEmpty)
             return null;
 
         var newDocument = await AvoidUsingRedundantElseFixer.RemoveRedundantElseClausesInDocument(document, diagnostics, fixAllContext.CancellationToken).ConfigureAwait(false);
-
-        return await newDocument.GetSyntaxRootAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
+        return newDocument;
     }
 }
diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/MakeMemberReadOnlyFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/MakeMemberReadOnlyFixer.cs
@@ -103,16 +103,15 @@ internal sealed class MakeMemberReadOnlyFixAllProvider : DocumentBasedFixAllProv
     {
         public static MakeMemberReadOnlyFixAllProvider Instance { get; } = new MakeMemberReadOnlyFixAllProvider();
 
-        protected override string CodeActionTitle => "Add readonly";
+        protected override string GetFixAllTitle(FixAllContext fixAllContext) => "Add readonly";
 
-        /// <inheritdoc/>
-        protected override async Task<SyntaxNode?> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
+        protected override async Task<Document?> FixAllAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
         {
             if (diagnostics.IsEmpty)
                 return null;
 
             var newDocument = await MakeReadOnly(document, diagnostics, fixAllContext.CancellationToken).ConfigureAwait(false);
-            return await newDocument.GetSyntaxRootAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
+            return newDocument;
         }
 
         internal static async Task<Document> MakeReadOnly(Document document, ImmutableArray<Diagnostic> diagnostics, CancellationToken cancellationToken)

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/MarkAttributesWithAttributeUsageAttributeFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/MarkAttributesWithAttributeUsageAttributeFixer.cs
@@ -54,13 +54,12 @@ private static async Task<Document> Refactor(Document document, SyntaxNode nodeT
 
         var attribute = editor.Generator.Attribute(
             generator.TypeExpression(attributeUsageAttribute, addImport: true),
-            new[]
-            {
+            [
                     generator.AttributeArgument(
                         generator.MemberAccessExpression(
                             generator.TypeExpression(attributeTargets, addImport: true),
                             nameof(AttributeTargets.All))),
-            });
+            ]);
 
         editor.AddAttribute(classNode, attribute);
         return editor.GetChangedDocument();

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/NotPatternShouldBeParenthesizedCodeFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/NotPatternShouldBeParenthesizedCodeFixer.cs
@@ -34,6 +34,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                 equivalenceKey: title);
             context.RegisterCodeFix(codeAction, context.Diagnostics);
         }
+
         {
             var title = "Negate all or patterns";
             var codeAction = CodeAction.Create(

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/OptimizeStringBuilderUsageFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/OptimizeStringBuilderUsageFixer.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;

diff --git a/src/Meziantou.Analyzer.CodeFixers/Rules/UseStructLayoutAttributeFixer.cs b/src/Meziantou.Analyzer.CodeFixers/Rules/UseStructLayoutAttributeFixer.cs
@@ -58,13 +58,12 @@ private static async Task<Document> Refactor(Document document, SyntaxNode nodeT
 
         var attribute = editor.Generator.Attribute(
             generator.TypeExpression(structLayoutAttribute).WithAdditionalAnnotations(Simplifier.AddImportsAnnotation),
-            new[]
-            {
+            [
                 generator.AttributeArgument(
                     generator.MemberAccessExpression(
                         generator.TypeExpression(layoutKindEnum).WithAdditionalAnnotations(Simplifier.AddImportsAnnotation),
                         layoutKind.ToString())),
-            });
+            ]);
 
         editor.AddAttribute(nodeToFix, attribute);
         return editor.GetChangedDocument();

diff --git a/src/Meziantou.Analyzer/Internals/EnumerableExtensions.cs b/src/Meziantou.Analyzer/Internals/EnumerableExtensions.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-namespace Meziantou.Analyzer;
+namespace Meziantou.Analyzer.Internals;
 
 internal static class EnumerableExtensions
 {

diff --git a/src/Meziantou.Analyzer/Internals/OperationExtensions.cs b/src/Meziantou.Analyzer/Internals/OperationExtensions.cs
@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Meziantou.Analyzer;
+namespace Meziantou.Analyzer.Internals;
 
 internal static class OperationExtensions
 {

diff --git a/src/Meziantou.Analyzer/Internals/StringExtensions.cs b/src/Meziantou.Analyzer/Internals/StringExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Meziantou.Analyzer.Rules;
+namespace Meziantou.Analyzer.Internals;
 
 internal static partial class StringExtensions
 {

diff --git a/src/Meziantou.Analyzer/Rules/AvoidClosureWhenUsingConcurrentDictionaryAnalyzer.cs b/src/Meziantou.Analyzer/Rules/AvoidClosureWhenUsingConcurrentDictionaryAnalyzer.cs
@@ -205,7 +205,7 @@ static IEnumerable<ISymbol> GetParameters(IOperation operation)
                 return GetParameters(delegateCreation.Target);
             }
 
-            return Enumerable.Empty<ISymbol>();
+            return [];
         }
     }
 

diff --git a/src/Meziantou.Analyzer/Rules/AvoidUsingRedundantElseAnalyzer.cs b/src/Meziantou.Analyzer/Rules/AvoidUsingRedundantElseAnalyzer.cs
@@ -76,6 +76,7 @@ private static IEnumerable<string> FindLocalIdentifiersIn(SyntaxNode node)
     {
         foreach (var child in node.DescendantNodes())
         {
+#pragma warning disable 
             switch (child)
             {
                 case VariableDeclaratorSyntax variableDeclarator:
@@ -90,6 +91,7 @@ private static IEnumerable<string> FindLocalIdentifiersIn(SyntaxNode node)
                     yield return singleVariableDesignation.Identifier.Text;
                     break;
             }
+#pragma warning restore IDE0010 // Add missing cases
         }
     }
 }
diff --git a/src/Meziantou.Analyzer/Rules/AvoidUsingRedundantElseAnalyzerCommon.cs b/src/Meziantou.Analyzer/Rules/AvoidUsingRedundantElseAnalyzerCommon.cs
@@ -10,6 +10,6 @@ internal static IEnumerable<SyntaxNode> GetElseClauseChildren(ElseClauseSyntax e
     {
         return elseClauseSyntax.Statement is BlockSyntax elseBlockSyntax ?
             elseBlockSyntax.ChildNodes() :
-            new[] { elseClauseSyntax.Statement };
+            [elseClauseSyntax.Statement];
     }
 }
diff --git a/src/Meziantou.Analyzer/Rules/FixToDoAnalyzer.cs b/src/Meziantou.Analyzer/Rules/FixToDoAnalyzer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Linq;
+using Meziantou.Analyzer.Internals;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Diagnostics;

diff --git a/src/Meziantou.Analyzer/Rules/NamedParameterAnalyzer.cs b/src/Meziantou.Analyzer/Rules/NamedParameterAnalyzer.cs
@@ -139,7 +139,7 @@ public override void Initialize(AnalysisContext context)
                         {
                             IMethodSymbol methodSymbol => methodSymbol.Parameters,
                             IPropertySymbol propertySymbol => propertySymbol.Parameters,
-                            _ => ImmutableArray<IParameterSymbol>.Empty,
+                            _ => [],
                         };
 
                         if (invokedMethodParameters.Length < GetMinimumMethodArgumentsConfiguration(syntaxContext.Options, expression))

diff --git a/src/Meziantou.Analyzer/Rules/NotPatternShouldBeParenthesizedAnalyzer.cs b/src/Meziantou.Analyzer/Rules/NotPatternShouldBeParenthesizedAnalyzer.cs
@@ -45,4 +45,4 @@ private void AnalyzeNotPatternSyntax(SyntaxNodeAnalysisContext context)
         }
     }
 }
-#endif
+#endif
diff --git a/src/Meziantou.Analyzer/Rules/UseArrayEmptyAnalyzer.cs b/src/Meziantou.Analyzer/Rules/UseArrayEmptyAnalyzer.cs
@@ -135,7 +135,7 @@ private static ImmutableArray<IParameterSymbol> GetParameters(ISymbol symbol)
         {
             SymbolKind.Method => ((IMethodSymbol)symbol).Parameters,
             SymbolKind.Property => ((IPropertySymbol)symbol).Parameters,
-            _ => ImmutableArray<IParameterSymbol>.Empty,
+            _ => [],
         };
     }
 }
diff --git a/src/Meziantou.Analyzer/Rules/UseRegexSourceGeneratorAnalyzer.cs b/src/Meziantou.Analyzer/Rules/UseRegexSourceGeneratorAnalyzer.cs
@@ -65,13 +65,13 @@ private static void AnalyzeObjectCreation(OperationAnalysisContext context)
                 return;
         }
 
-        var properties = ImmutableDictionary.CreateRange(new[]
-        {
+        var properties = ImmutableDictionary.CreateRange(
+        [
             new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.PatternIndexName, "0"),
             new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.RegexOptionsIndexName, op.Arguments.Length > 1 ? "1" : null),
             new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.RegexTimeoutIndexName, op.Arguments.Length > 2 ? "2" : null),
             new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.RegexTimeoutName, op.Arguments.Length > 2 ? TimeSpanOperation.GetMilliseconds(op.Arguments[2].Value)?.ToString(CultureInfo.InvariantCulture) : null),
-        });
+        ]);
 
         context.ReportDiagnostic(RegexSourceGeneratorRule, properties, op);
     }
@@ -110,13 +110,13 @@ private static void AnalyzeInvocation(OperationAnalysisContext context)
                     return;
             }
 
-            var properties = ImmutableDictionary.CreateRange(new[]
-            {
+            var properties = ImmutableDictionary.CreateRange(
+            [
                 new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.PatternIndexName, "1"),
                 new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.RegexOptionsIndexName, op.Arguments.Length > 2 ? "2" : null),
                 new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.RegexTimeoutIndexName, op.Arguments.Length > 3 ? "3" : null),
                 new KeyValuePair<string, string?>(UseRegexSourceGeneratorAnalyzerCommon.RegexTimeoutName, op.Arguments.Length > 3 ? TimeSpanOperation.GetMilliseconds(op.Arguments[3].Value)?.ToString(CultureInfo.InvariantCulture) : null),
-            });
+            ]);
 
             context.ReportDiagnostic(RegexSourceGeneratorRule, properties, op);
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                     return GetParameters(delegateCreation.Target);
                 }
-                return Enumerable.Empty<ISymbol>();
+                return [];
             }
         }
@@ Expand Down @@