Merge pull request #5421 from tamasvajk/feature/codequalityfixes

tamasvajk · web-flow · commit 0732f200e8fe · 2021-03-19T12:09:18.000+01:00
C#: Fix code quality issues reported by code scanning
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs
@@ -151,13 +151,10 @@ public Handle? MetadataHandle
                 if (handleProp is null)
                 {
                     var underlyingSymbolProp = GetPropertyInfo(Symbol, "UnderlyingSymbol");
-                    if (underlyingSymbolProp is not null)
+                    if (underlyingSymbolProp?.GetValue(Symbol) is object underlying)
                     {
-                        if (underlyingSymbolProp.GetValue(Symbol) is object underlying)
-                        {
-                            handleProp = GetPropertyInfo(underlying, "Handle");
-                            handleObj = underlying;
-                        }
+                        handleProp = GetPropertyInfo(underlying, "Handle");
+                        handleObj = underlying;
                     }
                 }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ImplicitCast.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ImplicitCast.cs
@@ -3,7 +3,7 @@
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
-    internal class ImplicitCast : Expression
+    internal sealed class ImplicitCast : Expression
     {
         public Expression Expr
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/MemberAccess.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/MemberAccess.cs
@@ -4,7 +4,7 @@
 
 namespace Semmle.Extraction.CSharp.Entities.Expressions
 {
-    internal class MemberAccess : Expression
+    internal sealed class MemberAccess : Expression
     {
         private MemberAccess(ExpressionNodeInfo info, ExpressionSyntax qualifier, ISymbol? target) : base(info)
         {

Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,10 @@ public Handle? MetadataHandle`
`151`	`151`	`if (handleProp is null)`
`152`	`152`	`{`
`153`	`153`	`var underlyingSymbolProp = GetPropertyInfo(Symbol, "UnderlyingSymbol");`
`154`		`- if (underlyingSymbolProp is not null)`
	`154`	`+ if (underlyingSymbolProp?.GetValue(Symbol) is object underlying)`
`155`	`155`	`{`
`156`		`- if (underlyingSymbolProp.GetValue(Symbol) is object underlying)`
`157`		`- {`
`158`		`- handleProp = GetPropertyInfo(underlying, "Handle");`
`159`		`- handleObj = underlying;`
`160`		`- }`
	`156`	`+ handleProp = GetPropertyInfo(underlying, "Handle");`
	`157`	`+ handleObj = underlying;`
`161`	`158`	`}`
`162`	`159`	`}`
`163`	`160`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Semmle.Extraction.CSharp.Entities.Expressions`
`5`	`5`	`{`
`6`		`- internal class ImplicitCast : Expression`
	`6`	`+ internal sealed class ImplicitCast : Expression`
`7`	`7`	`{`
`8`	`8`	`public Expression Expr`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Semmle.Extraction.CSharp.Entities.Expressions`
`6`	`6`	`{`
`7`		`- internal class MemberAccess : Expression`
	`7`	`+ internal sealed class MemberAccess : Expression`
`8`	`8`	`{`
`9`	`9`	`private MemberAccess(ExpressionNodeInfo info, ExpressionSyntax qualifier, ISymbol? target) : base(info)`
`10`	`10`	`{`