remove the tree-sitter wrapper

eyelash · Oct 7, 2023 · 415ccec · 415ccec
1 parent 09ccde6
commit 415ccec
Show file tree

Hide file tree

Showing 14 changed files with 190 additions and 357 deletions.
diff --git a/atom/src/syntax-scope-map.h b/atom/src/syntax-scope-map.h
@@ -2,18 +2,18 @@
 #define SYNTAX_SCOPE_MAP_H_
 
 #include <optional.h>
+#include <tree_sitter/api.h>
 #include <vector>
 #include <string>
 #include <unordered_map>
 #include <memory>
 
 struct TextBuffer;
-struct TreeCursor;
 
 struct SyntaxScopeMap {
   struct Result {
     virtual ~Result();
-    virtual optional<std::string> applyLeafRules(TextBuffer *, const TreeCursor &) = 0;
+    virtual optional<std::string> applyLeafRules(TextBuffer *, TSTreeCursor *) = 0;
   };
   struct Table {
     std::unordered_map<double, std::unique_ptr<Table>> indices;

diff --git a/atom/src/tree-sitter-grammar.cc b/atom/src/tree-sitter-grammar.cc
@@ -2,7 +2,7 @@
 #include "syntax-scope-map.h"
 #include "tree-sitter-language-mode.h"
 #include <regex.h>
-#include <tree-cursor.h>
+#include <tree-sitter.h>
 #include <text-buffer.h>
 
 TreeSitterGrammar::TreeSitterGrammar(const char *name, const char *scopeName, const TSLanguage *languageModule) : Grammar(name, scopeName) {
@@ -35,7 +35,7 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopes(cons
   struct StringResult final : SyntaxScopeMap::Result {
     std::string rules;
     StringResult(const char *value) : rules(value) {}
-    optional<std::string> applyLeafRules(TextBuffer *, const TreeCursor &) override {
+    optional<std::string> applyLeafRules(TextBuffer *, TSTreeCursor *) override {
       return rules;
     }
   };
@@ -47,8 +47,8 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopesExact
     std::u16string exact;
     std::shared_ptr<SyntaxScopeMap::Result> scopes;
     ExactResult(const char16_t *exact, std::shared_ptr<SyntaxScopeMap::Result> &&scopes) : exact(exact), scopes(std::move(scopes)) {}
-    optional<std::string> applyLeafRules(TextBuffer *buffer, const TreeCursor &cursor) override {
-      const std::u16string nodeText = buffer->buffer->text_in_range({cursor.startPosition(), cursor.endPosition()});
+    optional<std::string> applyLeafRules(TextBuffer *buffer, TSTreeCursor *cursor) override {
+      const std::u16string nodeText = buffer->buffer->text_in_range({startPosition(cursor), endPosition(cursor)});
       return nodeText == exact
         ? scopes->applyLeafRules(buffer, cursor)
         : optional<std::string>();
@@ -62,8 +62,8 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopesMatch
     Regex match;
     std::shared_ptr<SyntaxScopeMap::Result> scopes;
     MatchResult(const char16_t *match, std::shared_ptr<SyntaxScopeMap::Result> &&scopes) : match(match), scopes(std::move(scopes)) {}
-    optional<std::string> applyLeafRules(TextBuffer *buffer, const TreeCursor &cursor) override {
-      const std::u16string nodeText = buffer->buffer->text_in_range({cursor.startPosition(), cursor.endPosition()});
+    optional<std::string> applyLeafRules(TextBuffer *buffer, TSTreeCursor *cursor) override {
+      const std::u16string nodeText = buffer->buffer->text_in_range({startPosition(cursor), endPosition(cursor)});
       return match.match(nodeText)
         ? scopes->applyLeafRules(buffer, cursor)
         : optional<std::string>();
@@ -76,7 +76,7 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopes(std:
   struct ArrayResult final : SyntaxScopeMap::Result {
     std::vector<std::shared_ptr<SyntaxScopeMap::Result>> rules;
     ArrayResult(std::vector<std::shared_ptr<SyntaxScopeMap::Result>> &&value) : rules(std::move(value)) {}
-    optional<std::string> applyLeafRules(TextBuffer *buffer, const TreeCursor &cursor) override {
+    optional<std::string> applyLeafRules(TextBuffer *buffer, TSTreeCursor *cursor) override {
       for (size_t i = 0, length = rules.size(); i != length; ++i) {
         const auto result = rules[i]->applyLeafRules(buffer, cursor);
         if (result) return result;