Move AstLineCounter to top level class

This commit is contained in:
Tamas Vajk
2021-02-15 09:19:18 +01:00
parent 4f693be33b
commit 6cc858b9ef
3 changed files with 49 additions and 52 deletions

View File

@@ -1,51 +0,0 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Semmle.Util;
using System.IO;
namespace Semmle.Extraction.CSharp.Entities
{
public abstract partial class Method
{
private class AstLineCounter : CSharpSyntaxVisitor<LineCounts>
{
public override LineCounts DefaultVisit(SyntaxNode node)
{
var text = node.SyntaxTree.GetText().GetSubText(node.GetLocation().SourceSpan).ToString();
return LineCounter.ComputeLineCounts(text);
}
public override LineCounts VisitMethodDeclaration(MethodDeclarationSyntax method)
{
return Visit(method.Identifier, method.Body ?? (SyntaxNode)method.ExpressionBody);
}
public static LineCounts Visit(SyntaxToken identifier, SyntaxNode body)
{
var start = identifier.GetLocation().SourceSpan.Start;
var end = body.GetLocation().SourceSpan.End - 1;
var textSpan = new Microsoft.CodeAnalysis.Text.TextSpan(start, end - start);
var text = body.SyntaxTree.GetText().GetSubText(textSpan) + "\r\n";
return LineCounter.ComputeLineCounts(text);
}
public override LineCounts VisitConstructorDeclaration(ConstructorDeclarationSyntax method)
{
return Visit(method.Identifier, (SyntaxNode)method.Body ?? method.ExpressionBody);
}
public override LineCounts VisitDestructorDeclaration(DestructorDeclarationSyntax method)
{
return Visit(method.Identifier, (SyntaxNode)method.Body ?? method.ExpressionBody);
}
public override LineCounts VisitOperatorDeclaration(OperatorDeclarationSyntax node)
{
return Visit(node.OperatorToken, node.Body ?? (SyntaxNode)node.ExpressionBody);
}
}
}
}

View File

@@ -8,7 +8,7 @@ using System.Linq;
namespace Semmle.Extraction.CSharp.Entities
{
public abstract partial class Method : CachedSymbol<IMethodSymbol>, IExpressionParentEntity, IStatementParentEntity
public abstract class Method : CachedSymbol<IMethodSymbol>, IExpressionParentEntity, IStatementParentEntity
{
protected Method(Context cx, IMethodSymbol init)
: base(cx, init) { }

View File

@@ -0,0 +1,48 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Semmle.Util;
namespace Semmle.Extraction.CSharp.Populators
{
internal class AstLineCounter : CSharpSyntaxVisitor<LineCounts>
{
public override LineCounts DefaultVisit(SyntaxNode node)
{
var text = node.SyntaxTree.GetText().GetSubText(node.GetLocation().SourceSpan).ToString();
return LineCounter.ComputeLineCounts(text);
}
public override LineCounts VisitMethodDeclaration(MethodDeclarationSyntax method)
{
return Visit(method.Identifier, method.Body ?? (SyntaxNode)method.ExpressionBody);
}
public static LineCounts Visit(SyntaxToken identifier, SyntaxNode body)
{
var start = identifier.GetLocation().SourceSpan.Start;
var end = body.GetLocation().SourceSpan.End - 1;
var textSpan = new Microsoft.CodeAnalysis.Text.TextSpan(start, end - start);
var text = body.SyntaxTree.GetText().GetSubText(textSpan) + "\r\n";
return LineCounter.ComputeLineCounts(text);
}
public override LineCounts VisitConstructorDeclaration(ConstructorDeclarationSyntax method)
{
return Visit(method.Identifier, (SyntaxNode)method.Body ?? method.ExpressionBody);
}
public override LineCounts VisitDestructorDeclaration(DestructorDeclarationSyntax method)
{
return Visit(method.Identifier, (SyntaxNode)method.Body ?? method.ExpressionBody);
}
public override LineCounts VisitOperatorDeclaration(OperatorDeclarationSyntax node)
{
return Visit(node.OperatorToken, node.Body ?? (SyntaxNode)node.ExpressionBody);
}
}
}