diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 64f3e60b66..6933391943 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -31,7 +31,7 @@ "rollForward": false }, "csharpier": { - "version": "1.3.0", + "version": "1.4.0", "commands": [ "csharpier" ], diff --git a/src/Riok.Mapperly/Configuration/AttributeDataAccessor.cs b/src/Riok.Mapperly/Configuration/AttributeDataAccessor.cs index 8cf1b7e419..30e0d73e18 100644 --- a/src/Riok.Mapperly/Configuration/AttributeDataAccessor.cs +++ b/src/Riok.Mapperly/Configuration/AttributeDataAccessor.cs @@ -105,8 +105,7 @@ internal static TData Access(AttributeData attrData, SymbolAc var dataType = typeof(TData); var syntax = (AttributeSyntax?)attrData.ApplicationSyntaxReference?.GetSyntax(); - var syntaxArguments = - (IReadOnlyList?)syntax?.ArgumentList?.Arguments + var syntaxArguments = (IReadOnlyList?)syntax?.ArgumentList?.Arguments ?? new AttributeArgumentSyntax[attrData.ConstructorArguments.Length + attrData.NamedArguments.Length]; var typeArguments = (IReadOnlyCollection?)attrData.AttributeClass?.TypeArguments ?? []; var attr = Create(typeArguments, attrData.ConstructorArguments, syntaxArguments, symbolAccessor); diff --git a/src/Riok.Mapperly/Configuration/MapperConfigurationMerger.cs b/src/Riok.Mapperly/Configuration/MapperConfigurationMerger.cs index d707b4c569..b2d8c0370f 100644 --- a/src/Riok.Mapperly/Configuration/MapperConfigurationMerger.cs +++ b/src/Riok.Mapperly/Configuration/MapperConfigurationMerger.cs @@ -13,8 +13,8 @@ public static MapperConfiguration Merge(MapperConfiguration highPriority, Mapper EnumMappingStrategy = highPriority.EnumMappingStrategy ?? lowPriority.EnumMappingStrategy, EnumMappingIgnoreCase = highPriority.EnumMappingIgnoreCase ?? lowPriority.EnumMappingIgnoreCase, ThrowOnMappingNullMismatch = highPriority.ThrowOnMappingNullMismatch ?? lowPriority.ThrowOnMappingNullMismatch, - ThrowOnPropertyMappingNullMismatch = - highPriority.ThrowOnPropertyMappingNullMismatch ?? lowPriority.ThrowOnPropertyMappingNullMismatch, + ThrowOnPropertyMappingNullMismatch = highPriority.ThrowOnPropertyMappingNullMismatch + ?? lowPriority.ThrowOnPropertyMappingNullMismatch, AllowNullPropertyAssignment = highPriority.AllowNullPropertyAssignment ?? lowPriority.AllowNullPropertyAssignment, UseDeepCloning = highPriority.UseDeepCloning ?? lowPriority.UseDeepCloning, StackCloningStrategy = highPriority.StackCloningStrategy ?? lowPriority.StackCloningStrategy, @@ -37,84 +37,85 @@ public static MapperConfiguration Merge(MapperConfiguration highPriority, Mapper public static MapperAttribute MergeToAttribute(MapperConfiguration mapperConfiguration, MapperConfiguration defaultMapperConfiguration) { var mapper = new MapperAttribute(); - mapper.PropertyNameMappingStrategy = - mapperConfiguration.PropertyNameMappingStrategy + mapper.PropertyNameMappingStrategy = mapperConfiguration.PropertyNameMappingStrategy ?? defaultMapperConfiguration.PropertyNameMappingStrategy ?? mapper.PropertyNameMappingStrategy; - mapper.EnumMappingStrategy = - mapperConfiguration.EnumMappingStrategy ?? defaultMapperConfiguration.EnumMappingStrategy ?? mapper.EnumMappingStrategy; + mapper.EnumMappingStrategy = mapperConfiguration.EnumMappingStrategy + ?? defaultMapperConfiguration.EnumMappingStrategy + ?? mapper.EnumMappingStrategy; - mapper.EnumMappingIgnoreCase = - mapperConfiguration.EnumMappingIgnoreCase ?? defaultMapperConfiguration.EnumMappingIgnoreCase ?? mapper.EnumMappingIgnoreCase; + mapper.EnumMappingIgnoreCase = mapperConfiguration.EnumMappingIgnoreCase + ?? defaultMapperConfiguration.EnumMappingIgnoreCase + ?? mapper.EnumMappingIgnoreCase; - mapper.ThrowOnMappingNullMismatch = - mapperConfiguration.ThrowOnMappingNullMismatch + mapper.ThrowOnMappingNullMismatch = mapperConfiguration.ThrowOnMappingNullMismatch ?? defaultMapperConfiguration.ThrowOnMappingNullMismatch ?? mapper.ThrowOnMappingNullMismatch; - mapper.ThrowOnPropertyMappingNullMismatch = - mapperConfiguration.ThrowOnPropertyMappingNullMismatch + mapper.ThrowOnPropertyMappingNullMismatch = mapperConfiguration.ThrowOnPropertyMappingNullMismatch ?? defaultMapperConfiguration.ThrowOnPropertyMappingNullMismatch ?? mapper.ThrowOnPropertyMappingNullMismatch; - mapper.AllowNullPropertyAssignment = - mapperConfiguration.AllowNullPropertyAssignment + mapper.AllowNullPropertyAssignment = mapperConfiguration.AllowNullPropertyAssignment ?? defaultMapperConfiguration.AllowNullPropertyAssignment ?? mapper.AllowNullPropertyAssignment; mapper.UseDeepCloning = mapperConfiguration.UseDeepCloning ?? defaultMapperConfiguration.UseDeepCloning ?? mapper.UseDeepCloning; - mapper.StackCloningStrategy = - mapperConfiguration.StackCloningStrategy ?? defaultMapperConfiguration.StackCloningStrategy ?? mapper.StackCloningStrategy; + mapper.StackCloningStrategy = mapperConfiguration.StackCloningStrategy + ?? defaultMapperConfiguration.StackCloningStrategy + ?? mapper.StackCloningStrategy; - mapper.EnabledConversions = - mapperConfiguration.EnabledConversions ?? defaultMapperConfiguration.EnabledConversions ?? mapper.EnabledConversions; + mapper.EnabledConversions = mapperConfiguration.EnabledConversions + ?? defaultMapperConfiguration.EnabledConversions + ?? mapper.EnabledConversions; - mapper.UseReferenceHandling = - mapperConfiguration.UseReferenceHandling ?? defaultMapperConfiguration.UseReferenceHandling ?? mapper.UseReferenceHandling; + mapper.UseReferenceHandling = mapperConfiguration.UseReferenceHandling + ?? defaultMapperConfiguration.UseReferenceHandling + ?? mapper.UseReferenceHandling; - mapper.IgnoreObsoleteMembersStrategy = - mapperConfiguration.IgnoreObsoleteMembersStrategy + mapper.IgnoreObsoleteMembersStrategy = mapperConfiguration.IgnoreObsoleteMembersStrategy ?? defaultMapperConfiguration.IgnoreObsoleteMembersStrategy ?? mapper.IgnoreObsoleteMembersStrategy; - mapper.RequiredMappingStrategy = - mapperConfiguration.RequiredMappingStrategy + mapper.RequiredMappingStrategy = mapperConfiguration.RequiredMappingStrategy ?? defaultMapperConfiguration.RequiredMappingStrategy ?? mapper.RequiredMappingStrategy; - mapper.RequiredEnumMappingStrategy = - mapperConfiguration.RequiredEnumMappingStrategy + mapper.RequiredEnumMappingStrategy = mapperConfiguration.RequiredEnumMappingStrategy ?? defaultMapperConfiguration.RequiredEnumMappingStrategy ?? mapperConfiguration.RequiredMappingStrategy ?? defaultMapperConfiguration.RequiredMappingStrategy ?? mapper.RequiredMappingStrategy; - mapper.IncludedMembers = - mapperConfiguration.IncludedMembers ?? defaultMapperConfiguration.IncludedMembers ?? mapper.IncludedMembers; + mapper.IncludedMembers = mapperConfiguration.IncludedMembers + ?? defaultMapperConfiguration.IncludedMembers + ?? mapper.IncludedMembers; - mapper.IncludedConstructors = - mapperConfiguration.IncludedConstructors ?? defaultMapperConfiguration.IncludedConstructors ?? mapper.IncludedConstructors; + mapper.IncludedConstructors = mapperConfiguration.IncludedConstructors + ?? defaultMapperConfiguration.IncludedConstructors + ?? mapper.IncludedConstructors; - mapper.PreferParameterlessConstructors = - mapperConfiguration.PreferParameterlessConstructors + mapper.PreferParameterlessConstructors = mapperConfiguration.PreferParameterlessConstructors ?? defaultMapperConfiguration.PreferParameterlessConstructors ?? mapper.PreferParameterlessConstructors; - mapper.AutoUserMappings = - mapperConfiguration.AutoUserMappings ?? defaultMapperConfiguration.AutoUserMappings ?? mapper.AutoUserMappings; + mapper.AutoUserMappings = mapperConfiguration.AutoUserMappings + ?? defaultMapperConfiguration.AutoUserMappings + ?? mapper.AutoUserMappings; - mapper.EnumNamingStrategy = - mapperConfiguration.EnumNamingStrategy ?? defaultMapperConfiguration.EnumNamingStrategy ?? mapper.EnumNamingStrategy; + mapper.EnumNamingStrategy = mapperConfiguration.EnumNamingStrategy + ?? defaultMapperConfiguration.EnumNamingStrategy + ?? mapper.EnumNamingStrategy; - mapper.QueryableProjectionNullHandling = - mapperConfiguration.QueryableProjectionNullHandling + mapper.QueryableProjectionNullHandling = mapperConfiguration.QueryableProjectionNullHandling ?? defaultMapperConfiguration.QueryableProjectionNullHandling ?? mapper.QueryableProjectionNullHandling; - mapper.NoExpressionInlining = - mapperConfiguration.NoExpressionInlining ?? defaultMapperConfiguration.NoExpressionInlining ?? mapper.NoExpressionInlining; + mapper.NoExpressionInlining = mapperConfiguration.NoExpressionInlining + ?? defaultMapperConfiguration.NoExpressionInlining + ?? mapper.NoExpressionInlining; return mapper; } diff --git a/src/Riok.Mapperly/Configuration/MapperConfigurationReader.cs b/src/Riok.Mapperly/Configuration/MapperConfigurationReader.cs index 3968e59d0f..b49c621f19 100644 --- a/src/Riok.Mapperly/Configuration/MapperConfigurationReader.cs +++ b/src/Riok.Mapperly/Configuration/MapperConfigurationReader.cs @@ -129,8 +129,7 @@ bool supportsDeepCloning bool supportsDeepCloning ) { - var typeMapping = - (ITypeMapping?)_mappings.FindNamedNewInstanceMapping(name.FullName, out var ambiguousName) + var typeMapping = (ITypeMapping?)_mappings.FindNamedNewInstanceMapping(name.FullName, out var ambiguousName) ?? _mappings.FindExistingInstanceNamedMapping(name.FullName, out ambiguousName); var methodSymbol = (typeMapping as IUserMapping)?.Method; if (!ValidateIncludedConfig(ambiguousName, configRef, name.FullName, typeMapping, methodSymbol)) diff --git a/src/Riok.Mapperly/Descriptors/MappingBuilders/SpanMappingBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBuilders/SpanMappingBuilder.cs index 94b5619fb9..f73c345cef 100644 --- a/src/Riok.Mapperly/Descriptors/MappingBuilders/SpanMappingBuilder.cs +++ b/src/Riok.Mapperly/Descriptors/MappingBuilders/SpanMappingBuilder.cs @@ -43,8 +43,13 @@ public static class SpanMappingBuilder // if the source is Span/ReadOnlySpan or Array and target is Span/ReadOnlySpan // and element type is the same, then direct cast - (CollectionType.Span or CollectionType.ReadOnlySpan or CollectionType.Array, CollectionType.Span or CollectionType.ReadOnlySpan) - when elementMapping.IsSynthetic && !ctx.Configuration.UseDeepCloning => new CastMapping(ctx.Source, ctx.Target), + ( + CollectionType.Span + or CollectionType.ReadOnlySpan + or CollectionType.Array, + CollectionType.Span + or CollectionType.ReadOnlySpan + ) when elementMapping.IsSynthetic && !ctx.Configuration.UseDeepCloning => new CastMapping(ctx.Source, ctx.Target), // otherwise map each value into an Array _ => BuildToArrayOrMap(ctx, elementMapping), diff --git a/src/Riok.Mapperly/Descriptors/Mappings/DerivedTypeIfExpressionMapping.cs b/src/Riok.Mapperly/Descriptors/Mappings/DerivedTypeIfExpressionMapping.cs index 4b8fdbba52..85d0701e29 100644 --- a/src/Riok.Mapperly/Descriptors/Mappings/DerivedTypeIfExpressionMapping.cs +++ b/src/Riok.Mapperly/Descriptors/Mappings/DerivedTypeIfExpressionMapping.cs @@ -20,9 +20,8 @@ public override ExpressionSyntax Build(TypeMappingBuildContext ctx) // source is A x ? MapToA(x) : var typeExpressions = typeMappings .Reverse() - .Aggregate( - DefaultLiteral(), - (aggregate, current) => BuildConditional(ctx, aggregate, current) + .Aggregate(DefaultLiteral(), (aggregate, current) => + BuildConditional(ctx, aggregate, current) ); // cast to target type, to ensure the compiler picks the correct type diff --git a/src/Riok.Mapperly/Descriptors/UnsafeAccess/UnsafeAccessorTypeContext.cs b/src/Riok.Mapperly/Descriptors/UnsafeAccess/UnsafeAccessorTypeContext.cs index 643f71510c..be3e5d5f11 100644 --- a/src/Riok.Mapperly/Descriptors/UnsafeAccess/UnsafeAccessorTypeContext.cs +++ b/src/Riok.Mapperly/Descriptors/UnsafeAccess/UnsafeAccessorTypeContext.cs @@ -21,37 +21,29 @@ public class UnsafeAccessorTypeContext(UniqueNameBuilder nameBuilder, INamedType public UnsafeSetPropertyAccessor GetOrBuildPropertySetter(PropertyMember member) { - return GetOrBuild( - UnsafeAccessorType.SetProperty, - member.Symbol, - static (m, className, methodName) => new UnsafeSetPropertyAccessor(m, className, methodName) + return GetOrBuild(UnsafeAccessorType.SetProperty, member.Symbol, static (m, className, methodName) => + new UnsafeSetPropertyAccessor(m, className, methodName) ); } public UnsafeGetPropertyAccessor GetOrBuildPropertyGetter(PropertyMember member) { - return GetOrBuild( - UnsafeAccessorType.GetProperty, - member.Symbol, - static (m, className, methodName) => new UnsafeGetPropertyAccessor(m, className, methodName) + return GetOrBuild(UnsafeAccessorType.GetProperty, member.Symbol, static (m, className, methodName) => + new UnsafeGetPropertyAccessor(m, className, methodName) ); } public UnsafeFieldAccessor GetOrBuildFieldGetter(FieldMember member) { - return GetOrBuild( - UnsafeAccessorType.GetField, - member.Symbol, - static (m, className, methodName) => new UnsafeFieldAccessor(m, className, methodName) + return GetOrBuild(UnsafeAccessorType.GetField, member.Symbol, static (m, className, methodName) => + new UnsafeFieldAccessor(m, className, methodName) ); } public UnsafeConstructorAccessor GetOrBuildConstructor(IMethodSymbol ctorSymbol) { - return GetOrBuild( - UnsafeAccessorType.Constructor, - ctorSymbol, - static (s, className, methodName) => new UnsafeConstructorAccessor(s, className, methodName) + return GetOrBuild(UnsafeAccessorType.Constructor, ctorSymbol, static (s, className, methodName) => + new UnsafeConstructorAccessor(s, className, methodName) ); } diff --git a/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs b/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs index efa976f16e..bd6bba09fc 100644 --- a/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs +++ b/src/Riok.Mapperly/Descriptors/UserMethodMappingExtractor.cs @@ -21,8 +21,7 @@ internal static IEnumerable ExtractUserMappings(SimpleMappingBuild var methods = mapperSymbol.GetMembers().OfType().Where(method => IsMappingMethodCandidate(ctx, method)); foreach (var method in methods) { - var mapping = - BuildUserDefinedMapping(ctx, method) + var mapping = BuildUserDefinedMapping(ctx, method) ?? BuildUserImplementedMapping( ctx, method, diff --git a/src/Riok.Mapperly/Emit/Syntax/SyntaxIndentationExtensions.cs b/src/Riok.Mapperly/Emit/Syntax/SyntaxIndentationExtensions.cs index 8e0683dd66..cfa1ed5b53 100644 --- a/src/Riok.Mapperly/Emit/Syntax/SyntaxIndentationExtensions.cs +++ b/src/Riok.Mapperly/Emit/Syntax/SyntaxIndentationExtensions.cs @@ -98,21 +98,18 @@ public static SyntaxToken AddTrailingLineFeed(this SyntaxToken token, int indent public static SyntaxTriviaList AddLineFeedAndIndentation(this SyntaxTriviaList trivia, int indentation) { - var triviaToInsert = _indentationLineFeedSyntaxTriviaCache.GetOrAdd( - indentation, - static indentationLevel => + var triviaToInsert = _indentationLineFeedSyntaxTriviaCache.GetOrAdd(indentation, static indentationLevel => + { + // +1 for the new line at the beginning of the indentation + var toInsert = new SyntaxTrivia[indentationLevel + 1]; + toInsert[0] = ElasticCarriageReturnLineFeed; + for (var i = 1; i < toInsert.Length; i++) { - // +1 for the new line at the beginning of the indentation - var toInsert = new SyntaxTrivia[indentationLevel + 1]; - toInsert[0] = ElasticCarriageReturnLineFeed; - for (var i = 1; i < toInsert.Length; i++) - { - toInsert[i] = _indentation; - } - - return toInsert; + toInsert[i] = _indentation; } - ); + + return toInsert; + }); return trivia.InsertRange(0, triviaToInsert); } diff --git a/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs b/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs index c0b0b9a2df..22620adbf6 100644 --- a/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs +++ b/src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs @@ -50,16 +50,13 @@ public static void ReportDiagnostics( IncrementalValuesProvider> diagnostics ) { - context.RegisterSourceOutput( - diagnostics, - static (context, diagnostics) => + context.RegisterSourceOutput(diagnostics, static (context, diagnostics) => + { + foreach (var diagnostic in diagnostics) { - foreach (var diagnostic in diagnostics) - { - context.ReportDiagnostic(diagnostic); - } + context.ReportDiagnostic(diagnostic); } - ); + }); } /// @@ -72,13 +69,10 @@ public static void EmitMapperSource( IncrementalValuesProvider mappers ) { - context.RegisterImplementationSourceOutput( - mappers, - static (spc, mapper) => - { - var mapperText = mapper.Body.GetText(Encoding.UTF8); - spc.AddSource(mapper.FileName, mapperText); - } - ); + context.RegisterImplementationSourceOutput(mappers, static (spc, mapper) => + { + var mapperText = mapper.Body.GetText(Encoding.UTF8); + spc.AddSource(mapper.FileName, mapperText); + }); } } diff --git a/src/Riok.Mapperly/MapperGenerator.cs b/src/Riok.Mapperly/MapperGenerator.cs index d4faaf78dc..a419f1478f 100644 --- a/src/Riok.Mapperly/MapperGenerator.cs +++ b/src/Riok.Mapperly/MapperGenerator.cs @@ -116,15 +116,10 @@ CancellationToken cancellationToken var compilation = compilationContext.Compilation.WithOptions(advancedOptions); // map all symbols to the new compilation - compilationContext = compilationContext with - { - Compilation = compilation, - Types = new WellKnownTypes(compilation), - }; + compilationContext = compilationContext with { Compilation = compilation, Types = new WellKnownTypes(compilation) }; assemblyScopedStaticMappers = MapStaticMappers(assemblyScopedStaticMappers, compilation); var mapperDeclarationSymbolFqn = mapperDeclaration.Symbol.FullyQualifiedMetadataName(); - var mappedMapperSymbol = - compilationContext.Compilation.GetBestTypeByMetadataName(mapperDeclarationSymbolFqn) + var mappedMapperSymbol = compilationContext.Compilation.GetBestTypeByMetadataName(mapperDeclarationSymbolFqn) ?? throw new InvalidOperationException($"Could not get type {mapperDeclarationSymbolFqn}"); mapperDeclaration = mapperDeclaration with { Symbol = mappedMapperSymbol }; @@ -167,8 +162,7 @@ CSharpCompilation compilation foreach (var config in staticMappers) { var mapperTypeFqn = config.MapperType.FullyQualifiedMetadataName(); - var mappedMapperType = - compilation.GetBestTypeByMetadataName(mapperTypeFqn) + var mappedMapperType = compilation.GetBestTypeByMetadataName(mapperTypeFqn) ?? throw new InvalidOperationException($"Could not get type {mapperTypeFqn}"); staticMappersBuilder.Add( new UseStaticMapperConfiguration(mappedMapperType) { NoExpressionInlining = config.NoExpressionInlining } @@ -259,8 +253,9 @@ MapperConfiguration mapperDefaults { var includedMembers = mapperConfiguration.IncludedMembers ?? mapperDefaults.IncludedMembers ?? MemberVisibility.AllAccessible; - var includedConstructors = - mapperConfiguration.IncludedConstructors ?? mapperDefaults.IncludedConstructors ?? MemberVisibility.AllAccessible; + var includedConstructors = mapperConfiguration.IncludedConstructors + ?? mapperDefaults.IncludedConstructors + ?? MemberVisibility.AllAccessible; if (includedMembers.HasFlag(MemberVisibility.Accessible) && includedConstructors.HasFlag(MemberVisibility.Accessible)) { diff --git a/src/Riok.Mapperly/Symbols/Members/MemberPathGetter.cs b/src/Riok.Mapperly/Symbols/Members/MemberPathGetter.cs index 5d3802b74c..20563da482 100644 --- a/src/Riok.Mapperly/Symbols/Members/MemberPathGetter.cs +++ b/src/Riok.Mapperly/Symbols/Members/MemberPathGetter.cs @@ -54,20 +54,17 @@ public static MemberPathGetter Build(SimpleMappingBuilderContext ctx, MemberPath { if (nullConditional) { - return path.AggregateWithPrevious( - baseAccess, - (expr, prevProp, prop) => prop.Getter.BuildAccess(expr, prop.Member.ContainingType, prevProp.Member?.IsReadNullable == true) + return path.AggregateWithPrevious(baseAccess, (expr, prevProp, prop) => + prop.Getter.BuildAccess(expr, prop.Member.ContainingType, prevProp.Member?.IsReadNullable == true) ); } if (addValuePropertyOnNullable) { - return path.Aggregate( - baseAccess, - (a, b) => - b.Member.Type.IsNullableValueType() - ? MemberAccess(b.Getter.BuildAccess(a, b.Member.ContainingType), NullableValueProperty) - : b.Getter.BuildAccess(a, b.Member.ContainingType) + return path.Aggregate(baseAccess, (a, b) => + b.Member.Type.IsNullableValueType() + ? MemberAccess(b.Getter.BuildAccess(a, b.Member.ContainingType), NullableValueProperty) + : b.Getter.BuildAccess(a, b.Member.ContainingType) ); } diff --git a/test/Riok.Mapperly.IntegrationTests/BaseMapperTest.cs b/test/Riok.Mapperly.IntegrationTests/BaseMapperTest.cs index 9095d42812..91b9748730 100644 --- a/test/Riok.Mapperly.IntegrationTests/BaseMapperTest.cs +++ b/test/Riok.Mapperly.IntegrationTests/BaseMapperTest.cs @@ -158,8 +158,8 @@ public static TestObject NewTestObj() /// Either an empty string or the name of the version. private static string GetSnapshotVersionSuffix(Type type, MethodInfo method) { - var versionedSnapshot = - method.GetCustomAttribute() ?? type.GetCustomAttribute(); + var versionedSnapshot = method.GetCustomAttribute() + ?? type.GetCustomAttribute(); if (versionedSnapshot == null) return string.Empty; @@ -203,8 +203,8 @@ private static Versions GetCurrentVersion() private static string FindDirectoryOfFile(string fileExtension, [CallerFilePath] string baseFilePath = "") { - var dir = - Path.GetDirectoryName(baseFilePath) ?? throw new InvalidOperationException($"Could not get directory from {baseFilePath}"); + var dir = Path.GetDirectoryName(baseFilePath) + ?? throw new InvalidOperationException($"Could not get directory from {baseFilePath}"); while (Directory.GetFiles(dir, "*" + fileExtension, SearchOption.TopDirectoryOnly).Length == 0) { diff --git a/test/Riok.Mapperly.Tests/MapperGenerationResultAssertions.cs b/test/Riok.Mapperly.Tests/MapperGenerationResultAssertions.cs index 2fa1f65872..578cd5e17f 100644 --- a/test/Riok.Mapperly.Tests/MapperGenerationResultAssertions.cs +++ b/test/Riok.Mapperly.Tests/MapperGenerationResultAssertions.cs @@ -100,8 +100,7 @@ public MapperGenerationResultAssertions HaveDiagnostic(DiagnosticDescriptor desc return this; } - var matchingIdDiagnostic = - _notAssertedDiagnostics.FirstOrDefault(x => x.Descriptor.Equals(descriptor)) + var matchingIdDiagnostic = _notAssertedDiagnostics.FirstOrDefault(x => x.Descriptor.Equals(descriptor)) ?? _mapper.Diagnostics.First(x => x.Descriptor.Equals(descriptor)); matchingIdDiagnostic.GetMessage().ShouldBe(message, $"message of {descriptor.Id} should match"); return this;