diff --git a/Moyou.Aspects/Moyou.Aspects.Memento/MementoAttribute.cs b/Moyou.Aspects/Moyou.Aspects.Memento/MementoAttribute.cs index 997d8df..9649e5d 100644 --- a/Moyou.Aspects/Moyou.Aspects.Memento/MementoAttribute.cs +++ b/Moyou.Aspects/Moyou.Aspects.Memento/MementoAttribute.cs @@ -106,7 +106,7 @@ public override void BuildAspect(IAspectBuilder builder) }); builder.Advice.IntroduceMethod(builder.Target, nameof(CreateMementoImpl), - args: new { TMementoType = nestedMementoType, relevantMembers, introducedFieldsOnMemento, builder }, + args: new { TMementoType = nestedMementoType, relevantMembers, introducedFieldsOnMemento }, scope: IntroductionScope.Instance, whenExists: OverrideStrategy.Override, buildMethod: builder => { builder.Accessibility = Accessibility.Private; @@ -115,9 +115,11 @@ public override void BuildAspect(IAspectBuilder builder) return; IEnumerable IntroduceMementoTypeFields() => relevantMembers - .Select(fieldOrProperty => builder.Advice.IntroduceField(nestedMementoType, fieldOrProperty.Name, - fieldOrProperty.Type, IntroductionScope.Instance, - buildField: fBuilder => fBuilder.Accessibility = Accessibility.Public)) + .Select(fieldOrProperty => + builder.Advice.IntroduceField(nestedMementoType, fieldOrProperty.Name, + fieldOrProperty.Type, IntroductionScope.Instance, + buildField: fBuilder => fBuilder.Accessibility = Accessibility.Public) + ) .Select(r => r.Declaration); IEnumerable GetRelevantMembers() @@ -222,8 +224,7 @@ [CompileTime] IEnumerable introducedFieldsOnMemento [Template] public IMemento CreateMementoImpl<[CompileTime] TMementoType>( [CompileTime] IEnumerable relevantMembers, - [CompileTime] IEnumerable introducedFieldsOnMemento, - IAspectBuilder builder) where TMementoType : IMemento, new() + [CompileTime] IEnumerable introducedFieldsOnMemento) where TMementoType : IMemento, new() { var memento = new TMementoType(); //prevent multiple enumerations @@ -245,7 +246,7 @@ public IMemento CreateMementoImpl<[CompileTime] TMementoType>( } else if (sourceFieldOrProp.Type.Is(SpecialType.IEnumerable_T, ConversionKind.TypeDefinition)) { - HandleIEnumerable(sourceFieldOrProp, targetFieldOrProp, builder); + HandleIEnumerable(sourceFieldOrProp, targetFieldOrProp); } else { @@ -258,8 +259,7 @@ public IMemento CreateMementoImpl<[CompileTime] TMementoType>( } [Template] - private void HandleIEnumerable(IFieldOrProperty sourceFieldOrProp, IExpression targetFieldOrProp, - IAspectBuilder builder) + private void HandleIEnumerable(IFieldOrProperty sourceFieldOrProp, IExpression targetFieldOrProp) { var namedType = (INamedType)sourceFieldOrProp.Type; //copy-via-To[Collection]() types