Fixing some issues. Applying Metalama code style.

gfraiteur · Sep 24, 2024 · b1d6229 · b1d6229
1 parent cb4bca9
commit b1d6229
Show file tree

Hide file tree

Showing 27 changed files with 224 additions and 129 deletions.
diff --git a/CodeQualityTalk.Analyzers/CodeQualityTalk.Analyzers.csproj b/CodeQualityTalk.Analyzers/CodeQualityTalk.Analyzers.csproj
@@ -9,8 +9,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
-        <PackageReference Include="Polyfill" Version="5.5.3"/>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
+        <PackageReference Include="Polyfill" />
     </ItemGroup>
 
 </Project>
diff --git a/CodeQualityTalk.Analyzers/FactoryNameAnalyzer.cs b/CodeQualityTalk.Analyzers/FactoryNameAnalyzer.cs
@@ -1,5 +1,6 @@
-using System.Collections.Immutable;
-using System.Diagnostics;
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -9,71 +10,73 @@
 
 namespace CodeQualityTalk.Analyzers
 {
-
     [DiagnosticAnalyzer( LanguageNames.CSharp )]
     public class FactoryNameAnalyzer : DiagnosticAnalyzer
     {
-        private static readonly DiagnosticDescriptor _diagnosticDescriptor = new DiagnosticDescriptor(
+        private static readonly DiagnosticDescriptor _diagnosticDescriptor = new(
             "MY001",
             "Types implementing IDocumentFactory must be named *Factory",
             "(Analyzer) The type {0} must have the Factory suffix because it implements IDocumentFactory",
-            "Naming", DiagnosticSeverity.Warning, true);
+            "Naming",
+            DiagnosticSeverity.Warning,
+            true );
 
-        public override void Initialize(AnalysisContext context)
+        public override void Initialize( AnalysisContext context )
         {
             context.EnableConcurrentExecution();
-            context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-            context.RegisterSemanticModelAction(AnalyzeSemanticModel);
+            context.ConfigureGeneratedCodeAnalysis( GeneratedCodeAnalysisFlags.None );
+            context.RegisterSemanticModelAction( this.AnalyzeSemanticModel );
         }
 
-        private void AnalyzeSemanticModel(SemanticModelAnalysisContext context)
+        private void AnalyzeSemanticModel( SemanticModelAnalysisContext context )
         {
-            new Walker(context).Visit(context.FilterTree.GetRoot());
+            new Walker( context ).Visit( context.FilterTree.GetRoot() );
         }
 
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; }
             = [_diagnosticDescriptor];
 
-        class Walker : CSharpSyntaxWalker
+        private class Walker : CSharpSyntaxWalker
         {
             private readonly SemanticModelAnalysisContext _context;
 
-            public Walker(SemanticModelAnalysisContext context)
+            public Walker( SemanticModelAnalysisContext context )
             {
-                _context = context;
+                this._context = context;
             }
 
-
-            public override void VisitClassDeclaration(ClassDeclarationSyntax node)
+            public override void VisitClassDeclaration( ClassDeclarationSyntax node )
             {
-                this.InspectType(node);
-                base.VisitClassDeclaration(node);
+                this.InspectType( node );
+                base.VisitClassDeclaration( node );
             }
 
-            public override void VisitRecordDeclaration(RecordDeclarationSyntax node)
+            public override void VisitRecordDeclaration( RecordDeclarationSyntax node )
             {
-                this.InspectType(node);
-                base.VisitRecordDeclaration(node);
+                this.InspectType( node );
+                base.VisitRecordDeclaration( node );
             }
 
-            public override void VisitStructDeclaration(StructDeclarationSyntax node)
+            public override void VisitStructDeclaration( StructDeclarationSyntax node )
             {
-                this.InspectType(node);
-                base.VisitStructDeclaration(node);
+                this.InspectType( node );
+                base.VisitStructDeclaration( node );
             }
 
-            private void InspectType(TypeDeclarationSyntax type)
+            private void InspectType( TypeDeclarationSyntax type )
             {
-                var typeSymbol = this._context.SemanticModel.GetDeclaredSymbol(type);
+                var typeSymbol = this._context.SemanticModel.GetDeclaredSymbol( type );
 
                 if ( typeSymbol != null &&
-                    !type.Identifier.Text.EndsWith("Factory") &&
-                    typeSymbol.AllInterfaces.Any(i => i.Name == "IDocumentFactory"))
+                     !type.Identifier.Text.EndsWith( "Factory" ) &&
+                     typeSymbol.AllInterfaces.Any( i => i.Name == "IDocumentFactory" ) )
                 {
-                    _context.ReportDiagnostic(Diagnostic.Create(_diagnosticDescriptor, type.Identifier.GetLocation(),
-                        type.Identifier.Text));
+                    this._context.ReportDiagnostic(
+                        Diagnostic.Create(
+                            _diagnosticDescriptor,
+                            type.Identifier.GetLocation(),
+                            type.Identifier.Text ) );
                 }
-
             }
         }
     }

