diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0bec1be310..c89f8bd8b4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,7 +27,7 @@ ] }, "csharpier": { - "version": "0.26.5", + "version": "0.26.7", "commands": [ "dotnet-csharpier" ] diff --git a/src/Riok.Mapperly/Descriptors/Enumerables/EnsureCapacity/EnsureCapacityBuilder.cs b/src/Riok.Mapperly/Descriptors/Enumerables/EnsureCapacity/EnsureCapacityBuilder.cs index 8c1ea9cf8a..38e257d60a 100644 --- a/src/Riok.Mapperly/Descriptors/Enumerables/EnsureCapacity/EnsureCapacityBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/Enumerables/EnsureCapacity/EnsureCapacityBuilder.cs @@ -15,8 +15,7 @@ public static class EnsureCapacityBuilder if (ctx.CollectionInfos == null) return null; - var capacityMethod = ctx.SymbolAccessor - .GetAllMethods(ctx.Target, EnsureCapacityName) + var capacityMethod = ctx.SymbolAccessor.GetAllMethods(ctx.Target, EnsureCapacityName) .FirstOrDefault(x => x.Parameters.Length == 1 && x.Parameters[0].Type.SpecialType == SpecialType.System_Int32 && !x.IsStatic); // if EnsureCapacity is not available then return null @@ -31,8 +30,7 @@ public static class EnsureCapacityBuilder if (ctx.CollectionInfos.Source.CountIsKnown) return new EnsureCapacityMember(ctx.CollectionInfos.Target.CountPropertyName, ctx.CollectionInfos.Source.CountPropertyName); - var nonEnumeratedCountMethod = ctx.Types - .Get(typeof(Enumerable)) + var nonEnumeratedCountMethod = ctx.Types.Get(typeof(Enumerable)) .GetMembers(TryGetNonEnumeratedCountMethodName) .OfType() .FirstOrDefault( diff --git a/src/Riok.Mapperly/Descriptors/ExternalMappings/ExternalMappingsExtractor.cs b/src/Riok.Mapperly/Descriptors/ExternalMappings/ExternalMappingsExtractor.cs index c35af6c94d..da7ecf1629 100644 --- a/src/Riok.Mapperly/Descriptors/ExternalMappings/ExternalMappingsExtractor.cs +++ b/src/Riok.Mapperly/Descriptors/ExternalMappings/ExternalMappingsExtractor.cs @@ -11,8 +11,7 @@ internal static class ExternalMappingsExtractor { public static IEnumerable ExtractExternalMappings(SimpleMappingBuilderContext ctx, INamedTypeSymbol mapperSymbol) { - var staticExternalMappers = ctx.AttributeAccessor - .Access(mapperSymbol) + var staticExternalMappers = ctx.AttributeAccessor.Access(mapperSymbol) .Concat(ctx.AttributeAccessor.Access, UseStaticMapperConfiguration>(mapperSymbol)) .SelectMany( x => @@ -24,8 +23,7 @@ public static IEnumerable ExtractExternalMappings(SimpleMappingBui ) ); - var externalInstanceMappers = ctx.SymbolAccessor - .GetAllMembers(mapperSymbol) + var externalInstanceMappers = ctx.SymbolAccessor.GetAllMembers(mapperSymbol) .Where(x => ctx.AttributeAccessor.HasAttribute(x)) .SelectMany(x => ValidateAndExtractExternalInstanceMappings(ctx, x)); diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs index f16e558769..fad95d8426 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs @@ -30,16 +30,10 @@ protected MembersMappingBuilderContext(MappingBuilderContext builderContext, T m TargetMembers = GetTargetMembers(); IgnoredSourceMemberNames = builderContext - .Configuration - .Properties - .IgnoredSources - .Concat(GetIgnoredObsoleteSourceMembers()) + .Configuration.Properties.IgnoredSources.Concat(GetIgnoredObsoleteSourceMembers()) .ToHashSet(); var ignoredTargetMemberNames = builderContext - .Configuration - .Properties - .IgnoredTargets - .Concat(GetIgnoredObsoleteTargetMembers()) + .Configuration.Properties.IgnoredTargets.Concat(GetIgnoredObsoleteTargetMembers()) .ToHashSet(); _ignoredUnmatchedSourceMemberNames = InitIgnoredUnmatchedProperties(IgnoredSourceMemberNames, _unmappedSourceMemberNames); @@ -54,8 +48,7 @@ protected MembersMappingBuilderContext(MappingBuilderContext builderContext, T m // source and target properties may have been ignored and mapped explicitly _mappedAndIgnoredSourceMemberNames = MemberConfigsByRootTargetName - .Values - .SelectMany(v => v.Select(s => s.Source.Path.First())) + .Values.SelectMany(v => v.Select(s => s.Source.Path.First())) .ToHashSet(); _mappedAndIgnoredSourceMemberNames.IntersectWith(IgnoredSourceMemberNames); @@ -106,8 +99,7 @@ private IEnumerable GetIgnoredObsoleteTargetMembers() return Enumerable.Empty(); return BuilderContext - .SymbolAccessor - .GetAllAccessibleMappableMembers(Mapping.TargetType) + .SymbolAccessor.GetAllAccessibleMappableMembers(Mapping.TargetType) .Where(x => BuilderContext.SymbolAccessor.HasAttribute(x.MemberSymbol)) .Select(x => x.Name); } @@ -120,8 +112,7 @@ private IEnumerable GetIgnoredObsoleteSourceMembers() return Enumerable.Empty(); return BuilderContext - .SymbolAccessor - .GetAllAccessibleMappableMembers(Mapping.SourceType) + .SymbolAccessor.GetAllAccessibleMappableMembers(Mapping.SourceType) .Where(x => BuilderContext.SymbolAccessor.HasAttribute(x.MemberSymbol)) .Select(x => x.Name); } @@ -134,18 +125,14 @@ private HashSet GetSourceMemberNames() private Dictionary GetTargetMembers() { return BuilderContext - .SymbolAccessor - .GetAllAccessibleMappableMembers(Mapping.TargetType) + .SymbolAccessor.GetAllAccessibleMappableMembers(Mapping.TargetType) .ToDictionary(x => x.Name, StringComparer.OrdinalIgnoreCase); } private Dictionary> GetMemberConfigurations() { return BuilderContext - .Configuration - .Properties - .ExplicitMappings - .GroupBy(x => x.Target.Path.First()) + .Configuration.Properties.ExplicitMappings.GroupBy(x => x.Target.Path.First()) .ToDictionary(x => x.Key, x => x.ToList()); } diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs index f6d4974012..761c6db267 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs @@ -50,15 +50,13 @@ private static void BuildInitOnlyMemberMappings(INewInstanceBuilderContext // then by descending parameter count // ctors annotated with [Obsolete] are considered last unless they have a MapperConstructor attribute set var ctorCandidates = namedTargetType - .InstanceConstructors - .Where(ctor => ctx.BuilderContext.SymbolAccessor.IsDirectlyAccessible(ctor)) + .InstanceConstructors.Where(ctor => ctx.BuilderContext.SymbolAccessor.IsDirectlyAccessible(ctor)) .OrderByDescending(x => ctx.BuilderContext.SymbolAccessor.HasAttribute(x)) .ThenBy(x => ctx.BuilderContext.SymbolAccessor.HasAttribute(x)) .ThenByDescending(x => x.Parameters.Length == 0) @@ -325,15 +322,13 @@ out PropertyMappingConfiguration? memberConfig || !ctx.MemberConfigsByRootTargetName.TryGetValue(parameterName, out var memberConfigs) ) { - return ctx.BuilderContext - .SymbolAccessor - .TryFindMemberPath( - ctx.Mapping.SourceType, - MemberPathCandidateBuilder.BuildMemberPathCandidates(parameter.Name), - ctx.IgnoredSourceMemberNames, - true, - out sourcePath - ); + return ctx.BuilderContext.SymbolAccessor.TryFindMemberPath( + ctx.Mapping.SourceType, + MemberPathCandidateBuilder.BuildMemberPathCandidates(parameter.Name), + ctx.IgnoredSourceMemberNames, + true, + out sourcePath + ); } if (memberConfigs.Count > 1) diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs index 69b3c3971d..f5246435e8 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs @@ -182,15 +182,13 @@ out MemberPath? sourcePath var ignoreCase = ctx.BuilderContext.MapperConfiguration.PropertyNameMappingStrategy == PropertyNameMappingStrategy.CaseInsensitive; if ( - ctx.BuilderContext - .SymbolAccessor - .TryFindMemberPath( - ctx.Mapping.SourceType, - MemberPathCandidateBuilder.BuildMemberPathCandidates(field.Name), - ctx.IgnoredSourceMemberNames, - ignoreCase, - out sourcePath - ) + ctx.BuilderContext.SymbolAccessor.TryFindMemberPath( + ctx.Mapping.SourceType, + MemberPathCandidateBuilder.BuildMemberPathCandidates(field.Name), + ctx.IgnoredSourceMemberNames, + ignoreCase, + out sourcePath + ) ) { return true; @@ -201,14 +199,12 @@ out sourcePath if (!ctx.Mapping.SourceType.IsTupleType || ctx.Mapping.SourceType is not INamedTypeSymbol namedType) return false; - var mappableField = namedType - .TupleElements - .FirstOrDefault( - x => - x.CorrespondingTupleField != default - && !ctx.IgnoredSourceMemberNames.Contains(x.Name) - && string.Equals(field.CorrespondingTupleField!.Name, x.CorrespondingTupleField!.Name) - ); + var mappableField = namedType.TupleElements.FirstOrDefault( + x => + x.CorrespondingTupleField != default + && !ctx.IgnoredSourceMemberNames.Contains(x.Name) + && string.Equals(field.CorrespondingTupleField!.Name, x.CorrespondingTupleField!.Name) + ); if (mappableField == default) return false; diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/ObjectMemberMappingBodyBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/ObjectMemberMappingBodyBuilder.cs index 88e0e2c3d3..700796214b 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/ObjectMemberMappingBodyBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/ObjectMemberMappingBodyBuilder.cs @@ -41,15 +41,13 @@ public static void BuildMappingBody(IMembersContainerBuilderContext DoesTypesSatisfySubstitutionPrinciples(mapping, ctx.SymbolAccessor, x.SourceType.NonNullable(), x.TargetType) - && mapping - .TypeParameters - .DoesTypesSatisfyTypeParameterConstraints(ctx.SymbolAccessor, x.SourceType.NonNullable(), x.TargetType) + && mapping.TypeParameters.DoesTypesSatisfyTypeParameterConstraints( + ctx.SymbolAccessor, + x.SourceType.NonNullable(), + x.TargetType + ) ); BuildMappingBody(ctx, mapping, mappings); diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/CtorMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/CtorMappingBuilder.cs index 67a152ee2e..bfaa4fd115 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/CtorMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/CtorMappingBuilder.cs @@ -17,8 +17,7 @@ public static class CtorMappingBuilder // resolve ctors which have the source as single argument var ctorMethod = namedTarget - .InstanceConstructors - .Where(ctx.SymbolAccessor.IsDirectlyAccessible) + .InstanceConstructors.Where(ctx.SymbolAccessor.IsDirectlyAccessible) .FirstOrDefault( m => m.Parameters.Length == 1 diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/DictionaryMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/DictionaryMappingBuilder.cs index 6443bce810..5c32654317 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/DictionaryMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/DictionaryMappingBuilder.cs @@ -151,13 +151,11 @@ INewInstanceMapping valueMapping var enumerableType = ctx.Types.Get(typeof(IEnumerable<>)); var dictionaryType = ctx.Types.Get(typeof(Dictionary<,>)); - var fromEnumerableCtor = dictionaryType - .Constructors - .FirstOrDefault( - x => - x.Parameters.Length == 1 - && SymbolEqualityComparer.Default.Equals(((INamedTypeSymbol)x.Parameters[0].Type).ConstructedFrom, enumerableType) - ); + var fromEnumerableCtor = dictionaryType.Constructors.FirstOrDefault( + x => + x.Parameters.Length == 1 + && SymbolEqualityComparer.Default.Equals(((INamedTypeSymbol)x.Parameters[0].Type).ConstructedFrom, enumerableType) + ); if (fromEnumerableCtor != null) { diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumMappingBuilder.cs index 80dbb6b908..30c19c2b66 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumMappingBuilder.cs @@ -88,8 +88,7 @@ _ when ctx.SymbolAccessor.HasAttribute(ctx.Target) => EnumCastMa fallbackMapping ); var differentValueExplicitEnumMappings = enumMemberMappings - .ExplicitMemberMappings - .Where(x => x.Key.ConstantValue?.Equals(x.Value.ConstantValue) != true) + .ExplicitMemberMappings.Where(x => x.Key.ConstantValue?.Equals(x.Value.ConstantValue) != true) .ToDictionary(x => x.Key, x => x.Value, (IEqualityComparer)SymbolEqualityComparer.Default); if (differentValueExplicitEnumMappings.Count == 0) @@ -135,13 +134,11 @@ params IEqualityComparer[] propertyComparer var explicitMappings = ignoreExplicitAndIgnoredMappings ? new Dictionary(SymbolEqualityComparer.Default) : BuildExplicitValueMappings(ctx); - var sourceMembers = ctx.Source - .GetMembers() + var sourceMembers = ctx.Source.GetMembers() .OfType() .Where(x => !ignoredSourceMembers.Remove(x)) .ToHashSet(FieldSymbolEqualityComparer.Default); - var targetMembers = ctx.Target - .GetMembers() + var targetMembers = ctx.Target.GetMembers() .OfType() .Where(x => !ignoredTargetMembers.Remove(x)) .ToHashSet(FieldSymbolEqualityComparer.Default); diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumerableMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumerableMappingBuilder.cs index 9acb16021b..25b642f8b1 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumerableMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/EnumerableMappingBuilder.cs @@ -257,9 +257,9 @@ private static LinqEnumerableMapping BuildLinqMapping( return null; var typedEnumerable = ctx.Types.Get(typeof(IEnumerable<>)).Construct(typeSymbol); - var hasCtor = namedType - .Constructors - .Any(m => m.Parameters.Length == 1 && SymbolEqualityComparer.Default.Equals(m.Parameters[0].Type, typedEnumerable)); + var hasCtor = namedType.Constructors.Any( + m => m.Parameters.Length == 1 && SymbolEqualityComparer.Default.Equals(m.Parameters[0].Type, typedEnumerable) + ); if (hasCtor) return namedType; diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/ParseMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/ParseMappingBuilder.cs index 616a529664..66ea1ed68a 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/ParseMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/ParseMappingBuilder.cs @@ -19,8 +19,7 @@ public static class ParseMappingBuilder var targetIsNullable = ctx.Target.NonNullable(out var nonNullableTarget); - var parseMethodCandidates = ctx.SymbolAccessor - .GetAllMethods(nonNullableTarget, ParseMethodName) + var parseMethodCandidates = ctx.SymbolAccessor.GetAllMethods(nonNullableTarget, ParseMethodName) .Where( m => m.IsStatic diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/StringToEnumMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/StringToEnumMappingBuilder.cs index 9bed45a6c2..332651758d 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/StringToEnumMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/StringToEnumMappingBuilder.cs @@ -17,8 +17,7 @@ public static class StringToEnumMappingBuilder if (ctx.Source.SpecialType != SpecialType.System_String || !ctx.Target.IsEnum()) return null; - var genericEnumParseMethodSupported = ctx.Types - .Get() + var genericEnumParseMethodSupported = ctx.Types.Get() .GetMembers(nameof(Enum.Parse)) .OfType() .Any(x => x.IsGenericMethod); diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/ToStringMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/ToStringMappingBuilder.cs index e645951b8d..9e45504475 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/ToStringMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/ToStringMappingBuilder.cs @@ -67,8 +67,7 @@ private static bool HasToStringMethodWithNullableParameter(MappingBuilderContext private static IMethodSymbol? FindToStringMethod(MappingBuilderContext ctx, bool stringFormatParam, bool formatProviderParam) { - return ctx.SymbolAccessor - .GetAllMethods(ctx.Source, nameof(ToString)) + return ctx.SymbolAccessor.GetAllMethods(ctx.Source, nameof(ToString)) .FirstOrDefault(m => IsToStringMethod(ctx, m, stringFormatParam, formatProviderParam)); } diff --git a/src/Riok.Mapperly/Descriptors/Mappings/DerivedExistingTargetTypeSwitchMapping.cs b/src/Riok.Mapperly/Descriptors/Mappings/DerivedExistingTargetTypeSwitchMapping.cs index 791468a253..cce5d578b9 100644 --- a/src/Riok.Mapperly/Descriptors/Mappings/DerivedExistingTargetTypeSwitchMapping.cs +++ b/src/Riok.Mapperly/Descriptors/Mappings/DerivedExistingTargetTypeSwitchMapping.cs @@ -27,8 +27,7 @@ public override IEnumerable Build(TypeMappingBuildContext ctx, var caseSections = existingTargetTypeMappings.Select(x => BuildSwitchSection(ctx, x)); var defaultSection = BuildDefaultSwitchSection(ctx, target); - yield return ctx.SyntaxFactory - .SwitchStatement(sourceExpression, caseSections, defaultSection) + yield return ctx.SyntaxFactory.SwitchStatement(sourceExpression, caseSections, defaultSection) .AddLeadingLineFeed(ctx.SyntaxFactory.Indentation); } diff --git a/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs b/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs index bdc7360c7e..b149ce9f4b 100644 --- a/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs +++ b/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs @@ -188,9 +188,9 @@ private static bool BuildGenericTypeParameters( var targetType = parameters.Target?.Type ?? methodSymbol.ReturnType.UpgradeNullable(); var targetTypeParameter = methodSymbol.TypeParameters.FirstOrDefault(x => SymbolEqualityComparer.Default.Equals(x, targetType)); - var sourceTypeParameter = methodSymbol - .TypeParameters - .FirstOrDefault(x => SymbolEqualityComparer.Default.Equals(x, parameters.Source.Type)); + var sourceTypeParameter = methodSymbol.TypeParameters.FirstOrDefault( + x => SymbolEqualityComparer.Default.Equals(x, parameters.Source.Type) + ); var expectedTypeParametersCount = 0; if (targetTypeParameter != null) @@ -317,9 +317,9 @@ private static bool BuildParameters( private static MethodParameter? BuildReferenceHandlerParameter(SimpleMappingBuilderContext ctx, IMethodSymbol method) { - var refHandlerParameterSymbol = method - .Parameters - .FirstOrDefault(p => ctx.SymbolAccessor.HasAttribute(p)); + var refHandlerParameterSymbol = method.Parameters.FirstOrDefault( + p => ctx.SymbolAccessor.HasAttribute(p) + ); if (refHandlerParameterSymbol == null) return null; diff --git a/src/Riok.Mapperly/Helpers/SymbolExtensions.cs b/src/Riok.Mapperly/Helpers/SymbolExtensions.cs index c147e9fbac..75166af64a 100644 --- a/src/Riok.Mapperly/Helpers/SymbolExtensions.cs +++ b/src/Riok.Mapperly/Helpers/SymbolExtensions.cs @@ -6,9 +6,10 @@ namespace Riok.Mapperly.Helpers; internal static class SymbolExtensions { - private static readonly SymbolDisplayFormat _fullyQualifiedNullableFormat = SymbolDisplayFormat - .FullyQualifiedFormat - .AddMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier); + private static readonly SymbolDisplayFormat _fullyQualifiedNullableFormat = + SymbolDisplayFormat.FullyQualifiedFormat.AddMiscellaneousOptions( + SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier + ); private static readonly ImmutableHashSet _wellKnownImmutableTypes = ImmutableHashSet.Create( typeof(Uri).FullName!, diff --git a/src/Riok.Mapperly/MapperGenerator.cs b/src/Riok.Mapperly/MapperGenerator.cs index 18f2462e02..97fe5c8295 100644 --- a/src/Riok.Mapperly/MapperGenerator.cs +++ b/src/Riok.Mapperly/MapperGenerator.cs @@ -26,15 +26,14 @@ public void Initialize(IncrementalGeneratorInitializationContext context) var assemblyName = context.CompilationProvider.Select((x, _) => x.Assembly.Name); // report compilation diagnostics - var compilationDiagnostics = context - .CompilationProvider - .SelectMany(static (compilation, _) => BuildCompilationDiagnostics(compilation)); + var compilationDiagnostics = context.CompilationProvider.SelectMany( + static (compilation, _) => BuildCompilationDiagnostics(compilation) + ); context.ReportDiagnostics(compilationDiagnostics); // build the compilation context var compilationContext = context - .CompilationProvider - .Select(static (c, _) => new CompilationContext(c, new WellKnownTypes(c), new FileNameBuilder())) + .CompilationProvider.Select(static (c, _) => new CompilationContext(c, new WellKnownTypes(c), new FileNameBuilder())) .WithTrackingName(MapperGeneratorStepNames.BuildCompilationContext); // build the assembly default configurations diff --git a/src/Riok.Mapperly/SyntaxProvider.Roslyn4.0.cs b/src/Riok.Mapperly/SyntaxProvider.Roslyn4.0.cs index 2532be4241..eb3544c560 100644 --- a/src/Riok.Mapperly/SyntaxProvider.Roslyn4.0.cs +++ b/src/Riok.Mapperly/SyntaxProvider.Roslyn4.0.cs @@ -9,15 +9,13 @@ namespace Riok.Mapperly; internal static class SyntaxProvider { - private static readonly SymbolDisplayFormat _fullyQualifiedFormatWithoutGlobal = SymbolDisplayFormat - .FullyQualifiedFormat - .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.OmittedAsContaining); + private static readonly SymbolDisplayFormat _fullyQualifiedFormatWithoutGlobal = + SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.OmittedAsContaining); public static IncrementalValuesProvider GetMapperDeclarations(IncrementalGeneratorInitializationContext context) { return context - .SyntaxProvider - .CreateSyntaxProvider( + .SyntaxProvider.CreateSyntaxProvider( static (s, _) => s is ClassDeclarationSyntax { AttributeLists.Count: > 0 }, static (ctx, ct) => GetMapperDeclaration(ctx, ct) ) @@ -27,8 +25,7 @@ public static IncrementalValuesProvider GetMapperDeclarations public static IncrementalValueProvider GetMapperDefaultDeclarations(IncrementalGeneratorInitializationContext context) { return context - .SyntaxProvider - .CreateSyntaxProvider( + .SyntaxProvider.CreateSyntaxProvider( static (s, _) => s is CompilationUnitSyntax { AttributeLists.Count: > 0 }, static (ctx, ct) => GetMapperDefaultDeclarations(ctx) ) diff --git a/src/Riok.Mapperly/SyntaxProvider.Roslyn4.4.cs b/src/Riok.Mapperly/SyntaxProvider.Roslyn4.4.cs index 2b9ada42ee..fb3b8bafd1 100644 --- a/src/Riok.Mapperly/SyntaxProvider.Roslyn4.4.cs +++ b/src/Riok.Mapperly/SyntaxProvider.Roslyn4.4.cs @@ -11,8 +11,7 @@ internal static class SyntaxProvider public static IncrementalValuesProvider GetMapperDeclarations(IncrementalGeneratorInitializationContext context) { return context - .SyntaxProvider - .ForAttributeWithMetadataName( + .SyntaxProvider.ForAttributeWithMetadataName( MapperGenerator.MapperAttributeName, static (s, _) => s is ClassDeclarationSyntax, static (ctx, _) => (ctx.TargetSymbol, TargetNode: (ClassDeclarationSyntax)ctx.TargetNode) @@ -24,8 +23,7 @@ public static IncrementalValuesProvider GetMapperDeclarations public static IncrementalValueProvider GetMapperDefaultDeclarations(IncrementalGeneratorInitializationContext context) { return context - .SyntaxProvider - .ForAttributeWithMetadataName( + .SyntaxProvider.ForAttributeWithMetadataName( MapperGenerator.MapperDefaultsAttributeName, static (s, _) => s is CompilationUnitSyntax, static (ctx, _) => (IAssemblySymbol)ctx.TargetSymbol diff --git a/test/Riok.Mapperly.Tests/GeneratedMethod.cs b/test/Riok.Mapperly.Tests/GeneratedMethod.cs index 7fe6b3ae21..0445075df9 100644 --- a/test/Riok.Mapperly.Tests/GeneratedMethod.cs +++ b/test/Riok.Mapperly.Tests/GeneratedMethod.cs @@ -28,8 +28,7 @@ private static string ExtractBody(MethodDeclarationSyntax declarationSyntax) return string.Empty; var body = declarationSyntax - .Body - .ToFullString() + .Body.ToFullString() .Trim(' ', '\r', '\n') .TrimStart('{') .TrimEnd('}') diff --git a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTest.cs b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTest.cs index cd3cac5400..59febb9bc0 100644 --- a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTest.cs +++ b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTest.cs @@ -109,8 +109,7 @@ public void ModifyingMapperDoesRegenerateOriginal() var classDeclaration = syntaxTree .GetCompilationUnitRoot() - .Members - .OfType() + .Members.OfType() .Single(x => x.Identifier.Text == TestSourceBuilderOptions.DefaultMapperClassName); var member = ParseMemberDeclaration("internal partial int BarToBaz(int value);")!; var updatedClass = classDeclaration.AddMembers(member); @@ -138,8 +137,7 @@ public void ModifyingMapperDiagnosticsOnlyDoesRegenerateDiagnosticsOnly() var classDeclaration = syntaxTree .GetCompilationUnitRoot() - .Members - .OfType() + .Members.OfType() .Single(x => x.Identifier.Text == TestSourceBuilderOptions.DefaultMapperClassName); var member = ParseMemberDeclaration("[MapperIgnoreSource(\"not_found_updated\")] partial B Map(A source);")!; var updatedClass = classDeclaration.WithMembers(new SyntaxList(member)); diff --git a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs index d180306d69..d3f179a59e 100644 --- a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs +++ b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs @@ -16,8 +16,7 @@ public static CSharpCompilation ReplaceRecord( var syntaxTree = compilation.SyntaxTrees.Single(); var recordDeclaration = syntaxTree .GetCompilationUnitRoot() - .Members - .OfType() + .Members.OfType() .Single(x => x.Identifier.Text == recordName); var updatedRecordDeclaration = SyntaxFactory.ParseMemberDeclaration(newRecord)!; diff --git a/test/Riok.Mapperly.Tests/TestHelper.cs b/test/Riok.Mapperly.Tests/TestHelper.cs index 64da07053f..f087ce82a6 100644 --- a/test/Riok.Mapperly.Tests/TestHelper.cs +++ b/test/Riok.Mapperly.Tests/TestHelper.cs @@ -34,14 +34,12 @@ public static MapperGenerationResult GenerateMapper( var result = Generate(source, options, additionalAssemblies).GetRunResult(); var syntaxRoot = result - .GeneratedTrees - .SingleOrDefault(x => Path.GetFileName(x.FilePath) == options.GeneratedTreeFileName) + .GeneratedTrees.SingleOrDefault(x => Path.GetFileName(x.FilePath) == options.GeneratedTreeFileName) ?.GetRoot(); var methods = ExtractAllMethods(syntaxRoot).Select(x => new GeneratedMethod(x)).ToDictionary(x => x.Name); var groupedDiagnostics = result - .Diagnostics - .GroupBy(x => x.Descriptor.Id) + .Diagnostics.GroupBy(x => x.Descriptor.Id) .ToDictionary(x => x.Key, x => (IReadOnlyCollection)x.ToList()); var mapperResult = new MapperGenerationResult(result.Diagnostics, groupedDiagnostics, methods); if (options.AllowedDiagnostics != null) @@ -104,8 +102,7 @@ params SyntaxTree[] syntaxTrees var compilation = CSharpCompilation.Create(name, syntaxTrees, options: compilationOptions); var references = AppDomain - .CurrentDomain - .GetAssemblies() + .CurrentDomain.GetAssemblies() .Where(x => !x.IsDynamic && !string.IsNullOrWhiteSpace(x.Location)) .Select(x => MetadataReference.CreateFromFile(x.Location)); compilation = compilation.AddReferences(references);