#143: Handle expression body methods in implement clone method refact…

…oring
cezarypiatek · Oct 31, 2020 · 8f447f5 · 8f447f5
1 parent 9e8da67
commit 8f447f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/MappingGenerator/.editorconfig b/MappingGenerator/.editorconfig
@@ -1,4 +1,4 @@
 [*.cs]
 
-# CA2007: Consider calling ConfigureAwait on the awaited task
-dotnet_diagnostic.CA2007.severity = error
+# VSTHRD200: Use "Async" suffix for async methods
+dotnet_diagnostic.VSTHRD200.severity = none
diff --git a/...appingGenerator/MappingGenerator/Features/Refactorings/ImplementCloneMethodRefactoring.cs b/...appingGenerator/MappingGenerator/Features/Refactorings/ImplementCloneMethodRefactoring.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis.Formatting;
 using System.Linq;
 using MappingGenerator.Mappings.MappingImplementors;
+using MappingGenerator.MethodHelpers;
 
 namespace MappingGenerator.Features.Refactorings
 {
@@ -48,7 +49,10 @@ private async Task<Document> ImplementCloneMethodBody(Document document, MethodD
             var methodSymbol =  semanticModel.GetDeclaredSymbol(methodDeclaration, cancellationToken: cancellationToken);
             var mappingContext = new MappingContext(methodSymbol.ContainingType);
             var cloneExpression =  await CreateCloneExpressionAsync(generator, semanticModel, new AnnotatedType(methodSymbol.ReturnType), mappingContext).ConfigureAwait(false);
-            return await document.ReplaceNodes(methodDeclaration.Body, ((BaseMethodDeclarationSyntax) generator.MethodDeclaration(methodSymbol, cloneExpression)).Body, cancellationToken).ConfigureAwait(false);
+
+            var cloneBody = ((BaseMethodDeclarationSyntax) generator.MethodDeclaration(methodSymbol, cloneExpression)).Body;
+
+            return await document.ReplaceNodes(methodDeclaration, methodDeclaration.WithOnlyBody(cloneBody), cancellationToken).ConfigureAwait(false);
         }
 
         private bool IsCandidateForCloneMethod(MethodDeclarationSyntax md)
@@ -75,7 +79,7 @@ await GenerateCloneMethodStronglyTypedAsync(generator, typeDeclaration, semantic
 
             if (newClassDeclaration.BaseList == null || newClassDeclaration.BaseList.Types.Any(x => x.Type.ToString().Contains("ICloneable")) == false)
             {
-                var cloneableInterface = SyntaxFactory.ParseTypeName($"System.ICloneable");
+                var cloneableInterface = SyntaxFactory.ParseTypeName("System.ICloneable");
                 newClassDeclaration = generator.AddInterfaceType(newClassDeclaration, cloneableInterface.WithAdditionalAnnotations(Formatter.Annotation)) as TypeDeclarationSyntax;
             }