Relocate 'AstLineCounter'

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CSharp/Populators/Methods.cs renamed to csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.AstLineCounter.cs

@@ -4,9 +4,9 @@
 using Semmle.Util;
 using System.IO;
 
-namespace Semmle.Extraction.CSharp.Populators
+namespace Semmle.Extraction.CSharp.Entities
 {
-    public static class MethodExtensions
+    public abstract partial class Method
     {
         private class AstLineCounter : CSharpSyntaxVisitor<LineCounts>
         {
@@ -47,15 +47,5 @@ public override LineCounts VisitOperatorDeclaration(OperatorDeclarationSyntax no
                 return Visit(node.OperatorToken, node.Body ?? (SyntaxNode)node.ExpressionBody);
             }
         }
-
-        public static void NumberOfLines(this Context cx, TextWriter trapFile, ISymbol symbol, IEntity callable)
-        {
-            foreach (var decl in symbol.DeclaringSyntaxReferences)
-            {
-                var node = (CSharpSyntaxNode)decl.GetSyntax();
-                var lineCounts = node.Accept(new AstLineCounter());
-                trapFile.numlines(callable, lineCounts);
-            }
-        }
     }
 }

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

@@ -1,4 +1,5 @@
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.CSharp.Populators;
 using System.Collections.Generic;
@@ -7,7 +8,7 @@
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    public abstract class Method : CachedSymbol<IMethodSymbol>, IExpressionParentEntity, IStatementParentEntity
+    public abstract partial class Method : CachedSymbol<IMethodSymbol>, IExpressionParentEntity, IStatementParentEntity
     {
         protected Method(Context cx, IMethodSymbol init)
             : base(cx, init) { }
@@ -83,11 +84,21 @@ private void PopulateMethodBody(TextWriter trapFile)
                        else
                            Expression.Create(Context, expr, this, 0);
 
-                       Context.NumberOfLines(trapFile, BodyDeclaringSymbol, this);
+                       NumberOfLines(trapFile, BodyDeclaringSymbol, this);
                    });
             }
         }
 
+        public static void NumberOfLines(TextWriter trapFile, ISymbol symbol, IEntity callable)
+        {
+            foreach (var decl in symbol.DeclaringSyntaxReferences)
+            {
+                var node = (CSharpSyntaxNode)decl.GetSyntax();
+                var lineCounts = node.Accept(new AstLineCounter());
+                trapFile.numlines(callable, lineCounts);
+            }
+        }
+
         public void Overrides(TextWriter trapFile)
         {
             foreach (var explicitInterface in symbol.ExplicitInterfaceImplementations