Merge remote-tracking branch 'origin/develop' into develop

Author: inyutin-maxim

System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileCodeFix/AfterFix.txt

@@ -4,18 +4,18 @@ namespace SomeNameSpace
 {
 	public class WithOutFileSystem
 	{
-		private readonly IFileSystem _fileSystem;
+		private readonly IFileSystem _fSystem;
 
 		public WithOutFileSystem(IFileSystem fileSystem)
 		{
-			_fileSystem = fileSystem;
+			_fSystem = fileSystem;
 		}
 
 		public void SomeMethod()
 		{
 			const string filePath = "C:\\temp.txt";
 
-			_fileSystem.File.Delete(filePath);
+			_fSystem.File.Delete(filePath);
 		}
 	}
 }

System.IO.Abstractions.Analyzers.Tests/TestData/CodeFix/FileCodeFix/BeforeFix.txt

@@ -4,11 +4,11 @@ namespace SomeNameSpace
 {
 	public class WithOutFileSystem
 	{
-		private readonly IFileSystem _fileSystem;
+		private readonly IFileSystem _fSystem;
 
 		public WithOutFileSystem(IFileSystem fileSystem)
 		{
-			_fileSystem = fileSystem;
+			_fSystem = fileSystem;
 		}
 
 		public void SomeMethod()

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

@@ -14,23 +14,28 @@ public class FileSystemInvokeCodeAction : CodeAction
 
 		private readonly InvocationExpressionSyntax _invocation;
 
+		private readonly FieldDeclarationSyntax _field;
+
 		public override string Title { get; }
 
 		public override string EquivalenceKey => Title;
 
-		public FileSystemInvokeCodeAction(string title, Document document, InvocationExpressionSyntax invocation)
+		public FileSystemInvokeCodeAction(string title, Document document, InvocationExpressionSyntax invocation,
+										FieldDeclarationSyntax field)
 		{
 			Title = title;
 			_document = document;
 			_invocation = invocation;
+			_field = field;
 		}
 
 		protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
 		{
 			var editor = await DocumentEditor.CreateAsync(_document, cancellationToken).ConfigureAwait(false);
 
 			editor.ReplaceNode(_invocation,
-				SF.ParseExpression($"{Constants.FieldFileSystemName}.{_invocation.NormalizeWhitespace().ToFullString()}"));
+				SF.ParseExpression(
+					$"{_field.Declaration.Variables.FirstOrDefault().Identifier.Text}.{_invocation.NormalizeWhitespace().ToFullString()}"));
 
 			return editor.GetChangedDocument();
 		}

System.IO.Abstractions.Analyzers/CodeFixes/BaseInvokeCodeFix.cs

@@ -3,6 +3,7 @@
 using System.IO.Abstractions.Analyzers.RoslynToken;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
@@ -26,9 +27,15 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 			{
 				var invocation = root.FindNode(context.Span).FirstAncestorOrSelf<InvocationExpressionSyntax>();
 
+				var @class = root.FindNode(context.Span)
+					.FirstAncestorOrSelf<ClassDeclarationSyntax>();
+
+				var field = RoslynClassFileSystem.GetFileSystemFieldFromClass(@class);
+
 				context.RegisterCodeFix(new FileSystemInvokeCodeAction(Title,
 						context.Document,
-						invocation),
+						invocation,
+						field),
 					context.Diagnostics);
 			}
 		}