diff --git a/CodeQualityTalk.ArchUnitTests/ArchitectureTests.cs b/CodeQualityTalk.ArchUnitTests/ArchitectureTests.cs
@@ -1,3 +1,5 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
 using ArchUnitNET.Domain;
 using ArchUnitNET.Loader;
 using ArchUnitNET.xUnit;
@@ -10,38 +12,38 @@ namespace CodeQualityTalk.Tests;
 public class ArchitectureTests
 {
     private readonly Architecture _testedProjects =
-        new ArchLoader().LoadAssembly(typeof(IDocumentFactory).Assembly).Build();
+        new ArchLoader().LoadAssembly( typeof(IDocumentFactory).Assembly ).Build();
 
     [Fact]
     public void TypesDerivedFromIFactory_ShouldBe_NamedFactory()
     {
         Types()
             .That()
-            .ImplementInterface(typeof(IDocumentFactory))
+            .ImplementInterface( typeof(IDocumentFactory) )
             .Should()
-            .HaveName("^.*Factory$", true)
-            .Check(_testedProjects);
+            .HaveName( "^.*Factory$", true )
+            .Check( this._testedProjects );
     }
 
     [Fact]
     public void TypesDerivedFromIDocument_ShouldBe_InDocumentsNamespace()
     {
         Types()
             .That()
-            .ImplementInterface(typeof(IDocument))
+            .ImplementInterface( typeof(IDocument) )
             .Should()
-            .HaveFullName(@"^CodeQualityTalk\.Documents\..*", true)
-            .Check(_testedProjects);
+            .HaveFullName( @"^CodeQualityTalk\.Documents\..*", true )
+            .Check( this._testedProjects );
     }
 
     [Fact]
     public void Abstractions_CannotUse_DocumentsNamespace()
     {
         Types()
             .That()
-            .ResideInNamespace("CodeQualityTalk.Abstractions")
+            .ResideInNamespace( "CodeQualityTalk.Abstractions" )
             .Should()
-            .NotDependOnAny(Types().That().DoNotResideInNamespace("CodeQualityTalk.Abstractions"))
-            .Check(_testedProjects);
+            .NotDependOnAny( Types().That().DoNotResideInNamespace( "CodeQualityTalk.Abstractions" ) )
+            .Check( this._testedProjects );
     }
 }
diff --git a/CodeQualityTalk.ArchUnitTests/CodeQualityTalk.ArchUnitTests.csproj b/CodeQualityTalk.ArchUnitTests/CodeQualityTalk.ArchUnitTests.csproj
@@ -12,10 +12,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="TngTech.ArchUnitNET.xUnit" Version="0.10.6"/>
-        <PackageReference Include="xunit" Version="2.8.1"/>
+        <PackageReference Include="coverlet.collector"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+        <PackageReference Include="TngTech.ArchUnitNET.xUnit"/>
+        <PackageReference Include="xunit" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/CodeQualityTalk.Metalama/Abstractions/DocumentCreationContext.cs b/CodeQualityTalk.Metalama/Abstractions/DocumentCreationContext.cs
@@ -1,3 +1,5 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
 namespace CodeQualityTalk.Abstractions;
 
 public record DocumentCreationContext( string OwnerId );
