Fix compiler warnings

inyutin-maxim · inyutin-maxim · commit a8937118e75d · 2022-10-16T12:45:55.000+03:00
diff --git a/Roslyn.Testing/Analyzer/DiagnosticVerifier.cs b/Roslyn.Testing/Analyzer/DiagnosticVerifier.cs
@@ -14,7 +14,7 @@ namespace Roslyn.Testing.Analyzer;
 
 internal static class DiagnosticAnalyzerTestExtensions
 {
-	private static readonly MetadataReference CorlibReference =
+	private static readonly MetadataReference CoreLibraryReference =
 		MetadataReference.CreateFromFile(typeof(object).Assembly.Location);
 
 	private static readonly MetadataReference SystemCoreReference =
@@ -26,7 +26,7 @@ internal static class DiagnosticAnalyzerTestExtensions
 	private static readonly MetadataReference CodeAnalysisReference =
 		MetadataReference.CreateFromFile(typeof(Compilation).Assembly.Location);
 
-	private static readonly MetadataReference SystemDiagReference =
+	private static readonly MetadataReference SystemDiagnosticReference =
 		MetadataReference.CreateFromFile(typeof(Process).Assembly.Location);
 
 	internal static string DefaultFilePathPrefix = "Test";
@@ -41,7 +41,7 @@ internal static class DiagnosticAnalyzerTestExtensions
 
 	/// <summary>
 	/// Given classes in the form of strings, their language, and an
-	/// IDiagnosticAnlayzer to apply to it, return the diagnostics found in the string
+	/// IDiagnosticAnalyzer to apply to it, return the diagnostics found in the string
 	/// after converting it to a document.
 	/// </summary>
 	/// <param name="sources"> Classes in the form of strings </param>
@@ -199,11 +199,11 @@ private static Project CreateProject(string[] sources, string language, IEnumera
 		var solution = new AdhocWorkspace()
 			.CurrentSolution
 			.AddProject(projectId, TestProjectName, TestProjectName, language)
-			.AddMetadataReference(projectId, CorlibReference)
+			.AddMetadataReference(projectId, CoreLibraryReference)
 			.AddMetadataReference(projectId, SystemCoreReference)
 			.AddMetadataReference(projectId, CSharpSymbolsReference)
 			.AddMetadataReference(projectId, CodeAnalysisReference)
-			.AddMetadataReference(projectId, SystemDiagReference);
+			.AddMetadataReference(projectId, SystemDiagnosticReference);
 
 		if (references != null)
 		{
diff --git a/Roslyn.Testing/CodeFix/CodeFixProviderTestExtensions.cs b/Roslyn.Testing/CodeFix/CodeFixProviderTestExtensions.cs
@@ -90,7 +90,7 @@ public static VerifyCodeFixProviderResult VerifyFix(this CodeFixProvider codeFix
 		for (var i = 0; i < attempts; ++i)
 		{
 			var actions = new List<CodeAction>();
-			var context = new CodeFixContext(document, analyzerDiagnostics[0], (a, d) => actions.Add(a), CancellationToken.None);
+			var context = new CodeFixContext(document, analyzerDiagnostics[0], (a, _) => actions.Add(a), CancellationToken.None);
 
 			codeFixProvider.RegisterCodeFixesAsync(context)
 				.GetAwaiter()
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs
@@ -42,6 +42,12 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 		var editor = await DocumentEditor.CreateAsync(_document, cancellationToken)
 			.ConfigureAwait(false);
 
+		if (_creationExpressionSyntax.ArgumentList == null)
+		{
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken)
+				.ConfigureAwait(false);
+		}
+
 		var arguments = _creationExpressionSyntax.ArgumentList.Arguments.Select(x => x.ToFullString());
 
 		editor.ReplaceNode(_creationExpressionSyntax,
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs
@@ -70,8 +70,11 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 
 		if (systemIo == null)
 		{
-			editor.InsertBefore(compilationUnitSyntax.Usings.FirstOrDefault(),
-				RoslynClassFileSystem.GetFileSystemUsing());
+			if (compilationUnitSyntax.Usings.Any())
+			{
+				editor.InsertBefore(compilationUnitSyntax.Usings.FirstOrDefault()!,
+					RoslynClassFileSystem.GetFileSystemUsing());
+			}
 		} else
 		{
 			editor.InsertAfter(systemIo, RoslynClassFileSystem.GetFileSystemUsing());
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs
@@ -70,8 +70,11 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 
 		if (systemIo == null)
 		{
-			editor.InsertBefore(compilationUnitSyntax.Usings.FirstOrDefault(),
-				RoslynClassFileSystem.GetFileSystemUsing());
+			if (compilationUnitSyntax.Usings.Any())
+			{
+				editor.InsertBefore(compilationUnitSyntax.Usings.FirstOrDefault()!,
+					RoslynClassFileSystem.GetFileSystemUsing());
+			}
 		} else
 		{
 			editor.InsertAfter(systemIo, RoslynClassFileSystem.GetFileSystemUsing());
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs
@@ -42,6 +42,12 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 		var editor = await DocumentEditor.CreateAsync(_document, cancellationToken)
 			.ConfigureAwait(false);
 
+		if (_creationExpressionSyntax.ArgumentList == null)
+		{
+			return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken)
+				.ConfigureAwait(false);
+		}
+
 		var arguments = _creationExpressionSyntax.ArgumentList.Arguments.Select(x => x.ToFullString());
 
 		editor.ReplaceNode(_creationExpressionSyntax,
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileSystemInvokeCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileSystemInvokeCodeAction.cs
@@ -41,9 +41,12 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 		var editor = await DocumentEditor.CreateAsync(_document, cancellationToken)
 			.ConfigureAwait(false);
 
-		editor.ReplaceNode(_invocation,
-			SF.ParseExpression(
-				$"{_field.Declaration.Variables.FirstOrDefault().Identifier.Text}.{_invocation.NormalizeWhitespace().ToFullString()}"));
+		if (_field.Declaration.Variables.Any())
+		{
+			editor.ReplaceNode(_invocation,
+				SF.ParseExpression(
+					$"{_field.Declaration.Variables.FirstOrDefault()?.Identifier.Text}.{_invocation.NormalizeWhitespace().ToFullString()}"));
+		}
 
 		return await Formatter.FormatAsync(editor.GetChangedDocument(), cancellationToken: cancellationToken)
 			.ConfigureAwait(false);
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/DirectoryInfoCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/DirectoryInfoCodeFix.cs
@@ -38,28 +38,30 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)
 			.ConfigureAwait(false);
 
-		var classDeclarationSyntax = root.FindNode(context.Span)
+		var classDeclarationSyntax = root?.FindNode(context.Span)
 			.FirstAncestorOrSelf<ClassDeclarationSyntax>();
 
-		if (RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax))
+		if (classDeclarationSyntax is null || !RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax))
 		{
-			var creationExpressionSyntax = root.FindNode(context.Span)
-				.FirstAncestorOrSelf<ObjectCreationExpressionSyntax>();
+			return;
+		}
 
-			var fieldDeclarationSyntax = classDeclarationSyntax
-				.Members
-				.OfType<FieldDeclarationSyntax>()
-				.FirstOrDefault(x =>
-					x.Declaration.Type.NormalizeWhitespace()
-						.ToFullString()
-					== RoslynClassFileSystem.GetFileSystemType()
-						.ToFullString());
+		var creationExpressionSyntax = root.FindNode(context.Span)
+			.FirstAncestorOrSelf<ObjectCreationExpressionSyntax>();
 
-			context.RegisterCodeFix(new DirectoryInfoCodeAction(Title,
-					context.Document,
-					creationExpressionSyntax,
-					fieldDeclarationSyntax),
-				context.Diagnostics);
-		}
+		var fieldDeclarationSyntax = classDeclarationSyntax
+			.Members
+			.OfType<FieldDeclarationSyntax>()
+			.FirstOrDefault(x =>
+				x.Declaration.Type.NormalizeWhitespace()
+					.ToFullString()
+				== RoslynClassFileSystem.GetFileSystemType()
+					.ToFullString());
+
+		context.RegisterCodeFix(new DirectoryInfoCodeAction(Title,
+				context.Document,
+				creationExpressionSyntax,
+				fieldDeclarationSyntax),
+			context.Diagnostics);
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileInfoCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileInfoCodeFix.cs
@@ -38,28 +38,30 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)
 			.ConfigureAwait(false);
 
-		var classDeclarationSyntax = root.FindNode(context.Span)
+		var classDeclarationSyntax = root?.FindNode(context.Span)
 			.FirstAncestorOrSelf<ClassDeclarationSyntax>();
 
-		if (RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax))
+		if (classDeclarationSyntax is null || !RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax))
 		{
-			var creationExpressionSyntax = root.FindNode(context.Span)
-				.FirstAncestorOrSelf<ObjectCreationExpressionSyntax>();
+			return;
+		}
 
