Merge pull request #690 from dotnet-script/bugfix/CS8073

seesharper · web-flow · commit 124737c6dd77 · 2022-10-24T16:50:28.000+02:00
removed unnecessary CS8073 warnings
diff --git a/src/Dotnet.Script.Core/Internal/PreprocessorLineRewriter.cs b/src/Dotnet.Script.Core/Internal/PreprocessorLineRewriter.cs
@@ -22,13 +22,13 @@ public override SyntaxNode VisitReferenceDirectiveTrivia(ReferenceDirectiveTrivi
             return HandleSkippedTrivia(base.VisitReferenceDirectiveTrivia(node));
         }
 
-        private SyntaxNode HandleSkippedTrivia(SyntaxNode node)
+        private static SyntaxNode HandleSkippedTrivia(SyntaxNode node)
         {
             var skippedTrivia = node.DescendantTrivia().Where(x => x.RawKind == (int)SyntaxKind.SkippedTokensTrivia).FirstOrDefault();
-            if (skippedTrivia != null && skippedTrivia.Token.Kind() != SyntaxKind.None) 
+            if (skippedTrivia.Token.Kind() != SyntaxKind.None) 
             {
                 var firstToken = skippedTrivia.GetStructure().ChildTokens().FirstOrDefault();
-                if (firstToken != null && firstToken.Kind() == SyntaxKind.BadToken && firstToken.ToFullString().Trim() == ";")
+                if (firstToken.Kind() == SyntaxKind.BadToken && firstToken.ToFullString().Trim() == ";")
                 {
                     node = node.ReplaceToken(firstToken, SyntaxFactory.Token(SyntaxKind.None));
                     skippedTrivia = node.DescendantTrivia().Where(x => x.RawKind == (int)SyntaxKind.SkippedTokensTrivia).FirstOrDefault();

Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ public override SyntaxNode VisitReferenceDirectiveTrivia(ReferenceDirectiveTrivi`
`22`	`22`	`return HandleSkippedTrivia(base.VisitReferenceDirectiveTrivia(node));`
`23`	`23`	`}`
`24`	`24`
`25`		`- private SyntaxNode HandleSkippedTrivia(SyntaxNode node)`
	`25`	`+ private static SyntaxNode HandleSkippedTrivia(SyntaxNode node)`
`26`	`26`	`{`
`27`	`27`	`var skippedTrivia = node.DescendantTrivia().Where(x => x.RawKind == (int)SyntaxKind.SkippedTokensTrivia).FirstOrDefault();`
`28`		`- if (skippedTrivia != null && skippedTrivia.Token.Kind() != SyntaxKind.None)`
	`28`	`+ if (skippedTrivia.Token.Kind() != SyntaxKind.None)`
`29`	`29`	`{`
`30`	`30`	`var firstToken = skippedTrivia.GetStructure().ChildTokens().FirstOrDefault();`
`31`		`- if (firstToken != null && firstToken.Kind() == SyntaxKind.BadToken && firstToken.ToFullString().Trim() == ";")`
	`31`	`+ if (firstToken.Kind() == SyntaxKind.BadToken && firstToken.ToFullString().Trim() == ";")`
`32`	`32`	`{`
`33`	`33`	`node = node.ReplaceToken(firstToken, SyntaxFactory.Token(SyntaxKind.None));`
`34`	`34`	`skippedTrivia = node.DescendantTrivia().Where(x => x.RawKind == (int)SyntaxKind.SkippedTokensTrivia).FirstOrDefault();`