diff --git a/CodeQualityTalk.Metalama/Abstractions/DocumentHelper.cs b/CodeQualityTalk.Metalama/Abstractions/DocumentHelper.cs
@@ -1,8 +1,10 @@
-using CodeQualityTalk.Documents;
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using CodeQualityTalk.Documents;
 
 namespace CodeQualityTalk.Abstractions;
 
 public static class DocumentHelper
 {
-    public static bool IsInvoice(IDocument document) => document is Invoice;
+    public static bool IsInvoice( IDocument document ) => document is Invoice;
 }
diff --git a/CodeQualityTalk.Metalama/Abstractions/IDocument.cs b/CodeQualityTalk.Metalama/Abstractions/IDocument.cs
@@ -1,7 +1,10 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
 namespace CodeQualityTalk.Abstractions;
 
 public interface IDocument
 {
     string OwnerId { get; }
+
     string Name { get; }
 }
diff --git a/CodeQualityTalk.Metalama/Abstractions/IDocumentFactory.cs b/CodeQualityTalk.Metalama/Abstractions/IDocumentFactory.cs
@@ -1,9 +1,11 @@
-using Metalama.Extensions.Architecture.Aspects;
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using Metalama.Extensions.Architecture.Aspects;
 
 namespace CodeQualityTalk.Abstractions;
 
-[DerivedTypesMustRespectNamingConvention("*Factory")]
+[DerivedTypesMustRespectNamingConvention( "*Factory" )]
 public interface IDocumentFactory
 {
-    IDocument CreateDocument(string name, DocumentCreationContext context);
+    IDocument CreateDocument( string name, DocumentCreationContext context );
 }
diff --git a/CodeQualityTalk.Metalama/Architecture/AdvancedFabric.cs b/CodeQualityTalk.Metalama/Architecture/AdvancedFabric.cs
@@ -1,4 +1,6 @@
-using CodeQualityTalk.Abstractions;
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using CodeQualityTalk.Abstractions;
 using Metalama.Framework.Aspects;
 using Metalama.Framework.Code;
 using Metalama.Framework.Diagnostics;
@@ -11,21 +13,23 @@ public class AdvancedFabric : ProjectFabric
 {
     private const string _documentNamespace = "CodeQualityTalk.Documents";
 
-    private static DiagnosticDefinition<(INamedType Type, string Namespace)> _warning = new("MY001", Severity.Warning,
-        "(Metalama) The '{0}' type must be in the '{1}' namespace.");
+    private static readonly DiagnosticDefinition<(INamedType Type, string Namespace)> _warning = new(
+        "MY001",
+        Severity.Warning,
+        "(Metalama) The '{0}' type must be in the '{1}' namespace." );
 
-    public override void AmendProject(IProjectAmender amender)
+    public override void AmendProject( IProjectAmender amender )
     {
         // Validate namespace.
-        amender.SelectReflectionType(typeof(IDocument))
-            .ValidateInboundReferences(ValidateNamespace, ReferenceGranularity.Type, ReferenceKinds.BaseType);
+        amender.SelectReflectionType( typeof(IDocument) )
+            .ValidateInboundReferences( ValidateNamespace, ReferenceGranularity.Type, ReferenceKinds.BaseType );
     }
 
-    private static void ValidateNamespace(ReferenceValidationContext context)
+    private static void ValidateNamespace( ReferenceValidationContext context )
     {
-        if (context.Origin.Namespace.FullName != _documentNamespace)
+        if ( context.Origin.Namespace.FullName != _documentNamespace )
         {
-            context.Diagnostics.Report(_warning.WithArguments((context.Origin.Type, _documentNamespace)));
+            context.Diagnostics.Report( _warning.WithArguments( (context.Origin.Type, _documentNamespace) ) );
         }
     }
 }
