Name of language namespace changed

Author: matecsad

plugins/csharp/service/src_csharp/CSharpQueryHandler.cs

@@ -13,7 +13,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.Diagnostics;
-using language;
+using CodeCompass.Service.Language;
 using cc.service.csharp;
 using CSharpParser.model;
 
@@ -43,9 +43,9 @@ public CSharpQueryHandler(string connenctionString)
         dbContext = new CsharpDbContext(options);
     }
 
-    private language.AstNodeInfo createAstNodeInfo(CsharpAstNode node)
+    private AstNodeInfo createAstNodeInfo(CsharpAstNode node)
     {
-        language.AstNodeInfo ret = new language.AstNodeInfo();
+        AstNodeInfo ret = new AstNodeInfo();
         ret.Id = node.Id.ToString();
         ret.AstNodeValue = node.AstValue;
         ret.AstNodeType = node.RawKind.ToString();
@@ -60,9 +60,9 @@ private language.AstNodeInfo createAstNodeInfo(CsharpAstNode node)
         return ret;
     }
 
-    private List<language.AstNodeInfo> createAstNodeInfoList(List<CsharpAstNode> nodeList)
+    private List<AstNodeInfo> createAstNodeInfoList(List<CsharpAstNode> nodeList)
     {
-        var ret = new List<language.AstNodeInfo>();
+        var ret = new List<AstNodeInfo>();
         foreach (var node in nodeList)
         {
             var astNodeInfo = createAstNodeInfo(node);
@@ -285,14 +285,14 @@ private List<CsharpAstNode> queryEvents(CsharpAstNode astNode)
     }
 
 
-    public async Task<language.AstNodeInfo> getAstNodeInfo(string astNodeId, 
+    public async Task<AstNodeInfo> getAstNodeInfo(string astNodeId, 
         CancellationToken cancellationToken = default(CancellationToken))
     {
         System.Console.WriteLine("[CSharpService] getAstNodeInfoAsync");
-        return await Task.FromResult(new language.AstNodeInfo());
+        return await Task.FromResult(new AstNodeInfo());
     }
 
-    public async Task<language.AstNodeInfo> getAstNodeInfoByPosition(string path_, 
+    public async Task<AstNodeInfo> getAstNodeInfoByPosition(string path_, 
         Position pos_,
         CancellationToken cancellationToken = default(CancellationToken))
     {
@@ -308,7 +308,7 @@ private List<CsharpAstNode> queryEvents(CsharpAstNode astNode)
         if (nodes.Count() == 0)
         {
             System.Console.WriteLine("[CSharpService error] There are no AstNode at this position!");
-            return await Task.FromResult(new language.AstNodeInfo());
+            return await Task.FromResult(new AstNodeInfo());
         } 
 
         var minNode = nodes.FirstOrDefault();
@@ -570,12 +570,12 @@ public async Task<int> getReferenceCount(string astNodeId, int referenceId,
         return await Task.FromResult(ret);
     }
 
-    public async Task<List<language.AstNodeInfo>> getReferences(string astNodeId, 
+    public async Task<List<AstNodeInfo>> getReferences(string astNodeId, 
         int referenceId, List<string> tags, 
         CancellationToken cancellationToken = default(CancellationToken))
     {
         var node = queryCsharpAstNode(astNodeId);        
-        var ret = new List<language.AstNodeInfo>();
+        var ret = new List<AstNodeInfo>();
         switch ((ReferenceType)referenceId)
         {
             case ReferenceType.USAGE:
@@ -654,11 +654,11 @@ public async Task<int> getFileReferenceCount(string path, int referenceId,
         return await Task.FromResult(0);
     }
 
-    public async Task<List<language.AstNodeInfo>> getFileReferences(string path, 
+    public async Task<List<AstNodeInfo>> getFileReferences(string path, 
         int referenceId, 
         CancellationToken cancellationToken = default(CancellationToken))
     {
-        return await Task.FromResult(new List<language.AstNodeInfo>());
+        return await Task.FromResult(new List<AstNodeInfo>());
     }
 
     public async Task<Dictionary<string, int>> getDiagramTypes(string astNodeId, 
@@ -673,11 +673,11 @@ public async Task<string> getDiagram(string astNodeId, int diagramId,
         return await Task.FromResult("Diagram");
     }
 
-    public async Task<List<language.SyntaxHighlight>> getSyntaxHighlight(FileRange range, 
+    public async Task<List<SyntaxHighlight>> getSyntaxHighlight(FileRange range, 
         List<string> content, 
         CancellationToken cancellationToken = default(CancellationToken))
     {
-        return await Task.FromResult(new List<language.SyntaxHighlight>());
+        return await Task.FromResult(new List<SyntaxHighlight>());
     }
 
 

plugins/csharp/service/src_csharp/CSharpQueryServer.cs

@@ -17,7 +17,7 @@
 using Thrift.Transport.Server;
 using Thrift.Processor;
 using System.Diagnostics;
-using language;
+using CodeCompass.Service.Language;
 using cc.service.csharp;
 using CSharpParser.model;
 

service/language/language.thrift

@@ -2,7 +2,7 @@ include "../project/common.thrift"
 include "../project/project.thrift"
 
 namespace cpp cc.service.language
-namespace netstd language
+namespace netstd CodeCompass.Service.Language
 
 struct AstNodeInfo
 {