Address review comments

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Lambda.cs

@@ -24,12 +24,9 @@ private void VisitParameter(ParameterSyntax p)
         private Lambda(ExpressionNodeInfo info, CSharpSyntaxNode body, IEnumerable<ParameterSyntax> @params)
             : base(info)
         {
-            var symbol = cx.GetModel(info.Node).GetSymbolInfo(info.Node).Symbol as IMethodSymbol;
-
-            if (symbol is object)
+            if (cx.GetModel(info.Node).GetSymbolInfo(info.Node).Symbol is IMethodSymbol symbol)
             {
-                Modifier.ExtractStaticModifier(cx, info.Context.TrapWriter.Writer, this, symbol);
-                Modifier.ExtractAsyncModifier(cx, info.Context.TrapWriter.Writer, this, symbol);
+                Modifier.ExtractModifiers(cx, info.Context.TrapWriter.Writer, this, symbol);
             }
             else
             {

csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs

@@ -86,7 +86,10 @@ public static void ExtractModifiers(Context cx, TextWriter trapFile, IEntity key
             if (symbol.IsSealed)
                 HasModifier(cx, trapFile, key, "sealed");
 
-            ExtractStaticModifier(cx, trapFile, key, symbol);
+            var fromSource = symbol.DeclaringSyntaxReferences.Length > 0;
+
+            if (symbol.IsStatic && !(symbol.Kind == SymbolKind.Field && ((IFieldSymbol)symbol).IsConst && !fromSource))
+                HasModifier(cx, trapFile, key, "static");
 
             if (symbol.IsVirtual)
                 HasModifier(cx, trapFile, key, "virtual");
@@ -101,7 +104,8 @@ public static void ExtractModifiers(Context cx, TextWriter trapFile, IEntity key
             if (symbol.IsOverride)
                 HasModifier(cx, trapFile, key, "override");
 
-            ExtractAsyncModifier(cx, trapFile, key, symbol);
+            if (symbol.Kind == SymbolKind.Method && ((IMethodSymbol)symbol).IsAsync)
+                HasModifier(cx, trapFile, key, "async");
 
             if (symbol.IsExtern)
                 HasModifier(cx, trapFile, key, "extern");
@@ -125,20 +129,6 @@ public static void ExtractModifiers(Context cx, TextWriter trapFile, IEntity key
             }
         }
 
-        public static void ExtractAsyncModifier(Context cx, TextWriter trapFile, IEntity key, ISymbol symbol)
-        {
-            if (symbol.Kind == SymbolKind.Method && ((IMethodSymbol)symbol).IsAsync)
-                HasModifier(cx, trapFile, key, "async");
-        }
-
-        public static void ExtractStaticModifier(Context cx, TextWriter trapFile, IEntity key, ISymbol symbol)
-        {
-            var fromSource = symbol.DeclaringSyntaxReferences.Length > 0;
-
-            if (symbol.IsStatic && !(symbol.Kind == SymbolKind.Field && ((IFieldSymbol)symbol).IsConst && !fromSource))
-                HasModifier(cx, trapFile, key, "static");
-        }
-
         public static Modifier Create(Context cx, string modifier)
         {
             return ModifierFactory.Instance.CreateEntity(cx, (typeof(Modifier), modifier), modifier);

csharp/ql/test/library-tests/csharp9/LambdaModifier.expected

@@ -1,3 +1,11 @@
+| Discard.cs:7:33:7:52 | (...) => ... | private |
+| Discard.cs:8:13:8:24 | (...) => ... | private |
+| Discard.cs:9:13:9:32 | (...) => ... | private |
+| Discard.cs:10:13:10:49 | delegate(...) { ... } | private |
+| LambdaModifier.cs:11:11:11:27 | (...) => ... | private |
 | LambdaModifier.cs:11:11:11:27 | (...) => ... | static |
+| LambdaModifier.cs:12:11:12:20 | (...) => ... | private |
+| LambdaModifier.cs:13:11:13:51 | delegate(...) { ... } | private |
 | LambdaModifier.cs:13:11:13:51 | delegate(...) { ... } | static |
 | LambdaModifier.cs:15:24:15:64 | (...) => ... | async |
+| LambdaModifier.cs:15:24:15:64 | (...) => ... | private |