Skip to content

Commit f6b52fd

Browse files
matecsadmatecsad
committed
Removed .sln file, updated Utility classes
1 parent 9519a13 commit f6b52fd

8 files changed

Lines changed: 41 additions & 116 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ nbproject/
1212
## Build folders
1313
build/
1414
build_*/
15-
Build/
16-
Build_*/
1715
install/
1816
install_*/

‎plugins/csharp/csharp.sln‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎plugins/csharp/parser/src_csharp/AstVisitor.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@ partial class AstVisitor : CSharpSyntaxWalker
1414
private readonly CsharpDbContext DbContext;
1515
private readonly SemanticModel Model;
1616
private readonly SyntaxTree Tree;
17-
private readonly AstVisitorHelper Helper;
1817

1918
public bool FullyParsed = true;
2019

2120
public AstVisitor(CsharpDbContext context, SemanticModel model, SyntaxTree tree)
2221
{
2322
this.DbContext = context;
2423
this.Model = model;
25-
this.Tree = tree;
26-
this.Helper = new AstVisitorHelper();
24+
this.Tree = tree;
2725
}
2826

2927
private CsharpAstNode AstNode(SyntaxNode node, AstSymbolTypeEnum type, AstTypeEnum astType)
@@ -47,7 +45,7 @@ private CsharpAstNode AstNode(SyntaxNode node, AstSymbolTypeEnum type, AstTypeEn
4745
Accessibility = acc
4846
};
4947
astNode.SetLocation(Tree.GetLineSpan(node.Span));
50-
astNode.Id = Helper.createIdentifier(astNode);
48+
astNode.Id = AstVisitorUtility.CreateIdentifier(astNode);
5149

