Resharper code cleanup

inyutin-maxim · inyutin-maxim · commit 143deca5cf2c · 2019-04-26T22:40:21.000+03:00
diff --git a/System.IO.Abstractions.Analyzers/Analyzers/BaseFileSystemAnalyzer.cs b/System.IO.Abstractions.Analyzers/Analyzers/BaseFileSystemAnalyzer.cs
@@ -29,11 +29,14 @@ public override void Initialize(AnalysisContext context)
 		/// <summary>
 		/// Analysis
 		/// </summary>
-		/// <param name="compilationStartContext">Compilation Start Analysis Context</param>
-		/// <param name="fileSystemContext">FileSystem Context</param>
+		/// <param name="compilationStartContext"> Compilation Start Analysis Context </param>
+		/// <param name="fileSystemContext"> FileSystem Context </param>
 		protected abstract void AnalyzeCompilation(CompilationStartAnalysisContext compilationStartContext,
 													FileSystemContext fileSystemContext);
 
-		private static bool ShouldAnalyze(FileSystemContext fileSystemContext) => fileSystemContext.HasReference;
+		private static bool ShouldAnalyze(FileSystemContext fileSystemContext)
+		{
+			return fileSystemContext.HasReference;
+		}
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/Analyzers/BaseFileSystemNodeAnalyzer.cs b/System.IO.Abstractions.Analyzers/Analyzers/BaseFileSystemNodeAnalyzer.cs
@@ -42,14 +42,22 @@ protected override void AnalyzeCompilation(CompilationStartAnalysisContext compi
 
 		protected abstract Type GetFileSystemType();
 
-		private bool IsNotUsedSystemIo() => typeof(Path).Namespace != GetFileSystemType().Namespace;
+		private bool IsNotUsedSystemIo()
+		{
+			return typeof(Path).Namespace != GetFileSystemType().Namespace;
+		}
 
-		private bool IsTypesEquals(TypeSyntax type) => type.NormalizeWhitespace().ToFullString() == GetFileSystemType().Name;
+		private bool IsTypesEquals(TypeSyntax type)
+		{
+			return type.NormalizeWhitespace().ToFullString() == GetFileSystemType().Name;
+		}
 
-		private bool IsStaticInvocationStartWith(InvocationExpressionSyntax invocation) =>
-			invocation.IsKind(SyntaxKind.InvocationExpression)
-			&& invocation.Expression.NormalizeWhitespace()
-				.ToFullString()
-				.StartsWith(GetFileSystemType().Name + ".", StringComparison.CurrentCultureIgnoreCase);
+		private bool IsStaticInvocationStartWith(InvocationExpressionSyntax invocation)
+		{
+			return invocation.IsKind(SyntaxKind.InvocationExpression)
+					&& invocation.Expression.NormalizeWhitespace()
+						.ToFullString()
+						.StartsWith(GetFileSystemType().Name + ".", StringComparison.CurrentCultureIgnoreCase);
+		}
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/Analyzers/FileSystemTypeAnalyzers/DirectoryAnalyzer.cs b/System.IO.Abstractions.Analyzers/Analyzers/FileSystemTypeAnalyzers/DirectoryAnalyzer.cs
@@ -6,8 +6,8 @@
 
 namespace System.IO.Abstractions.Analyzers.Analyzers.FileSystemTypeAnalyzers
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class DirectoryAnalyzer : BaseFileSystemNodeAnalyzer
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	public class DirectoryAnalyzer : BaseFileSystemNodeAnalyzer
 	{
 		/// <summary>
 		/// Diagnostic Identifier
diff --git a/System.IO.Abstractions.Analyzers/Analyzers/FileSystemTypeAnalyzers/DirectoryInfoAnalyzer.cs b/System.IO.Abstractions.Analyzers/Analyzers/FileSystemTypeAnalyzers/DirectoryInfoAnalyzer.cs
@@ -6,8 +6,8 @@
 
 namespace System.IO.Abstractions.Analyzers.Analyzers.FileSystemTypeAnalyzers
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class DirectoryInfoAnalyzer: BaseFileSystemNodeAnalyzer
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	public class DirectoryInfoAnalyzer : BaseFileSystemNodeAnalyzer
 	{
 		/// <summary>
 		/// Diagnostic Identifier
diff --git a/System.IO.Abstractions.Analyzers/Analyzers/FileSystemTypeAnalyzers/FileAnalyzer.cs b/System.IO.Abstractions.Analyzers/Analyzers/FileSystemTypeAnalyzers/FileAnalyzer.cs
@@ -6,8 +6,8 @@
 
 namespace System.IO.Abstractions.Analyzers.Analyzers.FileSystemTypeAnalyzers
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class FileAnalyzer : BaseFileSystemNodeAnalyzer
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	public class FileAnalyzer : BaseFileSystemNodeAnalyzer
 	{
 		/// <summary>
 		/// Diagnostic Identifier
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs
@@ -12,15 +12,11 @@ namespace System.IO.Abstractions.Analyzers.CodeActions
 {
 	public class DirectoryInfoCodeAction : CodeAction
 	{
-		private readonly Document _document;
-
 		private readonly ObjectCreationExpressionSyntax _creationExpressionSyntax;
 
-		private readonly FieldDeclarationSyntax _field;
-
-		public override string Title { get; }
+		private readonly Document _document;
 
-		public override string EquivalenceKey => Title;
+		private readonly FieldDeclarationSyntax _field;
 
 		public DirectoryInfoCodeAction(string title, Document document, ObjectCreationExpressionSyntax creationExpressionSyntax,
 										FieldDeclarationSyntax field)
@@ -31,6 +27,10 @@ public DirectoryInfoCodeAction(string title, Document document, ObjectCreationEx
 			_field = field;
 		}
 
+		public override string Title { get; }
+
+		public override string EquivalenceKey => Title;
+
 		protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
 		{
 			var editor = await DocumentEditor.CreateAsync(_document, cancellationToken).ConfigureAwait(false);
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileInfoCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileInfoCodeAction.cs
@@ -12,25 +12,25 @@ namespace System.IO.Abstractions.Analyzers.CodeActions
 {
 	public class FileInfoCodeAction : CodeAction
 	{
-		private readonly Document _document;
-
 		private readonly ObjectCreationExpressionSyntax _creationExpressionSyntax;
 
-		private readonly FieldDeclarationSyntax _field;
-
-		public override string Title { get; }
+		private readonly Document _document;
 
-		public override string EquivalenceKey => Title;
+		private readonly FieldDeclarationSyntax _field;
 
 		public FileInfoCodeAction(string title, Document document, ObjectCreationExpressionSyntax creationExpressionSyntax,
-										FieldDeclarationSyntax field)
+								FieldDeclarationSyntax field)
 		{
 			Title = title;
 			_document = document;
 			_creationExpressionSyntax = creationExpressionSyntax;
 			_field = field;
 		}
 
+		public override string Title { get; }
+
+		public override string EquivalenceKey => Title;
+
 		protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
 		{
 			var editor = await DocumentEditor.CreateAsync(_document, cancellationToken).ConfigureAwait(false);
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs
@@ -8,7 +8,6 @@
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Simplification;
-using SyntaxNode = Microsoft.CodeAnalysis.SyntaxNode;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace System.IO.Abstractions.Analyzers.CodeActions
@@ -76,35 +75,34 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 
 		private static ExpressionStatementSyntax CreateAssignmentExpression(string field = Constants.FieldFileSystemName)
 		{
-			return SyntaxFactory.ExpressionStatement(SyntaxFactory.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression,
-				SyntaxFactory.IdentifierName(field),
-				SyntaxFactory.ObjectCreationExpression(SyntaxFactory.IdentifierName(Constants.FileSystemClassName))
-					.WithArgumentList(SyntaxFactory.ArgumentList())));
+			return SF.ExpressionStatement(SF.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression,
+				SF.IdentifierName(field),
+				SF.ObjectCreationExpression(SF.IdentifierName(Constants.FileSystemClassName))
+					.WithArgumentList(SF.ArgumentList())));
 		}
 
 		private static void ConstructorAddParameter(ClassDeclarationSyntax classDeclaration, SyntaxEditor editor)
 		{
 			var constructor = RoslynClassFileSystem.HasConstructor(classDeclaration)
 				? RoslynClassFileSystem.GetConstructor(classDeclaration)
 				: SF.ConstructorDeclaration(classDeclaration.Identifier)
-					.WithModifiers(SyntaxTokenList.Create(SyntaxFactory.Token(SyntaxKind.PublicKeyword)));
+					.WithModifiers(SyntaxTokenList.Create(SF.Token(SyntaxKind.PublicKeyword)));
 
 			var newConstructor = constructor.WithAdditionalAnnotations(Formatter.Annotation, Simplifier.Annotation)
 				.NormalizeWhitespace();
 
 			if (!RoslynClassFileSystem.ConstructorHasAssignmentExpression(newConstructor))
 			{
+				var statementSyntax = CreateAssignmentExpression();
+
 				if (RoslynClassFileSystem.HasFileSystemField(classDeclaration))
 				{
 					var fileSystem = RoslynClassFileSystem.GetFileSystemFieldFromClass(classDeclaration);
-
-					newConstructor =
-						newConstructor.AddBodyStatements(CreateAssignmentExpression(fileSystem.Declaration.Variables.ToFullString()));
-				} else
-				{
-					newConstructor =
-						newConstructor.AddBodyStatements(CreateAssignmentExpression());
+					statementSyntax = CreateAssignmentExpression(fileSystem.Declaration.Variables.ToFullString());
 				}
+
+				newConstructor =
+					newConstructor.AddBodyStatements(statementSyntax);
 			}
 
 			if (RoslynClassFileSystem.HasConstructor(classDeclaration))
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs
@@ -12,15 +12,11 @@ namespace System.IO.Abstractions.Analyzers.CodeActions
 {
 	public class FileStreamCodeAction : CodeAction
 	{
-		private readonly Document _document;
-
 		private readonly ObjectCreationExpressionSyntax _creationExpressionSyntax;
 
-		private readonly FieldDeclarationSyntax _field;
-
-		public override string Title { get; }
+		private readonly Document _document;
 
-		public override string EquivalenceKey => Title;
+		private readonly FieldDeclarationSyntax _field;
 
 		public FileStreamCodeAction(string title, Document document, ObjectCreationExpressionSyntax creationExpressionSyntax,
 									FieldDeclarationSyntax field)
@@ -31,6 +27,10 @@ public FileStreamCodeAction(string title, Document document, ObjectCreationExpre
 			_field = field;
 		}
 
+		public override string Title { get; }
+
+		public override string EquivalenceKey => Title;
+
 		protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
 		{
 			var editor = await DocumentEditor.CreateAsync(_document, cancellationToken).ConfigureAwait(false);
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileSystemInvokeCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileSystemInvokeCodeAction.cs
@@ -13,13 +13,9 @@ public class FileSystemInvokeCodeAction : CodeAction
 	{
 		private readonly Document _document;
 
-		private readonly InvocationExpressionSyntax _invocation;
-
 		private readonly FieldDeclarationSyntax _field;
 
-		public override string Title { get; }
-
-		public override string EquivalenceKey => Title;
+		private readonly InvocationExpressionSyntax _invocation;
 
 		public FileSystemInvokeCodeAction(string title, Document document, InvocationExpressionSyntax invocation,
 										FieldDeclarationSyntax field)
@@ -30,6 +26,10 @@ public FileSystemInvokeCodeAction(string title, Document document, InvocationExp
 			_field = field;
 		}
 
+		public override string Title { get; }
+
+		public override string EquivalenceKey => Title;
+
 		protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
 		{
 			var editor = await DocumentEditor.CreateAsync(_document, cancellationToken).ConfigureAwait(false);
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/BaseInvokeCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/BaseInvokeCodeFix.cs
@@ -16,7 +16,10 @@ public abstract class BaseInvokeCodeFix : CodeFixProvider
 
 		public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(DiagnosticId);
 
-		public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
 
 		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		{
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/DirectoryInfoCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/DirectoryInfoCodeFix.cs
@@ -19,7 +19,10 @@ public class DirectoryInfoCodeFix : CodeFixProvider
 		public override ImmutableArray<string> FixableDiagnosticIds =>
 			ImmutableArray.Create(Constants.Io0007);
 
-		public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
 
 		public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		{
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileInfoCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileInfoCodeFix.cs
@@ -19,7 +19,10 @@ public class FileInfoCodeFix : CodeFixProvider
 		public override ImmutableArray<string> FixableDiagnosticIds =>
 			ImmutableArray.Create(Constants.Io0004);
 
-		public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
 
 		public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		{
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceConstructorInitialCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceConstructorInitialCodeFix.cs
@@ -23,7 +23,10 @@ public class FileServiceConstructorInitialCodeFix : CodeFixProvider
 				Constants.Io0006,
 				Constants.Io0007);
 
-		public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
 
 		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		{
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceInterfaceInjectionCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceInterfaceInjectionCodeFix.cs
@@ -23,7 +23,10 @@ public class FileServiceInterfaceInjectionCodeFix : CodeFixProvider
 				Constants.Io0006,
 				Constants.Io0007);
 
-		public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
 
 		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		{
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileStreamCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileStreamCodeFix.cs
@@ -19,7 +19,10 @@ public class FileStreamCodeFix : CodeFixProvider
 		public override ImmutableArray<string> FixableDiagnosticIds =>
 			ImmutableArray.Create(Constants.Io0005);
 
-		public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
 
 		public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		{
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/PathCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/PathCodeFix.cs
@@ -6,7 +6,7 @@ namespace System.IO.Abstractions.Analyzers.CodeFixes
 {
 	[Shared]
 	[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(PathCodeFix))]
-	public class PathCodeFix: BaseInvokeCodeFix
+	public class PathCodeFix : BaseInvokeCodeFix
 	{
 		protected override string DiagnosticId => Constants.Io0006;
 
diff --git a/System.IO.Abstractions.Analyzers/Constants.cs b/System.IO.Abstractions.Analyzers/Constants.cs
@@ -19,32 +19,32 @@ public static class Constants
 		public const string Io0001 = "IO0001";
 
 		/// <summary>
-		/// <see cref="FileAnalyzer"/>
+		/// <see cref="FileAnalyzer" />
 		/// </summary>
 		public const string Io0002 = "IO0002";
 
 		/// <summary>
-		/// <see cref="DirectoryAnalyzer"/>
+		/// <see cref="DirectoryAnalyzer" />
 		/// </summary>
 		public const string Io0003 = "IO0003";
 
 		/// <summary>
-		/// <see cref="FileInfoAnalyzer"/>
+		/// <see cref="FileInfoAnalyzer" />
 		/// </summary>
 		public const string Io0004 = "IO0004";
 
 		/// <summary>
-		/// <see cref="FileStreamAnalyzer"/>
+		/// <see cref="FileStreamAnalyzer" />
 		/// </summary>
 		public const string Io0005 = "IO0005";
 
 		/// <summary>
-		/// <see cref="PathAnalyzer"/>
+		/// <see cref="PathAnalyzer" />
 		/// </summary>
 		public const string Io0006 = "IO0006";
 
 		/// <summary>
-		/// <see cref="DirectoryInfoAnalyzer"/>
+		/// <see cref="DirectoryInfoAnalyzer" />
 		/// </summary>
 		public const string Io0007 = "IO0007";
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace System.IO.Abstractions.Analyzers.Analyzers.FileSystemTypeAnalyzers`
`8`	`8`	`{`
`9`		`- [DiagnosticAnalyzer(LanguageNames.CSharp)]`
`10`		`- public class DirectoryAnalyzer : BaseFileSystemNodeAnalyzer`
	`9`	`+ [DiagnosticAnalyzer(LanguageNames.CSharp)]`
	`10`	`+ public class DirectoryAnalyzer : BaseFileSystemNodeAnalyzer`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Diagnostic Identifier`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,11 @@ namespace System.IO.Abstractions.Analyzers.CodeActions`
`12`	`12`	`{`
`13`	`13`	`public class DirectoryInfoCodeAction : CodeAction`
`14`	`14`	`{`
`15`		`- private readonly Document _document;`
`16`		`-`
`17`	`15`	`private readonly ObjectCreationExpressionSyntax _creationExpressionSyntax;`
`18`	`16`
`19`		`- private readonly FieldDeclarationSyntax _field;`
`20`		`-`
`21`		`- public override string Title { get; }`
	`17`	`+ private readonly Document _document;`
`22`	`18`
`23`		`- public override string EquivalenceKey => Title;`
	`19`	`+ private readonly FieldDeclarationSyntax _field;`
`24`	`20`
`25`	`21`	`public DirectoryInfoCodeAction(string title, Document document, ObjectCreationExpressionSyntax creationExpressionSyntax,`
`26`	`22`	`FieldDeclarationSyntax field)`
`@@ -31,6 +27,10 @@ public DirectoryInfoCodeAction(string title, Document document, ObjectCreationEx`
`31`	`27`	`_field = field;`
`32`	`28`	`}`
`33`	`29`
	`30`	`+ public override string Title { get; }`
	`31`	`+`
	`32`	`+ public override string EquivalenceKey => Title;`
	`33`	`+`
`34`	`34`	`protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)`
`35`	`35`	`{`
`36`	`36`	`var editor = await DocumentEditor.CreateAsync(_document, cancellationToken).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -12,25 +12,25 @@ namespace System.IO.Abstractions.Analyzers.CodeActions`
`12`	`12`	`{`
`13`	`13`	`public class FileInfoCodeAction : CodeAction`
`14`	`14`	`{`
`15`		`- private readonly Document _document;`
`16`		`-`
`17`	`15`	`private readonly ObjectCreationExpressionSyntax _creationExpressionSyntax;`
`18`	`16`
`19`		`- private readonly FieldDeclarationSyntax _field;`
`20`		`-`
`21`		`- public override string Title { get; }`
	`17`	`+ private readonly Document _document;`
`22`	`18`
`23`		`- public override string EquivalenceKey => Title;`
	`19`	`+ private readonly FieldDeclarationSyntax _field;`
`24`	`20`
`25`	`21`	`public FileInfoCodeAction(string title, Document document, ObjectCreationExpressionSyntax creationExpressionSyntax,`
`26`		`- FieldDeclarationSyntax field)`
	`22`	`+ FieldDeclarationSyntax field)`
`27`	`23`	`{`
`28`	`24`	`Title = title;`
`29`	`25`	`_document = document;`
`30`	`26`	`_creationExpressionSyntax = creationExpressionSyntax;`
`31`	`27`	`_field = field;`
`32`	`28`	`}`
`33`	`29`
	`30`	`+ public override string Title { get; }`
	`31`	`+`
	`32`	`+ public override string EquivalenceKey => Title;`
	`33`	`+`
`34`	`34`	`protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)`
`35`	`35`	`{`
`36`	`36`	`var editor = await DocumentEditor.CreateAsync(_document, cancellationToken).ConfigureAwait(false);`