diff --git a/CodeQualityTalk.Metalama/Architecture/Fabric.cs b/CodeQualityTalk.Metalama/Architecture/Fabric.cs
@@ -1,16 +1,18 @@
-using Metalama.Extensions.Architecture;
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using Metalama.Extensions.Architecture;
 using Metalama.Extensions.Architecture.Predicates;
 using Metalama.Framework.Fabrics;
 
 namespace CodeQualityTalk.Architecture;
 
 public class Fabric : ProjectFabric
 {
-    public override void AmendProject(IProjectAmender amender)
+    public override void AmendProject( IProjectAmender amender )
     {
         // Validate dependencies.
         amender
-            .Select(c=>c.GlobalNamespace.GetDescendant("CodeQualityTalk.Documents")!)
-            .CannotBeUsedFrom( x => x.Namespace("CodeQualityTalk.Abstractions"));
+            .Select( c => c.GlobalNamespace.GetDescendant( "CodeQualityTalk.Documents" )! )
+            .CannotBeUsedFrom( x => x.Namespace( "CodeQualityTalk.Abstractions" ) );
     }
 }
diff --git a/CodeQualityTalk.Metalama/CodeQualityTalk.Metalama.csproj b/CodeQualityTalk.Metalama/CodeQualityTalk.Metalama.csproj
@@ -8,11 +8,9 @@
         <RootNamespace>CodeQualityTalk</RootNamespace>
     </PropertyGroup>
 
-    <Import Project="c:\src\Metalama.Extensions\Metalama.Extensions.Import.props"/>
-
     <ItemGroup>
 
-        <PackageReference Include="Metalama.Extensions.Architecture" Version="$(MetalamaExtensionsVersion)"/>
+        <PackageReference Include="Metalama.Extensions.Architecture" />
     </ItemGroup>
 
 </Project>
diff --git a/CodeQualityTalk.Metalama/CreditNote.cs b/CodeQualityTalk.Metalama/CreditNote.cs
@@ -1,15 +1,18 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
 using CodeQualityTalk.Abstractions;
 
 namespace CodeQualityTalk;
 
 internal class CreditNote : IDocument
 {
-    public string OwnerId { get;  }
-    public string Name { get;  }
+    public string OwnerId { get; }
+
+    public string Name { get; }
 
-    public CreditNote(string ownerId, string name)
+    public CreditNote( string ownerId, string name )
     {
-        OwnerId = ownerId;
-        Name = name;
+        this.OwnerId = ownerId;
+        this.Name = name;
     }
 }
diff --git a/CodeQualityTalk.Metalama/Documents/Invoice.cs b/CodeQualityTalk.Metalama/Documents/Invoice.cs
@@ -1,15 +1,18 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
 using CodeQualityTalk.Abstractions;
 
 namespace CodeQualityTalk.Documents;
 
 internal class Invoice : IDocument
 {
-    public string OwnerId { get;  }
-    public string Name { get;  }
+    public string OwnerId { get; }
+
+    public string Name { get; }
 
-    public Invoice(string ownerId, string name)
+    public Invoice( string ownerId, string name )
     {
-        OwnerId = ownerId;
-        Name = name;
+        this.OwnerId = ownerId;
+        this.Name = name;
     }
 }
diff --git a/CodeQualityTalk.Metalama/Factories/CreditNoteCreator.cs b/CodeQualityTalk.Metalama/Factories/CreditNoteCreator.cs
@@ -1,9 +1,10 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
 using CodeQualityTalk.Abstractions;
 
 namespace CodeQualityTalk.Factories;
 
 public class CreditNoteCreator : IDocumentFactory
 {
-    public IDocument CreateDocument(string name, DocumentCreationContext context)
-        => new CreditNote(context.OwnerId, name);
+    public IDocument CreateDocument( string name, DocumentCreationContext context ) => new CreditNote( context.OwnerId, name );
 }
diff --git a/CodeQualityTalk.Metalama/Factories/InvoiceFactory.cs b/CodeQualityTalk.Metalama/Factories/InvoiceFactory.cs
@@ -1,10 +1,11 @@
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
 using CodeQualityTalk.Abstractions;
 using CodeQualityTalk.Documents;
 
 namespace CodeQualityTalk.Factories;
 
 public class InvoiceFactory : IDocumentFactory
 {
-    public IDocument CreateDocument(string name, DocumentCreationContext context)
-        => new Invoice(context.OwnerId, name);
+    public IDocument CreateDocument( string name, DocumentCreationContext context ) => new Invoice( context.OwnerId, name );
 }