5250
if (DbContext.CsharpAstNodes.Find(astNode.Id) == null)
5351
{
@@ -888,7 +886,7 @@ public override void VisitInvocationExpression(InvocationExpressionSyntax node)
888886
FullyParsed = false;
889887
}
890888
var info = Model.GetTypeInfo(node).ConvertedType;
891-
var declaratorNodeId = Helper.getAstNodeId(declaration.GetSyntax());
889+
var declaratorNodeId = AstVisitorUtility.GetAstNodeId(declaration.GetSyntax());
892890
var astNode = AstNode(node, AstSymbolTypeEnum.EtcEntity, AstTypeEnum.Usage);
893891
CsharpEtcEntity invoc = new CsharpEtcEntity
894892
{
@@ -936,7 +934,7 @@ public override void VisitIdentifierName(IdentifierNameSyntax node)
936934
EtcEntityTypeEnum.ForeachExpr : EtcEntityTypeEnum.Invocation;
937935
if (node.Parent.Parent.Kind() != SyntaxKind.InvocationExpression)
938936
{
939-
var declaratorNodeId = Helper.getAstNodeId(declaration.GetSyntax());
937+
var declaratorNodeId = AstVisitorUtility.GetAstNodeId(declaration.GetSyntax());
940938
var astNode = AstNode(node, AstSymbolTypeEnum.EtcEntity, AstTypeEnum.Usage);
941939
CsharpEtcEntity expr = new CsharpEtcEntity
942940
{

plugins/csharp/parser/src_csharp/AstVisitorHelper.cs renamed to plugins/csharp/parser/src_csharp/AstVisitorUtility.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
namespace CSharpParser
1111
{
12-
class AstVisitorHelper
12+
static class AstVisitorUtility
1313
{
14-
public ulong createIdentifier(CsharpAstNode astNode){
14+
public static ulong CreateIdentifier(CsharpAstNode astNode){
1515
string[] properties =
1616
{
1717
astNode.AstValue,":",
@@ -28,10 +28,10 @@ public ulong createIdentifier(CsharpAstNode astNode){
2828
string res = string.Concat(properties);
2929

3030
//WriteLine(res);
31-
return fnvHash(res);
31+
return FnvHash(res);
3232
}
3333

34-
private ulong fnvHash(string data_)
34+
private static ulong FnvHash(string data_)
3535
{
3636
ulong hash = 14695981039346656037;
3737

@@ -45,7 +45,7 @@ private ulong fnvHash(string data_)
4545
return hash;
4646
}
4747

48-
public ulong getAstNodeId(SyntaxNode node){
48+
public static ulong GetAstNodeId(SyntaxNode node){
4949
CsharpAstNode astNode = new CsharpAstNode
5050
{
5151
AstValue = node.ToString(),
@@ -54,7 +54,7 @@ public ulong getAstNodeId(SyntaxNode node){
5454
AstType = AstTypeEnum.Declaration
5555
};
5656
astNode.SetLocation(node.SyntaxTree.GetLineSpan(node.Span));
57-
var ret = createIdentifier(astNode);
57+
var ret = CreateIdentifier(astNode);
5858
return ret;
5959
}
6060
}

‎plugins/csharp/parser/src_csharp/Program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int Main(string[] args)
8282
}*/
8383

8484
//Converting the connectionstring into entiy framwork style connectionstring
85-
string csharpConnectionString = ProgramHelper.transformConnectionString(_connectionString);
85+
string csharpConnectionString = ProgramUtility.TransformConnectionString(_connectionString);
8686

8787
var options = new DbContextOptionsBuilder<CsharpDbContext>()
8888
.UseNpgsql(csharpConnectionString)
@@ -95,17 +95,17 @@ static int Main(string[] args)
9595
foreach (var p in _rootDir)
9696
{
9797
Console.WriteLine(p);
98-
allFiles.AddRange(ProgramHelper.GetSourceFilesFromDir(p, ".cs"));
98+
allFiles.AddRange(ProgramUtility.GetSourceFilesFromDir(p, ".cs"));
9999
}
100100

101101
foreach (var f in allFiles)
102102
{
103103
WriteLine(f);
104104
}
105-
IEnumerable<string> assemblies = ProgramHelper.GetSourceFilesFromDir(_buildDir, ".dll");
105+
IEnumerable<string> assemblies = ProgramUtility.GetSourceFilesFromDir(_buildDir, ".dll");
106106
IEnumerable<string> assemblies_base = assemblies;
107107
if (args.Length == 5)
108-
assemblies_base = ProgramHelper.GetSourceFilesFromDir(_buildDirBase, ".dll");
108+
assemblies_base = ProgramUtility.GetSourceFilesFromDir(_buildDirBase, ".dll");
109109

110110
List<SyntaxTree> trees = new List<SyntaxTree>();
111111
foreach (string file in allFiles)

plugins/csharp/parser/src_csharp/ProgramHelper.cs renamed to plugins/csharp/parser/src_csharp/ProgramUtility.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace CSharpParser
1414
{
15-
class ProgramHelper
15+
static class ProgramUtility
1616
{
1717
public static IEnumerable<string> GetSourceFilesFromDir(string root, string extension)
1818
{
@@ -85,7 +85,7 @@ public static IEnumerable<string> GetSourceFilesFromDir(string root, string exte
8585
return allFiles;
8686
}
8787

88-
public static string transformConnectionString(string _connectionString)
88+
public static string TransformConnectionString(string _connectionString)
8989
{
9090
_connectionString = _connectionString.Substring(_connectionString.IndexOf(':')+1);
9191
_connectionString = _connectionString.Replace("user", "username");

‎plugins/csharp/service/src_csharp/CSharpQueryHandler.cs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
public class CSharpQueryHandler : CsharpService.IAsync
2121
{
2222
private CsharpDbContext dbContext;
23-
24-
private QueryHelper queryHelper = new QueryHelper();
2523
public CSharpQueryHandler(string connenctionString)
2624
{
2725
// Converting the connectionstring into Entity Framework style connection string
@@ -264,7 +262,7 @@ public async Task<AstNodeInfo> getAstNodeInfoByPosition(string path_,
264262
minNode = node;
265263
}
266264

267-
return await Task.FromResult(queryHelper.createAstNodeInfo(minNode));
265+
return await Task.FromResult(QueryUtility.CreateAstNodeInfo(minNode));
268266
}
269267

270268
public async Task<Dictionary<string, string>> getProperties(string astNodeIds,
@@ -368,7 +366,7 @@ public async Task<string> getDocumentation(string astNodeId,
368366
public async Task<FileRange> getFileRange(string astNodeId,
369367
CancellationToken cancellationToken = default(CancellationToken))
370368
{
371-
return await Task.FromResult(queryHelper.getFileRange(queryCsharpAstNode(astNodeId)));
369+
return await Task.FromResult(QueryUtility.GetFileRange(queryCsharpAstNode(astNodeId)));
372370
}
373371

374372
public async Task<Dictionary<string, int>> getReferenceTypes(string astNodeId,
@@ -525,56 +523,56 @@ public async Task<List<AstNodeInfo>> getReferences(string astNodeId,
525523
switch ((ReferenceType)referenceId)
526524
{
527525
case ReferenceType.USAGE:
528-
ret = queryHelper.createAstNodeInfoList(queryInvocations(node));
526+
ret = QueryUtility.CreateAstNodeInfoList(queryInvocations(node));
529527
break;
530528
case ReferenceType.DEFINITION:
531529
case ReferenceType.DECLARATION:
532-
ret = queryHelper.createAstNodeInfoList(queryDeclarators(node));
530+
ret = QueryUtility.CreateAstNodeInfoList(queryDeclarators(node));
533531
break;
534532
case ReferenceType.EVALUATION:
535-
ret = queryHelper.createAstNodeInfoList(queryEvals(node));
533+
ret = QueryUtility.CreateAstNodeInfoList(queryEvals(node));
536534
break;
537535
case ReferenceType.PARAMETER:
538-
ret = queryHelper.createAstNodeInfoList(queryParams(node));
536+
ret = QueryUtility.CreateAstNodeInfoList(queryParams(node));
539537
break;
540538
case ReferenceType.LOCAL_VAR:
541-
ret = queryHelper.createAstNodeInfoList(queryLocals(node));
539+
ret = QueryUtility.CreateAstNodeInfoList(queryLocals(node));
542540
break;
543541
case ReferenceType.DATA_MEMBER:
544-
ret = queryHelper.createAstNodeInfoList(queryProperties(node));
542+
ret = QueryUtility.CreateAstNodeInfoList(queryProperties(node));
545543
break;
546544
case ReferenceType.THIS_CALLS:
547-
ret = queryHelper.createAstNodeInfoList(queryCalls(node));
545+
ret = QueryUtility.CreateAstNodeInfoList(queryCalls(node));
548546
break;
549547
case ReferenceType.CALLEE:
550-
ret = queryHelper.createAstNodeInfoList(queryCallees(node));
548+
ret = QueryUtility.CreateAstNodeInfoList(queryCallees(node));
551549
break;
552550
case ReferenceType.CALLER:
553-
ret = queryHelper.createAstNodeInfoList(queryCallers(node));
551+
ret = QueryUtility.CreateAstNodeInfoList(queryCallers(node));
554552
break;
555553
case ReferenceType.ENUM_CONSTANTS:
556-
ret = queryHelper.createAstNodeInfoList(queryEnumConsts(node));
554+
ret = QueryUtility.CreateAstNodeInfoList(queryEnumConsts(node));
557555
break;
558556
case ReferenceType.METHOD:
559-
ret = queryHelper.createAstNodeInfoList(queryMethods(node));
557+
ret = QueryUtility.CreateAstNodeInfoList(queryMethods(node));
560558
break;
561559
case ReferenceType.CONSTRUCTOR:
562-
ret = queryHelper.createAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Constructor));
560+
ret = QueryUtility.CreateAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Constructor));
563561
break;
564562
case ReferenceType.DESTRUCTOR:
565-
ret = queryHelper.createAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Destuctor));
563+
ret = QueryUtility.CreateAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Destuctor));
566564
break;
567565
case ReferenceType.OPERATOR:
568-
ret = queryHelper.createAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Operator));
566+
ret = QueryUtility.CreateAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Operator));
569567
break;
570568
case ReferenceType.ACCESSOR:
571-
ret = queryHelper.createAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Accessor));
569+
ret = QueryUtility.CreateAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Accessor));
572570
break;
573571
case ReferenceType.DELEGATE:
574-
ret = queryHelper.createAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Delegate));
572+
ret = QueryUtility.CreateAstNodeInfoList(queryMethodType(node, MethodTypeEnum.Delegate));
575573
break;
576574
case ReferenceType.EVENT:
577-
ret = queryHelper.createAstNodeInfoList(queryEvents(node));
575+
ret = QueryUtility.CreateAstNodeInfoList(queryEvents(node));
578576
break;
579577
default:
580578
System.Console.WriteLine($"[CSharpService] {(ReferenceType)referenceId}"+

plugins/csharp/service/src_csharp/CSharpQueryHelper.cs renamed to plugins/csharp/service/src_csharp/CSharpQueryUtility.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
using cc.service.csharp;
1818
using CSharpParser.model;
1919

20-
class QueryHelper
20+
static class QueryUtility
2121
{
22-
public AstNodeInfo createAstNodeInfo(CsharpAstNode node)
22+
public static AstNodeInfo CreateAstNodeInfo(CsharpAstNode node)
2323
{
2424
AstNodeInfo ret = new AstNodeInfo();
2525
ret.Id = node.Id.ToString();
2626
ret.AstNodeValue = node.AstValue;
2727
ret.AstNodeType = node.RawKind.ToString();
2828
ret.SymbolType = node.AstSymbolType.ToString();
29-
ret.Range = getFileRange(node);
29+
ret.Range = GetFileRange(node);
3030

3131
List<string> tags = new List<string>();
3232
tags.Add(node.Accessibility.ToString());
@@ -36,19 +36,19 @@ public AstNodeInfo createAstNodeInfo(CsharpAstNode node)
3636
return ret;
3737
}
3838

39-
public List<AstNodeInfo> createAstNodeInfoList(List<CsharpAstNode> nodeList)
39+
public static List<AstNodeInfo> CreateAstNodeInfoList(List<CsharpAstNode> nodeList)
4040
{
4141
var ret = new List<AstNodeInfo>();
4242
foreach (var node in nodeList)
4343
{
44-
var astNodeInfo = createAstNodeInfo(node);
44+
var astNodeInfo = CreateAstNodeInfo(node);
4545
ret.Add(astNodeInfo);
4646
}
4747

4848
return ret;
4949
}
5050

51-
public FileRange getFileRange(CsharpAstNode node)
51+
public static FileRange GetFileRange(CsharpAstNode node)
5252
{
5353
FileRange fileRange = new FileRange();
5454
Position startPosition = new Position

0 commit comments

Comments
 (0)