Add formatting code after apply code fix

inyutin-maxim · inyutin-maxim · commit ee138331a59e · 2019-04-25T22:46:06.000+03:00
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs
@@ -5,6 +5,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace System.IO.Abstractions.Analyzers.CodeActions
@@ -22,7 +23,7 @@ public class DirectoryInfoCodeAction : CodeAction
 		public override string EquivalenceKey => Title;
 
 		public DirectoryInfoCodeAction(string title, Document document, ObjectCreationExpressionSyntax creationExpressionSyntax,
-									FieldDeclarationSyntax field)
+										FieldDeclarationSyntax field)
 		{
 			Title = title;
 			_document = document;
@@ -36,9 +37,10 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 			var arguments = _creationExpressionSyntax.ArgumentList.Arguments.Select(x => x.ToFullString());
 
 			editor.ReplaceNode(_creationExpressionSyntax,
-				SF.ParseExpression($"{_field.Declaration.Variables.ToFullString()}.DirectoryInfo.FromDirectoryName({string.Join(",", arguments)})"));
+				SF.ParseExpression(
+					$"{_field.Declaration.Variables.ToFullString()}.DirectoryInfo.FromDirectoryName({string.Join(",", arguments)})"));
 
-			return editor.GetChangedDocument();
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileInfoCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileInfoCodeAction.cs
@@ -5,6 +5,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace System.IO.Abstractions.Analyzers.CodeActions
@@ -38,7 +39,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 			editor.ReplaceNode(_creationExpressionSyntax,
 				SF.ParseExpression($"{_field.Declaration.Variables.ToFullString()}.FileInfo.FromFileName({string.Join(",", arguments)})"));
 
-			return editor.GetChangedDocument();
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs
@@ -71,7 +71,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 				editor.InsertAfter(systemIo, RoslynClassFileSystem.GetFileSystemUsing());
 			}
 
-			return editor.GetChangedDocument();
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);
 		}
 
 		private static ExpressionStatementSyntax CreateAssignmentExpression(string field = Constants.FieldFileSystemName)
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs
@@ -71,7 +71,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 				editor.InsertAfter(systemIo, RoslynClassFileSystem.GetFileSystemUsing());
 			}
 
-			return editor.GetChangedDocument();
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);
 		}
 
 		private static ExpressionStatementSyntax CreateAssignmentExpression(string field, string parameter)
@@ -105,7 +105,8 @@ private static void ConstructorAddParameter(ClassDeclarationSyntax classDeclarat
 				{
 					var fileSystem = RoslynClassFileSystem.GetFileSystemFieldFromClass(classDeclaration);
 
-					newConstructor = newConstructor.AddBodyStatements(CreateAssignmentExpression(fileSystem.Declaration.Variables.ToFullString(),
+					newConstructor = newConstructor.AddBodyStatements(CreateAssignmentExpression(
+						fileSystem.Declaration.Variables.ToFullString(),
 						parameterSyntax.Identifier.Text));
 				} else
 				{
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs
@@ -5,6 +5,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace System.IO.Abstractions.Analyzers.CodeActions
@@ -38,7 +39,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 			editor.ReplaceNode(_creationExpressionSyntax,
 				SF.ParseExpression($"{_field.Declaration.Variables.ToFullString()}.FileStream.Create({string.Join(",", arguments)})"));
 
-			return editor.GetChangedDocument();
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileSystemInvokeCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileSystemInvokeCodeAction.cs
@@ -4,6 +4,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace System.IO.Abstractions.Analyzers.CodeActions
@@ -37,7 +38,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 				SF.ParseExpression(
 					$"{_field.Declaration.Variables.FirstOrDefault().Identifier.Text}.{_invocation.NormalizeWhitespace().ToFullString()}"));
 
-			return editor.GetChangedDocument();
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/BaseInvokeCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/BaseInvokeCodeFix.cs
@@ -3,7 +3,6 @@
 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;
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Microsoft.CodeAnalysis.CodeActions;`
`6`	`6`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`7`	`7`	`using Microsoft.CodeAnalysis.Editing;`
	`8`	`+using Microsoft.CodeAnalysis.Formatting;`
`8`	`9`	`using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;`
`9`	`10`
`10`	`11`	`namespace System.IO.Abstractions.Analyzers.CodeActions`
`@@ -22,7 +23,7 @@ public class DirectoryInfoCodeAction : CodeAction`
`22`	`23`	`public override string EquivalenceKey => Title;`
`23`	`24`
`24`	`25`	`public DirectoryInfoCodeAction(string title, Document document, ObjectCreationExpressionSyntax creationExpressionSyntax,`
`25`		`- FieldDeclarationSyntax field)`
	`26`	`+ FieldDeclarationSyntax field)`
`26`	`27`	`{`
`27`	`28`	`Title = title;`
`28`	`29`	`_document = document;`
`@@ -36,9 +37,10 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke`
`36`	`37`	`var arguments = _creationExpressionSyntax.ArgumentList.Arguments.Select(x => x.ToFullString());`
`37`	`38`
`38`	`39`	`editor.ReplaceNode(_creationExpressionSyntax,`
`39`		`- SF.ParseExpression($"{_field.Declaration.Variables.ToFullString()}.DirectoryInfo.FromDirectoryName({string.Join(",", arguments)})"));`
	`40`	`+ SF.ParseExpression(`
	`41`	`+ $"{_field.Declaration.Variables.ToFullString()}.DirectoryInfo.FromDirectoryName({string.Join(",", arguments)})"));`
`40`	`42`
`41`		`- return editor.GetChangedDocument();`
	`43`	`+ return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke`
`71`	`71`	`editor.InsertAfter(systemIo, RoslynClassFileSystem.GetFileSystemUsing());`
`72`	`72`	`}`
`73`	`73`
`74`		`- return editor.GetChangedDocument();`
	`74`	`+ return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`private static ExpressionStatementSyntax CreateAssignmentExpression(string field = Constants.FieldFileSystemName)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Microsoft.CodeAnalysis.CodeActions;`
`5`	`5`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`6`	`6`	`using Microsoft.CodeAnalysis.Editing;`
	`7`	`+using Microsoft.CodeAnalysis.Formatting;`
`7`	`8`	`using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;`
`8`	`9`
`9`	`10`	`namespace System.IO.Abstractions.Analyzers.CodeActions`
`@@ -37,7 +38,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke`
`37`	`38`	`SF.ParseExpression(`
`38`	`39`	`$"{_field.Declaration.Variables.FirstOrDefault().Identifier.Text}.{_invocation.NormalizeWhitespace().ToFullString()}"));`
`39`	`40`
`40`		`- return editor.GetChangedDocument();`
	`41`	`+ return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken).ConfigureAwait(false);`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`	`}`