Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8c4563b

Browse files
tamasvajktamasvajk
committed
Code quality improvements
1 parent d1fe542 commit 8c4563b

3 files changed

Lines changed: 30 additions & 24 deletions

File tree

‎csharp/extractor/Semmle.Extraction.CSharp/Populators/CompilationUnitVisitor.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ public CompilationUnitVisitor(Context cx)
1313
public override void VisitExternAliasDirective(ExternAliasDirectiveSyntax node)
1414
{
1515
// This information is not yet extracted.
16-
cx.ExtractionError("Not implemented extern alias directive", node.ToFullString(), cx.CreateLocation(node.GetLocation()), "", Severity.Info);
16+
Cx.ExtractionError("Not implemented extern alias directive", node.ToFullString(), Cx.CreateLocation(node.GetLocation()), "", Severity.Info);
1717
}
1818

1919
public override void VisitCompilationUnit(CompilationUnitSyntax compilationUnit)
2020
{
2121
foreach (var m in compilationUnit.ChildNodes())
2222
{
23-
cx.Try(m, null, () => ((CSharpSyntaxNode)m).Accept(this));
23+
Cx.Try(m, null, () => ((CSharpSyntaxNode)m).Accept(this));
2424
}
2525

2626
// Gather comments:
2727
foreach (var trivia in compilationUnit.DescendantTrivia(compilationUnit.Span, descendIntoTrivia: true))
2828
{
29-
CommentPopulator.ExtractComment(cx, trivia);
29+
CommentPopulator.ExtractComment(Cx, trivia);
3030
}
3131

3232
foreach (var trivia in compilationUnit.GetLeadingTrivia())
3333
{
34-
CommentPopulator.ExtractComment(cx, trivia);
34+
CommentPopulator.ExtractComment(Cx, trivia);
3535
}
3636

3737
foreach (var trivia in compilationUnit.GetTrailingTrivia())
3838
{
39-
CommentPopulator.ExtractComment(cx, trivia);
39+
CommentPopulator.ExtractComment(Cx, trivia);
4040
}
4141
}
4242
}

‎csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeContainerVisitor.cs‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ namespace Semmle.Extraction.CSharp.Populators
1111
{
1212
public class TypeContainerVisitor : CSharpSyntaxVisitor
1313
{
14-
protected Context cx { get; }
15-
protected IEntity parent { get; }
16-
protected TextWriter trapFile { get; }
14+
protected Context Cx { get; }
15+
protected IEntity Parent { get; }
16+
protected TextWriter TrapFile { get; }
1717
private readonly Lazy<Func<SyntaxNode, AttributeData>> attributeLookup;
1818

1919
public TypeContainerVisitor(Context cx, TextWriter trapFile, IEntity parent)
2020
{
21-
this.cx = cx;
22-
this.parent = parent;
23-
this.trapFile = trapFile;
21+
Cx = cx;
22+
Parent = parent;
23+
TrapFile = trapFile;
24+
2425
attributeLookup = new Lazy<Func<SyntaxNode, AttributeData>>(() =>
2526
{
2627
var dict = new Dictionary<SyntaxNode, AttributeData>();
@@ -40,46 +41,51 @@ public override void DefaultVisit(SyntaxNode node)
4041

4142
public override void VisitDelegateDeclaration(DelegateDeclarationSyntax node)
4243
{
43-
Entities.NamedType.Create(cx, cx.GetModel(node).GetDeclaredSymbol(node)).ExtractRecursive(trapFile, parent);
44+
Entities.NamedType.Create(Cx, Cx.GetModel(node).GetDeclaredSymbol(node)).ExtractRecursive(TrapFile, Parent);
4445
}
4546

4647
public override void VisitRecordDeclaration(RecordDeclarationSyntax node)
4748
{
48-
Entities.Type.Create(cx, cx.GetModel(node).GetDeclaredSymbol(node)).ExtractRecursive(trapFile, parent);
49+
ExtractTypeDeclaration(node);
4950
}
5051

51-
public override void VisitClassDeclaration(ClassDeclarationSyntax classDecl)
52+
public override void VisitClassDeclaration(ClassDeclarationSyntax node)
5253
{
53-
Entities.Type.Create(cx, cx.GetModel(classDecl).GetDeclaredSymbol(classDecl)).ExtractRecursive(trapFile, parent);
54+
ExtractTypeDeclaration(node);
5455
}
5556

5657
public override void VisitStructDeclaration(StructDeclarationSyntax node)
5758
{
58-
Entities.Type.Create(cx, cx.GetModel(node).GetDeclaredSymbol(node)).ExtractRecursive(trapFile, parent);
59+
ExtractTypeDeclaration(node);
5960
}
6061

6162
public override void VisitEnumDeclaration(EnumDeclarationSyntax node)
6263
{
63-
Entities.Type.Create(cx, cx.GetModel(node).GetDeclaredSymbol(node)).ExtractRecursive(trapFile, parent);
64+
ExtractTypeDeclaration(node);
6465
}
6566

6667
public override void VisitInterfaceDeclaration(InterfaceDeclarationSyntax node)
6768
{
68-
Entities.Type.Create(cx, cx.GetModel(node).GetDeclaredSymbol(node)).ExtractRecursive(trapFile, parent);
69+
ExtractTypeDeclaration(node);
70+
}
71+
72+
private void ExtractTypeDeclaration(BaseTypeDeclarationSyntax node)
73+
{
74+
Entities.Type.Create(Cx, Cx.GetModel(node).GetDeclaredSymbol(node)).ExtractRecursive(TrapFile, Parent);
6975
}
7076

7177
public override void VisitAttributeList(AttributeListSyntax node)
7278
{
73-
if (cx.Extractor.Standalone)
79+
if (Cx.Extractor.Standalone)
7480
return;
7581

76-
var outputAssembly = Assembly.CreateOutputAssembly(cx);
82+
var outputAssembly = Assembly.CreateOutputAssembly(Cx);
7783
foreach (var attribute in node.Attributes)
7884
{
7985
if (attributeLookup.Value(attribute) is AttributeData attributeData)
8086
{
81-
var ae = Semmle.Extraction.CSharp.Entities.Attribute.Create(cx, attributeData, outputAssembly);
82-
cx.BindComments(ae, attribute.GetLocation());
87+
var ae = Semmle.Extraction.CSharp.Entities.Attribute.Create(Cx, attributeData, outputAssembly);
88+
Cx.BindComments(ae, attribute.GetLocation());
8389
}
8490
}
8591
}

‎csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeOrNamespaceVisitor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ public override void VisitUsingDirective(UsingDirectiveSyntax usingDirective)
1313
{
1414
// Only deal with "using namespace" not "using X = Y"
1515
if (usingDirective.Alias == null)
16-
new UsingDirective(cx, usingDirective, (NamespaceDeclaration)parent);
16+
new UsingDirective(Cx, usingDirective, (NamespaceDeclaration)Parent);
1717
}
1818

1919
public override void VisitNamespaceDeclaration(NamespaceDeclarationSyntax node)
2020
{
21-
NamespaceDeclaration.Create(cx, node, (NamespaceDeclaration)parent);
21+
NamespaceDeclaration.Create(Cx, node, (NamespaceDeclaration)Parent);
2222
}
2323
}
2424
}

0 commit comments

Comments
 (0)