Apply updated code style

Author: inyutin-maxim

Roslyn.Testing/Analyzer/CSharpDiagnosticAnalyzerTest.cs

@@ -11,22 +11,18 @@ public abstract class CSharpDiagnosticAnalyzerTest<T> : FileReaderTest
 	where T : DiagnosticAnalyzer, new()
 {
 	/// <inheritdoc />
-	public override string Filepath => _diagnosticAnalyzer.GetType().Name;
+	public override string Filepath =>
+		_diagnosticAnalyzer.GetType()
+			.Name;
 
 	/// <inheritdoc />
 	public override string PathToTestData => "./TestData/Analyzer/";
 
 	private readonly DiagnosticAnalyzer _diagnosticAnalyzer;
 
-	protected CSharpDiagnosticAnalyzerTest()
-	{
-		_diagnosticAnalyzer = new T();
-	}
+	protected CSharpDiagnosticAnalyzerTest() => _diagnosticAnalyzer = new T();
 
-	protected virtual IEnumerable<MetadataReference> GetAdditionalReferences()
-	{
-		return Enumerable.Empty<MetadataReference>();
-	}
+	protected virtual IEnumerable<MetadataReference> GetAdditionalReferences() => Enumerable.Empty<MetadataReference>();
 
 	/// <summary>
 	/// Called to test a C# DiagnosticAnalyzer when applied on the single inputted
@@ -38,20 +34,23 @@ protected virtual IEnumerable<MetadataReference> GetAdditionalReferences()
 	/// DiagnosticResults that should appear after the analyzer
 	/// is run on the source
 	/// </param>
-	protected void VerifyDiagnostic(string source, DiagnosticResult[] expected)
+	protected void VerifyDiagnostic(string source, DiagnosticResult[] expected) => VerifyDiagnostic(new[]
 	{
-		VerifyDiagnostic(new[] { source }, expected);
-	}
+		source
+	}, expected);
 
-	protected void VerifyDiagnostic(string source, DiagnosticResult expected)
+	protected void VerifyDiagnostic(string source, DiagnosticResult expected) => VerifyDiagnostic(new[]
 	{
-		VerifyDiagnostic(new[] { source }, new[] { expected });
-	}
+		source
+	}, new[]
+	{
+		expected
+	});
 
-	protected void VerifyNoDiagnosticTriggered(string source)
+	protected void VerifyNoDiagnosticTriggered(string source) => VerifyDiagnostic(new[]
 	{
-		VerifyDiagnostic(new[] { source }, new DiagnosticResult[0]);
-	}
+		source
+	}, new DiagnosticResult[0]);
 
 	/// <summary>
 	/// Called to test a C# DiagnosticAnalyzer when applied on the inputted strings as

Roslyn.Testing/Analyzer/DiagnosticVerifier.Helpers.cs

@@ -38,7 +38,7 @@ public abstract class DiagnosticVerifier
 
 	internal static string TestProjectName = "TestProject";
 
-#region  Get Diagnostics
+	#region Get Diagnostics
 
 	/// <summary>
 	/// Given classes in the form of strings, their language, and an
@@ -55,10 +55,8 @@ public abstract class DiagnosticVerifier
 	/// </returns>
 	[UsedImplicitly]
 	private static Diagnostic[] GetSortedDiagnostics(string[] sources, string language, ImmutableArray<DiagnosticAnalyzer> analyzers,
-													IEnumerable<MetadataReference> references = null)
-	{
-		return GetSortedDiagnosticsFromDocuments(analyzers, GetDocuments(sources, language, references));
-	}
+													IEnumerable<MetadataReference> references = null) =>
+		GetSortedDiagnosticsFromDocuments(analyzers, GetDocuments(sources, language, references));
 
 	/// <summary>
 	/// Given an analyzer and a document to apply it to, run the analyzer and gather an
@@ -84,8 +82,14 @@ protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(ImmutableArray<D
 
 		foreach (var project in projects)
 		{
-			var compilationWithAnalyzers = project.GetCompilationAsync().GetAwaiter().GetResult().WithAnalyzers(analyzers);
-			var diags = compilationWithAnalyzers.GetAnalyzerDiagnosticsAsync().GetAwaiter().GetResult();
+			var compilationWithAnalyzers = project.GetCompilationAsync()
+				.GetAwaiter()
+				.GetResult()
+				.WithAnalyzers(analyzers);
+
+			var diags = compilationWithAnalyzers.GetAnalyzerDiagnosticsAsync()
+				.GetAwaiter()
+				.GetResult();
 
 			foreach (var diag in diags)
 			{
@@ -97,7 +101,10 @@ protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(ImmutableArray<D
 					for (var i = 0; i < documents.Length; i++)
 					{
 						var document = documents[i];
-						var tree = document.GetSyntaxTreeAsync().GetAwaiter().GetResult();
+
+						var tree = document.GetSyntaxTreeAsync()
+							.GetAwaiter()
+							.GetResult();
 
 						if (tree == diag.Location.SourceTree)
 						{
@@ -119,14 +126,13 @@ protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(ImmutableArray<D
 	/// </summary>
 	/// <param name="diagnostics"> The list of Diagnostics to be sorted </param>
 	/// <returns> An IEnumerable containing the Diagnostics in order of Location </returns>
-	private static Diagnostic[] SortDiagnostics(IEnumerable<Diagnostic> diagnostics)
-	{
-		return diagnostics.OrderBy(d => d.Location.SourceSpan.Start).ToArray();
-	}
+	private static Diagnostic[] SortDiagnostics(IEnumerable<Diagnostic> diagnostics) => diagnostics
+		.OrderBy(d => d.Location.SourceSpan.Start)
+		.ToArray();
 
-#endregion
+	#endregion
 
-#region Set up compilation and documents
+	#region Set up compilation and documents
 
 	/// <summary>
 	/// Given an array of strings as sources and a language, turn them into a project
@@ -165,10 +171,11 @@ private static Document[] GetDocuments(string[] sources, string language, IEnume
 	/// <param name="references"></param>
 	/// <returns> A Document created from the source string </returns>
 	protected static Document CreateDocument(string source, string language = LanguageNames.CSharp,
-											IEnumerable<MetadataReference> references = null)
-	{
-		return CreateProject(new[] { source }, language, references).Documents.First();
-	}
+											IEnumerable<MetadataReference> references = null) => CreateProject(new[]
+		{
+			source
+		}, language, references)
+		.Documents.First();
 
 	/// <summary>
 	/// Create a project using the inputted strings as sources.
@@ -184,7 +191,10 @@ private static Project CreateProject(string[] sources, string language = Languag
 										IEnumerable<MetadataReference> references = null)
 	{
 		var fileNamePrefix = DefaultFilePathPrefix;
-		var fileExt = language == LanguageNames.CSharp ? CSharpDefaultFileExt : VisualBasicDefaultExt;
+
+		var fileExt = language == LanguageNames.CSharp
+			? CSharpDefaultFileExt
+			: VisualBasicDefaultExt;
 
 		var projectId = ProjectId.CreateNewId(TestProjectName);
 
@@ -215,5 +225,5 @@ private static Project CreateProject(string[] sources, string language = Languag
 		return solution.GetProject(projectId);
 	}
 
-#endregion
+	#endregion
 }