Just a syntax refactoring

inyutin-maxim · inyutin-maxim · commit 0964f6839002 · 2025-09-25T19:58:32.000+03:00
diff --git a/Roslyn.Testing/Analyzer/DiagnosticVerifier.Helpers.cs b/Roslyn.Testing/Analyzer/DiagnosticVerifier.Helpers.cs
@@ -206,7 +206,7 @@ private static Project CreateProject(string[] sources, string language = Languag
 			.AddMetadataReference(projectId, CodeAnalysisReference)
 			.AddMetadataReference(projectId, SystemDiagReference);
 
-		if (references != null)
+		if (references is not null)
 		{
 			solution = solution.AddMetadataReferences(projectId, references);
 		}
diff --git a/Roslyn.Testing/Analyzer/DiagnosticVerifier.cs b/Roslyn.Testing/Analyzer/DiagnosticVerifier.cs
@@ -203,7 +203,7 @@ private static Project CreateProject(string[] sources, string language, IEnumera
 			.AddMetadataReference(projectId, CodeAnalysisReference)
 			.AddMetadataReference(projectId, SystemDiagnosticReference);
 
-		if (references != null)
+		if (references is not null)
 		{
 			solution = solution.AddMetadataReferences(projectId, references);
 		}
@@ -348,7 +348,7 @@ private static VerifyDiagnosticAnalyzerResult VerifyDiagnosticLocation(Diagnosti
 		var actualSpan = actual.GetLineSpan();
 
 		var isInExpectedFile = actualSpan.Path == expected.Path
-								|| (actualSpan.Path != null
+								|| (actualSpan.Path is not null
 									&& actualSpan.Path.Contains("Test0.")
 									&& expected.Path.Contains("Test."));
 
@@ -448,7 +448,7 @@ private static string FormatDiagnostics(DiagnosticAnalyzer analyzer, Diagnostic[
 
 			foreach (var rule in rules)
 			{
-				if (rule != null
+				if (rule is not null
 					&& rule.Id
 					== diagnostics[i]
 						.Id)
diff --git a/Roslyn.Testing/CodeFix/CodeFixProviderTestExtensions.cs b/Roslyn.Testing/CodeFix/CodeFixProviderTestExtensions.cs
@@ -100,7 +100,7 @@ public static VerifyCodeFixProviderResult VerifyFix(this CodeFixProvider codeFix
 				break;
 			}
 
-			if (codeFixIndex != null)
+			if (codeFixIndex is not null)
 			{
 				document = document.ApplyFix(actions.ElementAt((int) codeFixIndex));
 
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/DirectoryInfoCodeAction.cs
@@ -42,7 +42,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 		var editor = await DocumentEditor.CreateAsync(_document, cancellationToken)
 			.ConfigureAwait(false);
 
-		if (_creationExpressionSyntax.ArgumentList == null)
+		if (_creationExpressionSyntax.ArgumentList is null)
 		{
 			return _document;
 		}
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileInfoCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileInfoCodeAction.cs
@@ -42,7 +42,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 		var editor = await DocumentEditor.CreateAsync(_document, cancellationToken)
 			.ConfigureAwait(false);
 
-		if (_creationExpressionSyntax.ArgumentList == null)
+		if (_creationExpressionSyntax.ArgumentList is null)
 		{
 			return _document;
 		}
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceConstructorInitialCodeAction.cs
@@ -58,14 +58,14 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 
 		var fileSystem = RoslynClassFileSystem.GetUsing(compilationUnitSyntax, Constants.FileSystemNameSpace);
 
-		if (fileSystem != null)
+		if (fileSystem is not null)
 		{
 			return editor.GetChangedDocument();
 		}
 
 		var systemIo = RoslynClassFileSystem.GetSystemIoUsing(compilationUnitSyntax);
 
-		if (systemIo == null)
+		if (systemIo is null)
 		{
 			if (compilationUnitSyntax.Usings.Any())
 			{
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileServiceInterfaceInjectionCodeAction.cs
@@ -58,14 +58,14 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 
 		var fileSystem = RoslynClassFileSystem.GetUsing(compilationUnitSyntax, Constants.FileSystemNameSpace);
 
-		if (fileSystem != null)
+		if (fileSystem is not null)
 		{
 			return editor.GetChangedDocument();
 		}
 
 		var systemIo = RoslynClassFileSystem.GetSystemIoUsing(compilationUnitSyntax);
 
-		if (systemIo == null)
+		if (systemIo is null)
 		{
 			if (compilationUnitSyntax.Usings.Any())
 			{
diff --git a/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs b/System.IO.Abstractions.Analyzers/CodeActions/FileStreamCodeAction.cs
@@ -42,7 +42,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
 		var editor = await DocumentEditor.CreateAsync(_document, cancellationToken)
 			.ConfigureAwait(false);
 
-		if (_creationExpressionSyntax.ArgumentList == null)
+		if (_creationExpressionSyntax.ArgumentList is null)
 		{
 			return _document;
 		}
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/BaseInvokeCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/BaseInvokeCodeFix.cs
@@ -35,7 +35,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)
 			.ConfigureAwait(false);
 
-		if (root == null)
+		if (root is null)
 		{
 			return;
 		}
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceConstructorInitialCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceConstructorInitialCodeFix.cs
@@ -44,7 +44,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)
 			.ConfigureAwait(false);
 
-		if (root == null)
+		if (root is null)
 		{
 			return;
 		}
@@ -55,7 +55,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		var constructor = RoslynClassFileSystem.GetConstructor(classDeclarationSyntax);
 
 		if (!RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax)
-			|| (constructor != null && !RoslynClassFileSystem.ConstructorHasFileSystemParameter(constructor)))
+			|| (constructor is not null && !RoslynClassFileSystem.ConstructorHasFileSystemParameter(constructor)))
 		{
 			context.RegisterCodeFix(new FileServiceConstructorInitialCodeAction(Title,
 					context.Document,
diff --git a/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceInterfaceInjectionCodeFix.cs b/System.IO.Abstractions.Analyzers/CodeFixes/FileServiceInterfaceInjectionCodeFix.cs
@@ -50,8 +50,8 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 		var constructor = RoslynClassFileSystem.GetConstructor(classDeclarationSyntax);
 
 		if (!RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax)
-			|| (constructor != null && !RoslynClassFileSystem.ConstructorHasFileSystemParameter(constructor))
-			|| (constructor != null && !RoslynClassFileSystem.ConstructorHasAssignmentExpression(constructor)))
+			|| (constructor is not null && !RoslynClassFileSystem.ConstructorHasFileSystemParameter(constructor))
+			|| (constructor is not null && !RoslynClassFileSystem.ConstructorHasAssignmentExpression(constructor)))
 		{
 			context.RegisterCodeFix(new FileServiceInterfaceInjectionCodeAction(Title,
 					context.Document,
diff --git a/System.IO.Abstractions.Analyzers/RoslynToken/RoslynClassFileSystem.cs b/System.IO.Abstractions.Analyzers/RoslynToken/RoslynClassFileSystem.cs
@@ -34,7 +34,8 @@ public static bool HasFileSystemField(TypeDeclarationSyntax classDeclaration) =>
 	public static UsingDirectiveSyntax GetSystemIoUsing(CompilationUnitSyntax unit) => GetUsing(unit, typeof(Path).Namespace);
 
 	public static UsingDirectiveSyntax GetUsing(CompilationUnitSyntax unit, string usingName) => unit.Usings.FirstOrDefault(x =>
-		x.Name.NormalizeWhitespace()
+		x.Name is not null
+		&& x.Name.NormalizeWhitespace()
 			.ToFullString()
 			.Equals(usingName, StringComparison.Ordinal));
 
@@ -45,7 +46,7 @@ public static FieldDeclarationSyntax CreateFileSystemFieldDeclaration() => SF.Fi
 			SF.Token(SyntaxKind.ReadOnlyKeyword)));
 
 	public static bool ConstructorHasFileSystemParameter(BaseMethodDeclarationSyntax constructor) => constructor.ParameterList.Parameters
-		.Any(x => x.Type != null
+		.Any(x => x.Type is not null
 				&& x.Type.NormalizeWhitespace()
 					.ToFullString()
 				== GetFileSystemType()
@@ -55,7 +56,7 @@ public static bool ConstructorHasFileSystemParameter(BaseMethodDeclarationSyntax
 	public static ParameterSyntax GetFileSystemParameterFromConstructor(ConstructorDeclarationSyntax constructor) => constructor
 		.ParameterList.Parameters
 		.FirstOrDefault(x =>
-			x.Type != null
+			x.Type is not null
 			&& x.Type.NormalizeWhitespace()
 				.ToFullString()
 			== GetFileSystemType()
@@ -84,7 +85,7 @@ public static ParameterSyntax CreateFileSystemParameterDeclaration() => SF.Param
 	public static bool ConstructorHasAssignmentExpression(BaseMethodDeclarationSyntax constructor,
 														string field = Constants.FieldFileSystemName)
 	{
-		if (constructor.Body == null)
+		if (constructor.Body is null)
 		{
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ private static Project CreateProject(string[] sources, string language = Languag`
`206`	`206`	`.AddMetadataReference(projectId, CodeAnalysisReference)`
`207`	`207`	`.AddMetadataReference(projectId, SystemDiagReference);`
`208`	`208`
`209`		`- if (references != null)`
	`209`	`+ if (references is not null)`
`210`	`210`	`{`
`211`	`211`	`solution = solution.AddMetadataReferences(projectId, references);`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public static VerifyCodeFixProviderResult VerifyFix(this CodeFixProvider codeFix`
`100`	`100`	`break;`
`101`	`101`	`}`
`102`	`102`
`103`		`- if (codeFixIndex != null)`
	`103`	`+ if (codeFixIndex is not null)`
`104`	`104`	`{`
`105`	`105`	`document = document.ApplyFix(actions.ElementAt((int) codeFixIndex));`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke`
`42`	`42`	`var editor = await DocumentEditor.CreateAsync(_document, cancellationToken)`
`43`	`43`	`.ConfigureAwait(false);`
`44`	`44`
`45`		`- if (_creationExpressionSyntax.ArgumentList == null)`
	`45`	`+ if (_creationExpressionSyntax.ArgumentList is null)`
`46`	`46`	`{`
`47`	`47`	`return _document;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,14 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke`
`58`	`58`
`59`	`59`	`var fileSystem = RoslynClassFileSystem.GetUsing(compilationUnitSyntax, Constants.FileSystemNameSpace);`
`60`	`60`
`61`		`- if (fileSystem != null)`
	`61`	`+ if (fileSystem is not null)`
`62`	`62`	`{`
`63`	`63`	`return editor.GetChangedDocument();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`var systemIo = RoslynClassFileSystem.GetSystemIoUsing(compilationUnitSyntax);`
`67`	`67`
`68`		`- if (systemIo == null)`
	`68`	`+ if (systemIo is null)`
`69`	`69`	`{`
`70`	`70`	`if (compilationUnitSyntax.Usings.Any())`
`71`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)`
`35`	`35`	`var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)`
`36`	`36`	`.ConfigureAwait(false);`
`37`	`37`
`38`		`- if (root == null)`
	`38`	`+ if (root is null)`
`39`	`39`	`{`
`40`	`40`	`return;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)`
`44`	`44`	`var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken)`
`45`	`45`	`.ConfigureAwait(false);`
`46`	`46`
`47`		`- if (root == null)`
	`47`	`+ if (root is null)`
`48`	`48`	`{`
`49`	`49`	`return;`
`50`	`50`	`}`
`@@ -55,7 +55,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)`
`55`	`55`	`var constructor = RoslynClassFileSystem.GetConstructor(classDeclarationSyntax);`
`56`	`56`
`57`	`57`	`if (!RoslynClassFileSystem.HasFileSystemField(classDeclarationSyntax)`
`58`		`- \|\| (constructor != null && !RoslynClassFileSystem.ConstructorHasFileSystemParameter(constructor)))`
	`58`	`+ \|\| (constructor is not null && !RoslynClassFileSystem.ConstructorHasFileSystemParameter(constructor)))`
`59`	`59`	`{`
`60`	`60`	`context.RegisterCodeFix(new FileServiceConstructorInitialCodeAction(Title,`
`61`	`61`	`context.Document,`