-			var fieldDeclarationSyntax = classDeclarationSyntax
-				.Members
-				.OfType<FieldDeclarationSyntax>()
-				.FirstOrDefault(x =>
-					x.Declaration.Type.NormalizeWhitespace()
-						.ToFullString()
-					== RoslynClassFileSystem.GetFileSystemType()
-						.ToFullString());
+		var creationExpressionSyntax = root.FindNode(context.Span)
+			.FirstAncestorOrSelf<ObjectCreationExpressionSyntax>();
 
-			context.RegisterCodeFix(new FileInfoCodeAction(Title,
-					context.Document,
-					creationExpressionSyntax,
-					fieldDeclarationSyntax),
-				context.Diagnostics);
-		}
+		var fieldDeclarationSyntax = classDeclarationSyntax
+			.Members
+			.OfType<FieldDeclarationSyntax>()
+			.FirstOrDefault(x =>
+				x.Declaration.Type.NormalizeWhitespace()
+					.ToFullString()
+				== RoslynClassFileSystem.GetFileSystemType()
+					.ToFullString());
+
+		context.RegisterCodeFix(new FileInfoCodeAction(Title,
+				context.Document,
+				creationExpressionSyntax,
+				fieldDeclarationSyntax),
+			context.Diagnostics);
 	}
 }
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceConstructorInitialCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceConstructorInitialCodeFix.cs
@@ -42,6 +42,11 @@ public override async sealed Task RegisterCodeFixesAsync(CodeFixContext context)
 		var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)
 			.ConfigureAwait(false);
 
