Update

Summpot · Nov 3, 2023 · 06a4f54 · 06a4f54
1 parent acae31a
commit 06a4f54
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 19 deletions.
diff --git a/src/TreeSitterSharp.C/CParser.cs b/src/TreeSitterSharp.C/CParser.cs
@@ -1,5 +1,5 @@
 namespace TreeSitterSharp.C;
-public class CParser : TreeSitterSyntaxParser
+public class CParser : TreeSitterParser
 {
     public CParser() : base(CLanguageProvider.GetLanguage())
     {

diff --git a/src/TreeSitterSharp.Json/JsonParser.cs b/src/TreeSitterSharp.Json/JsonParser.cs
@@ -1,6 +1,6 @@
 
 namespace TreeSitterSharp.Json;
-public class JsonParser : TreeSitterSyntaxParser
+public class JsonParser : TreeSitterParser
 {
     public JsonParser() : base(JsonLanguageProvider.GetLanguage())
     {

diff --git a/...TreeSitterSharp/TreeSitterSyntaxParser.cs → src/TreeSitterSharp/TreeSitterParser.cs b/...TreeSitterSharp/TreeSitterSyntaxParser.cs → src/TreeSitterSharp/TreeSitterParser.cs
@@ -3,14 +3,14 @@
 using TreeSitterSharp.Native;
 
 namespace TreeSitterSharp;
-public unsafe class TreeSitterSyntaxParser : INativeObject<TsParser>
+public unsafe class TreeSitterParser : INativeObject<TsParser>
 {
     private TsParser* _parser;
     private Language? _language;
 
 
 
-    public TreeSitterSyntaxParser(Language language)
+    public TreeSitterParser(Language language)
     {
         static void* NewMalloc(nuint byteCount) => NativeMemory.Alloc(byteCount);
         static void* NewCalloc(nuint count, nuint size) => NativeMemory.AllocZeroed(count * size);
@@ -21,7 +21,7 @@ public TreeSitterSyntaxParser(Language language)
         Language = language;
     }
 
-    ~TreeSitterSyntaxParser()
+    ~TreeSitterParser()
     {
         Ts.parser_delete(_parser);
     }

diff --git a/src/TreeSitterSharp/QueryCursor.cs → src/TreeSitterSharp/TreeSitterQueryCursor.cs b/src/TreeSitterSharp/QueryCursor.cs → src/TreeSitterSharp/TreeSitterQueryCursor.cs
@@ -9,11 +9,11 @@
 
 namespace TreeSitterSharp;
 
-public unsafe class QueryCursor
+public unsafe class TreeSitterQueryCursor
 {
     private TsQueryCursor* _queryCursor;
 
-    public QueryCursor()
+    public TreeSitterQueryCursor()
     {
         _queryCursor = Ts.query_cursor_new();
     }

diff --git a/src/TreeSitterSharp/TreeSitterSharp.csproj b/src/TreeSitterSharp/TreeSitterSharp.csproj
@@ -9,7 +9,6 @@
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
     <PackageReference Include="tree-sitter" Version="*" />
   </ItemGroup>
 </Project>
diff --git a/src/TreeSitterSharp/TreeSitterSyntaxTree.cs b/src/TreeSitterSharp/TreeSitterSyntaxTree.cs
@@ -1,6 +1,4 @@
 using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
 using TreeSitterSharp.Native;
 
 namespace TreeSitterSharp;

diff --git a/src/TreeSitterSharp/SyntaxTreeCursor.cs → ...SitterSharp/TreeSitterSyntaxTreeCursor.cs b/src/TreeSitterSharp/SyntaxTreeCursor.cs → ...SitterSharp/TreeSitterSyntaxTreeCursor.cs
@@ -1,20 +1,20 @@
 using TreeSitterSharp.Native;
 
 namespace TreeSitterSharp;
-public class SyntaxTreeCursor
+public class TreeSitterSyntaxTreeCursor
 {
     private readonly TsTreeCursor _treeCursor;
     private readonly TsNode _node;
 
-    public SyntaxTreeCursor(TreeSitterSyntaxNode node)
+    public TreeSitterSyntaxTreeCursor(TreeSitterSyntaxNode node)
     {
         _node = node.ToUnmanaged();
         _treeCursor = Ts.tree_cursor_new(_node);
     }
 
-    private SyntaxTreeCursor(TsTreeCursor treeCursor) => _treeCursor = treeCursor;
+    private TreeSitterSyntaxTreeCursor(TsTreeCursor treeCursor) => _treeCursor = treeCursor;
 
-    ~SyntaxTreeCursor()
+    ~TreeSitterSyntaxTreeCursor()
     {
         Ts.tree_cursor_delete(_treeCursor);
     }
@@ -39,13 +39,13 @@ public void Reset()
         Ts.tree_cursor_reset(_treeCursor, _node);
     }
 
-    public void ResetTo(SyntaxTreeCursor dst)
+    public void ResetTo(TreeSitterSyntaxTreeCursor dst)
     {
         Ts.tree_cursor_reset_to(dst._treeCursor, _treeCursor);
     }
 
-    public SyntaxTreeCursor Copy()
+    public TreeSitterSyntaxTreeCursor Copy()
     {
-        return new SyntaxTreeCursor(Ts.tree_cursor_copy(_treeCursor));
+        return new TreeSitterSyntaxTreeCursor(Ts.tree_cursor_copy(_treeCursor));
     }
 }
diff --git a/tests/TreeSitterSharp.C.Tests/CParserTests.cs b/tests/TreeSitterSharp.C.Tests/CParserTests.cs
@@ -26,7 +26,7 @@ int fibonacci(int n) {
 
 
         var tree = parser.Parse(code);
-        var treeCursor = new SyntaxTreeCursor(tree.Root);
+        var treeCursor = new TreeSitterSyntaxTreeCursor(tree.Root);
         var a = treeCursor.GotoFirstChild();
         Assert.Equal(expected, tree.Root.GetSExpression());
     }
@@ -51,7 +51,7 @@ int fibonacci(int n) {
 
         var tree = parser.Parse(code);
 
-        var cursor = new QueryCursor();
+        var cursor = new TreeSitterQueryCursor();
 
         cursor.Execute(Query.Create(tree.Language, "(preproc_include)", out var errorOffset, out var error), tree.Root);