Update

src/TreeSitterSharp.C/CLanguageProvider.cs

@@ -1,20 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 using TreeSitterSharp.Native;
 
 namespace TreeSitterSharp.C;
 internal class CLanguageProvider : ILanguageProvider
 {
     [DllImport("tree-sitter-c", EntryPoint = "tree_sitter_c", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-    private static extern unsafe Native.TsLanguage* tree_sitter_c();
+    private static extern unsafe TsLanguage* tree_sitter_c();
 
-    public static unsafe TsLanguage GetLanguage()
+    public static unsafe Language GetLanguage()
     {
-        return new TsLanguage(tree_sitter_c());
+        return new Language(tree_sitter_c());
     }
 
 }

src/TreeSitterSharp.C/CParser.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TreeSitterSharp.C;
-public class CParser : TsParser
+namespace TreeSitterSharp.C;
+public class CParser : Parser
 {
     public CParser() : base(CLanguageProvider.GetLanguage())
     {

src/TreeSitterSharp.Json/JsonLanguageProvider.cs

@@ -1,18 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 using TreeSitterSharp.Native;
 
 namespace TreeSitterSharp.Json
 {
     internal unsafe class JsonLanguageProvider : ILanguageProvider
     {
         [DllImport("tree-sitter-json", EntryPoint = "tree_sitter_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        private static extern unsafe Native.TsLanguage* tree_sitter_json();
+        private static extern TsLanguage* tree_sitter_json();
 
-        public static TsLanguage GetLanguage() => new(tree_sitter_json());
+        public static Language GetLanguage() => new(tree_sitter_json());
     }
 }

src/TreeSitterSharp.Json/JsonParser.cs

@@ -1,12 +1,6 @@
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace TreeSitterSharp.Json;
-public class JsonParser : TsParser
+public class JsonParser : Parser
 {
     public JsonParser() : base(JsonLanguageProvider.GetLanguage())
     {

src/TreeSitterSharp/ILanguageProvider.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TreeSitterSharp;
+namespace TreeSitterSharp;
 public interface ILanguageProvider
 {
-    static abstract TsLanguage GetLanguage();
+    static abstract Language GetLanguage();
 }

src/TreeSitterSharp/INativeObject.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TreeSitterSharp;
+internal interface INativeObject<T> where T : struct
+{
+    unsafe T* ToUnmanaged();
+}

src/TreeSitterSharp/Language.cs

@@ -0,0 +1,17 @@
+using TreeSitterSharp.Native;
+
+namespace TreeSitterSharp;
+public unsafe class Language:INativeObject<TsLanguage>
+{
+    private TsLanguage* _language;
+
+    public Language(TsLanguage* language)
+    {
+        _language = language;
+    }
+
+    public TsLanguage* ToUnmanaged()
+    {
+        return _language;
+    }
+}

src/TreeSitterSharp/Native/NativeTypeNameAttribute.cs

@@ -1,12 +1,11 @@
-using System;
 using System.Diagnostics;
 
 namespace TreeSitterSharp.Native;
 
 /// <summary>Defines the type of a member as it was used in the native signature.</summary>
-[AttributeUsage(AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.ReturnValue, AllowMultiple = false, Inherited = true)]
+[AttributeUsage(AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
 [Conditional("DEBUG")]
-internal sealed partial class NativeTypeNameAttribute : Attribute
+internal sealed class NativeTypeNameAttribute : Attribute
 {
     private readonly string _name;
 

src/TreeSitterSharp/Native/TsFieldMapEntry.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsFieldMapEntry
+public struct TsFieldMapEntry
 {
     [NativeTypeName("TSFieldId")]
     public ushort field_id;

src/TreeSitterSharp/Native/TsFieldMapSlice.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsFieldMapSlice
+public struct TsFieldMapSlice
 {
     [NativeTypeName("uint16_t")]
     public ushort index;

src/TreeSitterSharp/Native/TsInput.cs

@@ -1,11 +1,11 @@
 namespace TreeSitterSharp.Native;
 
-public unsafe partial struct TsInput
+public unsafe struct TsInput
 {
     public void* payload;
 
     [NativeTypeName("const char *(*)(void *, uint32_t, TSPoint, uint32_t *)")]
-    public delegate* unmanaged[Cdecl]<void*, uint, TsPoint, uint*, string> read;
+    public delegate* unmanaged[Cdecl]<void*, uint, Point, uint*, string> read;
 
     public TsInputEncoding encoding;
 }

src/TreeSitterSharp/Native/TsInputEdit.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsInputEdit
+public struct TsInputEdit
 {
     [NativeTypeName("uint32_t")]
     public uint start_byte;
@@ -11,9 +11,9 @@ public partial struct TsInputEdit
     [NativeTypeName("uint32_t")]
     public uint new_end_byte;
 
-    public TsPoint start_point;
+    public Point start_point;
 
-    public TsPoint old_end_point;
+    public Point old_end_point;
 
-    public TsPoint new_end_point;
+    public Point new_end_point;
 }

src/TreeSitterSharp/Native/TsLanguage.cs

@@ -89,7 +89,7 @@ public unsafe partial struct TsLanguage
     [NativeTypeName("const TSStateId *")]
     public ushort* primary_state_ids;
 
-    public unsafe partial struct _external_scanner_e__Struct
+    public struct _external_scanner_e__Struct
     {
         [NativeTypeName("const bool *")]
         public bool* states;

src/TreeSitterSharp/Native/TsLexMode.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsLexMode
+public struct TsLexMode
 {
     [NativeTypeName("uint16_t")]
     public ushort lex_state;

src/TreeSitterSharp/Native/TsLexer.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public unsafe partial struct TsLexer
+public unsafe struct TsLexer
 {
     [NativeTypeName("int32_t")]
     public int lookahead;

src/TreeSitterSharp/Native/TsLogger.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public unsafe partial struct TsLogger
+public unsafe struct TsLogger
 {
     public void* payload;
 

src/TreeSitterSharp/Native/TsLookaheadIterator.cs

@@ -1,5 +1,5 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsLookaheadIterator
+public struct TsLookaheadIterator
 {
 }

src/TreeSitterSharp/Native/TsNode.cs

@@ -1,13 +1,13 @@
 namespace TreeSitterSharp.Native;
 
-public unsafe partial struct TsNode
+public unsafe struct TsNode
 {
     [NativeTypeName("uint32_t[4]")]
     public fixed uint context[4];
 
     [NativeTypeName("const void *")]
     public void* id;
 
-    [NativeTypeName("const TsTree *")]
+    [NativeTypeName("const Tree *")]
     public TsTree* tree;
 }

src/TreeSitterSharp/Native/TsParseAction.cs

@@ -17,7 +17,7 @@ public partial struct TsParseAction
     [NativeTypeName("uint8_t")]
     public byte type;
 
-    public partial struct _shift_e__Struct
+    public struct _shift_e__Struct
     {
         [NativeTypeName("uint8_t")]
         public byte type;
@@ -32,7 +32,7 @@ public partial struct _shift_e__Struct
         public byte repetition;
     }
 
-    public partial struct _reduce_e__Struct
+    public struct _reduce_e__Struct
     {
         [NativeTypeName("uint8_t")]
         public byte type;

src/TreeSitterSharp/Native/TsParseActionEntry.cs

@@ -12,7 +12,7 @@ public partial struct TsParseActionEntry
     [NativeTypeName("__AnonymousRecord_parser_L83_C3")]
     public EntryEStruct entry;
 
-    public partial struct EntryEStruct
+    public struct EntryEStruct
     {
         [NativeTypeName("uint8_t")]
         public byte Count;

src/TreeSitterSharp/Native/TsParser.cs

@@ -1,5 +1,5 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsParser
+public struct TsParser
 {
 }

src/TreeSitterSharp/Native/TsQuery.cs

@@ -1,5 +1,5 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsQuery
+public struct TsQuery
 {
 }

src/TreeSitterSharp/Native/TsQueryCapture.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsQueryCapture
+public struct TsQueryCapture
 {
     public TsNode Node;
 

src/TreeSitterSharp/Native/TsQueryCursor.cs

@@ -1,5 +1,5 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsQueryCursor
+public struct TsQueryCursor
 {
 }

src/TreeSitterSharp/Native/TsQueryMatch.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public unsafe partial struct TsQueryMatch
+public unsafe struct TsQueryMatch
 {
     [NativeTypeName("uint32_t")]
     public uint Id;

src/TreeSitterSharp/Native/TsQueryPredicateStep.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsQueryPredicateStep
+public struct TsQueryPredicateStep
 {
     public TsQueryPredicateStepType Type;
 

src/TreeSitterSharp/Native/TsRange.cs

@@ -1,10 +1,10 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsRange
+public struct TsRange
 {
-    public TsPoint start_point;
+    public Point start_point;
 
-    public TsPoint end_point;
+    public Point end_point;
 
     public uint start_byte;
 

src/TreeSitterSharp/Native/TsSymbolMetadata.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public partial struct TsSymbolMetadata
+public struct TsSymbolMetadata
 {
     [NativeTypeName("bool")]
     public byte Visible;

src/TreeSitterSharp/Native/TsTreeCursor.cs

@@ -1,6 +1,6 @@
 namespace TreeSitterSharp.Native;
 
-public unsafe partial struct TsTreeCursor
+public unsafe struct TsTreeCursor
 {
     public TsTree* tree;