+		if (root == null)
+		{
+			return;
+		}
+
 		var classDeclarationSyntax = root.FindNode(context.Span)
 			.FirstAncestorOrSelf<ClassDeclarationSyntax>();
 
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileStreamCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileStreamCodeFix.cs
@@ -1,6 +1,5 @@
 using System.Collections.Immutable;
 using System.Composition;
-using System.IO.Abstractions.Analyzers.Analyzers.FileSystemTypeAnalyzers;
 using System.IO.Abstractions.Analyzers.CodeActions;
 using System.IO.Abstractions.Analyzers.RoslynToken;
 using System.Linq;
@@ -12,7 +11,7 @@
 namespace System.IO.Abstractions.Analyzers.CodeFixes;
 
 /// <summary>
-/// Code fix provider for <see cref="FileStreamAnalyzer"/>.
+/// Code fix provider for <see cref="System.IO.Abstractions.Analyzers.Analyzers.FileSystemTypeAnalyzers.FileStreamAnalyzer"/>.
 /// </summary>
 [Shared]
 [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(FileStreamCodeFix))]
@@ -38,28 +37,30 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)
 			.ConfigureAwait(false);
 
-		var classDeclarationSyntax = root.FindNode(context.Span)
+		var classDeclarationSyntax = root?.FindNode(context.Span)
 			.FirstAncestorOrSelf<ClassDeclarationSyntax>();
 
-		if (RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax))
+		if (classDeclarationSyntax is null || !RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax))
 		{
-			var creationExpressionSyntax = root.FindNode(context.Span)
-				.FirstAncestorOrSelf<ObjectCreationExpressionSyntax>();
+			return;
+		}
 
-			var fieldDeclarationSyntax = classDeclarationSyntax
-				.Members
-				.OfType<FieldDeclarationSyntax>()
-				.FirstOrDefault(x =>
-					x.Declaration.Type.NormalizeWhitespace()
-						.ToFullString()
-					== RoslynClassFileSystem.GetFileSystemType()
-						.ToFullString());
+		var creationExpressionSyntax = root.FindNode(context.Span)
+			.FirstAncestorOrSelf<ObjectCreationExpressionSyntax>();
 
-			context.RegisterCodeFix(new FileStreamCodeAction(Title,
-					context.Document,
-					creationExpressionSyntax,
-					fieldDeclarationSyntax),
-				context.Diagnostics);
-		}
+		var fieldDeclarationSyntax = classDeclarationSyntax
+			.Members
+			.OfType<FieldDeclarationSyntax>()
+			.FirstOrDefault(x =>
+				x.Declaration.Type.NormalizeWhitespace()
+					.ToFullString()
+				== RoslynClassFileSystem.GetFileSystemType()
+					.ToFullString());
+
+		context.RegisterCodeFix(new FileStreamCodeAction(Title,
+				context.Document,
+				creationExpressionSyntax,
+				fieldDeclarationSyntax),
+			context.Diagnostics);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static VerifyCodeFixProviderResult VerifyFix(this CodeFixProvider codeFix`
`90`	`90`	`for (var i = 0; i < attempts; ++i)`
`91`	`91`	`{`
`92`	`92`	`var actions = new List<CodeAction>();`
`93`		`- var context = new CodeFixContext(document, analyzerDiagnostics[0], (a, d) => actions.Add(a), CancellationToken.None);`
	`93`	`+ var context = new CodeFixContext(document, analyzerDiagnostics[0], (a, _) => actions.Add(a), CancellationToken.None);`
`94`	`94`
`95`	`95`	`codeFixProvider.RegisterCodeFixesAsync(context)`
`96`	`96`	`.GetAwaiter()`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,11 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke`
`70`	`70`
`71`	`71`	`if (systemIo == null)`
`72`	`72`	`{`
`73`		`- editor.InsertBefore(compilationUnitSyntax.Usings.FirstOrDefault(),`
`74`		`- RoslynClassFileSystem.GetFileSystemUsing());`
	`73`	`+ if (compilationUnitSyntax.Usings.Any())`
	`74`	`+ {`
	`75`	`+ editor.InsertBefore(compilationUnitSyntax.Usings.FirstOrDefault()!,`
	`76`	`+ RoslynClassFileSystem.GetFileSystemUsing());`
	`77`	`+ }`
`75`	`78`	`} else`
`76`	`79`	`{`
`77`	`80`	`editor.InsertAfter(systemIo, RoslynClassFileSystem.GetFileSystemUsing());`