Merge branch 'f/5-check-existing-constructor-parameter' into develop

Author: inyutin-maxim

System.IO.Abstractions.Analyzers.Tests/CodeFixes/FileServiceInterfaceInjectionCodeFixTests.cs

@@ -14,6 +14,8 @@ public class FileServiceInterfaceInjectionCodeFixTests :
 		[InlineData("BeforeFix.txt", "AfterFix.txt")]
 		[InlineData("BeforeFixWithoutConstructor.txt", "AfterFix.txt")]
 		[InlineData("BeforeFixExistsAbstractionsUsing.txt", "AfterFix.txt")]
+		[InlineData("BeforeFixExistingConstructorParameter.txt", "AfterFix.txt")]
+		[InlineData("BeforeFixExistingConstructorParameterUniqName.txt", "AfterFixConstructorParameterUniqName.txt")]
 		public void CodeFix(string sourceBefore, string sourceAfter)
 		{
 			var sourceBeforeFix = ReadFile(sourceBefore);

System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileServiceInterfaceInjectionCodeFix/AfterFixConstructorParameterUniqName.txt

@@ -0,0 +1,25 @@
+using System.IO;
+using System.IO.Abstractions;
+
+namespace SomeNameSpace
+{
+	public class WithOutFileSystem
+	{
+		private readonly IFileSystem _fileSystem;
+
+		public WithOutFileSystem(IFileSystem fSystem)
+		{
+			_fileSystem = fSystem;
+		}
+
+		public void SomeMethod()
+		{
+			const string filePath = "C:\\temp.txt";
+
+			if (File.Exists(filePath))
+			{
+				File.Delete(filePath);
+			}
+		}
+	}
+}

System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileServiceInterfaceInjectionCodeFix/BeforeFixExistingConstructorParameter.txt

@@ -0,0 +1,21 @@
+using System.IO;
+
+namespace SomeNameSpace
+{
+	public class WithOutFileSystem
+	{
+		public WithOutFileSystem(IFileSystem fileSystem)
+		{
+		}
+
+		public void SomeMethod()
+		{
+			const string filePath = "C:\\temp.txt";
+
+			if (File.Exists(filePath))
+			{
+				File.Delete(filePath);
+			}
+		}
+	}
+}

System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileServiceInterfaceInjectionCodeFix/BeforeFixExistingConstructorParameterUniqName.txt

@@ -0,0 +1,21 @@
+using System.IO;
+
+namespace SomeNameSpace
+{
+	public class WithOutFileSystem
+	{
+		public WithOutFileSystem(IFileSystem fSystem)
+		{
+		}
+
+		public void SomeMethod()
+		{
+			const string filePath = "C:\\temp.txt";
+
+			if (File.Exists(filePath))
+			{
+				File.Delete(filePath);
+			}
+		}
+	}
+}

System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs

@@ -74,11 +74,11 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 			return editor.GetChangedDocument();
 		}
 
-		private static ExpressionStatementSyntax CreateAssignmentExpression()
+		private static ExpressionStatementSyntax CreateAssignmentExpression(string parameter)
 		{
 			return SF.ExpressionStatement(SF.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression,
 				SF.IdentifierName(Constants.FieldFileSystemName),
-				SF.IdentifierName(Constants.ParameterFileSystemName)));
+				SF.IdentifierName(parameter)));
 		}
 
 		private static void ConstructorAddParameter(ClassDeclarationSyntax classDeclaration, SyntaxEditor editor)
@@ -91,17 +91,20 @@ private static void ConstructorAddParameter(ClassDeclarationSyntax classDeclarat
 			var newConstructor = constructor.WithAdditionalAnnotations(Formatter.Annotation, Simplifier.Annotation)
 				.NormalizeWhitespace();
 
-			if (!RoslynClassFileSystem.ConstructorHasAssignmentExpression(newConstructor))
-			{
-				newConstructor = newConstructor.AddBodyStatements(CreateAssignmentExpression());
-			}
-
 			if (!RoslynClassFileSystem.ConstructorHasFileSystemParameter(newConstructor))
 			{
 				var parameter = RoslynClassFileSystem.CreateFileSystemParameterDeclaration();
 				newConstructor = newConstructor.AddParameterListParameters(parameter);
 			}
 
+			if (!RoslynClassFileSystem.ConstructorHasAssignmentExpression(newConstructor))
+			{
+				var parameterSyntax = RoslynClassFileSystem.GetFileSystemParameterFromConstructor(newConstructor);
+
+				newConstructor =
+					newConstructor.AddBodyStatements(CreateAssignmentExpression(parameterSyntax.Identifier.Text));
+			}
+
 			if (RoslynClassFileSystem.HasConstructor(classDeclaration))
 			{
 				editor.ReplaceNode(constructor, newConstructor);

System.IO.Abstractions.Analyzers/RoslynToken/RoslynClassFileSystem.cs

@@ -63,7 +63,14 @@ public static FieldDeclarationSyntax CreateFileSystemFieldDeclaration()
 		public static bool ConstructorHasFileSystemParameter(BaseMethodDeclarationSyntax constructor)
 		{
 			return constructor.ParameterList.Parameters
-				.Any(x => x.Identifier.Text == Constants.ParameterFileSystemName && x.Type == GetFileSystemType());
+				.Any(x => x.Type.NormalizeWhitespace().ToFullString() == GetFileSystemType().NormalizeWhitespace().ToFullString());
+		}
+
+		public static ParameterSyntax GetFileSystemParameterFromConstructor(BaseMethodDeclarationSyntax constructor)
+		{
+			return constructor.ParameterList.Parameters
+				.FirstOrDefault(x =>
+					x.Type.NormalizeWhitespace().ToFullString() == GetFileSystemType().NormalizeWhitespace().ToFullString());
 		}
 
 		public static ParameterSyntax CreateFileSystemParameterDeclaration()
@@ -99,8 +106,7 @@ public static bool ConstructorHasAssignmentExpression(BaseMethodDeclarationSynta
 
 			return constructor.Body.Statements.OfType<ExpressionStatementSyntax>()
 				.Any(x => x.IsKind(SyntaxKind.SimpleAssignmentExpression)
-						&& x.Expression.Contains(SF.IdentifierName(Constants.FieldFileSystemName))
-						&& x.Expression.Contains(SF.IdentifierName(Constants.ParameterFileSystemName)));
+						&& x.Expression.Contains(SF.IdentifierName(Constants.FieldFileSystemName)));
 		}
 	}
 }