Merge pull request github#5420 from tamasvajk/feature/fix-nullable-warning

tamasvajk · web-flow · commit 2e2a5d62c2f0 · 2021-03-17T12:16:15.000+01:00
C#: Fix nullable warning
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs
@@ -625,7 +625,14 @@ public static bool IsSourceDeclaration(this IParameterSymbol parameter)
             {
                 try
                 {
-                    return symbol.Accept(new Populators.Symbols(cx));
+                    var entity = symbol.Accept(new Populators.Symbols(cx));
+                    if (entity is null)
+                    {
+                        cx.ModelError(symbol, $"Symbol visitor returned null entity on symbol: {symbol}");
+                    }
+#nullable disable warnings
+                    return entity;
+#nullable restore warnings
                 }
                 catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
                 {

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,14 @@ public static bool IsSourceDeclaration(this IParameterSymbol parameter)`
`625`	`625`	`{`
`626`	`626`	`try`
`627`	`627`	`{`
`628`		`- return symbol.Accept(new Populators.Symbols(cx));`
	`628`	`+ var entity = symbol.Accept(new Populators.Symbols(cx));`
	`629`	`+ if (entity is null)`
	`630`	`+ {`
	`631`	`+ cx.ModelError(symbol, $"Symbol visitor returned null entity on symbol: {symbol}");`
	`632`	`+ }`
	`633`	`+#nullable disable warnings`
	`634`	`+ return entity;`
	`635`	`+#nullable restore warnings`
`629`	`636`	`}`
`630`	`637`	`catch (Exception ex) // lgtm[cs/catch-of-all-exceptions]`
`631`	`638`	`{`